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 @@ | |||
7 | 1 | 2013-12-04: bluesabre@xfce.org | 1 | 2014-01-25: bluesabre@xfce.org |
8 | 2 | * Bugfix release 0.5.4 | 2 | * Stable release 0.6.0 |
9 | 3 | * Fix bug with DIR handles not being closed (bug #10600) | ||
10 | 4 | * Fix crash for m3u files with all absolute paths | ||
11 | 5 | * Added 128px appicon | ||
12 | 6 | * Added Contents menu-item to Help menu | ||
13 | 7 | |||
14 | 8 | 2013-12-29: bluesabre@xfce.org | ||
15 | 9 | * Development release 0.5.91 | ||
16 | 10 | * Fix untranslatable strings (bug #10418) | ||
17 | 3 | * Fix loading of playlists with relative paths (bug #10436) | 11 | * Fix loading of playlists with relative paths (bug #10436) |
19 | 4 | * Fix file-filters for audio/video mimetypes (bug #10434) | 12 | * Add realmedia video to supported video mimetypes (bug #10434) |
20 | 5 | * Fix IF/ELSE for plugin installation on multiple platforms (bugs #10142, #10441) | 13 | * Fix IF/ELSE for plugin installation on multiple platforms (bugs #10142, #10441) |
21 | 14 | * Fix building with enable-debug=full on some platforms (bug #10525) | ||
22 | 6 | * Fix "Remove Duplicates" functionality. | 15 | * Fix "Remove Duplicates" functionality. |
23 | 16 | * Plugin API documentation updates | ||
24 | 17 | * Fixed playlist search | ||
25 | 18 | * New MPRIS2 plugin | ||
26 | 19 | |||
27 | 20 | 2013-10-19: bluesabre@xfce.org | ||
28 | 21 | * Development release 0.5.90 | ||
29 | 22 | * Completed port to GTK+3 | ||
30 | 23 | - Remove deprecated GTK+2 items | ||
31 | 24 | - Use GtkOverlay for player controls | ||
32 | 25 | - Use symbolic icons for menus, plugins | ||
33 | 26 | * Improved window maximization | ||
34 | 27 | - Window dimensions are no longer saved when maximizing | ||
35 | 28 | - Added "window-maximized" setting to xfconf to keep maximization across sessions | ||
36 | 29 | * Rearranged and improved menubar | ||
37 | 30 | - Renamed "Edit" menu to "Playback" | ||
38 | 31 | - Renamed "Languages" menu item to "Audio Track" | ||
39 | 32 | - Added Tools menu | ||
40 | 33 | - Moved Plugins and Preferences to Tools menu | ||
41 | 34 | - Added DVD menu (visible only when a DVD or DVD ISO is being played) | ||
42 | 35 | - Added "Save Playlist" item to Media menu | ||
43 | 36 | - Added "Report Bug" item to Help menu | ||
44 | 37 | * Improved playlist | ||
45 | 38 | - Use symbolic icons in an inline toolbar | ||
46 | 39 | - Removed redundant settings button | ||
47 | 40 | - Added Move Up/Down buttons | ||
48 | 41 | * Updated/improved included plugins | ||
49 | 42 | - Added Previous/Next Track menu items to Tray plugin | ||
50 | 43 | - Added Previous/Next Track menu items to Notification plugin | ||
51 | 44 | * Other improvements | ||
52 | 45 | - Updated artwork (background image, icons) | ||
53 | 46 | - Fixed GStreamer 1.0 support | ||
54 | 47 | - Added ability to play DVD ISOs from the Open dialog | ||
55 | 48 | - Plugins now correctly report when they fail to load | ||
56 | 49 | * Bugs fixed | ||
57 | 50 | - missing option to open DVD from iso (bug #10300) | ||
58 | 51 | - Allow a playlist to be sorted and/or items to be moved (bug #10066) | ||
59 | 52 | - Remember playlist option in GUI not working (bug #10269) | ||
60 | 53 | - Parole show irritating edge (bug #10081) | ||
61 | 7 | 54 | ||
62 | 8 | 2013-08-03: bluesabre@xfce.org | 55 | 2013-08-03: bluesabre@xfce.org |
63 | 9 | * Bugfix release 0.5.3 | 56 | * Bugfix release 0.5.3 |
64 | 10 | 57 | ||
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 | 12 | Basic Installation | 12 | Basic Installation |
70 | 13 | ================== | 13 | ================== |
71 | 14 | 14 | ||
74 | 15 | Briefly, the shell commands `./configure; make; make install' should | 15 | Briefly, the shell command `./configure && make && make install' |
75 | 16 | configure, build, and install this package. The following | 16 | should configure, build, and install this package. The following |
76 | 17 | more-detailed instructions are generic; see the `README' file for | 17 | more-detailed instructions are generic; see the `README' file for |
77 | 18 | instructions specific to this package. Some packages provide this | 18 | instructions specific to this package. Some packages provide this |
78 | 19 | `INSTALL' file but do not implement all of the features documented | 19 | `INSTALL' file but do not implement all of the features documented |
79 | 20 | 20 | ||
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 @@ | |||
85 | 1 | # Makefile.in generated by automake 1.13.3 from Makefile.am. | 1 | # Makefile.in generated by automake 1.14.1 from Makefile.am. |
86 | 2 | # @configure_input@ | 2 | # @configure_input@ |
87 | 3 | 3 | ||
88 | 4 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. | 4 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. |
89 | @@ -82,7 +82,7 @@ | |||
90 | 82 | $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ | 82 | $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ |
91 | 83 | $(top_srcdir)/configure $(am__configure_deps) \ | 83 | $(top_srcdir)/configure $(am__configure_deps) \ |
92 | 84 | $(srcdir)/config.h.in COPYING THANKS TODO compile config.guess \ | 84 | $(srcdir)/config.h.in COPYING THANKS TODO compile config.guess \ |
94 | 85 | config.sub depcomp install-sh missing ltmain.sh | 85 | config.sub install-sh missing ltmain.sh |
95 | 86 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | 86 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
96 | 87 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac | 87 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
97 | 88 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 88 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
98 | @@ -407,7 +407,6 @@ | |||
99 | 407 | docdir = @docdir@ | 407 | docdir = @docdir@ |
100 | 408 | dvidir = @dvidir@ | 408 | dvidir = @dvidir@ |
101 | 409 | exec_prefix = @exec_prefix@ | 409 | exec_prefix = @exec_prefix@ |
102 | 410 | gtkrcdir = @gtkrcdir@ | ||
103 | 411 | host = @host@ | 410 | host = @host@ |
104 | 412 | host_alias = @host_alias@ | 411 | host_alias = @host_alias@ |
105 | 413 | host_cpu = @host_cpu@ | 412 | host_cpu = @host_cpu@ |
106 | @@ -499,8 +498,8 @@ | |||
107 | 499 | $(am__aclocal_m4_deps): | 498 | $(am__aclocal_m4_deps): |
108 | 500 | 499 | ||
109 | 501 | config.h: stamp-h1 | 500 | config.h: stamp-h1 |
112 | 502 | @if test ! -f $@; then rm -f stamp-h1; else :; fi | 501 | @test -f $@ || rm -f stamp-h1 |
113 | 503 | @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi | 502 | @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 |
114 | 504 | 503 | ||
115 | 505 | stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status | 504 | stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status |
116 | 506 | @rm -f stamp-h1 | 505 | @rm -f stamp-h1 |
117 | @@ -708,10 +707,16 @@ | |||
118 | 708 | $(am__post_remove_distdir) | 707 | $(am__post_remove_distdir) |
119 | 709 | 708 | ||
120 | 710 | dist-tarZ: distdir | 709 | dist-tarZ: distdir |
121 | 710 | @echo WARNING: "Support for shar distribution archives is" \ | ||
122 | 711 | "deprecated." >&2 | ||
123 | 712 | @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 | ||
124 | 711 | tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z | 713 | tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z |
125 | 712 | $(am__post_remove_distdir) | 714 | $(am__post_remove_distdir) |
126 | 713 | 715 | ||
127 | 714 | dist-shar: distdir | 716 | dist-shar: distdir |
128 | 717 | @echo WARNING: "Support for distribution archives compressed with" \ | ||
129 | 718 | "legacy program 'compress' is deprecated." >&2 | ||
130 | 719 | @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 | ||
131 | 715 | shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz | 720 | shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz |
132 | 716 | $(am__post_remove_distdir) | 721 | $(am__post_remove_distdir) |
133 | 717 | 722 | ||
134 | @@ -753,9 +758,10 @@ | |||
135 | 753 | && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ | 758 | && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ |
136 | 754 | && am__cwd=`pwd` \ | 759 | && am__cwd=`pwd` \ |
137 | 755 | && $(am__cd) $(distdir)/_build \ | 760 | && $(am__cd) $(distdir)/_build \ |
139 | 756 | && ../configure --srcdir=.. --prefix="$$dc_install_base" \ | 761 | && ../configure \ |
140 | 757 | $(AM_DISTCHECK_CONFIGURE_FLAGS) \ | 762 | $(AM_DISTCHECK_CONFIGURE_FLAGS) \ |
141 | 758 | $(DISTCHECK_CONFIGURE_FLAGS) \ | 763 | $(DISTCHECK_CONFIGURE_FLAGS) \ |
142 | 764 | --srcdir=.. --prefix="$$dc_install_base" \ | ||
143 | 759 | && $(MAKE) $(AM_MAKEFLAGS) \ | 765 | && $(MAKE) $(AM_MAKEFLAGS) \ |
144 | 760 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ | 766 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ |
145 | 761 | && $(MAKE) $(AM_MAKEFLAGS) check \ | 767 | && $(MAKE) $(AM_MAKEFLAGS) check \ |
146 | 762 | 768 | ||
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 | 1 | 0.6.0 | ||
152 | 2 | ======= | ||
153 | 3 | - Completed port to GTK+3 | ||
154 | 4 | - Remove deprecated GTK+2 items | ||
155 | 5 | - Use GtkOverlay for player controls | ||
156 | 6 | - Use symbolic icons for menus, plugins | ||
157 | 7 | - Improved window maximization | ||
158 | 8 | - Window dimensions are no longer saved when maximizing | ||
159 | 9 | - Added "window-maximized" setting to xfconf to keep maximization across sessions | ||
160 | 10 | - Rearranged and improved menubar | ||
161 | 11 | - Renamed "Edit" menu to "Playback" | ||
162 | 12 | - Renamed "Languages" menu item to "Audio Track" | ||
163 | 13 | - Added Tools menu | ||
164 | 14 | - Moved Plugins and Preferences to Tools menu | ||
165 | 15 | - Added DVD menu (visible only when a DVD or DVD ISO is being played) | ||
166 | 16 | - Added "Save Playlist" item to Media menu | ||
167 | 17 | - Added "Contents" item to Help menu | ||
168 | 18 | - Added "Report Bug" item to Help menu | ||
169 | 19 | - Improved playlist | ||
170 | 20 | - Use symbolic icons in an inline toolbar | ||
171 | 21 | - Removed redundant settings button | ||
172 | 22 | - Added Move Up/Down buttons | ||
173 | 23 | - Improved search | ||
174 | 24 | - Plugin updates | ||
175 | 25 | - Added Previous/Next Track menu items to Tray plugin | ||
176 | 26 | - Added Previous/Next Track menu items to Notification plugin | ||
177 | 27 | - Added NEW MPRIS2 plugin | ||
178 | 28 | - Other improvements | ||
179 | 29 | - Updated artwork (background image, icons) | ||
180 | 30 | - Fixed GStreamer 1.0 support | ||
181 | 31 | - Added ability to play DVD ISOs from the Open dialog | ||
182 | 32 | - Plugins now correctly report when they fail to load | ||
183 | 33 | - Plugin API documentation updates | ||
184 | 34 | - Bugs fixed | ||
185 | 35 | - Fixed missing option to open DVD from iso (bug #10300) | ||
186 | 36 | - Fixed allowing a playlist to be sorted and/or items to be moved (bug #10066) | ||
187 | 37 | - Fixed Remember playlist option in GUI not working (bug #10269) | ||
188 | 38 | - Fixed Parole showing irritating edge (bug #10081) | ||
189 | 39 | - Fixed untranslatable strings (bug #10418) | ||
190 | 40 | - Fixed loading of playlists with relative paths (bug #10436) | ||
191 | 41 | - Added realmedia video to supported video mimetypes (bug #10434) | ||
192 | 42 | - Fixed IF/ELSE for plugin installation on multiple platforms (bugs #10142, #10441) | ||
193 | 43 | - Fixed building with enable-debug=full on some platforms (bug #10525) | ||
194 | 44 | - Fixed crash for m3u files with all absolute paths | ||
195 | 45 | - Fixed "Remove Duplicates" functionality. | ||
196 | 46 | |||
197 | 1 | 0.5.0 | 47 | 0.5.0 |
198 | 2 | ======= | 48 | ======= |
199 | 3 | - Fixed potential file name clash in parole extension (bug #9728) | 49 | - Fixed potential file name clash in parole extension (bug #9728) |
200 | 4 | 50 | ||
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 | 10 | ================= | 10 | ================= |
206 | 11 | Parole depends on the following packages: | 11 | Parole depends on the following packages: |
207 | 12 | 12 | ||
209 | 13 | - Gtk 2.24 or above. | 13 | - Gtk 3.2 or above. |
210 | 14 | - Glib 2.32 or above. | 14 | - Glib 2.32 or above. |
212 | 15 | - Gio 2.16 or above. | 15 | - Gio 2.28 or above. |
213 | 16 | - DBus 0.60 or above. | 16 | - DBus 0.60 or above. |
214 | 17 | - DBus glib 0.70 or above. | 17 | - DBus glib 0.70 or above. |
215 | 18 | - GStreamer: base, video, interface and GStreamer X, version 0.10.24 or above. | 18 | - GStreamer: base, video, interface and GStreamer X, version 0.10.24 or above. |
218 | 19 | - libxfce4ui 4.8.0 or above. | 19 | - libxfce4ui 4.11.0 or above. |
219 | 20 | - libxfce4util 4.8.0 or above. | 20 | - libxfce4util 4.11.0 or above. |
220 | 21 | 21 | ||
221 | 22 | How to report bugs? | 22 | How to report bugs? |
222 | 23 | =================== | 23 | =================== |
223 | 24 | 24 | ||
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 | 1 | |||
229 | 1 | === Media player === | 2 | === Media player === |
230 | 2 | * Support scale ratio view. | 3 | * Support scale ratio view. |
231 | 3 | 4 | ||
232 | 4 | 5 | ||
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 @@ | |||
238 | 1 | # generated automatically by aclocal 1.13.3 -*- Autoconf -*- | 1 | # generated automatically by aclocal 1.14.1 -*- Autoconf -*- |
239 | 2 | 2 | ||
240 | 3 | # Copyright (C) 1996-2013 Free Software Foundation, Inc. | 3 | # Copyright (C) 1996-2013 Free Software Foundation, Inc. |
241 | 4 | 4 | ||
242 | @@ -457,7 +457,7 @@ | |||
243 | 457 | 457 | ||
244 | 458 | 458 | ||
245 | 459 | # nls.m4 serial 5 (gettext-0.18) | 459 | # nls.m4 serial 5 (gettext-0.18) |
247 | 460 | dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, | 460 | dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation, |
248 | 461 | dnl Inc. | 461 | dnl Inc. |
249 | 462 | dnl This file is free software; the Free Software Foundation | 462 | dnl This file is free software; the Free Software Foundation |
250 | 463 | dnl gives unlimited permission to copy and/or distribute it, | 463 | dnl gives unlimited permission to copy and/or distribute it, |
251 | @@ -661,10 +661,10 @@ | |||
252 | 661 | # generated from the m4 files accompanying Automake X.Y. | 661 | # generated from the m4 files accompanying Automake X.Y. |
253 | 662 | # (This private macro should not be called outside this file.) | 662 | # (This private macro should not be called outside this file.) |
254 | 663 | AC_DEFUN([AM_AUTOMAKE_VERSION], | 663 | AC_DEFUN([AM_AUTOMAKE_VERSION], |
256 | 664 | [am__api_version='1.13' | 664 | [am__api_version='1.14' |
257 | 665 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to | 665 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
258 | 666 | dnl require some minimum version. Point them to the right macro. | 666 | dnl require some minimum version. Point them to the right macro. |
260 | 667 | m4_if([$1], [1.13.3], [], | 667 | m4_if([$1], [1.14.1], [], |
261 | 668 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl | 668 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
262 | 669 | ]) | 669 | ]) |
263 | 670 | 670 | ||
264 | @@ -680,7 +680,7 @@ | |||
265 | 680 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. | 680 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
266 | 681 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. | 681 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
267 | 682 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], | 682 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
269 | 683 | [AM_AUTOMAKE_VERSION([1.13.3])dnl | 683 | [AM_AUTOMAKE_VERSION([1.14.1])dnl |
270 | 684 | m4_ifndef([AC_AUTOCONF_VERSION], | 684 | m4_ifndef([AC_AUTOCONF_VERSION], |
271 | 685 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | 685 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
272 | 686 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) | 686 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
273 | @@ -1047,6 +1047,12 @@ | |||
274 | 1047 | # This macro actually does too much. Some checks are only needed if | 1047 | # This macro actually does too much. Some checks are only needed if |
275 | 1048 | # your package does certain things. But this isn't really a big deal. | 1048 | # your package does certain things. But this isn't really a big deal. |
276 | 1049 | 1049 | ||
277 | 1050 | dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. | ||
278 | 1051 | m4_define([AC_PROG_CC], | ||
279 | 1052 | m4_defn([AC_PROG_CC]) | ||
280 | 1053 | [_AM_PROG_CC_C_O | ||
281 | 1054 | ]) | ||
282 | 1055 | |||
283 | 1050 | # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) | 1056 | # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) |
284 | 1051 | # AM_INIT_AUTOMAKE([OPTIONS]) | 1057 | # AM_INIT_AUTOMAKE([OPTIONS]) |
285 | 1052 | # ----------------------------------------------- | 1058 | # ----------------------------------------------- |
286 | @@ -1155,7 +1161,48 @@ | |||
287 | 1155 | AC_CONFIG_COMMANDS_PRE(dnl | 1161 | AC_CONFIG_COMMANDS_PRE(dnl |
288 | 1156 | [m4_provide_if([_AM_COMPILER_EXEEXT], | 1162 | [m4_provide_if([_AM_COMPILER_EXEEXT], |
289 | 1157 | [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl | 1163 | [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl |
291 | 1158 | ]) | 1164 | |
292 | 1165 | # POSIX will say in a future version that running "rm -f" with no argument | ||
293 | 1166 | # is OK; and we want to be able to make that assumption in our Makefile | ||
294 | 1167 | # recipes. So use an aggressive probe to check that the usage we want is | ||
295 | 1168 | # actually supported "in the wild" to an acceptable degree. | ||
296 | 1169 | # See automake bug#10828. | ||
297 | 1170 | # To make any issue more visible, cause the running configure to be aborted | ||
298 | 1171 | # by default if the 'rm' program in use doesn't match our expectations; the | ||
299 | 1172 | # user can still override this though. | ||
300 | 1173 | if rm -f && rm -fr && rm -rf; then : OK; else | ||
301 | 1174 | cat >&2 <<'END' | ||
302 | 1175 | Oops! | ||
303 | 1176 | |||
304 | 1177 | Your 'rm' program seems unable to run without file operands specified | ||
305 | 1178 | on the command line, even when the '-f' option is present. This is contrary | ||
306 | 1179 | to the behaviour of most rm programs out there, and not conforming with | ||
307 | 1180 | the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> | ||
308 | 1181 | |||
309 | 1182 | Please tell bug-automake@gnu.org about your system, including the value | ||
310 | 1183 | of your $PATH and any error possibly output before this message. This | ||
311 | 1184 | can help us improve future automake versions. | ||
312 | 1185 | |||
313 | 1186 | END | ||
314 | 1187 | if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then | ||
315 | 1188 | echo 'Configuration will proceed anyway, since you have set the' >&2 | ||
316 | 1189 | echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 | ||
317 | 1190 | echo >&2 | ||
318 | 1191 | else | ||
319 | 1192 | cat >&2 <<'END' | ||
320 | 1193 | Aborting the configuration process, to ensure you take notice of the issue. | ||
321 | 1194 | |||
322 | 1195 | You can download and install GNU coreutils to get an 'rm' implementation | ||
323 | 1196 | that behaves properly: <http://www.gnu.org/software/coreutils/>. | ||
324 | 1197 | |||
325 | 1198 | If you want to complete the configuration process using your problematic | ||
326 | 1199 | 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM | ||
327 | 1200 | to "yes", and re-run configure. | ||
328 | 1201 | |||
329 | 1202 | END | ||
330 | 1203 | AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) | ||
331 | 1204 | fi | ||
332 | 1205 | fi]) | ||
333 | 1159 | 1206 | ||
334 | 1160 | dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not | 1207 | dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not |
335 | 1161 | dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further | 1208 | dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further |
336 | @@ -1163,7 +1210,6 @@ | |||
337 | 1163 | m4_define([_AC_COMPILER_EXEEXT], | 1210 | m4_define([_AC_COMPILER_EXEEXT], |
338 | 1164 | m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) | 1211 | m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) |
339 | 1165 | 1212 | ||
340 | 1166 | |||
341 | 1167 | # When config.status generates a header, we must update the stamp-h file. | 1213 | # When config.status generates a header, we must update the stamp-h file. |
342 | 1168 | # This file resides in the same directory as the config header | 1214 | # This file resides in the same directory as the config header |
343 | 1169 | # that is generated. The stamp files are numbered to have different names. | 1215 | # that is generated. The stamp files are numbered to have different names. |
344 | @@ -1311,38 +1357,6 @@ | |||
345 | 1311 | rm -f confinc confmf | 1357 | rm -f confinc confmf |
346 | 1312 | ]) | 1358 | ]) |
347 | 1313 | 1359 | ||
348 | 1314 | # Copyright (C) 1999-2013 Free Software Foundation, Inc. | ||
349 | 1315 | # | ||
350 | 1316 | # This file is free software; the Free Software Foundation | ||
351 | 1317 | # gives unlimited permission to copy and/or distribute it, | ||
352 | 1318 | # with or without modifications, as long as this notice is preserved. | ||
353 | 1319 | |||
354 | 1320 | # AM_PROG_CC_C_O | ||
355 | 1321 | # -------------- | ||
356 | 1322 | # Like AC_PROG_CC_C_O, but changed for automake. | ||
357 | 1323 | AC_DEFUN([AM_PROG_CC_C_O], | ||
358 | 1324 | [AC_REQUIRE([AC_PROG_CC_C_O])dnl | ||
359 | 1325 | AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl | ||
360 | 1326 | AC_REQUIRE_AUX_FILE([compile])dnl | ||
361 | 1327 | # FIXME: we rely on the cache variable name because | ||
362 | 1328 | # there is no other way. | ||
363 | 1329 | set dummy $CC | ||
364 | 1330 | am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` | ||
365 | 1331 | eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o | ||
366 | 1332 | if test "$am_t" != yes; then | ||
367 | 1333 | # Losing compiler, so override with the script. | ||
368 | 1334 | # FIXME: It is wrong to rewrite CC. | ||
369 | 1335 | # But if we don't then we get into trouble of one sort or another. | ||
370 | 1336 | # A longer-term fix would be to have automake use am__CC in this case, | ||
371 | 1337 | # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" | ||
372 | 1338 | CC="$am_aux_dir/compile $CC" | ||
373 | 1339 | fi | ||
374 | 1340 | dnl Make sure AC_PROG_CC is never called again, or it will override our | ||
375 | 1341 | dnl setting of CC. | ||
376 | 1342 | m4_define([AC_PROG_CC], | ||
377 | 1343 | [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) | ||
378 | 1344 | ]) | ||
379 | 1345 | |||
380 | 1346 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- | 1360 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- |
381 | 1347 | 1361 | ||
382 | 1348 | # Copyright (C) 1997-2013 Free Software Foundation, Inc. | 1362 | # Copyright (C) 1997-2013 Free Software Foundation, Inc. |
383 | @@ -1442,6 +1456,53 @@ | |||
384 | 1442 | AC_DEFUN([_AM_IF_OPTION], | 1456 | AC_DEFUN([_AM_IF_OPTION], |
385 | 1443 | [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) | 1457 | [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) |
386 | 1444 | 1458 | ||
387 | 1459 | # Copyright (C) 1999-2013 Free Software Foundation, Inc. | ||
388 | 1460 | # | ||
389 | 1461 | # This file is free software; the Free Software Foundation | ||
390 | 1462 | # gives unlimited permission to copy and/or distribute it, | ||
391 | 1463 | # with or without modifications, as long as this notice is preserved. | ||
392 | 1464 | |||
393 | 1465 | # _AM_PROG_CC_C_O | ||
394 | 1466 | # --------------- | ||
395 | 1467 | # Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC | ||
396 | 1468 | # to automatically call this. | ||
397 | 1469 | AC_DEFUN([_AM_PROG_CC_C_O], | ||
398 | 1470 | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl | ||
399 | 1471 | AC_REQUIRE_AUX_FILE([compile])dnl | ||
400 | 1472 | AC_LANG_PUSH([C])dnl | ||
401 | 1473 | AC_CACHE_CHECK( | ||
402 | 1474 | [whether $CC understands -c and -o together], | ||
403 | 1475 | [am_cv_prog_cc_c_o], | ||
404 | 1476 | [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) | ||
405 | 1477 | # Make sure it works both with $CC and with simple cc. | ||
406 | 1478 | # Following AC_PROG_CC_C_O, we do the test twice because some | ||
407 | 1479 | # compilers refuse to overwrite an existing .o file with -o, | ||
408 | 1480 | # though they will create one. | ||
409 | 1481 | am_cv_prog_cc_c_o=yes | ||
410 | 1482 | for am_i in 1 2; do | ||
411 | 1483 | if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ | ||
412 | 1484 | && test -f conftest2.$ac_objext; then | ||
413 | 1485 | : OK | ||
414 | 1486 | else | ||
415 | 1487 | am_cv_prog_cc_c_o=no | ||
416 | 1488 | break | ||
417 | 1489 | fi | ||
418 | 1490 | done | ||
419 | 1491 | rm -f core conftest* | ||
420 | 1492 | unset am_i]) | ||
421 | 1493 | if test "$am_cv_prog_cc_c_o" != yes; then | ||
422 | 1494 | # Losing compiler, so override with the script. | ||
423 | 1495 | # FIXME: It is wrong to rewrite CC. | ||
424 | 1496 | # But if we don't then we get into trouble of one sort or another. | ||
425 | 1497 | # A longer-term fix would be to have automake use am__CC in this case, | ||
426 | 1498 | # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" | ||
427 | 1499 | CC="$am_aux_dir/compile $CC" | ||
428 | 1500 | fi | ||
429 | 1501 | AC_LANG_POP([C])]) | ||
430 | 1502 | |||
431 | 1503 | # For backward compatibility. | ||
432 | 1504 | AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) | ||
433 | 1505 | |||
434 | 1445 | # Copyright (C) 2001-2013 Free Software Foundation, Inc. | 1506 | # Copyright (C) 2001-2013 Free Software Foundation, Inc. |
435 | 1446 | # | 1507 | # |
436 | 1447 | # This file is free software; the Free Software Foundation | 1508 | # This file is free software; the Free Software Foundation |
437 | @@ -3373,7 +3434,7 @@ | |||
438 | 3373 | rm -rf conftest* | 3434 | rm -rf conftest* |
439 | 3374 | ;; | 3435 | ;; |
440 | 3375 | 3436 | ||
442 | 3376 | x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ | 3437 | x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ |
443 | 3377 | s390*-*linux*|s390*-*tpf*|sparc*-*linux*) | 3438 | s390*-*linux*|s390*-*tpf*|sparc*-*linux*) |
444 | 3378 | # Find out which ABI we are using. | 3439 | # Find out which ABI we are using. |
445 | 3379 | echo 'int i;' > conftest.$ac_ext | 3440 | echo 'int i;' > conftest.$ac_ext |
446 | @@ -3394,7 +3455,10 @@ | |||
447 | 3394 | ;; | 3455 | ;; |
448 | 3395 | esac | 3456 | esac |
449 | 3396 | ;; | 3457 | ;; |
451 | 3397 | ppc64-*linux*|powerpc64-*linux*) | 3458 | powerpc64le-*) |
452 | 3459 | LD="${LD-ld} -m elf32lppclinux" | ||
453 | 3460 | ;; | ||
454 | 3461 | powerpc64-*) | ||
455 | 3398 | LD="${LD-ld} -m elf32ppclinux" | 3462 | LD="${LD-ld} -m elf32ppclinux" |
456 | 3399 | ;; | 3463 | ;; |
457 | 3400 | s390x-*linux*) | 3464 | s390x-*linux*) |
458 | @@ -3413,7 +3477,10 @@ | |||
459 | 3413 | x86_64-*linux*) | 3477 | x86_64-*linux*) |
460 | 3414 | LD="${LD-ld} -m elf_x86_64" | 3478 | LD="${LD-ld} -m elf_x86_64" |
461 | 3415 | ;; | 3479 | ;; |
463 | 3416 | ppc*-*linux*|powerpc*-*linux*) | 3480 | powerpcle-*) |
464 | 3481 | LD="${LD-ld} -m elf64lppc" | ||
465 | 3482 | ;; | ||
466 | 3483 | powerpc-*) | ||
467 | 3417 | LD="${LD-ld} -m elf64ppc" | 3484 | LD="${LD-ld} -m elf64ppc" |
468 | 3418 | ;; | 3485 | ;; |
469 | 3419 | s390*-*linux*|s390*-*tpf*) | 3486 | s390*-*linux*|s390*-*tpf*) |
470 | 3420 | 3487 | ||
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 | 15 | /* Define the GStreamer+ API version */ | 15 | /* Define the GStreamer+ API version */ |
476 | 16 | #undef GSTREAMER_API_VERSION | 16 | #undef GSTREAMER_API_VERSION |
477 | 17 | 17 | ||
478 | 18 | /* pixmaps directory */ | ||
479 | 19 | #undef GTKRC_DIR | ||
480 | 20 | |||
481 | 21 | /* Define to 1 if you have the `bind_textdomain_codeset' function. */ | 18 | /* Define to 1 if you have the `bind_textdomain_codeset' function. */ |
482 | 22 | #undef HAVE_BIND_TEXTDOMAIN_CODESET | 19 | #undef HAVE_BIND_TEXTDOMAIN_CODESET |
483 | 23 | 20 | ||
484 | @@ -100,9 +97,6 @@ | |||
485 | 100 | */ | 97 | */ |
486 | 101 | #undef LT_OBJDIR | 98 | #undef LT_OBJDIR |
487 | 102 | 99 | ||
488 | 103 | /* Define to 1 if your C compiler doesn't accept -c and -o together. */ | ||
489 | 104 | #undef NO_MINUS_C_MINUS_O | ||
490 | 105 | |||
491 | 106 | /* Name of package */ | 100 | /* Name of package */ |
492 | 107 | #undef PACKAGE | 101 | #undef PACKAGE |
493 | 108 | 102 | ||
494 | 109 | 103 | ||
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 | 1 | #! /bin/sh | 1 | #! /bin/sh |
500 | 2 | # Guess values for system-dependent variables and create Makefiles. | 2 | # Guess values for system-dependent variables and create Makefiles. |
502 | 3 | # Generated by GNU Autoconf 2.69 for parole 0.5.4. | 3 | # Generated by GNU Autoconf 2.69 for parole 0.6.0. |
503 | 4 | # | 4 | # |
505 | 5 | # Report bugs to <aliov@xfce.org>. | 5 | # Report bugs to <http://docs.xfce.org/apps/parole/bugs>. |
506 | 6 | # | 6 | # |
507 | 7 | # | 7 | # |
508 | 8 | # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. | 8 | # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. |
509 | @@ -274,11 +274,11 @@ | |||
510 | 274 | $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" | 274 | $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" |
511 | 275 | $as_echo "$0: be upgraded to zsh 4.3.4 or later." | 275 | $as_echo "$0: be upgraded to zsh 4.3.4 or later." |
512 | 276 | else | 276 | else |
518 | 277 | $as_echo "$0: Please tell bug-autoconf@gnu.org and aliov@xfce.org | 277 | $as_echo "$0: Please tell bug-autoconf@gnu.org and |
519 | 278 | $0: about your system, including any error possibly output | 278 | $0: http://docs.xfce.org/apps/parole/bugs about your |
520 | 279 | $0: before this message. Then install a modern shell, or | 279 | $0: system, including any error possibly output before this |
521 | 280 | $0: manually run the script under such a shell if you do | 280 | $0: message. Then install a modern shell, or manually run |
522 | 281 | $0: have one." | 281 | $0: the script under such a shell if you do have one." |
523 | 282 | fi | 282 | fi |
524 | 283 | exit 1 | 283 | exit 1 |
525 | 284 | fi | 284 | fi |
526 | @@ -590,9 +590,9 @@ | |||
527 | 590 | # Identity of this package. | 590 | # Identity of this package. |
528 | 591 | PACKAGE_NAME='parole' | 591 | PACKAGE_NAME='parole' |
529 | 592 | PACKAGE_TARNAME='parole' | 592 | PACKAGE_TARNAME='parole' |
533 | 593 | PACKAGE_VERSION='0.5.4' | 593 | PACKAGE_VERSION='0.6.0' |
534 | 594 | PACKAGE_STRING='parole 0.5.4' | 594 | PACKAGE_STRING='parole 0.6.0' |
535 | 595 | PACKAGE_BUGREPORT='aliov@xfce.org' | 595 | PACKAGE_BUGREPORT='http://docs.xfce.org/apps/parole/bugs' |
536 | 596 | PACKAGE_URL='' | 596 | PACKAGE_URL='' |
537 | 597 | 597 | ||
538 | 598 | # Factoring default headers for most tests. | 598 | # Factoring default headers for most tests. |
539 | @@ -651,6 +651,8 @@ | |||
540 | 651 | GTKDOC_MKPDF | 651 | GTKDOC_MKPDF |
541 | 652 | GTKDOC_REBASE | 652 | GTKDOC_REBASE |
542 | 653 | GTKDOC_CHECK | 653 | GTKDOC_CHECK |
543 | 654 | PAROLE_MPRIS2_PLUGIN_FALSE | ||
544 | 655 | PAROLE_MPRIS2_PLUGIN_TRUE | ||
545 | 654 | PAROLE_TRAY_PLUGIN_FALSE | 656 | PAROLE_TRAY_PLUGIN_FALSE |
546 | 655 | PAROLE_TRAY_PLUGIN_TRUE | 657 | PAROLE_TRAY_PLUGIN_TRUE |
547 | 656 | LIBNOTIFY_REQUIRED_VERSION | 658 | LIBNOTIFY_REQUIRED_VERSION |
548 | @@ -668,7 +670,6 @@ | |||
549 | 668 | TAGLIB_CFLAGS | 670 | TAGLIB_CFLAGS |
550 | 669 | TAGLIB_VERSION | 671 | TAGLIB_VERSION |
551 | 670 | pixmapsdir | 672 | pixmapsdir |
552 | 671 | gtkrcdir | ||
553 | 672 | LIBX11_LIBS | 673 | LIBX11_LIBS |
554 | 673 | LIBX11_LDFLAGS | 674 | LIBX11_LDFLAGS |
555 | 674 | LIBX11_CFLAGS | 675 | LIBX11_CFLAGS |
556 | @@ -677,26 +678,6 @@ | |||
557 | 677 | X_PRE_LIBS | 678 | X_PRE_LIBS |
558 | 678 | X_CFLAGS | 679 | X_CFLAGS |
559 | 679 | XMKMF | 680 | XMKMF |
560 | 680 | XFCONF_REQUIRED_VERSION | ||
561 | 681 | XFCONF_LIBS | ||
562 | 682 | XFCONF_CFLAGS | ||
563 | 683 | XFCONF_VERSION | ||
564 | 684 | LIBXFCE4UTIL_REQUIRED_VERSION | ||
565 | 685 | LIBXFCE4UTIL_LIBS | ||
566 | 686 | LIBXFCE4UTIL_CFLAGS | ||
567 | 687 | LIBXFCE4UTIL_VERSION | ||
568 | 688 | LIBXFCE4UI_REQUIRED_VERSION | ||
569 | 689 | LIBXFCE4UI_LIBS | ||
570 | 690 | LIBXFCE4UI_CFLAGS | ||
571 | 691 | LIBXFCE4UI_VERSION | ||
572 | 692 | DBUS_GLIB_REQUIRED_VERSION | ||
573 | 693 | DBUS_GLIB_LIBS | ||
574 | 694 | DBUS_GLIB_CFLAGS | ||
575 | 695 | DBUS_GLIB_VERSION | ||
576 | 696 | DBUS_REQUIRED_VERSION | ||
577 | 697 | DBUS_LIBS | ||
578 | 698 | DBUS_CFLAGS | ||
579 | 699 | DBUS_VERSION | ||
580 | 700 | GST_INTERFACES_REQUIRED_VERSION | 681 | GST_INTERFACES_REQUIRED_VERSION |
581 | 701 | GST_INTERFACES_LIBS | 682 | GST_INTERFACES_LIBS |
582 | 702 | GST_INTERFACES_CFLAGS | 683 | GST_INTERFACES_CFLAGS |
583 | @@ -717,6 +698,30 @@ | |||
584 | 717 | GST_LIBS | 698 | GST_LIBS |
585 | 718 | GST_CFLAGS | 699 | GST_CFLAGS |
586 | 719 | GST_VERSION | 700 | GST_VERSION |
587 | 701 | GTK_REQUIRED_VERSION | ||
588 | 702 | GTK_LIBS | ||
589 | 703 | GTK_CFLAGS | ||
590 | 704 | GTK_VERSION | ||
591 | 705 | LIBXFCE4UI_REQUIRED_VERSION | ||
592 | 706 | LIBXFCE4UI_LIBS | ||
593 | 707 | LIBXFCE4UI_CFLAGS | ||
594 | 708 | LIBXFCE4UI_VERSION | ||
595 | 709 | XFCONF_REQUIRED_VERSION | ||
596 | 710 | XFCONF_LIBS | ||
597 | 711 | XFCONF_CFLAGS | ||
598 | 712 | XFCONF_VERSION | ||
599 | 713 | LIBXFCE4UTIL_REQUIRED_VERSION | ||
600 | 714 | LIBXFCE4UTIL_LIBS | ||
601 | 715 | LIBXFCE4UTIL_CFLAGS | ||
602 | 716 | LIBXFCE4UTIL_VERSION | ||
603 | 717 | DBUS_GLIB_REQUIRED_VERSION | ||
604 | 718 | DBUS_GLIB_LIBS | ||
605 | 719 | DBUS_GLIB_CFLAGS | ||
606 | 720 | DBUS_GLIB_VERSION | ||
607 | 721 | DBUS_REQUIRED_VERSION | ||
608 | 722 | DBUS_LIBS | ||
609 | 723 | DBUS_CFLAGS | ||
610 | 724 | DBUS_VERSION | ||
611 | 720 | GIO_REQUIRED_VERSION | 725 | GIO_REQUIRED_VERSION |
612 | 721 | GIO_LIBS | 726 | GIO_LIBS |
613 | 722 | GIO_CFLAGS | 727 | GIO_CFLAGS |
614 | @@ -737,10 +742,6 @@ | |||
615 | 737 | GLIB_LIBS | 742 | GLIB_LIBS |
616 | 738 | GLIB_CFLAGS | 743 | GLIB_CFLAGS |
617 | 739 | GLIB_VERSION | 744 | GLIB_VERSION |
618 | 740 | GTK_REQUIRED_VERSION | ||
619 | 741 | GTK_LIBS | ||
620 | 742 | GTK_CFLAGS | ||
621 | 743 | GTK_VERSION | ||
622 | 744 | PKG_CONFIG_LIBDIR | 745 | PKG_CONFIG_LIBDIR |
623 | 745 | PKG_CONFIG_PATH | 746 | PKG_CONFIG_PATH |
624 | 746 | PKG_CONFIG | 747 | PKG_CONFIG |
625 | @@ -940,6 +941,7 @@ | |||
626 | 940 | enable_taglib | 941 | enable_taglib |
627 | 941 | enable_notify_plugin | 942 | enable_notify_plugin |
628 | 942 | enable_tray_plugin | 943 | enable_tray_plugin |
629 | 944 | enable_mpris2_plugin | ||
630 | 943 | enable_debug | 945 | enable_debug |
631 | 944 | with_html_dir | 946 | with_html_dir |
632 | 945 | enable_gtk_doc | 947 | enable_gtk_doc |
633 | @@ -1505,7 +1507,7 @@ | |||
634 | 1505 | # Omit some internal or obsolete options to make the list less imposing. | 1507 | # Omit some internal or obsolete options to make the list less imposing. |
635 | 1506 | # This message is too long to be a string in the A/UX 3.1 sh. | 1508 | # This message is too long to be a string in the A/UX 3.1 sh. |
636 | 1507 | cat <<_ACEOF | 1509 | cat <<_ACEOF |
638 | 1508 | \`configure' configures parole 0.5.4 to adapt to many kinds of systems. | 1510 | \`configure' configures parole 0.6.0 to adapt to many kinds of systems. |
639 | 1509 | 1511 | ||
640 | 1510 | Usage: $0 [OPTION]... [VAR=VALUE]... | 1512 | Usage: $0 [OPTION]... [VAR=VALUE]... |
641 | 1511 | 1513 | ||
642 | @@ -1579,7 +1581,7 @@ | |||
643 | 1579 | 1581 | ||
644 | 1580 | if test -n "$ac_init_help"; then | 1582 | if test -n "$ac_init_help"; then |
645 | 1581 | case $ac_init_help in | 1583 | case $ac_init_help in |
647 | 1582 | short | recursive ) echo "Configuration of parole 0.5.4:";; | 1584 | short | recursive ) echo "Configuration of parole 0.6.0:";; |
648 | 1583 | esac | 1585 | esac |
649 | 1584 | cat <<\_ACEOF | 1586 | cat <<\_ACEOF |
650 | 1585 | 1587 | ||
651 | @@ -1607,6 +1609,7 @@ | |||
652 | 1607 | --disable-taglib Disable checking for tag lib | 1609 | --disable-taglib Disable checking for tag lib |
653 | 1608 | --disable-notify-plugin Don't build parole notification plugin | 1610 | --disable-notify-plugin Don't build parole notification plugin |
654 | 1609 | --disable-tray-plugin Don't build parole tray icon plugin | 1611 | --disable-tray-plugin Don't build parole tray icon plugin |
655 | 1612 | --disable-mpris2-plugin Don't build parole mpris2 plugin | ||
656 | 1610 | --enable-debug[=no|minimum|yes|full] | 1613 | --enable-debug[=no|minimum|yes|full] |
657 | 1611 | Build with debugging support [default=[]] | 1614 | Build with debugging support [default=[]] |
658 | 1612 | --disable-debug Include no debugging support | 1615 | --disable-debug Include no debugging support |
659 | @@ -1627,7 +1630,7 @@ | |||
660 | 1627 | 1630 | ||
661 | 1628 | --with-gstreamer=0.10|1.0 | 1631 | --with-gstreamer=0.10|1.0 |
662 | 1629 | which gstreamer version to compile against (default: | 1632 | which gstreamer version to compile against (default: |
664 | 1630 | 0.10) | 1633 | 1.0) |
665 | 1631 | --with-x use the X Window System | 1634 | --with-x use the X Window System |
666 | 1632 | --with-html-dir=PATH path to installed docs | 1635 | --with-html-dir=PATH path to installed docs |
667 | 1633 | 1636 | ||
668 | @@ -1657,7 +1660,7 @@ | |||
669 | 1657 | Use these variables to override the choices made by `configure' or to help | 1660 | Use these variables to override the choices made by `configure' or to help |
670 | 1658 | it to find libraries and programs with nonstandard names/locations. | 1661 | it to find libraries and programs with nonstandard names/locations. |
671 | 1659 | 1662 | ||
673 | 1660 | Report bugs to <aliov@xfce.org>. | 1663 | Report bugs to <http://docs.xfce.org/apps/parole/bugs>. |
674 | 1661 | _ACEOF | 1664 | _ACEOF |
675 | 1662 | ac_status=$? | 1665 | ac_status=$? |
676 | 1663 | fi | 1666 | fi |
677 | @@ -1720,7 +1723,7 @@ | |||
678 | 1720 | test -n "$ac_init_help" && exit $ac_status | 1723 | test -n "$ac_init_help" && exit $ac_status |
679 | 1721 | if $ac_init_version; then | 1724 | if $ac_init_version; then |
680 | 1722 | cat <<\_ACEOF | 1725 | cat <<\_ACEOF |
682 | 1723 | parole configure 0.5.4 | 1726 | parole configure 0.6.0 |
683 | 1724 | generated by GNU Autoconf 2.69 | 1727 | generated by GNU Autoconf 2.69 |
684 | 1725 | 1728 | ||
685 | 1726 | Copyright (C) 2012 Free Software Foundation, Inc. | 1729 | Copyright (C) 2012 Free Software Foundation, Inc. |
686 | @@ -1879,9 +1882,9 @@ | |||
687 | 1879 | $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} | 1882 | $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} |
688 | 1880 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 | 1883 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 |
689 | 1881 | $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} | 1884 | $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} |
693 | 1882 | ( $as_echo "## ----------------------------- ## | 1885 | ( $as_echo "## ---------------------------------------------------- ## |
694 | 1883 | ## Report this to aliov@xfce.org ## | 1886 | ## Report this to http://docs.xfce.org/apps/parole/bugs ## |
695 | 1884 | ## ----------------------------- ##" | 1887 | ## ---------------------------------------------------- ##" |
696 | 1885 | ) | sed "s/^/$as_me: WARNING: /" >&2 | 1888 | ) | sed "s/^/$as_me: WARNING: /" >&2 |
697 | 1886 | ;; | 1889 | ;; |
698 | 1887 | esac | 1890 | esac |
699 | @@ -2256,7 +2259,7 @@ | |||
700 | 2256 | This file contains any messages produced by compilers while | 2259 | This file contains any messages produced by compilers while |
701 | 2257 | running configure, to aid debugging if configure makes a mistake. | 2260 | running configure, to aid debugging if configure makes a mistake. |
702 | 2258 | 2261 | ||
704 | 2259 | It was created by parole $as_me 0.5.4, which was | 2262 | It was created by parole $as_me 0.6.0, which was |
705 | 2260 | generated by GNU Autoconf 2.69. Invocation command line was | 2263 | generated by GNU Autoconf 2.69. Invocation command line was |
706 | 2261 | 2264 | ||
707 | 2262 | $ $0 $@ | 2265 | $ $0 $@ |
708 | @@ -2608,7 +2611,7 @@ | |||
709 | 2608 | 2611 | ||
710 | 2609 | 2612 | ||
711 | 2610 | 2613 | ||
713 | 2611 | am__api_version='1.13' | 2614 | am__api_version='1.14' |
714 | 2612 | 2615 | ||
715 | 2613 | ac_aux_dir= | 2616 | ac_aux_dir= |
716 | 2614 | for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do | 2617 | for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do |
717 | @@ -3123,7 +3126,7 @@ | |||
718 | 3123 | 3126 | ||
719 | 3124 | # Define the identity of the package. | 3127 | # Define the identity of the package. |
720 | 3125 | PACKAGE='parole' | 3128 | PACKAGE='parole' |
722 | 3126 | VERSION='0.5.4' | 3129 | VERSION='0.6.0' |
723 | 3127 | 3130 | ||
724 | 3128 | 3131 | ||
725 | 3129 | cat >>confdefs.h <<_ACEOF | 3132 | cat >>confdefs.h <<_ACEOF |
726 | @@ -3290,6 +3293,47 @@ | |||
727 | 3290 | 3293 | ||
728 | 3291 | 3294 | ||
729 | 3292 | 3295 | ||
730 | 3296 | # POSIX will say in a future version that running "rm -f" with no argument | ||
731 | 3297 | # is OK; and we want to be able to make that assumption in our Makefile | ||
732 | 3298 | # recipes. So use an aggressive probe to check that the usage we want is | ||
733 | 3299 | # actually supported "in the wild" to an acceptable degree. | ||
734 | 3300 | # See automake bug#10828. | ||
735 | 3301 | # To make any issue more visible, cause the running configure to be aborted | ||
736 | 3302 | # by default if the 'rm' program in use doesn't match our expectations; the | ||
737 | 3303 | # user can still override this though. | ||
738 | 3304 | if rm -f && rm -fr && rm -rf; then : OK; else | ||
739 | 3305 | cat >&2 <<'END' | ||
740 | 3306 | Oops! | ||
741 | 3307 | |||
742 | 3308 | Your 'rm' program seems unable to run without file operands specified | ||
743 | 3309 | on the command line, even when the '-f' option is present. This is contrary | ||
744 | 3310 | to the behaviour of most rm programs out there, and not conforming with | ||
745 | 3311 | the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> | ||
746 | 3312 | |||
747 | 3313 | Please tell bug-automake@gnu.org about your system, including the value | ||
748 | 3314 | of your $PATH and any error possibly output before this message. This | ||
749 | 3315 | can help us improve future automake versions. | ||
750 | 3316 | |||
751 | 3317 | END | ||
752 | 3318 | if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then | ||
753 | 3319 | echo 'Configuration will proceed anyway, since you have set the' >&2 | ||
754 | 3320 | echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 | ||
755 | 3321 | echo >&2 | ||
756 | 3322 | else | ||
757 | 3323 | cat >&2 <<'END' | ||
758 | 3324 | Aborting the configuration process, to ensure you take notice of the issue. | ||
759 | 3325 | |||
760 | 3326 | You can download and install GNU coreutils to get an 'rm' implementation | ||
761 | 3327 | that behaves properly: <http://www.gnu.org/software/coreutils/>. | ||
762 | 3328 | |||
763 | 3329 | If you want to complete the configuration process using your problematic | ||
764 | 3330 | 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM | ||
765 | 3331 | to "yes", and re-run configure. | ||
766 | 3332 | |||
767 | 3333 | END | ||
768 | 3334 | as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 | ||
769 | 3335 | fi | ||
770 | 3336 | fi | ||
771 | 3293 | ac_config_headers="$ac_config_headers config.h" | 3337 | ac_config_headers="$ac_config_headers config.h" |
772 | 3294 | 3338 | ||
773 | 3295 | 3339 | ||
774 | @@ -3318,7 +3362,7 @@ | |||
775 | 3318 | 3362 | ||
776 | 3319 | 3363 | ||
777 | 3320 | else | 3364 | else |
779 | 3321 | if test x${enable_debug} != x"no"; then | 3365 | if test x${enable_debug} != x"no"; then |
780 | 3322 | 3366 | ||
781 | 3323 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 | 3367 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 |
782 | 3324 | $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } | 3368 | $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } |
783 | @@ -3342,7 +3386,7 @@ | |||
784 | 3342 | MAINT=$MAINTAINER_MODE_TRUE | 3386 | MAINT=$MAINTAINER_MODE_TRUE |
785 | 3343 | 3387 | ||
786 | 3344 | 3388 | ||
788 | 3345 | else | 3389 | else |
789 | 3346 | 3390 | ||
790 | 3347 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 | 3391 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 |
791 | 3348 | $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } | 3392 | $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } |
792 | @@ -3366,7 +3410,7 @@ | |||
793 | 3366 | MAINT=$MAINTAINER_MODE_TRUE | 3410 | MAINT=$MAINTAINER_MODE_TRUE |
794 | 3367 | 3411 | ||
795 | 3368 | 3412 | ||
797 | 3369 | fi | 3413 | fi |
798 | 3370 | fi | 3414 | fi |
799 | 3371 | 3415 | ||
800 | 3372 | # Check whether --enable-silent-rules was given. | 3416 | # Check whether --enable-silent-rules was given. |
801 | @@ -4261,6 +4305,65 @@ | |||
802 | 4261 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | 4305 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
803 | 4262 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | 4306 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
804 | 4263 | 4307 | ||
805 | 4308 | ac_ext=c | ||
806 | 4309 | ac_cpp='$CPP $CPPFLAGS' | ||
807 | 4310 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
808 | 4311 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
809 | 4312 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
810 | 4313 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 | ||
811 | 4314 | $as_echo_n "checking whether $CC understands -c and -o together... " >&6; } | ||
812 | 4315 | if ${am_cv_prog_cc_c_o+:} false; then : | ||
813 | 4316 | $as_echo_n "(cached) " >&6 | ||
814 | 4317 | else | ||
815 | 4318 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
816 | 4319 | /* end confdefs.h. */ | ||
817 | 4320 | |||
818 | 4321 | int | ||
819 | 4322 | main () | ||
820 | 4323 | { | ||
821 | 4324 | |||
822 | 4325 | ; | ||
823 | 4326 | return 0; | ||
824 | 4327 | } | ||
825 | 4328 | _ACEOF | ||
826 | 4329 | # Make sure it works both with $CC and with simple cc. | ||
827 | 4330 | # Following AC_PROG_CC_C_O, we do the test twice because some | ||
828 | 4331 | # compilers refuse to overwrite an existing .o file with -o, | ||
829 | 4332 | # though they will create one. | ||
830 | 4333 | am_cv_prog_cc_c_o=yes | ||
831 | 4334 | for am_i in 1 2; do | ||
832 | 4335 | if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 | ||
833 | 4336 | ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 | ||
834 | 4337 | ac_status=$? | ||
835 | 4338 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
836 | 4339 | (exit $ac_status); } \ | ||
837 | 4340 | && test -f conftest2.$ac_objext; then | ||
838 | 4341 | : OK | ||
839 | 4342 | else | ||
840 | 4343 | am_cv_prog_cc_c_o=no | ||
841 | 4344 | break | ||
842 | 4345 | fi | ||
843 | 4346 | done | ||
844 | 4347 | rm -f core conftest* | ||
845 | 4348 | unset am_i | ||
846 | 4349 | fi | ||
847 | 4350 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 | ||
848 | 4351 | $as_echo "$am_cv_prog_cc_c_o" >&6; } | ||
849 | 4352 | if test "$am_cv_prog_cc_c_o" != yes; then | ||
850 | 4353 | # Losing compiler, so override with the script. | ||
851 | 4354 | # FIXME: It is wrong to rewrite CC. | ||
852 | 4355 | # But if we don't then we get into trouble of one sort or another. | ||
853 | 4356 | # A longer-term fix would be to have automake use am__CC in this case, | ||
854 | 4357 | # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" | ||
855 | 4358 | CC="$am_aux_dir/compile $CC" | ||
856 | 4359 | fi | ||
857 | 4360 | ac_ext=c | ||
858 | 4361 | ac_cpp='$CPP $CPPFLAGS' | ||
859 | 4362 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
860 | 4363 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
861 | 4364 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
862 | 4365 | |||
863 | 4366 | |||
864 | 4264 | depcc="$CC" am_compiler_list= | 4367 | depcc="$CC" am_compiler_list= |
865 | 4265 | 4368 | ||
866 | 4266 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 | 4369 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 |
867 | @@ -5391,6 +5494,65 @@ | |||
868 | 5391 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | 5494 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
869 | 5392 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | 5495 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
870 | 5393 | 5496 | ||
871 | 5497 | ac_ext=c | ||
872 | 5498 | ac_cpp='$CPP $CPPFLAGS' | ||
873 | 5499 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
874 | 5500 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
875 | 5501 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
876 | 5502 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 | ||
877 | 5503 | $as_echo_n "checking whether $CC understands -c and -o together... " >&6; } | ||
878 | 5504 | if ${am_cv_prog_cc_c_o+:} false; then : | ||
879 | 5505 | $as_echo_n "(cached) " >&6 | ||
880 | 5506 | else | ||
881 | 5507 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
882 | 5508 | /* end confdefs.h. */ | ||
883 | 5509 | |||
884 | 5510 | int | ||
885 | 5511 | main () | ||
886 | 5512 | { | ||
887 | 5513 | |||
888 | 5514 | ; | ||
889 | 5515 | return 0; | ||
890 | 5516 | } | ||
891 | 5517 | _ACEOF | ||
892 | 5518 | # Make sure it works both with $CC and with simple cc. | ||
893 | 5519 | # Following AC_PROG_CC_C_O, we do the test twice because some | ||
894 | 5520 | # compilers refuse to overwrite an existing .o file with -o, | ||
895 | 5521 | # though they will create one. | ||
896 | 5522 | am_cv_prog_cc_c_o=yes | ||
897 | 5523 | for am_i in 1 2; do | ||
898 | 5524 | if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 | ||
899 | 5525 | ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 | ||
900 | 5526 | ac_status=$? | ||
901 | 5527 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
902 | 5528 | (exit $ac_status); } \ | ||
903 | 5529 | && test -f conftest2.$ac_objext; then | ||
904 | 5530 | : OK | ||
905 | 5531 | else | ||
906 | 5532 | am_cv_prog_cc_c_o=no | ||
907 | 5533 | break | ||
908 | 5534 | fi | ||
909 | 5535 | done | ||
910 | 5536 | rm -f core conftest* | ||
911 | 5537 | unset am_i | ||
912 | 5538 | fi | ||
913 | 5539 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 | ||
914 | 5540 | $as_echo "$am_cv_prog_cc_c_o" >&6; } | ||
915 | 5541 | if test "$am_cv_prog_cc_c_o" != yes; then | ||
916 | 5542 | # Losing compiler, so override with the script. | ||
917 | 5543 | # FIXME: It is wrong to rewrite CC. | ||
918 | 5544 | # But if we don't then we get into trouble of one sort or another. | ||
919 | 5545 | # A longer-term fix would be to have automake use am__CC in this case, | ||
920 | 5546 | # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" | ||
921 | 5547 | CC="$am_aux_dir/compile $CC" | ||
922 | 5548 | fi | ||
923 | 5549 | ac_ext=c | ||
924 | 5550 | ac_cpp='$CPP $CPPFLAGS' | ||
925 | 5551 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
926 | 5552 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
927 | 5553 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
928 | 5554 | |||
929 | 5555 | |||
930 | 5394 | depcc="$CC" am_compiler_list= | 5556 | depcc="$CC" am_compiler_list= |
931 | 5395 | 5557 | ||
932 | 5396 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 | 5558 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 |
933 | @@ -5904,131 +6066,6 @@ | |||
934 | 5904 | fi | 6066 | fi |
935 | 5905 | 6067 | ||
936 | 5906 | 6068 | ||
937 | 5907 | if test "x$CC" != xcc; then | ||
938 | 5908 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 | ||
939 | 5909 | $as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } | ||
940 | 5910 | else | ||
941 | 5911 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 | ||
942 | 5912 | $as_echo_n "checking whether cc understands -c and -o together... " >&6; } | ||
943 | 5913 | fi | ||
944 | 5914 | set dummy $CC; ac_cc=`$as_echo "$2" | | ||
945 | 5915 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` | ||
946 | 5916 | if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : | ||
947 | 5917 | $as_echo_n "(cached) " >&6 | ||
948 | 5918 | else | ||
949 | 5919 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
950 | 5920 | /* end confdefs.h. */ | ||
951 | 5921 | |||
952 | 5922 | int | ||
953 | 5923 | main () | ||
954 | 5924 | { | ||
955 | 5925 | |||
956 | 5926 | ; | ||
957 | 5927 | return 0; | ||
958 | 5928 | } | ||
959 | 5929 | _ACEOF | ||
960 | 5930 | # Make sure it works both with $CC and with simple cc. | ||
961 | 5931 | # We do the test twice because some compilers refuse to overwrite an | ||
962 | 5932 | # existing .o file with -o, though they will create one. | ||
963 | 5933 | ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' | ||
964 | 5934 | rm -f conftest2.* | ||
965 | 5935 | if { { case "(($ac_try" in | ||
966 | 5936 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
967 | 5937 | *) ac_try_echo=$ac_try;; | ||
968 | 5938 | esac | ||
969 | 5939 | eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
970 | 5940 | $as_echo "$ac_try_echo"; } >&5 | ||
971 | 5941 | (eval "$ac_try") 2>&5 | ||
972 | 5942 | ac_status=$? | ||
973 | 5943 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
974 | 5944 | test $ac_status = 0; } && | ||
975 | 5945 | test -f conftest2.$ac_objext && { { case "(($ac_try" in | ||
976 | 5946 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
977 | 5947 | *) ac_try_echo=$ac_try;; | ||
978 | 5948 | esac | ||
979 | 5949 | eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
980 | 5950 | $as_echo "$ac_try_echo"; } >&5 | ||
981 | 5951 | (eval "$ac_try") 2>&5 | ||
982 | 5952 | ac_status=$? | ||
983 | 5953 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
984 | 5954 | test $ac_status = 0; }; | ||
985 | 5955 | then | ||
986 | 5956 | eval ac_cv_prog_cc_${ac_cc}_c_o=yes | ||
987 | 5957 | if test "x$CC" != xcc; then | ||
988 | 5958 | # Test first that cc exists at all. | ||
989 | 5959 | if { ac_try='cc -c conftest.$ac_ext >&5' | ||
990 | 5960 | { { case "(($ac_try" in | ||
991 | 5961 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
992 | 5962 | *) ac_try_echo=$ac_try;; | ||
993 | 5963 | esac | ||
994 | 5964 | eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
995 | 5965 | $as_echo "$ac_try_echo"; } >&5 | ||
996 | 5966 | (eval "$ac_try") 2>&5 | ||
997 | 5967 | ac_status=$? | ||
998 | 5968 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
999 | 5969 | test $ac_status = 0; }; }; then | ||
1000 | 5970 | ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' | ||
1001 | 5971 | rm -f conftest2.* | ||
1002 | 5972 | if { { case "(($ac_try" in | ||
1003 | 5973 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
1004 | 5974 | *) ac_try_echo=$ac_try;; | ||
1005 | 5975 | esac | ||
1006 | 5976 | eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
1007 | 5977 | $as_echo "$ac_try_echo"; } >&5 | ||
1008 | 5978 | (eval "$ac_try") 2>&5 | ||
1009 | 5979 | ac_status=$? | ||
1010 | 5980 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
1011 | 5981 | test $ac_status = 0; } && | ||
1012 | 5982 | test -f conftest2.$ac_objext && { { case "(($ac_try" in | ||
1013 | 5983 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
1014 | 5984 | *) ac_try_echo=$ac_try;; | ||
1015 | 5985 | esac | ||
1016 | 5986 | eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
1017 | 5987 | $as_echo "$ac_try_echo"; } >&5 | ||
1018 | 5988 | (eval "$ac_try") 2>&5 | ||
1019 | 5989 | ac_status=$? | ||
1020 | 5990 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
1021 | 5991 | test $ac_status = 0; }; | ||
1022 | 5992 | then | ||
1023 | 5993 | # cc works too. | ||
1024 | 5994 | : | ||
1025 | 5995 | else | ||
1026 | 5996 | # cc exists but doesn't like -o. | ||
1027 | 5997 | eval ac_cv_prog_cc_${ac_cc}_c_o=no | ||
1028 | 5998 | fi | ||
1029 | 5999 | fi | ||
1030 | 6000 | fi | ||
1031 | 6001 | else | ||
1032 | 6002 | eval ac_cv_prog_cc_${ac_cc}_c_o=no | ||
1033 | 6003 | fi | ||
1034 | 6004 | rm -f core conftest* | ||
1035 | 6005 | |||
1036 | 6006 | fi | ||
1037 | 6007 | if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then | ||
1038 | 6008 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
1039 | 6009 | $as_echo "yes" >&6; } | ||
1040 | 6010 | else | ||
1041 | 6011 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
1042 | 6012 | $as_echo "no" >&6; } | ||
1043 | 6013 | |||
1044 | 6014 | $as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h | ||
1045 | 6015 | |||
1046 | 6016 | fi | ||
1047 | 6017 | |||
1048 | 6018 | # FIXME: we rely on the cache variable name because | ||
1049 | 6019 | # there is no other way. | ||
1050 | 6020 | set dummy $CC | ||
1051 | 6021 | am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` | ||
1052 | 6022 | eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o | ||
1053 | 6023 | if test "$am_t" != yes; then | ||
1054 | 6024 | # Losing compiler, so override with the script. | ||
1055 | 6025 | # FIXME: It is wrong to rewrite CC. | ||
1056 | 6026 | # But if we don't then we get into trouble of one sort or another. | ||
1057 | 6027 | # A longer-term fix would be to have automake use am__CC in this case, | ||
1058 | 6028 | # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" | ||
1059 | 6029 | CC="$am_aux_dir/compile $CC" | ||
1060 | 6030 | fi | ||
1061 | 6031 | |||
1062 | 6032 | 6069 | ||
1063 | 6033 | # Make sure we can run config.sub. | 6070 | # Make sure we can run config.sub. |
1064 | 6034 | $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || | 6071 | $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || |
1065 | @@ -7015,7 +7052,7 @@ | |||
1066 | 7015 | 7052 | ||
1067 | 7016 | 7053 | ||
1068 | 7017 | # ===================================================== # | 7054 | # ===================================================== # |
1070 | 7018 | # Initialize libtool # | 7055 | # Initialize libtool # |
1071 | 7019 | # ===================================================== # | 7056 | # ===================================================== # |
1072 | 7020 | 7057 | ||
1073 | 7021 | case `pwd` in | 7058 | case `pwd` in |
1074 | @@ -8891,7 +8928,7 @@ | |||
1075 | 8891 | rm -rf conftest* | 8928 | rm -rf conftest* |
1076 | 8892 | ;; | 8929 | ;; |
1077 | 8893 | 8930 | ||
1079 | 8894 | x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ | 8931 | x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ |
1080 | 8895 | s390*-*linux*|s390*-*tpf*|sparc*-*linux*) | 8932 | s390*-*linux*|s390*-*tpf*|sparc*-*linux*) |
1081 | 8896 | # Find out which ABI we are using. | 8933 | # Find out which ABI we are using. |
1082 | 8897 | echo 'int i;' > conftest.$ac_ext | 8934 | echo 'int i;' > conftest.$ac_ext |
1083 | @@ -8916,7 +8953,10 @@ | |||
1084 | 8916 | ;; | 8953 | ;; |
1085 | 8917 | esac | 8954 | esac |
1086 | 8918 | ;; | 8955 | ;; |
1088 | 8919 | ppc64-*linux*|powerpc64-*linux*) | 8956 | powerpc64le-*) |
1089 | 8957 | LD="${LD-ld} -m elf32lppclinux" | ||
1090 | 8958 | ;; | ||
1091 | 8959 | powerpc64-*) | ||
1092 | 8920 | LD="${LD-ld} -m elf32ppclinux" | 8960 | LD="${LD-ld} -m elf32ppclinux" |
1093 | 8921 | ;; | 8961 | ;; |
1094 | 8922 | s390x-*linux*) | 8962 | s390x-*linux*) |
1095 | @@ -8935,7 +8975,10 @@ | |||
1096 | 8935 | x86_64-*linux*) | 8975 | x86_64-*linux*) |
1097 | 8936 | LD="${LD-ld} -m elf_x86_64" | 8976 | LD="${LD-ld} -m elf_x86_64" |
1098 | 8937 | ;; | 8977 | ;; |
1100 | 8938 | ppc*-*linux*|powerpc*-*linux*) | 8978 | powerpcle-*) |
1101 | 8979 | LD="${LD-ld} -m elf64lppc" | ||
1102 | 8980 | ;; | ||
1103 | 8981 | powerpc-*) | ||
1104 | 8939 | LD="${LD-ld} -m elf64ppc" | 8982 | LD="${LD-ld} -m elf64ppc" |
1105 | 8940 | ;; | 8983 | ;; |
1106 | 8941 | s390*-*linux*|s390*-*tpf*) | 8984 | s390*-*linux*|s390*-*tpf*) |
1107 | @@ -17409,7 +17452,7 @@ | |||
1108 | 17409 | Report bugs to <bug-libtool@gnu.org>." | 17452 | Report bugs to <bug-libtool@gnu.org>." |
1109 | 17410 | 17453 | ||
1110 | 17411 | lt_cl_version="\ | 17454 | lt_cl_version="\ |
1112 | 17412 | parole config.lt 0.5.4 | 17455 | parole config.lt 0.6.0 |
1113 | 17413 | configured by $0, generated by GNU Autoconf 2.69. | 17456 | configured by $0, generated by GNU Autoconf 2.69. |
1114 | 17414 | 17457 | ||
1115 | 17415 | Copyright (C) 2011 Free Software Foundation, Inc. | 17458 | Copyright (C) 2011 Free Software Foundation, Inc. |
1116 | @@ -18638,22 +18681,22 @@ | |||
1117 | 18638 | 18681 | ||
1118 | 18639 | 18682 | ||
1119 | 18640 | # ===================================================== # | 18683 | # ===================================================== # |
1121 | 18641 | # Version information # | 18684 | # Version information # |
1122 | 18642 | # ===================================================== # | 18685 | # ===================================================== # |
1124 | 18643 | PAROLE_VERINFO=0:5:4 | 18686 | PAROLE_VERINFO=0:6:0 |
1125 | 18644 | PAROLE_VERSION_API=0 | 18687 | PAROLE_VERSION_API=0 |
1126 | 18645 | PAROLE_VERSION_MAJOR=0 | 18688 | PAROLE_VERSION_MAJOR=0 |
1138 | 18646 | PAROLE_VERSION_MINOR=5 | 18689 | PAROLE_VERSION_MINOR=6 |
1139 | 18647 | PAROLE_VERSION_MICRO=4 | 18690 | PAROLE_VERSION_MICRO=0 |
1140 | 18648 | 18691 | ||
1141 | 18649 | 18692 | ||
1142 | 18650 | 18693 | ||
1143 | 18651 | 18694 | ||
1144 | 18652 | 18695 | ||
1145 | 18653 | 18696 | ||
1146 | 18654 | # ==================================================== # | 18697 | # ===================================================== # |
1147 | 18655 | # Check for headers needed for standard interfaces # | 18698 | # Check for headers needed for standard interfaces # |
1148 | 18656 | # ==================================================== # | 18699 | # ===================================================== # |
1149 | 18657 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 | 18700 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 |
1150 | 18658 | $as_echo_n "checking for ANSI C header files... " >&6; } | 18701 | $as_echo_n "checking for ANSI C header files... " >&6; } |
1151 | 18659 | if ${ac_cv_header_stdc+:} false; then : | 18702 | if ${ac_cv_header_stdc+:} false; then : |
1152 | @@ -18783,7 +18826,7 @@ | |||
1153 | 18783 | 18826 | ||
1154 | 18784 | 18827 | ||
1155 | 18785 | # ===================================================== # | 18828 | # ===================================================== # |
1157 | 18786 | # Check for i18n support # | 18829 | # Check for i18n support # |
1158 | 18787 | # ===================================================== # | 18830 | # ===================================================== # |
1159 | 18788 | 18831 | ||
1160 | 18789 | 18832 | ||
1161 | @@ -18795,7 +18838,7 @@ | |||
1162 | 18795 | 18838 | ||
1163 | 18796 | 18839 | ||
1164 | 18797 | 18840 | ||
1166 | 18798 | 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 " | 18841 | 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 | 18799 | 18842 | ||
1168 | 18800 | for ac_header in locale.h | 18843 | for ac_header in locale.h |
1169 | 18801 | do : | 18844 | do : |
1170 | @@ -19543,9 +19586,9 @@ | |||
1171 | 19543 | $as_echo "$XGETTEXT_ARGS" >&6; } | 19586 | $as_echo "$XGETTEXT_ARGS" >&6; } |
1172 | 19544 | 19587 | ||
1173 | 19545 | 19588 | ||
1177 | 19546 | #==================================================== # | 19589 | # ===================================================== # |
1178 | 19547 | # Check for required packages # | 19590 | # Check for required packages # |
1179 | 19548 | #=====================================================# | 19591 | # ===================================================== # |
1180 | 19549 | 19592 | ||
1181 | 19550 | 19593 | ||
1182 | 19551 | 19594 | ||
1183 | @@ -19557,7 +19600,7 @@ | |||
1184 | 19557 | *) as_fn_error $? "invalid gstreamer version specified" "$LINENO" 5 ;; | 19600 | *) as_fn_error $? "invalid gstreamer version specified" "$LINENO" 5 ;; |
1185 | 19558 | esac | 19601 | esac |
1186 | 19559 | else | 19602 | else |
1188 | 19560 | with_gstreamer=0.10 | 19603 | with_gstreamer=1.0 |
1189 | 19561 | 19604 | ||
1190 | 19562 | fi | 19605 | fi |
1191 | 19563 | 19606 | ||
1192 | @@ -19730,201 +19773,6 @@ | |||
1193 | 19730 | 19773 | ||
1194 | 19731 | 19774 | ||
1195 | 19732 | 19775 | ||
1196 | 19733 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0 >= 2.24.0" >&5 | ||
1197 | 19734 | $as_echo_n "checking for gtk+-2.0 >= 2.24.0... " >&6; } | ||
1198 | 19735 | if $PKG_CONFIG "--atleast-version=2.24.0" "gtk+-2.0" >/dev/null 2>&1; then | ||
1199 | 19736 | GTK_VERSION=`$PKG_CONFIG --modversion "gtk+-2.0"` | ||
1200 | 19737 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_VERSION" >&5 | ||
1201 | 19738 | $as_echo "$GTK_VERSION" >&6; } | ||
1202 | 19739 | |||
1203 | 19740 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking GTK_CFLAGS" >&5 | ||
1204 | 19741 | $as_echo_n "checking GTK_CFLAGS... " >&6; } | ||
1205 | 19742 | GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0"` | ||
1206 | 19743 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_CFLAGS" >&5 | ||
1207 | 19744 | $as_echo "$GTK_CFLAGS" >&6; } | ||
1208 | 19745 | |||
1209 | 19746 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking GTK_LIBS" >&5 | ||
1210 | 19747 | $as_echo_n "checking GTK_LIBS... " >&6; } | ||
1211 | 19748 | GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0"` | ||
1212 | 19749 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_LIBS" >&5 | ||
1213 | 19750 | $as_echo "$GTK_LIBS" >&6; } | ||
1214 | 19751 | |||
1215 | 19752 | GTK_REQUIRED_VERSION=2.24.0 | ||
1216 | 19753 | |||
1217 | 19754 | |||
1218 | 19755 | |||
1219 | 19756 | |||
1220 | 19757 | |||
1221 | 19758 | |||
1222 | 19759 | |||
1223 | 19760 | elif $PKG_CONFIG --exists "gtk+-2.0" >/dev/null 2>&1; then | ||
1224 | 19761 | xdt_cv_version=`$PKG_CONFIG --modversion "gtk+-2.0"` | ||
1225 | 19762 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 | ||
1226 | 19763 | $as_echo "found, but $xdt_cv_version" >&6; } | ||
1227 | 19764 | |||
1228 | 19765 | |||
1229 | 19766 | echo "*** The required package gtk+-2.0 was found on your system," | ||
1230 | 19767 | echo "*** but the installed version ($xdt_cv_version) is too old." | ||
1231 | 19768 | echo "*** Please upgrade gtk+-2.0 to atleast version 2.24.0, or adjust" | ||
1232 | 19769 | echo "*** the PKG_CONFIG_PATH environment variable if you installed" | ||
1233 | 19770 | echo "*** the new version of the package in a nonstandard prefix so" | ||
1234 | 19771 | echo "*** pkg-config is able to find it." | ||
1235 | 19772 | exit 1 | ||
1236 | 19773 | |||
1237 | 19774 | else | ||
1238 | 19775 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 | ||
1239 | 19776 | $as_echo "not found" >&6; } | ||
1240 | 19777 | |||
1241 | 19778 | |||
1242 | 19779 | echo "*** The required package gtk+-2.0 was not found on your system." | ||
1243 | 19780 | echo "*** Please install gtk+-2.0 (atleast version 2.24.0) or adjust" | ||
1244 | 19781 | echo "*** the PKG_CONFIG_PATH environment variable if you" | ||
1245 | 19782 | echo "*** installed the package in a nonstandard prefix so that" | ||
1246 | 19783 | echo "*** pkg-config is able to find it." | ||
1247 | 19784 | exit 1 | ||
1248 | 19785 | |||
1249 | 19786 | fi | ||
1250 | 19787 | |||
1251 | 19788 | |||
1252 | 19789 | |||
1253 | 19790 | # minimum supported version of pkg-config | ||
1254 | 19791 | xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 | ||
1255 | 19792 | |||
1256 | 19793 | |||
1257 | 19794 | |||
1258 | 19795 | |||
1259 | 19796 | |||
1260 | 19797 | |||
1261 | 19798 | |||
1262 | 19799 | |||
1263 | 19800 | |||
1264 | 19801 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then | ||
1265 | 19802 | if test -n "$ac_tool_prefix"; then | ||
1266 | 19803 | # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. | ||
1267 | 19804 | set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 | ||
1268 | 19805 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
1269 | 19806 | $as_echo_n "checking for $ac_word... " >&6; } | ||
1270 | 19807 | if ${ac_cv_path_PKG_CONFIG+:} false; then : | ||
1271 | 19808 | $as_echo_n "(cached) " >&6 | ||
1272 | 19809 | else | ||
1273 | 19810 | case $PKG_CONFIG in | ||
1274 | 19811 | [\\/]* | ?:[\\/]*) | ||
1275 | 19812 | ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. | ||
1276 | 19813 | ;; | ||
1277 | 19814 | *) | ||
1278 | 19815 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
1279 | 19816 | for as_dir in $PATH | ||
1280 | 19817 | do | ||
1281 | 19818 | IFS=$as_save_IFS | ||
1282 | 19819 | test -z "$as_dir" && as_dir=. | ||
1283 | 19820 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
1284 | 19821 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
1285 | 19822 | ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
1286 | 19823 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
1287 | 19824 | break 2 | ||
1288 | 19825 | fi | ||
1289 | 19826 | done | ||
1290 | 19827 | done | ||
1291 | 19828 | IFS=$as_save_IFS | ||
1292 | 19829 | |||
1293 | 19830 | ;; | ||
1294 | 19831 | esac | ||
1295 | 19832 | fi | ||
1296 | 19833 | PKG_CONFIG=$ac_cv_path_PKG_CONFIG | ||
1297 | 19834 | if test -n "$PKG_CONFIG"; then | ||
1298 | 19835 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 | ||
1299 | 19836 | $as_echo "$PKG_CONFIG" >&6; } | ||
1300 | 19837 | else | ||
1301 | 19838 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
1302 | 19839 | $as_echo "no" >&6; } | ||
1303 | 19840 | fi | ||
1304 | 19841 | |||
1305 | 19842 | |||
1306 | 19843 | fi | ||
1307 | 19844 | if test -z "$ac_cv_path_PKG_CONFIG"; then | ||
1308 | 19845 | ac_pt_PKG_CONFIG=$PKG_CONFIG | ||
1309 | 19846 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
1310 | 19847 | set dummy pkg-config; ac_word=$2 | ||
1311 | 19848 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
1312 | 19849 | $as_echo_n "checking for $ac_word... " >&6; } | ||
1313 | 19850 | if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : | ||
1314 | 19851 | $as_echo_n "(cached) " >&6 | ||
1315 | 19852 | else | ||
1316 | 19853 | case $ac_pt_PKG_CONFIG in | ||
1317 | 19854 | [\\/]* | ?:[\\/]*) | ||
1318 | 19855 | ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. | ||
1319 | 19856 | ;; | ||
1320 | 19857 | *) | ||
1321 | 19858 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
1322 | 19859 | for as_dir in $PATH | ||
1323 | 19860 | do | ||
1324 | 19861 | IFS=$as_save_IFS | ||
1325 | 19862 | test -z "$as_dir" && as_dir=. | ||
1326 | 19863 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
1327 | 19864 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
1328 | 19865 | ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
1329 | 19866 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
1330 | 19867 | break 2 | ||
1331 | 19868 | fi | ||
1332 | 19869 | done | ||
1333 | 19870 | done | ||
1334 | 19871 | IFS=$as_save_IFS | ||
1335 | 19872 | |||
1336 | 19873 | ;; | ||
1337 | 19874 | esac | ||
1338 | 19875 | fi | ||
1339 | 19876 | ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG | ||
1340 | 19877 | if test -n "$ac_pt_PKG_CONFIG"; then | ||
1341 | 19878 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 | ||
1342 | 19879 | $as_echo "$ac_pt_PKG_CONFIG" >&6; } | ||
1343 | 19880 | else | ||
1344 | 19881 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
1345 | 19882 | $as_echo "no" >&6; } | ||
1346 | 19883 | fi | ||
1347 | 19884 | |||
1348 | 19885 | if test "x$ac_pt_PKG_CONFIG" = x; then | ||
1349 | 19886 | PKG_CONFIG="" | ||
1350 | 19887 | else | ||
1351 | 19888 | case $cross_compiling:$ac_tool_warned in | ||
1352 | 19889 | yes:) | ||
1353 | 19890 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
1354 | 19891 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
1355 | 19892 | ac_tool_warned=yes ;; | ||
1356 | 19893 | esac | ||
1357 | 19894 | PKG_CONFIG=$ac_pt_PKG_CONFIG | ||
1358 | 19895 | fi | ||
1359 | 19896 | else | ||
1360 | 19897 | PKG_CONFIG="$ac_cv_path_PKG_CONFIG" | ||
1361 | 19898 | fi | ||
1362 | 19899 | |||
1363 | 19900 | fi | ||
1364 | 19901 | if test -n "$PKG_CONFIG"; then | ||
1365 | 19902 | _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION | ||
1366 | 19903 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 | ||
1367 | 19904 | $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } | ||
1368 | 19905 | if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then | ||
1369 | 19906 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
1370 | 19907 | $as_echo "yes" >&6; } | ||
1371 | 19908 | else | ||
1372 | 19909 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
1373 | 19910 | $as_echo "no" >&6; } | ||
1374 | 19911 | PKG_CONFIG="" | ||
1375 | 19912 | fi | ||
1376 | 19913 | fi | ||
1377 | 19914 | |||
1378 | 19915 | if test x"$PKG_CONFIG" = x""; then | ||
1379 | 19916 | echo | ||
1380 | 19917 | echo "*** Your version of pkg-config is too old. You need atleast" | ||
1381 | 19918 | echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" | ||
1382 | 19919 | echo "*** from the freedesktop.org software repository at" | ||
1383 | 19920 | echo "***" | ||
1384 | 19921 | echo "*** http://www.freedesktop.org/software/pkgconfig" | ||
1385 | 19922 | echo "***" | ||
1386 | 19923 | exit 1; | ||
1387 | 19924 | fi | ||
1388 | 19925 | |||
1389 | 19926 | |||
1390 | 19927 | |||
1391 | 19928 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glib-2.0 >= 2.32.0" >&5 | 19776 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glib-2.0 >= 2.32.0" >&5 |
1392 | 19929 | $as_echo_n "checking for glib-2.0 >= 2.32.0... " >&6; } | 19777 | $as_echo_n "checking for glib-2.0 >= 2.32.0... " >&6; } |
1393 | 19930 | if $PKG_CONFIG "--atleast-version=2.32.0" "glib-2.0" >/dev/null 2>&1; then | 19778 | if $PKG_CONFIG "--atleast-version=2.32.0" "glib-2.0" >/dev/null 2>&1; then |
1394 | @@ -20901,6 +20749,1179 @@ | |||
1395 | 20901 | 20749 | ||
1396 | 20902 | 20750 | ||
1397 | 20903 | 20751 | ||
1398 | 20752 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus-1 >= 0.60" >&5 | ||
1399 | 20753 | $as_echo_n "checking for dbus-1 >= 0.60... " >&6; } | ||
1400 | 20754 | if $PKG_CONFIG "--atleast-version=0.60" "dbus-1" >/dev/null 2>&1; then | ||
1401 | 20755 | DBUS_VERSION=`$PKG_CONFIG --modversion "dbus-1"` | ||
1402 | 20756 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_VERSION" >&5 | ||
1403 | 20757 | $as_echo "$DBUS_VERSION" >&6; } | ||
1404 | 20758 | |||
1405 | 20759 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking DBUS_CFLAGS" >&5 | ||
1406 | 20760 | $as_echo_n "checking DBUS_CFLAGS... " >&6; } | ||
1407 | 20761 | DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1"` | ||
1408 | 20762 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_CFLAGS" >&5 | ||
1409 | 20763 | $as_echo "$DBUS_CFLAGS" >&6; } | ||
1410 | 20764 | |||
1411 | 20765 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking DBUS_LIBS" >&5 | ||
1412 | 20766 | $as_echo_n "checking DBUS_LIBS... " >&6; } | ||
1413 | 20767 | DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1"` | ||
1414 | 20768 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_LIBS" >&5 | ||
1415 | 20769 | $as_echo "$DBUS_LIBS" >&6; } | ||
1416 | 20770 | |||
1417 | 20771 | DBUS_REQUIRED_VERSION=0.60 | ||
1418 | 20772 | |||
1419 | 20773 | |||
1420 | 20774 | |||
1421 | 20775 | |||
1422 | 20776 | |||
1423 | 20777 | |||
1424 | 20778 | |||
1425 | 20779 | elif $PKG_CONFIG --exists "dbus-1" >/dev/null 2>&1; then | ||
1426 | 20780 | xdt_cv_version=`$PKG_CONFIG --modversion "dbus-1"` | ||
1427 | 20781 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 | ||
1428 | 20782 | $as_echo "found, but $xdt_cv_version" >&6; } | ||
1429 | 20783 | |||
1430 | 20784 | |||
1431 | 20785 | echo "*** The required package dbus-1 was found on your system," | ||
1432 | 20786 | echo "*** but the installed version ($xdt_cv_version) is too old." | ||
1433 | 20787 | echo "*** Please upgrade dbus-1 to atleast version 0.60, or adjust" | ||
1434 | 20788 | echo "*** the PKG_CONFIG_PATH environment variable if you installed" | ||
1435 | 20789 | echo "*** the new version of the package in a nonstandard prefix so" | ||
1436 | 20790 | echo "*** pkg-config is able to find it." | ||
1437 | 20791 | exit 1 | ||
1438 | 20792 | |||
1439 | 20793 | else | ||
1440 | 20794 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 | ||
1441 | 20795 | $as_echo "not found" >&6; } | ||
1442 | 20796 | |||
1443 | 20797 | |||
1444 | 20798 | echo "*** The required package dbus-1 was not found on your system." | ||
1445 | 20799 | echo "*** Please install dbus-1 (atleast version 0.60) or adjust" | ||
1446 | 20800 | echo "*** the PKG_CONFIG_PATH environment variable if you" | ||
1447 | 20801 | echo "*** installed the package in a nonstandard prefix so that" | ||
1448 | 20802 | echo "*** pkg-config is able to find it." | ||
1449 | 20803 | exit 1 | ||
1450 | 20804 | |||
1451 | 20805 | fi | ||
1452 | 20806 | |||
1453 | 20807 | |||
1454 | 20808 | |||
1455 | 20809 | # minimum supported version of pkg-config | ||
1456 | 20810 | xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 | ||
1457 | 20811 | |||
1458 | 20812 | |||
1459 | 20813 | |||
1460 | 20814 | |||
1461 | 20815 | |||
1462 | 20816 | |||
1463 | 20817 | |||
1464 | 20818 | |||
1465 | 20819 | |||
1466 | 20820 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then | ||
1467 | 20821 | if test -n "$ac_tool_prefix"; then | ||
1468 | 20822 | # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. | ||
1469 | 20823 | set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 | ||
1470 | 20824 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
1471 | 20825 | $as_echo_n "checking for $ac_word... " >&6; } | ||
1472 | 20826 | if ${ac_cv_path_PKG_CONFIG+:} false; then : | ||
1473 | 20827 | $as_echo_n "(cached) " >&6 | ||
1474 | 20828 | else | ||
1475 | 20829 | case $PKG_CONFIG in | ||
1476 | 20830 | [\\/]* | ?:[\\/]*) | ||
1477 | 20831 | ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. | ||
1478 | 20832 | ;; | ||
1479 | 20833 | *) | ||
1480 | 20834 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
1481 | 20835 | for as_dir in $PATH | ||
1482 | 20836 | do | ||
1483 | 20837 | IFS=$as_save_IFS | ||
1484 | 20838 | test -z "$as_dir" && as_dir=. | ||
1485 | 20839 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
1486 | 20840 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
1487 | 20841 | ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
1488 | 20842 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
1489 | 20843 | break 2 | ||
1490 | 20844 | fi | ||
1491 | 20845 | done | ||
1492 | 20846 | done | ||
1493 | 20847 | IFS=$as_save_IFS | ||
1494 | 20848 | |||
1495 | 20849 | ;; | ||
1496 | 20850 | esac | ||
1497 | 20851 | fi | ||
1498 | 20852 | PKG_CONFIG=$ac_cv_path_PKG_CONFIG | ||
1499 | 20853 | if test -n "$PKG_CONFIG"; then | ||
1500 | 20854 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 | ||
1501 | 20855 | $as_echo "$PKG_CONFIG" >&6; } | ||
1502 | 20856 | else | ||
1503 | 20857 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
1504 | 20858 | $as_echo "no" >&6; } | ||
1505 | 20859 | fi | ||
1506 | 20860 | |||
1507 | 20861 | |||
1508 | 20862 | fi | ||
1509 | 20863 | if test -z "$ac_cv_path_PKG_CONFIG"; then | ||
1510 | 20864 | ac_pt_PKG_CONFIG=$PKG_CONFIG | ||
1511 | 20865 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
1512 | 20866 | set dummy pkg-config; ac_word=$2 | ||
1513 | 20867 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
1514 | 20868 | $as_echo_n "checking for $ac_word... " >&6; } | ||
1515 | 20869 | if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : | ||
1516 | 20870 | $as_echo_n "(cached) " >&6 | ||
1517 | 20871 | else | ||
1518 | 20872 | case $ac_pt_PKG_CONFIG in | ||
1519 | 20873 | [\\/]* | ?:[\\/]*) | ||
1520 | 20874 | ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. | ||
1521 | 20875 | ;; | ||
1522 | 20876 | *) | ||
1523 | 20877 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
1524 | 20878 | for as_dir in $PATH | ||
1525 | 20879 | do | ||
1526 | 20880 | IFS=$as_save_IFS | ||
1527 | 20881 | test -z "$as_dir" && as_dir=. | ||
1528 | 20882 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
1529 | 20883 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
1530 | 20884 | ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
1531 | 20885 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
1532 | 20886 | break 2 | ||
1533 | 20887 | fi | ||
1534 | 20888 | done | ||
1535 | 20889 | done | ||
1536 | 20890 | IFS=$as_save_IFS | ||
1537 | 20891 | |||
1538 | 20892 | ;; | ||
1539 | 20893 | esac | ||
1540 | 20894 | fi | ||
1541 | 20895 | ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG | ||
1542 | 20896 | if test -n "$ac_pt_PKG_CONFIG"; then | ||
1543 | 20897 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 | ||
1544 | 20898 | $as_echo "$ac_pt_PKG_CONFIG" >&6; } | ||
1545 | 20899 | else | ||
1546 | 20900 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
1547 | 20901 | $as_echo "no" >&6; } | ||
1548 | 20902 | fi | ||
1549 | 20903 | |||
1550 | 20904 | if test "x$ac_pt_PKG_CONFIG" = x; then | ||
1551 | 20905 | PKG_CONFIG="" | ||
1552 | 20906 | else | ||
1553 | 20907 | case $cross_compiling:$ac_tool_warned in | ||
1554 | 20908 | yes:) | ||
1555 | 20909 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
1556 | 20910 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
1557 | 20911 | ac_tool_warned=yes ;; | ||
1558 | 20912 | esac | ||
1559 | 20913 | PKG_CONFIG=$ac_pt_PKG_CONFIG | ||
1560 | 20914 | fi | ||
1561 | 20915 | else | ||
1562 | 20916 | PKG_CONFIG="$ac_cv_path_PKG_CONFIG" | ||
1563 | 20917 | fi | ||
1564 | 20918 | |||
1565 | 20919 | fi | ||
1566 | 20920 | if test -n "$PKG_CONFIG"; then | ||
1567 | 20921 | _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION | ||
1568 | 20922 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 | ||
1569 | 20923 | $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } | ||
1570 | 20924 | if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then | ||
1571 | 20925 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
1572 | 20926 | $as_echo "yes" >&6; } | ||
1573 | 20927 | else | ||
1574 | 20928 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
1575 | 20929 | $as_echo "no" >&6; } | ||
1576 | 20930 | PKG_CONFIG="" | ||
1577 | 20931 | fi | ||
1578 | 20932 | fi | ||
1579 | 20933 | |||
1580 | 20934 | if test x"$PKG_CONFIG" = x""; then | ||
1581 | 20935 | echo | ||
1582 | 20936 | echo "*** Your version of pkg-config is too old. You need atleast" | ||
1583 | 20937 | echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" | ||
1584 | 20938 | echo "*** from the freedesktop.org software repository at" | ||
1585 | 20939 | echo "***" | ||
1586 | 20940 | echo "*** http://www.freedesktop.org/software/pkgconfig" | ||
1587 | 20941 | echo "***" | ||
1588 | 20942 | exit 1; | ||
1589 | 20943 | fi | ||
1590 | 20944 | |||
1591 | 20945 | |||
1592 | 20946 | |||
1593 | 20947 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus-glib-1 >= 0.70" >&5 | ||
1594 | 20948 | $as_echo_n "checking for dbus-glib-1 >= 0.70... " >&6; } | ||
1595 | 20949 | if $PKG_CONFIG "--atleast-version=0.70" "dbus-glib-1" >/dev/null 2>&1; then | ||
1596 | 20950 | DBUS_GLIB_VERSION=`$PKG_CONFIG --modversion "dbus-glib-1"` | ||
1597 | 20951 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_GLIB_VERSION" >&5 | ||
1598 | 20952 | $as_echo "$DBUS_GLIB_VERSION" >&6; } | ||
1599 | 20953 | |||
1600 | 20954 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking DBUS_GLIB_CFLAGS" >&5 | ||
1601 | 20955 | $as_echo_n "checking DBUS_GLIB_CFLAGS... " >&6; } | ||
1602 | 20956 | DBUS_GLIB_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1"` | ||
1603 | 20957 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_GLIB_CFLAGS" >&5 | ||
1604 | 20958 | $as_echo "$DBUS_GLIB_CFLAGS" >&6; } | ||
1605 | 20959 | |||
1606 | 20960 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking DBUS_GLIB_LIBS" >&5 | ||
1607 | 20961 | $as_echo_n "checking DBUS_GLIB_LIBS... " >&6; } | ||
1608 | 20962 | DBUS_GLIB_LIBS=`$PKG_CONFIG --libs "dbus-glib-1"` | ||
1609 | 20963 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_GLIB_LIBS" >&5 | ||
1610 | 20964 | $as_echo "$DBUS_GLIB_LIBS" >&6; } | ||
1611 | 20965 | |||
1612 | 20966 | DBUS_GLIB_REQUIRED_VERSION=0.70 | ||
1613 | 20967 | |||
1614 | 20968 | |||
1615 | 20969 | |||
1616 | 20970 | |||
1617 | 20971 | |||
1618 | 20972 | |||
1619 | 20973 | |||
1620 | 20974 | elif $PKG_CONFIG --exists "dbus-glib-1" >/dev/null 2>&1; then | ||
1621 | 20975 | xdt_cv_version=`$PKG_CONFIG --modversion "dbus-glib-1"` | ||
1622 | 20976 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 | ||
1623 | 20977 | $as_echo "found, but $xdt_cv_version" >&6; } | ||
1624 | 20978 | |||
1625 | 20979 | |||
1626 | 20980 | echo "*** The required package dbus-glib-1 was found on your system," | ||
1627 | 20981 | echo "*** but the installed version ($xdt_cv_version) is too old." | ||
1628 | 20982 | echo "*** Please upgrade dbus-glib-1 to atleast version 0.70, or adjust" | ||
1629 | 20983 | echo "*** the PKG_CONFIG_PATH environment variable if you installed" | ||
1630 | 20984 | echo "*** the new version of the package in a nonstandard prefix so" | ||
1631 | 20985 | echo "*** pkg-config is able to find it." | ||
1632 | 20986 | exit 1 | ||
1633 | 20987 | |||
1634 | 20988 | else | ||
1635 | 20989 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 | ||
1636 | 20990 | $as_echo "not found" >&6; } | ||
1637 | 20991 | |||
1638 | 20992 | |||
1639 | 20993 | echo "*** The required package dbus-glib-1 was not found on your system." | ||
1640 | 20994 | echo "*** Please install dbus-glib-1 (atleast version 0.70) or adjust" | ||
1641 | 20995 | echo "*** the PKG_CONFIG_PATH environment variable if you" | ||
1642 | 20996 | echo "*** installed the package in a nonstandard prefix so that" | ||
1643 | 20997 | echo "*** pkg-config is able to find it." | ||
1644 | 20998 | exit 1 | ||
1645 | 20999 | |||
1646 | 21000 | fi | ||
1647 | 21001 | |||
1648 | 21002 | |||
1649 | 21003 | |||
1650 | 21004 | |||
1651 | 21005 | # minimum supported version of pkg-config | ||
1652 | 21006 | xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 | ||
1653 | 21007 | |||
1654 | 21008 | |||
1655 | 21009 | |||
1656 | 21010 | |||
1657 | 21011 | |||
1658 | 21012 | |||
1659 | 21013 | |||
1660 | 21014 | |||
1661 | 21015 | |||
1662 | 21016 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then | ||
1663 | 21017 | if test -n "$ac_tool_prefix"; then | ||
1664 | 21018 | # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. | ||
1665 | 21019 | set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 | ||
1666 | 21020 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
1667 | 21021 | $as_echo_n "checking for $ac_word... " >&6; } | ||
1668 | 21022 | if ${ac_cv_path_PKG_CONFIG+:} false; then : | ||
1669 | 21023 | $as_echo_n "(cached) " >&6 | ||
1670 | 21024 | else | ||
1671 | 21025 | case $PKG_CONFIG in | ||
1672 | 21026 | [\\/]* | ?:[\\/]*) | ||
1673 | 21027 | ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. | ||
1674 | 21028 | ;; | ||
1675 | 21029 | *) | ||
1676 | 21030 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
1677 | 21031 | for as_dir in $PATH | ||
1678 | 21032 | do | ||
1679 | 21033 | IFS=$as_save_IFS | ||
1680 | 21034 | test -z "$as_dir" && as_dir=. | ||
1681 | 21035 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
1682 | 21036 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
1683 | 21037 | ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
1684 | 21038 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
1685 | 21039 | break 2 | ||
1686 | 21040 | fi | ||
1687 | 21041 | done | ||
1688 | 21042 | done | ||
1689 | 21043 | IFS=$as_save_IFS | ||
1690 | 21044 | |||
1691 | 21045 | ;; | ||
1692 | 21046 | esac | ||
1693 | 21047 | fi | ||
1694 | 21048 | PKG_CONFIG=$ac_cv_path_PKG_CONFIG | ||
1695 | 21049 | if test -n "$PKG_CONFIG"; then | ||
1696 | 21050 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 | ||
1697 | 21051 | $as_echo "$PKG_CONFIG" >&6; } | ||
1698 | 21052 | else | ||
1699 | 21053 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
1700 | 21054 | $as_echo "no" >&6; } | ||
1701 | 21055 | fi | ||
1702 | 21056 | |||
1703 | 21057 | |||
1704 | 21058 | fi | ||
1705 | 21059 | if test -z "$ac_cv_path_PKG_CONFIG"; then | ||
1706 | 21060 | ac_pt_PKG_CONFIG=$PKG_CONFIG | ||
1707 | 21061 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
1708 | 21062 | set dummy pkg-config; ac_word=$2 | ||
1709 | 21063 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
1710 | 21064 | $as_echo_n "checking for $ac_word... " >&6; } | ||
1711 | 21065 | if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : | ||
1712 | 21066 | $as_echo_n "(cached) " >&6 | ||
1713 | 21067 | else | ||
1714 | 21068 | case $ac_pt_PKG_CONFIG in | ||
1715 | 21069 | [\\/]* | ?:[\\/]*) | ||
1716 | 21070 | ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. | ||
1717 | 21071 | ;; | ||
1718 | 21072 | *) | ||
1719 | 21073 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
1720 | 21074 | for as_dir in $PATH | ||
1721 | 21075 | do | ||
1722 | 21076 | IFS=$as_save_IFS | ||
1723 | 21077 | test -z "$as_dir" && as_dir=. | ||
1724 | 21078 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
1725 | 21079 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
1726 | 21080 | ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
1727 | 21081 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
1728 | 21082 | break 2 | ||
1729 | 21083 | fi | ||
1730 | 21084 | done | ||
1731 | 21085 | done | ||
1732 | 21086 | IFS=$as_save_IFS | ||
1733 | 21087 | |||
1734 | 21088 | ;; | ||
1735 | 21089 | esac | ||
1736 | 21090 | fi | ||
1737 | 21091 | ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG | ||
1738 | 21092 | if test -n "$ac_pt_PKG_CONFIG"; then | ||
1739 | 21093 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 | ||
1740 | 21094 | $as_echo "$ac_pt_PKG_CONFIG" >&6; } | ||
1741 | 21095 | else | ||
1742 | 21096 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
1743 | 21097 | $as_echo "no" >&6; } | ||
1744 | 21098 | fi | ||
1745 | 21099 | |||
1746 | 21100 | if test "x$ac_pt_PKG_CONFIG" = x; then | ||
1747 | 21101 | PKG_CONFIG="" | ||
1748 | 21102 | else | ||
1749 | 21103 | case $cross_compiling:$ac_tool_warned in | ||
1750 | 21104 | yes:) | ||
1751 | 21105 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
1752 | 21106 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
1753 | 21107 | ac_tool_warned=yes ;; | ||
1754 | 21108 | esac | ||
1755 | 21109 | PKG_CONFIG=$ac_pt_PKG_CONFIG | ||
1756 | 21110 | fi | ||
1757 | 21111 | else | ||
1758 | 21112 | PKG_CONFIG="$ac_cv_path_PKG_CONFIG" | ||
1759 | 21113 | fi | ||
1760 | 21114 | |||
1761 | 21115 | fi | ||
1762 | 21116 | if test -n "$PKG_CONFIG"; then | ||
1763 | 21117 | _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION | ||
1764 | 21118 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 | ||
1765 | 21119 | $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } | ||
1766 | 21120 | if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then | ||
1767 | 21121 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
1768 | 21122 | $as_echo "yes" >&6; } | ||
1769 | 21123 | else | ||
1770 | 21124 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
1771 | 21125 | $as_echo "no" >&6; } | ||
1772 | 21126 | PKG_CONFIG="" | ||
1773 | 21127 | fi | ||
1774 | 21128 | fi | ||
1775 | 21129 | |||
1776 | 21130 | if test x"$PKG_CONFIG" = x""; then | ||
1777 | 21131 | echo | ||
1778 | 21132 | echo "*** Your version of pkg-config is too old. You need atleast" | ||
1779 | 21133 | echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" | ||
1780 | 21134 | echo "*** from the freedesktop.org software repository at" | ||
1781 | 21135 | echo "***" | ||
1782 | 21136 | echo "*** http://www.freedesktop.org/software/pkgconfig" | ||
1783 | 21137 | echo "***" | ||
1784 | 21138 | exit 1; | ||
1785 | 21139 | fi | ||
1786 | 21140 | |||
1787 | 21141 | |||
1788 | 21142 | |||
1789 | 21143 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4util-1.0 >= 4.10.0" >&5 | ||
1790 | 21144 | $as_echo_n "checking for libxfce4util-1.0 >= 4.10.0... " >&6; } | ||
1791 | 21145 | if $PKG_CONFIG "--atleast-version=4.10.0" "libxfce4util-1.0" >/dev/null 2>&1; then | ||
1792 | 21146 | LIBXFCE4UTIL_VERSION=`$PKG_CONFIG --modversion "libxfce4util-1.0"` | ||
1793 | 21147 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_VERSION" >&5 | ||
1794 | 21148 | $as_echo "$LIBXFCE4UTIL_VERSION" >&6; } | ||
1795 | 21149 | |||
1796 | 21150 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4UTIL_CFLAGS" >&5 | ||
1797 | 21151 | $as_echo_n "checking LIBXFCE4UTIL_CFLAGS... " >&6; } | ||
1798 | 21152 | LIBXFCE4UTIL_CFLAGS=`$PKG_CONFIG --cflags "libxfce4util-1.0"` | ||
1799 | 21153 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_CFLAGS" >&5 | ||
1800 | 21154 | $as_echo "$LIBXFCE4UTIL_CFLAGS" >&6; } | ||
1801 | 21155 | |||
1802 | 21156 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4UTIL_LIBS" >&5 | ||
1803 | 21157 | $as_echo_n "checking LIBXFCE4UTIL_LIBS... " >&6; } | ||
1804 | 21158 | LIBXFCE4UTIL_LIBS=`$PKG_CONFIG --libs "libxfce4util-1.0"` | ||
1805 | 21159 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_LIBS" >&5 | ||
1806 | 21160 | $as_echo "$LIBXFCE4UTIL_LIBS" >&6; } | ||
1807 | 21161 | |||
1808 | 21162 | LIBXFCE4UTIL_REQUIRED_VERSION=4.10.0 | ||
1809 | 21163 | |||
1810 | 21164 | |||
1811 | 21165 | |||
1812 | 21166 | |||
1813 | 21167 | |||
1814 | 21168 | |||
1815 | 21169 | |||
1816 | 21170 | elif $PKG_CONFIG --exists "libxfce4util-1.0" >/dev/null 2>&1; then | ||
1817 | 21171 | xdt_cv_version=`$PKG_CONFIG --modversion "libxfce4util-1.0"` | ||
1818 | 21172 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 | ||
1819 | 21173 | $as_echo "found, but $xdt_cv_version" >&6; } | ||
1820 | 21174 | |||
1821 | 21175 | |||
1822 | 21176 | echo "*** The required package libxfce4util-1.0 was found on your system," | ||
1823 | 21177 | echo "*** but the installed version ($xdt_cv_version) is too old." | ||
1824 | 21178 | echo "*** Please upgrade libxfce4util-1.0 to atleast version 4.10.0, or adjust" | ||
1825 | 21179 | echo "*** the PKG_CONFIG_PATH environment variable if you installed" | ||
1826 | 21180 | echo "*** the new version of the package in a nonstandard prefix so" | ||
1827 | 21181 | echo "*** pkg-config is able to find it." | ||
1828 | 21182 | exit 1 | ||
1829 | 21183 | |||
1830 | 21184 | else | ||
1831 | 21185 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 | ||
1832 | 21186 | $as_echo "not found" >&6; } | ||
1833 | 21187 | |||
1834 | 21188 | |||
1835 | 21189 | echo "*** The required package libxfce4util-1.0 was not found on your system." | ||
1836 | 21190 | echo "*** Please install libxfce4util-1.0 (atleast version 4.10.0) or adjust" | ||
1837 | 21191 | echo "*** the PKG_CONFIG_PATH environment variable if you" | ||
1838 | 21192 | echo "*** installed the package in a nonstandard prefix so that" | ||
1839 | 21193 | echo "*** pkg-config is able to find it." | ||
1840 | 21194 | exit 1 | ||
1841 | 21195 | |||
1842 | 21196 | fi | ||
1843 | 21197 | |||
1844 | 21198 | |||
1845 | 21199 | |||
1846 | 21200 | # minimum supported version of pkg-config | ||
1847 | 21201 | xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 | ||
1848 | 21202 | |||
1849 | 21203 | |||
1850 | 21204 | |||
1851 | 21205 | |||
1852 | 21206 | |||
1853 | 21207 | |||
1854 | 21208 | |||
1855 | 21209 | |||
1856 | 21210 | |||
1857 | 21211 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then | ||
1858 | 21212 | if test -n "$ac_tool_prefix"; then | ||
1859 | 21213 | # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. | ||
1860 | 21214 | set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 | ||
1861 | 21215 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
1862 | 21216 | $as_echo_n "checking for $ac_word... " >&6; } | ||
1863 | 21217 | if ${ac_cv_path_PKG_CONFIG+:} false; then : | ||
1864 | 21218 | $as_echo_n "(cached) " >&6 | ||
1865 | 21219 | else | ||
1866 | 21220 | case $PKG_CONFIG in | ||
1867 | 21221 | [\\/]* | ?:[\\/]*) | ||
1868 | 21222 | ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. | ||
1869 | 21223 | ;; | ||
1870 | 21224 | *) | ||
1871 | 21225 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
1872 | 21226 | for as_dir in $PATH | ||
1873 | 21227 | do | ||
1874 | 21228 | IFS=$as_save_IFS | ||
1875 | 21229 | test -z "$as_dir" && as_dir=. | ||
1876 | 21230 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
1877 | 21231 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
1878 | 21232 | ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
1879 | 21233 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
1880 | 21234 | break 2 | ||
1881 | 21235 | fi | ||
1882 | 21236 | done | ||
1883 | 21237 | done | ||
1884 | 21238 | IFS=$as_save_IFS | ||
1885 | 21239 | |||
1886 | 21240 | ;; | ||
1887 | 21241 | esac | ||
1888 | 21242 | fi | ||
1889 | 21243 | PKG_CONFIG=$ac_cv_path_PKG_CONFIG | ||
1890 | 21244 | if test -n "$PKG_CONFIG"; then | ||
1891 | 21245 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 | ||
1892 | 21246 | $as_echo "$PKG_CONFIG" >&6; } | ||
1893 | 21247 | else | ||
1894 | 21248 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
1895 | 21249 | $as_echo "no" >&6; } | ||
1896 | 21250 | fi | ||
1897 | 21251 | |||
1898 | 21252 | |||
1899 | 21253 | fi | ||
1900 | 21254 | if test -z "$ac_cv_path_PKG_CONFIG"; then | ||
1901 | 21255 | ac_pt_PKG_CONFIG=$PKG_CONFIG | ||
1902 | 21256 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
1903 | 21257 | set dummy pkg-config; ac_word=$2 | ||
1904 | 21258 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
1905 | 21259 | $as_echo_n "checking for $ac_word... " >&6; } | ||
1906 | 21260 | if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : | ||
1907 | 21261 | $as_echo_n "(cached) " >&6 | ||
1908 | 21262 | else | ||
1909 | 21263 | case $ac_pt_PKG_CONFIG in | ||
1910 | 21264 | [\\/]* | ?:[\\/]*) | ||
1911 | 21265 | ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. | ||
1912 | 21266 | ;; | ||
1913 | 21267 | *) | ||
1914 | 21268 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
1915 | 21269 | for as_dir in $PATH | ||
1916 | 21270 | do | ||
1917 | 21271 | IFS=$as_save_IFS | ||
1918 | 21272 | test -z "$as_dir" && as_dir=. | ||
1919 | 21273 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
1920 | 21274 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
1921 | 21275 | ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
1922 | 21276 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
1923 | 21277 | break 2 | ||
1924 | 21278 | fi | ||
1925 | 21279 | done | ||
1926 | 21280 | done | ||
1927 | 21281 | IFS=$as_save_IFS | ||
1928 | 21282 | |||
1929 | 21283 | ;; | ||
1930 | 21284 | esac | ||
1931 | 21285 | fi | ||
1932 | 21286 | ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG | ||
1933 | 21287 | if test -n "$ac_pt_PKG_CONFIG"; then | ||
1934 | 21288 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 | ||
1935 | 21289 | $as_echo "$ac_pt_PKG_CONFIG" >&6; } | ||
1936 | 21290 | else | ||
1937 | 21291 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
1938 | 21292 | $as_echo "no" >&6; } | ||
1939 | 21293 | fi | ||
1940 | 21294 | |||
1941 | 21295 | if test "x$ac_pt_PKG_CONFIG" = x; then | ||
1942 | 21296 | PKG_CONFIG="" | ||
1943 | 21297 | else | ||
1944 | 21298 | case $cross_compiling:$ac_tool_warned in | ||
1945 | 21299 | yes:) | ||
1946 | 21300 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
1947 | 21301 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
1948 | 21302 | ac_tool_warned=yes ;; | ||
1949 | 21303 | esac | ||
1950 | 21304 | PKG_CONFIG=$ac_pt_PKG_CONFIG | ||
1951 | 21305 | fi | ||
1952 | 21306 | else | ||
1953 | 21307 | PKG_CONFIG="$ac_cv_path_PKG_CONFIG" | ||
1954 | 21308 | fi | ||
1955 | 21309 | |||
1956 | 21310 | fi | ||
1957 | 21311 | if test -n "$PKG_CONFIG"; then | ||
1958 | 21312 | _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION | ||
1959 | 21313 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 | ||
1960 | 21314 | $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } | ||
1961 | 21315 | if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then | ||
1962 | 21316 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
1963 | 21317 | $as_echo "yes" >&6; } | ||
1964 | 21318 | else | ||
1965 | 21319 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
1966 | 21320 | $as_echo "no" >&6; } | ||
1967 | 21321 | PKG_CONFIG="" | ||
1968 | 21322 | fi | ||
1969 | 21323 | fi | ||
1970 | 21324 | |||
1971 | 21325 | if test x"$PKG_CONFIG" = x""; then | ||
1972 | 21326 | echo | ||
1973 | 21327 | echo "*** Your version of pkg-config is too old. You need atleast" | ||
1974 | 21328 | echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" | ||
1975 | 21329 | echo "*** from the freedesktop.org software repository at" | ||
1976 | 21330 | echo "***" | ||
1977 | 21331 | echo "*** http://www.freedesktop.org/software/pkgconfig" | ||
1978 | 21332 | echo "***" | ||
1979 | 21333 | exit 1; | ||
1980 | 21334 | fi | ||
1981 | 21335 | |||
1982 | 21336 | |||
1983 | 21337 | |||
1984 | 21338 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfconf-0 >= 4.10.0" >&5 | ||
1985 | 21339 | $as_echo_n "checking for libxfconf-0 >= 4.10.0... " >&6; } | ||
1986 | 21340 | if $PKG_CONFIG "--atleast-version=4.10.0" "libxfconf-0" >/dev/null 2>&1; then | ||
1987 | 21341 | XFCONF_VERSION=`$PKG_CONFIG --modversion "libxfconf-0"` | ||
1988 | 21342 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XFCONF_VERSION" >&5 | ||
1989 | 21343 | $as_echo "$XFCONF_VERSION" >&6; } | ||
1990 | 21344 | |||
1991 | 21345 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking XFCONF_CFLAGS" >&5 | ||
1992 | 21346 | $as_echo_n "checking XFCONF_CFLAGS... " >&6; } | ||
1993 | 21347 | XFCONF_CFLAGS=`$PKG_CONFIG --cflags "libxfconf-0"` | ||
1994 | 21348 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XFCONF_CFLAGS" >&5 | ||
1995 | 21349 | $as_echo "$XFCONF_CFLAGS" >&6; } | ||
1996 | 21350 | |||
1997 | 21351 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking XFCONF_LIBS" >&5 | ||
1998 | 21352 | $as_echo_n "checking XFCONF_LIBS... " >&6; } | ||
1999 | 21353 | XFCONF_LIBS=`$PKG_CONFIG --libs "libxfconf-0"` | ||
2000 | 21354 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XFCONF_LIBS" >&5 | ||
2001 | 21355 | $as_echo "$XFCONF_LIBS" >&6; } | ||
2002 | 21356 | |||
2003 | 21357 | XFCONF_REQUIRED_VERSION=4.10.0 | ||
2004 | 21358 | |||
2005 | 21359 | |||
2006 | 21360 | |||
2007 | 21361 | |||
2008 | 21362 | |||
2009 | 21363 | |||
2010 | 21364 | |||
2011 | 21365 | elif $PKG_CONFIG --exists "libxfconf-0" >/dev/null 2>&1; then | ||
2012 | 21366 | xdt_cv_version=`$PKG_CONFIG --modversion "libxfconf-0"` | ||
2013 | 21367 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 | ||
2014 | 21368 | $as_echo "found, but $xdt_cv_version" >&6; } | ||
2015 | 21369 | |||
2016 | 21370 | |||
2017 | 21371 | echo "*** The required package libxfconf-0 was found on your system," | ||
2018 | 21372 | echo "*** but the installed version ($xdt_cv_version) is too old." | ||
2019 | 21373 | echo "*** Please upgrade libxfconf-0 to atleast version 4.10.0, or adjust" | ||
2020 | 21374 | echo "*** the PKG_CONFIG_PATH environment variable if you installed" | ||
2021 | 21375 | echo "*** the new version of the package in a nonstandard prefix so" | ||
2022 | 21376 | echo "*** pkg-config is able to find it." | ||
2023 | 21377 | exit 1 | ||
2024 | 21378 | |||
2025 | 21379 | else | ||
2026 | 21380 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 | ||
2027 | 21381 | $as_echo "not found" >&6; } | ||
2028 | 21382 | |||
2029 | 21383 | |||
2030 | 21384 | echo "*** The required package libxfconf-0 was not found on your system." | ||
2031 | 21385 | echo "*** Please install libxfconf-0 (atleast version 4.10.0) or adjust" | ||
2032 | 21386 | echo "*** the PKG_CONFIG_PATH environment variable if you" | ||
2033 | 21387 | echo "*** installed the package in a nonstandard prefix so that" | ||
2034 | 21388 | echo "*** pkg-config is able to find it." | ||
2035 | 21389 | exit 1 | ||
2036 | 21390 | |||
2037 | 21391 | fi | ||
2038 | 21392 | |||
2039 | 21393 | |||
2040 | 21394 | |||
2041 | 21395 | |||
2042 | 21396 | # minimum supported version of pkg-config | ||
2043 | 21397 | xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 | ||
2044 | 21398 | |||
2045 | 21399 | |||
2046 | 21400 | |||
2047 | 21401 | |||
2048 | 21402 | |||
2049 | 21403 | |||
2050 | 21404 | |||
2051 | 21405 | |||
2052 | 21406 | |||
2053 | 21407 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then | ||
2054 | 21408 | if test -n "$ac_tool_prefix"; then | ||
2055 | 21409 | # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. | ||
2056 | 21410 | set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 | ||
2057 | 21411 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2058 | 21412 | $as_echo_n "checking for $ac_word... " >&6; } | ||
2059 | 21413 | if ${ac_cv_path_PKG_CONFIG+:} false; then : | ||
2060 | 21414 | $as_echo_n "(cached) " >&6 | ||
2061 | 21415 | else | ||
2062 | 21416 | case $PKG_CONFIG in | ||
2063 | 21417 | [\\/]* | ?:[\\/]*) | ||
2064 | 21418 | ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. | ||
2065 | 21419 | ;; | ||
2066 | 21420 | *) | ||
2067 | 21421 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2068 | 21422 | for as_dir in $PATH | ||
2069 | 21423 | do | ||
2070 | 21424 | IFS=$as_save_IFS | ||
2071 | 21425 | test -z "$as_dir" && as_dir=. | ||
2072 | 21426 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2073 | 21427 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
2074 | 21428 | ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
2075 | 21429 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2076 | 21430 | break 2 | ||
2077 | 21431 | fi | ||
2078 | 21432 | done | ||
2079 | 21433 | done | ||
2080 | 21434 | IFS=$as_save_IFS | ||
2081 | 21435 | |||
2082 | 21436 | ;; | ||
2083 | 21437 | esac | ||
2084 | 21438 | fi | ||
2085 | 21439 | PKG_CONFIG=$ac_cv_path_PKG_CONFIG | ||
2086 | 21440 | if test -n "$PKG_CONFIG"; then | ||
2087 | 21441 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 | ||
2088 | 21442 | $as_echo "$PKG_CONFIG" >&6; } | ||
2089 | 21443 | else | ||
2090 | 21444 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2091 | 21445 | $as_echo "no" >&6; } | ||
2092 | 21446 | fi | ||
2093 | 21447 | |||
2094 | 21448 | |||
2095 | 21449 | fi | ||
2096 | 21450 | if test -z "$ac_cv_path_PKG_CONFIG"; then | ||
2097 | 21451 | ac_pt_PKG_CONFIG=$PKG_CONFIG | ||
2098 | 21452 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
2099 | 21453 | set dummy pkg-config; ac_word=$2 | ||
2100 | 21454 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2101 | 21455 | $as_echo_n "checking for $ac_word... " >&6; } | ||
2102 | 21456 | if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : | ||
2103 | 21457 | $as_echo_n "(cached) " >&6 | ||
2104 | 21458 | else | ||
2105 | 21459 | case $ac_pt_PKG_CONFIG in | ||
2106 | 21460 | [\\/]* | ?:[\\/]*) | ||
2107 | 21461 | ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. | ||
2108 | 21462 | ;; | ||
2109 | 21463 | *) | ||
2110 | 21464 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2111 | 21465 | for as_dir in $PATH | ||
2112 | 21466 | do | ||
2113 | 21467 | IFS=$as_save_IFS | ||
2114 | 21468 | test -z "$as_dir" && as_dir=. | ||
2115 | 21469 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2116 | 21470 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
2117 | 21471 | ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
2118 | 21472 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2119 | 21473 | break 2 | ||
2120 | 21474 | fi | ||
2121 | 21475 | done | ||
2122 | 21476 | done | ||
2123 | 21477 | IFS=$as_save_IFS | ||
2124 | 21478 | |||
2125 | 21479 | ;; | ||
2126 | 21480 | esac | ||
2127 | 21481 | fi | ||
2128 | 21482 | ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG | ||
2129 | 21483 | if test -n "$ac_pt_PKG_CONFIG"; then | ||
2130 | 21484 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 | ||
2131 | 21485 | $as_echo "$ac_pt_PKG_CONFIG" >&6; } | ||
2132 | 21486 | else | ||
2133 | 21487 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2134 | 21488 | $as_echo "no" >&6; } | ||
2135 | 21489 | fi | ||
2136 | 21490 | |||
2137 | 21491 | if test "x$ac_pt_PKG_CONFIG" = x; then | ||
2138 | 21492 | PKG_CONFIG="" | ||
2139 | 21493 | else | ||
2140 | 21494 | case $cross_compiling:$ac_tool_warned in | ||
2141 | 21495 | yes:) | ||
2142 | 21496 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
2143 | 21497 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
2144 | 21498 | ac_tool_warned=yes ;; | ||
2145 | 21499 | esac | ||
2146 | 21500 | PKG_CONFIG=$ac_pt_PKG_CONFIG | ||
2147 | 21501 | fi | ||
2148 | 21502 | else | ||
2149 | 21503 | PKG_CONFIG="$ac_cv_path_PKG_CONFIG" | ||
2150 | 21504 | fi | ||
2151 | 21505 | |||
2152 | 21506 | fi | ||
2153 | 21507 | if test -n "$PKG_CONFIG"; then | ||
2154 | 21508 | _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION | ||
2155 | 21509 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 | ||
2156 | 21510 | $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } | ||
2157 | 21511 | if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then | ||
2158 | 21512 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
2159 | 21513 | $as_echo "yes" >&6; } | ||
2160 | 21514 | else | ||
2161 | 21515 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2162 | 21516 | $as_echo "no" >&6; } | ||
2163 | 21517 | PKG_CONFIG="" | ||
2164 | 21518 | fi | ||
2165 | 21519 | fi | ||
2166 | 21520 | |||
2167 | 21521 | if test x"$PKG_CONFIG" = x""; then | ||
2168 | 21522 | echo | ||
2169 | 21523 | echo "*** Your version of pkg-config is too old. You need atleast" | ||
2170 | 21524 | echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" | ||
2171 | 21525 | echo "*** from the freedesktop.org software repository at" | ||
2172 | 21526 | echo "***" | ||
2173 | 21527 | echo "*** http://www.freedesktop.org/software/pkgconfig" | ||
2174 | 21528 | echo "***" | ||
2175 | 21529 | exit 1; | ||
2176 | 21530 | fi | ||
2177 | 21531 | |||
2178 | 21532 | |||
2179 | 21533 | |||
2180 | 21534 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4ui-2 >= 4.10.0" >&5 | ||
2181 | 21535 | $as_echo_n "checking for libxfce4ui-2 >= 4.10.0... " >&6; } | ||
2182 | 21536 | if $PKG_CONFIG "--atleast-version=4.10.0" "libxfce4ui-2" >/dev/null 2>&1; then | ||
2183 | 21537 | LIBXFCE4UI_VERSION=`$PKG_CONFIG --modversion "libxfce4ui-2"` | ||
2184 | 21538 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UI_VERSION" >&5 | ||
2185 | 21539 | $as_echo "$LIBXFCE4UI_VERSION" >&6; } | ||
2186 | 21540 | |||
2187 | 21541 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4UI_CFLAGS" >&5 | ||
2188 | 21542 | $as_echo_n "checking LIBXFCE4UI_CFLAGS... " >&6; } | ||
2189 | 21543 | LIBXFCE4UI_CFLAGS=`$PKG_CONFIG --cflags "libxfce4ui-2"` | ||
2190 | 21544 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UI_CFLAGS" >&5 | ||
2191 | 21545 | $as_echo "$LIBXFCE4UI_CFLAGS" >&6; } | ||
2192 | 21546 | |||
2193 | 21547 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4UI_LIBS" >&5 | ||
2194 | 21548 | $as_echo_n "checking LIBXFCE4UI_LIBS... " >&6; } | ||
2195 | 21549 | LIBXFCE4UI_LIBS=`$PKG_CONFIG --libs "libxfce4ui-2"` | ||
2196 | 21550 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UI_LIBS" >&5 | ||
2197 | 21551 | $as_echo "$LIBXFCE4UI_LIBS" >&6; } | ||
2198 | 21552 | |||
2199 | 21553 | LIBXFCE4UI_REQUIRED_VERSION=4.10.0 | ||
2200 | 21554 | |||
2201 | 21555 | |||
2202 | 21556 | |||
2203 | 21557 | |||
2204 | 21558 | |||
2205 | 21559 | |||
2206 | 21560 | |||
2207 | 21561 | elif $PKG_CONFIG --exists "libxfce4ui-2" >/dev/null 2>&1; then | ||
2208 | 21562 | xdt_cv_version=`$PKG_CONFIG --modversion "libxfce4ui-2"` | ||
2209 | 21563 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 | ||
2210 | 21564 | $as_echo "found, but $xdt_cv_version" >&6; } | ||
2211 | 21565 | |||
2212 | 21566 | |||
2213 | 21567 | echo "*** The required package libxfce4ui-2 was found on your system," | ||
2214 | 21568 | echo "*** but the installed version ($xdt_cv_version) is too old." | ||
2215 | 21569 | echo "*** Please upgrade libxfce4ui-2 to atleast version 4.10.0, or adjust" | ||
2216 | 21570 | echo "*** the PKG_CONFIG_PATH environment variable if you installed" | ||
2217 | 21571 | echo "*** the new version of the package in a nonstandard prefix so" | ||
2218 | 21572 | echo "*** pkg-config is able to find it." | ||
2219 | 21573 | exit 1 | ||
2220 | 21574 | |||
2221 | 21575 | else | ||
2222 | 21576 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 | ||
2223 | 21577 | $as_echo "not found" >&6; } | ||
2224 | 21578 | |||
2225 | 21579 | |||
2226 | 21580 | echo "*** The required package libxfce4ui-2 was not found on your system." | ||
2227 | 21581 | echo "*** Please install libxfce4ui-2 (atleast version 4.10.0) or adjust" | ||
2228 | 21582 | echo "*** the PKG_CONFIG_PATH environment variable if you" | ||
2229 | 21583 | echo "*** installed the package in a nonstandard prefix so that" | ||
2230 | 21584 | echo "*** pkg-config is able to find it." | ||
2231 | 21585 | exit 1 | ||
2232 | 21586 | |||
2233 | 21587 | fi | ||
2234 | 21588 | |||
2235 | 21589 | |||
2236 | 21590 | |||
2237 | 21591 | # minimum supported version of pkg-config | ||
2238 | 21592 | xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 | ||
2239 | 21593 | |||
2240 | 21594 | |||
2241 | 21595 | |||
2242 | 21596 | |||
2243 | 21597 | |||
2244 | 21598 | |||
2245 | 21599 | |||
2246 | 21600 | |||
2247 | 21601 | |||
2248 | 21602 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then | ||
2249 | 21603 | if test -n "$ac_tool_prefix"; then | ||
2250 | 21604 | # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. | ||
2251 | 21605 | set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 | ||
2252 | 21606 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2253 | 21607 | $as_echo_n "checking for $ac_word... " >&6; } | ||
2254 | 21608 | if ${ac_cv_path_PKG_CONFIG+:} false; then : | ||
2255 | 21609 | $as_echo_n "(cached) " >&6 | ||
2256 | 21610 | else | ||
2257 | 21611 | case $PKG_CONFIG in | ||
2258 | 21612 | [\\/]* | ?:[\\/]*) | ||
2259 | 21613 | ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. | ||
2260 | 21614 | ;; | ||
2261 | 21615 | *) | ||
2262 | 21616 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2263 | 21617 | for as_dir in $PATH | ||
2264 | 21618 | do | ||
2265 | 21619 | IFS=$as_save_IFS | ||
2266 | 21620 | test -z "$as_dir" && as_dir=. | ||
2267 | 21621 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2268 | 21622 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
2269 | 21623 | ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
2270 | 21624 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2271 | 21625 | break 2 | ||
2272 | 21626 | fi | ||
2273 | 21627 | done | ||
2274 | 21628 | done | ||
2275 | 21629 | IFS=$as_save_IFS | ||
2276 | 21630 | |||
2277 | 21631 | ;; | ||
2278 | 21632 | esac | ||
2279 | 21633 | fi | ||
2280 | 21634 | PKG_CONFIG=$ac_cv_path_PKG_CONFIG | ||
2281 | 21635 | if test -n "$PKG_CONFIG"; then | ||
2282 | 21636 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 | ||
2283 | 21637 | $as_echo "$PKG_CONFIG" >&6; } | ||
2284 | 21638 | else | ||
2285 | 21639 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2286 | 21640 | $as_echo "no" >&6; } | ||
2287 | 21641 | fi | ||
2288 | 21642 | |||
2289 | 21643 | |||
2290 | 21644 | fi | ||
2291 | 21645 | if test -z "$ac_cv_path_PKG_CONFIG"; then | ||
2292 | 21646 | ac_pt_PKG_CONFIG=$PKG_CONFIG | ||
2293 | 21647 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
2294 | 21648 | set dummy pkg-config; ac_word=$2 | ||
2295 | 21649 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2296 | 21650 | $as_echo_n "checking for $ac_word... " >&6; } | ||
2297 | 21651 | if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : | ||
2298 | 21652 | $as_echo_n "(cached) " >&6 | ||
2299 | 21653 | else | ||
2300 | 21654 | case $ac_pt_PKG_CONFIG in | ||
2301 | 21655 | [\\/]* | ?:[\\/]*) | ||
2302 | 21656 | ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. | ||
2303 | 21657 | ;; | ||
2304 | 21658 | *) | ||
2305 | 21659 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2306 | 21660 | for as_dir in $PATH | ||
2307 | 21661 | do | ||
2308 | 21662 | IFS=$as_save_IFS | ||
2309 | 21663 | test -z "$as_dir" && as_dir=. | ||
2310 | 21664 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2311 | 21665 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
2312 | 21666 | ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
2313 | 21667 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2314 | 21668 | break 2 | ||
2315 | 21669 | fi | ||
2316 | 21670 | done | ||
2317 | 21671 | done | ||
2318 | 21672 | IFS=$as_save_IFS | ||
2319 | 21673 | |||
2320 | 21674 | ;; | ||
2321 | 21675 | esac | ||
2322 | 21676 | fi | ||
2323 | 21677 | ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG | ||
2324 | 21678 | if test -n "$ac_pt_PKG_CONFIG"; then | ||
2325 | 21679 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 | ||
2326 | 21680 | $as_echo "$ac_pt_PKG_CONFIG" >&6; } | ||
2327 | 21681 | else | ||
2328 | 21682 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2329 | 21683 | $as_echo "no" >&6; } | ||
2330 | 21684 | fi | ||
2331 | 21685 | |||
2332 | 21686 | if test "x$ac_pt_PKG_CONFIG" = x; then | ||
2333 | 21687 | PKG_CONFIG="" | ||
2334 | 21688 | else | ||
2335 | 21689 | case $cross_compiling:$ac_tool_warned in | ||
2336 | 21690 | yes:) | ||
2337 | 21691 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
2338 | 21692 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
2339 | 21693 | ac_tool_warned=yes ;; | ||
2340 | 21694 | esac | ||
2341 | 21695 | PKG_CONFIG=$ac_pt_PKG_CONFIG | ||
2342 | 21696 | fi | ||
2343 | 21697 | else | ||
2344 | 21698 | PKG_CONFIG="$ac_cv_path_PKG_CONFIG" | ||
2345 | 21699 | fi | ||
2346 | 21700 | |||
2347 | 21701 | fi | ||
2348 | 21702 | if test -n "$PKG_CONFIG"; then | ||
2349 | 21703 | _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION | ||
2350 | 21704 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 | ||
2351 | 21705 | $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } | ||
2352 | 21706 | if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then | ||
2353 | 21707 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
2354 | 21708 | $as_echo "yes" >&6; } | ||
2355 | 21709 | else | ||
2356 | 21710 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2357 | 21711 | $as_echo "no" >&6; } | ||
2358 | 21712 | PKG_CONFIG="" | ||
2359 | 21713 | fi | ||
2360 | 21714 | fi | ||
2361 | 21715 | |||
2362 | 21716 | if test x"$PKG_CONFIG" = x""; then | ||
2363 | 21717 | echo | ||
2364 | 21718 | echo "*** Your version of pkg-config is too old. You need atleast" | ||
2365 | 21719 | echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" | ||
2366 | 21720 | echo "*** from the freedesktop.org software repository at" | ||
2367 | 21721 | echo "***" | ||
2368 | 21722 | echo "*** http://www.freedesktop.org/software/pkgconfig" | ||
2369 | 21723 | echo "***" | ||
2370 | 21724 | exit 1; | ||
2371 | 21725 | fi | ||
2372 | 21726 | |||
2373 | 21727 | |||
2374 | 21728 | |||
2375 | 21729 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-3.0 >= 3.2.0" >&5 | ||
2376 | 21730 | $as_echo_n "checking for gtk+-3.0 >= 3.2.0... " >&6; } | ||
2377 | 21731 | if $PKG_CONFIG "--atleast-version=3.2.0" "gtk+-3.0" >/dev/null 2>&1; then | ||
2378 | 21732 | GTK_VERSION=`$PKG_CONFIG --modversion "gtk+-3.0"` | ||
2379 | 21733 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_VERSION" >&5 | ||
2380 | 21734 | $as_echo "$GTK_VERSION" >&6; } | ||
2381 | 21735 | |||
2382 | 21736 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking GTK_CFLAGS" >&5 | ||
2383 | 21737 | $as_echo_n "checking GTK_CFLAGS... " >&6; } | ||
2384 | 21738 | GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0"` | ||
2385 | 21739 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_CFLAGS" >&5 | ||
2386 | 21740 | $as_echo "$GTK_CFLAGS" >&6; } | ||
2387 | 21741 | |||
2388 | 21742 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking GTK_LIBS" >&5 | ||
2389 | 21743 | $as_echo_n "checking GTK_LIBS... " >&6; } | ||
2390 | 21744 | GTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0"` | ||
2391 | 21745 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_LIBS" >&5 | ||
2392 | 21746 | $as_echo "$GTK_LIBS" >&6; } | ||
2393 | 21747 | |||
2394 | 21748 | GTK_REQUIRED_VERSION=3.2.0 | ||
2395 | 21749 | |||
2396 | 21750 | |||
2397 | 21751 | |||
2398 | 21752 | |||
2399 | 21753 | |||
2400 | 21754 | |||
2401 | 21755 | |||
2402 | 21756 | elif $PKG_CONFIG --exists "gtk+-3.0" >/dev/null 2>&1; then | ||
2403 | 21757 | xdt_cv_version=`$PKG_CONFIG --modversion "gtk+-3.0"` | ||
2404 | 21758 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 | ||
2405 | 21759 | $as_echo "found, but $xdt_cv_version" >&6; } | ||
2406 | 21760 | |||
2407 | 21761 | |||
2408 | 21762 | echo "*** The required package gtk+-3.0 was found on your system," | ||
2409 | 21763 | echo "*** but the installed version ($xdt_cv_version) is too old." | ||
2410 | 21764 | echo "*** Please upgrade gtk+-3.0 to atleast version 3.2.0, or adjust" | ||
2411 | 21765 | echo "*** the PKG_CONFIG_PATH environment variable if you installed" | ||
2412 | 21766 | echo "*** the new version of the package in a nonstandard prefix so" | ||
2413 | 21767 | echo "*** pkg-config is able to find it." | ||
2414 | 21768 | exit 1 | ||
2415 | 21769 | |||
2416 | 21770 | else | ||
2417 | 21771 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 | ||
2418 | 21772 | $as_echo "not found" >&6; } | ||
2419 | 21773 | |||
2420 | 21774 | |||
2421 | 21775 | echo "*** The required package gtk+-3.0 was not found on your system." | ||
2422 | 21776 | echo "*** Please install gtk+-3.0 (atleast version 3.2.0) or adjust" | ||
2423 | 21777 | echo "*** the PKG_CONFIG_PATH environment variable if you" | ||
2424 | 21778 | echo "*** installed the package in a nonstandard prefix so that" | ||
2425 | 21779 | echo "*** pkg-config is able to find it." | ||
2426 | 21780 | exit 1 | ||
2427 | 21781 | |||
2428 | 21782 | fi | ||
2429 | 21783 | |||
2430 | 21784 | |||
2431 | 21785 | |||
2432 | 21786 | |||
2433 | 21787 | # minimum supported version of pkg-config | ||
2434 | 21788 | xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 | ||
2435 | 21789 | |||
2436 | 21790 | |||
2437 | 21791 | |||
2438 | 21792 | |||
2439 | 21793 | |||
2440 | 21794 | |||
2441 | 21795 | |||
2442 | 21796 | |||
2443 | 21797 | |||
2444 | 21798 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then | ||
2445 | 21799 | if test -n "$ac_tool_prefix"; then | ||
2446 | 21800 | # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. | ||
2447 | 21801 | set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 | ||
2448 | 21802 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2449 | 21803 | $as_echo_n "checking for $ac_word... " >&6; } | ||
2450 | 21804 | if ${ac_cv_path_PKG_CONFIG+:} false; then : | ||
2451 | 21805 | $as_echo_n "(cached) " >&6 | ||
2452 | 21806 | else | ||
2453 | 21807 | case $PKG_CONFIG in | ||
2454 | 21808 | [\\/]* | ?:[\\/]*) | ||
2455 | 21809 | ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. | ||
2456 | 21810 | ;; | ||
2457 | 21811 | *) | ||
2458 | 21812 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2459 | 21813 | for as_dir in $PATH | ||
2460 | 21814 | do | ||
2461 | 21815 | IFS=$as_save_IFS | ||
2462 | 21816 | test -z "$as_dir" && as_dir=. | ||
2463 | 21817 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2464 | 21818 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
2465 | 21819 | ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
2466 | 21820 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2467 | 21821 | break 2 | ||
2468 | 21822 | fi | ||
2469 | 21823 | done | ||
2470 | 21824 | done | ||
2471 | 21825 | IFS=$as_save_IFS | ||
2472 | 21826 | |||
2473 | 21827 | ;; | ||
2474 | 21828 | esac | ||
2475 | 21829 | fi | ||
2476 | 21830 | PKG_CONFIG=$ac_cv_path_PKG_CONFIG | ||
2477 | 21831 | if test -n "$PKG_CONFIG"; then | ||
2478 | 21832 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 | ||
2479 | 21833 | $as_echo "$PKG_CONFIG" >&6; } | ||
2480 | 21834 | else | ||
2481 | 21835 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2482 | 21836 | $as_echo "no" >&6; } | ||
2483 | 21837 | fi | ||
2484 | 21838 | |||
2485 | 21839 | |||
2486 | 21840 | fi | ||
2487 | 21841 | if test -z "$ac_cv_path_PKG_CONFIG"; then | ||
2488 | 21842 | ac_pt_PKG_CONFIG=$PKG_CONFIG | ||
2489 | 21843 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
2490 | 21844 | set dummy pkg-config; ac_word=$2 | ||
2491 | 21845 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2492 | 21846 | $as_echo_n "checking for $ac_word... " >&6; } | ||
2493 | 21847 | if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : | ||
2494 | 21848 | $as_echo_n "(cached) " >&6 | ||
2495 | 21849 | else | ||
2496 | 21850 | case $ac_pt_PKG_CONFIG in | ||
2497 | 21851 | [\\/]* | ?:[\\/]*) | ||
2498 | 21852 | ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. | ||
2499 | 21853 | ;; | ||
2500 | 21854 | *) | ||
2501 | 21855 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2502 | 21856 | for as_dir in $PATH | ||
2503 | 21857 | do | ||
2504 | 21858 | IFS=$as_save_IFS | ||
2505 | 21859 | test -z "$as_dir" && as_dir=. | ||
2506 | 21860 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2507 | 21861 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
2508 | 21862 | ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
2509 | 21863 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2510 | 21864 | break 2 | ||
2511 | 21865 | fi | ||
2512 | 21866 | done | ||
2513 | 21867 | done | ||
2514 | 21868 | IFS=$as_save_IFS | ||
2515 | 21869 | |||
2516 | 21870 | ;; | ||
2517 | 21871 | esac | ||
2518 | 21872 | fi | ||
2519 | 21873 | ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG | ||
2520 | 21874 | if test -n "$ac_pt_PKG_CONFIG"; then | ||
2521 | 21875 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 | ||
2522 | 21876 | $as_echo "$ac_pt_PKG_CONFIG" >&6; } | ||
2523 | 21877 | else | ||
2524 | 21878 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2525 | 21879 | $as_echo "no" >&6; } | ||
2526 | 21880 | fi | ||
2527 | 21881 | |||
2528 | 21882 | if test "x$ac_pt_PKG_CONFIG" = x; then | ||
2529 | 21883 | PKG_CONFIG="" | ||
2530 | 21884 | else | ||
2531 | 21885 | case $cross_compiling:$ac_tool_warned in | ||
2532 | 21886 | yes:) | ||
2533 | 21887 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
2534 | 21888 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
2535 | 21889 | ac_tool_warned=yes ;; | ||
2536 | 21890 | esac | ||
2537 | 21891 | PKG_CONFIG=$ac_pt_PKG_CONFIG | ||
2538 | 21892 | fi | ||
2539 | 21893 | else | ||
2540 | 21894 | PKG_CONFIG="$ac_cv_path_PKG_CONFIG" | ||
2541 | 21895 | fi | ||
2542 | 21896 | |||
2543 | 21897 | fi | ||
2544 | 21898 | if test -n "$PKG_CONFIG"; then | ||
2545 | 21899 | _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION | ||
2546 | 21900 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 | ||
2547 | 21901 | $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } | ||
2548 | 21902 | if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then | ||
2549 | 21903 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
2550 | 21904 | $as_echo "yes" >&6; } | ||
2551 | 21905 | else | ||
2552 | 21906 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2553 | 21907 | $as_echo "no" >&6; } | ||
2554 | 21908 | PKG_CONFIG="" | ||
2555 | 21909 | fi | ||
2556 | 21910 | fi | ||
2557 | 21911 | |||
2558 | 21912 | if test x"$PKG_CONFIG" = x""; then | ||
2559 | 21913 | echo | ||
2560 | 21914 | echo "*** Your version of pkg-config is too old. You need atleast" | ||
2561 | 21915 | echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" | ||
2562 | 21916 | echo "*** from the freedesktop.org software repository at" | ||
2563 | 21917 | echo "***" | ||
2564 | 21918 | echo "*** http://www.freedesktop.org/software/pkgconfig" | ||
2565 | 21919 | echo "***" | ||
2566 | 21920 | exit 1; | ||
2567 | 21921 | fi | ||
2568 | 21922 | |||
2569 | 21923 | |||
2570 | 21924 | |||
2571 | 20904 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gstreamer-${gstreamer_api_version} >= ${gstreamer_minimum_version}" >&5 | 21925 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gstreamer-${gstreamer_api_version} >= ${gstreamer_minimum_version}" >&5 |
2572 | 20905 | $as_echo_n "checking for gstreamer-${gstreamer_api_version} >= ${gstreamer_minimum_version}... " >&6; } | 21926 | $as_echo_n "checking for gstreamer-${gstreamer_api_version} >= ${gstreamer_minimum_version}... " >&6; } |
2573 | 20906 | if $PKG_CONFIG "--atleast-version=${gstreamer_minimum_version}" "gstreamer-${gstreamer_api_version}" >/dev/null 2>&1; then | 21927 | if $PKG_CONFIG "--atleast-version=${gstreamer_minimum_version}" "gstreamer-${gstreamer_api_version}" >/dev/null 2>&1; then |
2574 | @@ -21745,982 +22766,6 @@ | |||
2575 | 21745 | 22766 | ||
2576 | 21746 | 22767 | ||
2577 | 21747 | 22768 | ||
2578 | 21748 | # minimum supported version of pkg-config | ||
2579 | 21749 | xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 | ||
2580 | 21750 | |||
2581 | 21751 | |||
2582 | 21752 | |||
2583 | 21753 | |||
2584 | 21754 | |||
2585 | 21755 | |||
2586 | 21756 | |||
2587 | 21757 | |||
2588 | 21758 | |||
2589 | 21759 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then | ||
2590 | 21760 | if test -n "$ac_tool_prefix"; then | ||
2591 | 21761 | # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. | ||
2592 | 21762 | set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 | ||
2593 | 21763 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2594 | 21764 | $as_echo_n "checking for $ac_word... " >&6; } | ||
2595 | 21765 | if ${ac_cv_path_PKG_CONFIG+:} false; then : | ||
2596 | 21766 | $as_echo_n "(cached) " >&6 | ||
2597 | 21767 | else | ||
2598 | 21768 | case $PKG_CONFIG in | ||
2599 | 21769 | [\\/]* | ?:[\\/]*) | ||
2600 | 21770 | ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. | ||
2601 | 21771 | ;; | ||
2602 | 21772 | *) | ||
2603 | 21773 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2604 | 21774 | for as_dir in $PATH | ||
2605 | 21775 | do | ||
2606 | 21776 | IFS=$as_save_IFS | ||
2607 | 21777 | test -z "$as_dir" && as_dir=. | ||
2608 | 21778 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2609 | 21779 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
2610 | 21780 | ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
2611 | 21781 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2612 | 21782 | break 2 | ||
2613 | 21783 | fi | ||
2614 | 21784 | done | ||
2615 | 21785 | done | ||
2616 | 21786 | IFS=$as_save_IFS | ||
2617 | 21787 | |||
2618 | 21788 | ;; | ||
2619 | 21789 | esac | ||
2620 | 21790 | fi | ||
2621 | 21791 | PKG_CONFIG=$ac_cv_path_PKG_CONFIG | ||
2622 | 21792 | if test -n "$PKG_CONFIG"; then | ||
2623 | 21793 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 | ||
2624 | 21794 | $as_echo "$PKG_CONFIG" >&6; } | ||
2625 | 21795 | else | ||
2626 | 21796 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2627 | 21797 | $as_echo "no" >&6; } | ||
2628 | 21798 | fi | ||
2629 | 21799 | |||
2630 | 21800 | |||
2631 | 21801 | fi | ||
2632 | 21802 | if test -z "$ac_cv_path_PKG_CONFIG"; then | ||
2633 | 21803 | ac_pt_PKG_CONFIG=$PKG_CONFIG | ||
2634 | 21804 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
2635 | 21805 | set dummy pkg-config; ac_word=$2 | ||
2636 | 21806 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2637 | 21807 | $as_echo_n "checking for $ac_word... " >&6; } | ||
2638 | 21808 | if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : | ||
2639 | 21809 | $as_echo_n "(cached) " >&6 | ||
2640 | 21810 | else | ||
2641 | 21811 | case $ac_pt_PKG_CONFIG in | ||
2642 | 21812 | [\\/]* | ?:[\\/]*) | ||
2643 | 21813 | ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. | ||
2644 | 21814 | ;; | ||
2645 | 21815 | *) | ||
2646 | 21816 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2647 | 21817 | for as_dir in $PATH | ||
2648 | 21818 | do | ||
2649 | 21819 | IFS=$as_save_IFS | ||
2650 | 21820 | test -z "$as_dir" && as_dir=. | ||
2651 | 21821 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2652 | 21822 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
2653 | 21823 | ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
2654 | 21824 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2655 | 21825 | break 2 | ||
2656 | 21826 | fi | ||
2657 | 21827 | done | ||
2658 | 21828 | done | ||
2659 | 21829 | IFS=$as_save_IFS | ||
2660 | 21830 | |||
2661 | 21831 | ;; | ||
2662 | 21832 | esac | ||
2663 | 21833 | fi | ||
2664 | 21834 | ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG | ||
2665 | 21835 | if test -n "$ac_pt_PKG_CONFIG"; then | ||
2666 | 21836 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 | ||
2667 | 21837 | $as_echo "$ac_pt_PKG_CONFIG" >&6; } | ||
2668 | 21838 | else | ||
2669 | 21839 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2670 | 21840 | $as_echo "no" >&6; } | ||
2671 | 21841 | fi | ||
2672 | 21842 | |||
2673 | 21843 | if test "x$ac_pt_PKG_CONFIG" = x; then | ||
2674 | 21844 | PKG_CONFIG="" | ||
2675 | 21845 | else | ||
2676 | 21846 | case $cross_compiling:$ac_tool_warned in | ||
2677 | 21847 | yes:) | ||
2678 | 21848 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
2679 | 21849 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
2680 | 21850 | ac_tool_warned=yes ;; | ||
2681 | 21851 | esac | ||
2682 | 21852 | PKG_CONFIG=$ac_pt_PKG_CONFIG | ||
2683 | 21853 | fi | ||
2684 | 21854 | else | ||
2685 | 21855 | PKG_CONFIG="$ac_cv_path_PKG_CONFIG" | ||
2686 | 21856 | fi | ||
2687 | 21857 | |||
2688 | 21858 | fi | ||
2689 | 21859 | if test -n "$PKG_CONFIG"; then | ||
2690 | 21860 | _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION | ||
2691 | 21861 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 | ||
2692 | 21862 | $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } | ||
2693 | 21863 | if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then | ||
2694 | 21864 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
2695 | 21865 | $as_echo "yes" >&6; } | ||
2696 | 21866 | else | ||
2697 | 21867 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2698 | 21868 | $as_echo "no" >&6; } | ||
2699 | 21869 | PKG_CONFIG="" | ||
2700 | 21870 | fi | ||
2701 | 21871 | fi | ||
2702 | 21872 | |||
2703 | 21873 | if test x"$PKG_CONFIG" = x""; then | ||
2704 | 21874 | echo | ||
2705 | 21875 | echo "*** Your version of pkg-config is too old. You need atleast" | ||
2706 | 21876 | echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" | ||
2707 | 21877 | echo "*** from the freedesktop.org software repository at" | ||
2708 | 21878 | echo "***" | ||
2709 | 21879 | echo "*** http://www.freedesktop.org/software/pkgconfig" | ||
2710 | 21880 | echo "***" | ||
2711 | 21881 | exit 1; | ||
2712 | 21882 | fi | ||
2713 | 21883 | |||
2714 | 21884 | |||
2715 | 21885 | |||
2716 | 21886 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus-1 >= 0.60" >&5 | ||
2717 | 21887 | $as_echo_n "checking for dbus-1 >= 0.60... " >&6; } | ||
2718 | 21888 | if $PKG_CONFIG "--atleast-version=0.60" "dbus-1" >/dev/null 2>&1; then | ||
2719 | 21889 | DBUS_VERSION=`$PKG_CONFIG --modversion "dbus-1"` | ||
2720 | 21890 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_VERSION" >&5 | ||
2721 | 21891 | $as_echo "$DBUS_VERSION" >&6; } | ||
2722 | 21892 | |||
2723 | 21893 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking DBUS_CFLAGS" >&5 | ||
2724 | 21894 | $as_echo_n "checking DBUS_CFLAGS... " >&6; } | ||
2725 | 21895 | DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1"` | ||
2726 | 21896 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_CFLAGS" >&5 | ||
2727 | 21897 | $as_echo "$DBUS_CFLAGS" >&6; } | ||
2728 | 21898 | |||
2729 | 21899 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking DBUS_LIBS" >&5 | ||
2730 | 21900 | $as_echo_n "checking DBUS_LIBS... " >&6; } | ||
2731 | 21901 | DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1"` | ||
2732 | 21902 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_LIBS" >&5 | ||
2733 | 21903 | $as_echo "$DBUS_LIBS" >&6; } | ||
2734 | 21904 | |||
2735 | 21905 | DBUS_REQUIRED_VERSION=0.60 | ||
2736 | 21906 | |||
2737 | 21907 | |||
2738 | 21908 | |||
2739 | 21909 | |||
2740 | 21910 | |||
2741 | 21911 | |||
2742 | 21912 | |||
2743 | 21913 | elif $PKG_CONFIG --exists "dbus-1" >/dev/null 2>&1; then | ||
2744 | 21914 | xdt_cv_version=`$PKG_CONFIG --modversion "dbus-1"` | ||
2745 | 21915 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 | ||
2746 | 21916 | $as_echo "found, but $xdt_cv_version" >&6; } | ||
2747 | 21917 | |||
2748 | 21918 | |||
2749 | 21919 | echo "*** The required package dbus-1 was found on your system," | ||
2750 | 21920 | echo "*** but the installed version ($xdt_cv_version) is too old." | ||
2751 | 21921 | echo "*** Please upgrade dbus-1 to atleast version 0.60, or adjust" | ||
2752 | 21922 | echo "*** the PKG_CONFIG_PATH environment variable if you installed" | ||
2753 | 21923 | echo "*** the new version of the package in a nonstandard prefix so" | ||
2754 | 21924 | echo "*** pkg-config is able to find it." | ||
2755 | 21925 | exit 1 | ||
2756 | 21926 | |||
2757 | 21927 | else | ||
2758 | 21928 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 | ||
2759 | 21929 | $as_echo "not found" >&6; } | ||
2760 | 21930 | |||
2761 | 21931 | |||
2762 | 21932 | echo "*** The required package dbus-1 was not found on your system." | ||
2763 | 21933 | echo "*** Please install dbus-1 (atleast version 0.60) or adjust" | ||
2764 | 21934 | echo "*** the PKG_CONFIG_PATH environment variable if you" | ||
2765 | 21935 | echo "*** installed the package in a nonstandard prefix so that" | ||
2766 | 21936 | echo "*** pkg-config is able to find it." | ||
2767 | 21937 | exit 1 | ||
2768 | 21938 | |||
2769 | 21939 | fi | ||
2770 | 21940 | |||
2771 | 21941 | |||
2772 | 21942 | |||
2773 | 21943 | # minimum supported version of pkg-config | ||
2774 | 21944 | xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 | ||
2775 | 21945 | |||
2776 | 21946 | |||
2777 | 21947 | |||
2778 | 21948 | |||
2779 | 21949 | |||
2780 | 21950 | |||
2781 | 21951 | |||
2782 | 21952 | |||
2783 | 21953 | |||
2784 | 21954 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then | ||
2785 | 21955 | if test -n "$ac_tool_prefix"; then | ||
2786 | 21956 | # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. | ||
2787 | 21957 | set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 | ||
2788 | 21958 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2789 | 21959 | $as_echo_n "checking for $ac_word... " >&6; } | ||
2790 | 21960 | if ${ac_cv_path_PKG_CONFIG+:} false; then : | ||
2791 | 21961 | $as_echo_n "(cached) " >&6 | ||
2792 | 21962 | else | ||
2793 | 21963 | case $PKG_CONFIG in | ||
2794 | 21964 | [\\/]* | ?:[\\/]*) | ||
2795 | 21965 | ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. | ||
2796 | 21966 | ;; | ||
2797 | 21967 | *) | ||
2798 | 21968 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2799 | 21969 | for as_dir in $PATH | ||
2800 | 21970 | do | ||
2801 | 21971 | IFS=$as_save_IFS | ||
2802 | 21972 | test -z "$as_dir" && as_dir=. | ||
2803 | 21973 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2804 | 21974 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
2805 | 21975 | ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
2806 | 21976 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2807 | 21977 | break 2 | ||
2808 | 21978 | fi | ||
2809 | 21979 | done | ||
2810 | 21980 | done | ||
2811 | 21981 | IFS=$as_save_IFS | ||
2812 | 21982 | |||
2813 | 21983 | ;; | ||
2814 | 21984 | esac | ||
2815 | 21985 | fi | ||
2816 | 21986 | PKG_CONFIG=$ac_cv_path_PKG_CONFIG | ||
2817 | 21987 | if test -n "$PKG_CONFIG"; then | ||
2818 | 21988 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 | ||
2819 | 21989 | $as_echo "$PKG_CONFIG" >&6; } | ||
2820 | 21990 | else | ||
2821 | 21991 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2822 | 21992 | $as_echo "no" >&6; } | ||
2823 | 21993 | fi | ||
2824 | 21994 | |||
2825 | 21995 | |||
2826 | 21996 | fi | ||
2827 | 21997 | if test -z "$ac_cv_path_PKG_CONFIG"; then | ||
2828 | 21998 | ac_pt_PKG_CONFIG=$PKG_CONFIG | ||
2829 | 21999 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
2830 | 22000 | set dummy pkg-config; ac_word=$2 | ||
2831 | 22001 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2832 | 22002 | $as_echo_n "checking for $ac_word... " >&6; } | ||
2833 | 22003 | if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : | ||
2834 | 22004 | $as_echo_n "(cached) " >&6 | ||
2835 | 22005 | else | ||
2836 | 22006 | case $ac_pt_PKG_CONFIG in | ||
2837 | 22007 | [\\/]* | ?:[\\/]*) | ||
2838 | 22008 | ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. | ||
2839 | 22009 | ;; | ||
2840 | 22010 | *) | ||
2841 | 22011 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2842 | 22012 | for as_dir in $PATH | ||
2843 | 22013 | do | ||
2844 | 22014 | IFS=$as_save_IFS | ||
2845 | 22015 | test -z "$as_dir" && as_dir=. | ||
2846 | 22016 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2847 | 22017 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
2848 | 22018 | ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
2849 | 22019 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2850 | 22020 | break 2 | ||
2851 | 22021 | fi | ||
2852 | 22022 | done | ||
2853 | 22023 | done | ||
2854 | 22024 | IFS=$as_save_IFS | ||
2855 | 22025 | |||
2856 | 22026 | ;; | ||
2857 | 22027 | esac | ||
2858 | 22028 | fi | ||
2859 | 22029 | ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG | ||
2860 | 22030 | if test -n "$ac_pt_PKG_CONFIG"; then | ||
2861 | 22031 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 | ||
2862 | 22032 | $as_echo "$ac_pt_PKG_CONFIG" >&6; } | ||
2863 | 22033 | else | ||
2864 | 22034 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2865 | 22035 | $as_echo "no" >&6; } | ||
2866 | 22036 | fi | ||
2867 | 22037 | |||
2868 | 22038 | if test "x$ac_pt_PKG_CONFIG" = x; then | ||
2869 | 22039 | PKG_CONFIG="" | ||
2870 | 22040 | else | ||
2871 | 22041 | case $cross_compiling:$ac_tool_warned in | ||
2872 | 22042 | yes:) | ||
2873 | 22043 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
2874 | 22044 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
2875 | 22045 | ac_tool_warned=yes ;; | ||
2876 | 22046 | esac | ||
2877 | 22047 | PKG_CONFIG=$ac_pt_PKG_CONFIG | ||
2878 | 22048 | fi | ||
2879 | 22049 | else | ||
2880 | 22050 | PKG_CONFIG="$ac_cv_path_PKG_CONFIG" | ||
2881 | 22051 | fi | ||
2882 | 22052 | |||
2883 | 22053 | fi | ||
2884 | 22054 | if test -n "$PKG_CONFIG"; then | ||
2885 | 22055 | _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION | ||
2886 | 22056 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 | ||
2887 | 22057 | $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } | ||
2888 | 22058 | if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then | ||
2889 | 22059 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
2890 | 22060 | $as_echo "yes" >&6; } | ||
2891 | 22061 | else | ||
2892 | 22062 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2893 | 22063 | $as_echo "no" >&6; } | ||
2894 | 22064 | PKG_CONFIG="" | ||
2895 | 22065 | fi | ||
2896 | 22066 | fi | ||
2897 | 22067 | |||
2898 | 22068 | if test x"$PKG_CONFIG" = x""; then | ||
2899 | 22069 | echo | ||
2900 | 22070 | echo "*** Your version of pkg-config is too old. You need atleast" | ||
2901 | 22071 | echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" | ||
2902 | 22072 | echo "*** from the freedesktop.org software repository at" | ||
2903 | 22073 | echo "***" | ||
2904 | 22074 | echo "*** http://www.freedesktop.org/software/pkgconfig" | ||
2905 | 22075 | echo "***" | ||
2906 | 22076 | exit 1; | ||
2907 | 22077 | fi | ||
2908 | 22078 | |||
2909 | 22079 | |||
2910 | 22080 | |||
2911 | 22081 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus-glib-1 >= 0.70" >&5 | ||
2912 | 22082 | $as_echo_n "checking for dbus-glib-1 >= 0.70... " >&6; } | ||
2913 | 22083 | if $PKG_CONFIG "--atleast-version=0.70" "dbus-glib-1" >/dev/null 2>&1; then | ||
2914 | 22084 | DBUS_GLIB_VERSION=`$PKG_CONFIG --modversion "dbus-glib-1"` | ||
2915 | 22085 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_GLIB_VERSION" >&5 | ||
2916 | 22086 | $as_echo "$DBUS_GLIB_VERSION" >&6; } | ||
2917 | 22087 | |||
2918 | 22088 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking DBUS_GLIB_CFLAGS" >&5 | ||
2919 | 22089 | $as_echo_n "checking DBUS_GLIB_CFLAGS... " >&6; } | ||
2920 | 22090 | DBUS_GLIB_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1"` | ||
2921 | 22091 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_GLIB_CFLAGS" >&5 | ||
2922 | 22092 | $as_echo "$DBUS_GLIB_CFLAGS" >&6; } | ||
2923 | 22093 | |||
2924 | 22094 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking DBUS_GLIB_LIBS" >&5 | ||
2925 | 22095 | $as_echo_n "checking DBUS_GLIB_LIBS... " >&6; } | ||
2926 | 22096 | DBUS_GLIB_LIBS=`$PKG_CONFIG --libs "dbus-glib-1"` | ||
2927 | 22097 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_GLIB_LIBS" >&5 | ||
2928 | 22098 | $as_echo "$DBUS_GLIB_LIBS" >&6; } | ||
2929 | 22099 | |||
2930 | 22100 | DBUS_GLIB_REQUIRED_VERSION=0.70 | ||
2931 | 22101 | |||
2932 | 22102 | |||
2933 | 22103 | |||
2934 | 22104 | |||
2935 | 22105 | |||
2936 | 22106 | |||
2937 | 22107 | |||
2938 | 22108 | elif $PKG_CONFIG --exists "dbus-glib-1" >/dev/null 2>&1; then | ||
2939 | 22109 | xdt_cv_version=`$PKG_CONFIG --modversion "dbus-glib-1"` | ||
2940 | 22110 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 | ||
2941 | 22111 | $as_echo "found, but $xdt_cv_version" >&6; } | ||
2942 | 22112 | |||
2943 | 22113 | |||
2944 | 22114 | echo "*** The required package dbus-glib-1 was found on your system," | ||
2945 | 22115 | echo "*** but the installed version ($xdt_cv_version) is too old." | ||
2946 | 22116 | echo "*** Please upgrade dbus-glib-1 to atleast version 0.70, or adjust" | ||
2947 | 22117 | echo "*** the PKG_CONFIG_PATH environment variable if you installed" | ||
2948 | 22118 | echo "*** the new version of the package in a nonstandard prefix so" | ||
2949 | 22119 | echo "*** pkg-config is able to find it." | ||
2950 | 22120 | exit 1 | ||
2951 | 22121 | |||
2952 | 22122 | else | ||
2953 | 22123 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 | ||
2954 | 22124 | $as_echo "not found" >&6; } | ||
2955 | 22125 | |||
2956 | 22126 | |||
2957 | 22127 | echo "*** The required package dbus-glib-1 was not found on your system." | ||
2958 | 22128 | echo "*** Please install dbus-glib-1 (atleast version 0.70) or adjust" | ||
2959 | 22129 | echo "*** the PKG_CONFIG_PATH environment variable if you" | ||
2960 | 22130 | echo "*** installed the package in a nonstandard prefix so that" | ||
2961 | 22131 | echo "*** pkg-config is able to find it." | ||
2962 | 22132 | exit 1 | ||
2963 | 22133 | |||
2964 | 22134 | fi | ||
2965 | 22135 | |||
2966 | 22136 | |||
2967 | 22137 | |||
2968 | 22138 | |||
2969 | 22139 | # minimum supported version of pkg-config | ||
2970 | 22140 | xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 | ||
2971 | 22141 | |||
2972 | 22142 | |||
2973 | 22143 | |||
2974 | 22144 | |||
2975 | 22145 | |||
2976 | 22146 | |||
2977 | 22147 | |||
2978 | 22148 | |||
2979 | 22149 | |||
2980 | 22150 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then | ||
2981 | 22151 | if test -n "$ac_tool_prefix"; then | ||
2982 | 22152 | # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. | ||
2983 | 22153 | set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 | ||
2984 | 22154 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2985 | 22155 | $as_echo_n "checking for $ac_word... " >&6; } | ||
2986 | 22156 | if ${ac_cv_path_PKG_CONFIG+:} false; then : | ||
2987 | 22157 | $as_echo_n "(cached) " >&6 | ||
2988 | 22158 | else | ||
2989 | 22159 | case $PKG_CONFIG in | ||
2990 | 22160 | [\\/]* | ?:[\\/]*) | ||
2991 | 22161 | ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. | ||
2992 | 22162 | ;; | ||
2993 | 22163 | *) | ||
2994 | 22164 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2995 | 22165 | for as_dir in $PATH | ||
2996 | 22166 | do | ||
2997 | 22167 | IFS=$as_save_IFS | ||
2998 | 22168 | test -z "$as_dir" && as_dir=. | ||
2999 | 22169 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
3000 | 22170 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
3001 | 22171 | ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
3002 | 22172 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
3003 | 22173 | break 2 | ||
3004 | 22174 | fi | ||
3005 | 22175 | done | ||
3006 | 22176 | done | ||
3007 | 22177 | IFS=$as_save_IFS | ||
3008 | 22178 | |||
3009 | 22179 | ;; | ||
3010 | 22180 | esac | ||
3011 | 22181 | fi | ||
3012 | 22182 | PKG_CONFIG=$ac_cv_path_PKG_CONFIG | ||
3013 | 22183 | if test -n "$PKG_CONFIG"; then | ||
3014 | 22184 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 | ||
3015 | 22185 | $as_echo "$PKG_CONFIG" >&6; } | ||
3016 | 22186 | else | ||
3017 | 22187 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
3018 | 22188 | $as_echo "no" >&6; } | ||
3019 | 22189 | fi | ||
3020 | 22190 | |||
3021 | 22191 | |||
3022 | 22192 | fi | ||
3023 | 22193 | if test -z "$ac_cv_path_PKG_CONFIG"; then | ||
3024 | 22194 | ac_pt_PKG_CONFIG=$PKG_CONFIG | ||
3025 | 22195 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
3026 | 22196 | set dummy pkg-config; ac_word=$2 | ||
3027 | 22197 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
3028 | 22198 | $as_echo_n "checking for $ac_word... " >&6; } | ||
3029 | 22199 | if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : | ||
3030 | 22200 | $as_echo_n "(cached) " >&6 | ||
3031 | 22201 | else | ||
3032 | 22202 | case $ac_pt_PKG_CONFIG in | ||
3033 | 22203 | [\\/]* | ?:[\\/]*) | ||
3034 | 22204 | ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. | ||
3035 | 22205 | ;; | ||
3036 | 22206 | *) | ||
3037 | 22207 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
3038 | 22208 | for as_dir in $PATH | ||
3039 | 22209 | do | ||
3040 | 22210 | IFS=$as_save_IFS | ||
3041 | 22211 | test -z "$as_dir" && as_dir=. | ||
3042 | 22212 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
3043 | 22213 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
3044 | 22214 | ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
3045 | 22215 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
3046 | 22216 | break 2 | ||
3047 | 22217 | fi | ||
3048 | 22218 | done | ||
3049 | 22219 | done | ||
3050 | 22220 | IFS=$as_save_IFS | ||
3051 | 22221 | |||
3052 | 22222 | ;; | ||
3053 | 22223 | esac | ||
3054 | 22224 | fi | ||
3055 | 22225 | ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG | ||
3056 | 22226 | if test -n "$ac_pt_PKG_CONFIG"; then | ||
3057 | 22227 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 | ||
3058 | 22228 | $as_echo "$ac_pt_PKG_CONFIG" >&6; } | ||
3059 | 22229 | else | ||
3060 | 22230 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
3061 | 22231 | $as_echo "no" >&6; } | ||
3062 | 22232 | fi | ||
3063 | 22233 | |||
3064 | 22234 | if test "x$ac_pt_PKG_CONFIG" = x; then | ||
3065 | 22235 | PKG_CONFIG="" | ||
3066 | 22236 | else | ||
3067 | 22237 | case $cross_compiling:$ac_tool_warned in | ||
3068 | 22238 | yes:) | ||
3069 | 22239 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
3070 | 22240 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
3071 | 22241 | ac_tool_warned=yes ;; | ||
3072 | 22242 | esac | ||
3073 | 22243 | PKG_CONFIG=$ac_pt_PKG_CONFIG | ||
3074 | 22244 | fi | ||
3075 | 22245 | else | ||
3076 | 22246 | PKG_CONFIG="$ac_cv_path_PKG_CONFIG" | ||
3077 | 22247 | fi | ||
3078 | 22248 | |||
3079 | 22249 | fi | ||
3080 | 22250 | if test -n "$PKG_CONFIG"; then | ||
3081 | 22251 | _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION | ||
3082 | 22252 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 | ||
3083 | 22253 | $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } | ||
3084 | 22254 | if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then | ||
3085 | 22255 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
3086 | 22256 | $as_echo "yes" >&6; } | ||
3087 | 22257 | else | ||
3088 | 22258 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
3089 | 22259 | $as_echo "no" >&6; } | ||
3090 | 22260 | PKG_CONFIG="" | ||
3091 | 22261 | fi | ||
3092 | 22262 | fi | ||
3093 | 22263 | |||
3094 | 22264 | if test x"$PKG_CONFIG" = x""; then | ||
3095 | 22265 | echo | ||
3096 | 22266 | echo "*** Your version of pkg-config is too old. You need atleast" | ||
3097 | 22267 | echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" | ||
3098 | 22268 | echo "*** from the freedesktop.org software repository at" | ||
3099 | 22269 | echo "***" | ||
3100 | 22270 | echo "*** http://www.freedesktop.org/software/pkgconfig" | ||
3101 | 22271 | echo "***" | ||
3102 | 22272 | exit 1; | ||
3103 | 22273 | fi | ||
3104 | 22274 | |||
3105 | 22275 | |||
3106 | 22276 | |||
3107 | 22277 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4ui-1 >= 4.8.0" >&5 | ||
3108 | 22278 | $as_echo_n "checking for libxfce4ui-1 >= 4.8.0... " >&6; } | ||
3109 | 22279 | if $PKG_CONFIG "--atleast-version=4.8.0" "libxfce4ui-1" >/dev/null 2>&1; then | ||
3110 | 22280 | LIBXFCE4UI_VERSION=`$PKG_CONFIG --modversion "libxfce4ui-1"` | ||
3111 | 22281 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UI_VERSION" >&5 | ||
3112 | 22282 | $as_echo "$LIBXFCE4UI_VERSION" >&6; } | ||
3113 | 22283 | |||
3114 | 22284 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4UI_CFLAGS" >&5 | ||
3115 | 22285 | $as_echo_n "checking LIBXFCE4UI_CFLAGS... " >&6; } | ||
3116 | 22286 | LIBXFCE4UI_CFLAGS=`$PKG_CONFIG --cflags "libxfce4ui-1"` | ||
3117 | 22287 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UI_CFLAGS" >&5 | ||
3118 | 22288 | $as_echo "$LIBXFCE4UI_CFLAGS" >&6; } | ||
3119 | 22289 | |||
3120 | 22290 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4UI_LIBS" >&5 | ||
3121 | 22291 | $as_echo_n "checking LIBXFCE4UI_LIBS... " >&6; } | ||
3122 | 22292 | LIBXFCE4UI_LIBS=`$PKG_CONFIG --libs "libxfce4ui-1"` | ||
3123 | 22293 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UI_LIBS" >&5 | ||
3124 | 22294 | $as_echo "$LIBXFCE4UI_LIBS" >&6; } | ||
3125 | 22295 | |||
3126 | 22296 | LIBXFCE4UI_REQUIRED_VERSION=4.8.0 | ||
3127 | 22297 | |||
3128 | 22298 | |||
3129 | 22299 | |||
3130 | 22300 | |||
3131 | 22301 | |||
3132 | 22302 | |||
3133 | 22303 | |||
3134 | 22304 | elif $PKG_CONFIG --exists "libxfce4ui-1" >/dev/null 2>&1; then | ||
3135 | 22305 | xdt_cv_version=`$PKG_CONFIG --modversion "libxfce4ui-1"` | ||
3136 | 22306 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 | ||
3137 | 22307 | $as_echo "found, but $xdt_cv_version" >&6; } | ||
3138 | 22308 | |||
3139 | 22309 | |||
3140 | 22310 | echo "*** The required package libxfce4ui-1 was found on your system," | ||
3141 | 22311 | echo "*** but the installed version ($xdt_cv_version) is too old." | ||
3142 | 22312 | echo "*** Please upgrade libxfce4ui-1 to atleast version 4.8.0, or adjust" | ||
3143 | 22313 | echo "*** the PKG_CONFIG_PATH environment variable if you installed" | ||
3144 | 22314 | echo "*** the new version of the package in a nonstandard prefix so" | ||
3145 | 22315 | echo "*** pkg-config is able to find it." | ||
3146 | 22316 | exit 1 | ||
3147 | 22317 | |||
3148 | 22318 | else | ||
3149 | 22319 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 | ||
3150 | 22320 | $as_echo "not found" >&6; } | ||
3151 | 22321 | |||
3152 | 22322 | |||
3153 | 22323 | echo "*** The required package libxfce4ui-1 was not found on your system." | ||
3154 | 22324 | echo "*** Please install libxfce4ui-1 (atleast version 4.8.0) or adjust" | ||
3155 | 22325 | echo "*** the PKG_CONFIG_PATH environment variable if you" | ||
3156 | 22326 | echo "*** installed the package in a nonstandard prefix so that" | ||
3157 | 22327 | echo "*** pkg-config is able to find it." | ||
3158 | 22328 | exit 1 | ||
3159 | 22329 | |||
3160 | 22330 | fi | ||
3161 | 22331 | |||
3162 | 22332 | |||
3163 | 22333 | |||
3164 | 22334 | # minimum supported version of pkg-config | ||
3165 | 22335 | xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 | ||
3166 | 22336 | |||
3167 | 22337 | |||
3168 | 22338 | |||
3169 | 22339 | |||
3170 | 22340 | |||
3171 | 22341 | |||
3172 | 22342 | |||
3173 | 22343 | |||
3174 | 22344 | |||
3175 | 22345 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then | ||
3176 | 22346 | if test -n "$ac_tool_prefix"; then | ||
3177 | 22347 | # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. | ||
3178 | 22348 | set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 | ||
3179 | 22349 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
3180 | 22350 | $as_echo_n "checking for $ac_word... " >&6; } | ||
3181 | 22351 | if ${ac_cv_path_PKG_CONFIG+:} false; then : | ||
3182 | 22352 | $as_echo_n "(cached) " >&6 | ||
3183 | 22353 | else | ||
3184 | 22354 | case $PKG_CONFIG in | ||
3185 | 22355 | [\\/]* | ?:[\\/]*) | ||
3186 | 22356 | ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. | ||
3187 | 22357 | ;; | ||
3188 | 22358 | *) | ||
3189 | 22359 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
3190 | 22360 | for as_dir in $PATH | ||
3191 | 22361 | do | ||
3192 | 22362 | IFS=$as_save_IFS | ||
3193 | 22363 | test -z "$as_dir" && as_dir=. | ||
3194 | 22364 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
3195 | 22365 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
3196 | 22366 | ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
3197 | 22367 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
3198 | 22368 | break 2 | ||
3199 | 22369 | fi | ||
3200 | 22370 | done | ||
3201 | 22371 | done | ||
3202 | 22372 | IFS=$as_save_IFS | ||
3203 | 22373 | |||
3204 | 22374 | ;; | ||
3205 | 22375 | esac | ||
3206 | 22376 | fi | ||
3207 | 22377 | PKG_CONFIG=$ac_cv_path_PKG_CONFIG | ||
3208 | 22378 | if test -n "$PKG_CONFIG"; then | ||
3209 | 22379 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 | ||
3210 | 22380 | $as_echo "$PKG_CONFIG" >&6; } | ||
3211 | 22381 | else | ||
3212 | 22382 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
3213 | 22383 | $as_echo "no" >&6; } | ||
3214 | 22384 | fi | ||
3215 | 22385 | |||
3216 | 22386 | |||
3217 | 22387 | fi | ||
3218 | 22388 | if test -z "$ac_cv_path_PKG_CONFIG"; then | ||
3219 | 22389 | ac_pt_PKG_CONFIG=$PKG_CONFIG | ||
3220 | 22390 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
3221 | 22391 | set dummy pkg-config; ac_word=$2 | ||
3222 | 22392 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
3223 | 22393 | $as_echo_n "checking for $ac_word... " >&6; } | ||
3224 | 22394 | if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : | ||
3225 | 22395 | $as_echo_n "(cached) " >&6 | ||
3226 | 22396 | else | ||
3227 | 22397 | case $ac_pt_PKG_CONFIG in | ||
3228 | 22398 | [\\/]* | ?:[\\/]*) | ||
3229 | 22399 | ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. | ||
3230 | 22400 | ;; | ||
3231 | 22401 | *) | ||
3232 | 22402 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
3233 | 22403 | for as_dir in $PATH | ||
3234 | 22404 | do | ||
3235 | 22405 | IFS=$as_save_IFS | ||
3236 | 22406 | test -z "$as_dir" && as_dir=. | ||
3237 | 22407 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
3238 | 22408 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
3239 | 22409 | ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
3240 | 22410 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
3241 | 22411 | break 2 | ||
3242 | 22412 | fi | ||
3243 | 22413 | done | ||
3244 | 22414 | done | ||
3245 | 22415 | IFS=$as_save_IFS | ||
3246 | 22416 | |||
3247 | 22417 | ;; | ||
3248 | 22418 | esac | ||
3249 | 22419 | fi | ||
3250 | 22420 | ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG | ||
3251 | 22421 | if test -n "$ac_pt_PKG_CONFIG"; then | ||
3252 | 22422 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 | ||
3253 | 22423 | $as_echo "$ac_pt_PKG_CONFIG" >&6; } | ||
3254 | 22424 | else | ||
3255 | 22425 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
3256 | 22426 | $as_echo "no" >&6; } | ||
3257 | 22427 | fi | ||
3258 | 22428 | |||
3259 | 22429 | if test "x$ac_pt_PKG_CONFIG" = x; then | ||
3260 | 22430 | PKG_CONFIG="" | ||
3261 | 22431 | else | ||
3262 | 22432 | case $cross_compiling:$ac_tool_warned in | ||
3263 | 22433 | yes:) | ||
3264 | 22434 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
3265 | 22435 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
3266 | 22436 | ac_tool_warned=yes ;; | ||
3267 | 22437 | esac | ||
3268 | 22438 | PKG_CONFIG=$ac_pt_PKG_CONFIG | ||
3269 | 22439 | fi | ||
3270 | 22440 | else | ||
3271 | 22441 | PKG_CONFIG="$ac_cv_path_PKG_CONFIG" | ||
3272 | 22442 | fi | ||
3273 | 22443 | |||
3274 | 22444 | fi | ||
3275 | 22445 | if test -n "$PKG_CONFIG"; then | ||
3276 | 22446 | _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION | ||
3277 | 22447 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 | ||
3278 | 22448 | $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } | ||
3279 | 22449 | if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then | ||
3280 | 22450 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
3281 | 22451 | $as_echo "yes" >&6; } | ||
3282 | 22452 | else | ||
3283 | 22453 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
3284 | 22454 | $as_echo "no" >&6; } | ||
3285 | 22455 | PKG_CONFIG="" | ||
3286 | 22456 | fi | ||
3287 | 22457 | fi | ||
3288 | 22458 | |||
3289 | 22459 | if test x"$PKG_CONFIG" = x""; then | ||
3290 | 22460 | echo | ||
3291 | 22461 | echo "*** Your version of pkg-config is too old. You need atleast" | ||
3292 | 22462 | echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" | ||
3293 | 22463 | echo "*** from the freedesktop.org software repository at" | ||
3294 | 22464 | echo "***" | ||
3295 | 22465 | echo "*** http://www.freedesktop.org/software/pkgconfig" | ||
3296 | 22466 | echo "***" | ||
3297 | 22467 | exit 1; | ||
3298 | 22468 | fi | ||
3299 | 22469 | |||
3300 | 22470 | |||
3301 | 22471 | |||
3302 | 22472 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4util-1.0 >= 4.8.0" >&5 | ||
3303 | 22473 | $as_echo_n "checking for libxfce4util-1.0 >= 4.8.0... " >&6; } | ||
3304 | 22474 | if $PKG_CONFIG "--atleast-version=4.8.0" "libxfce4util-1.0" >/dev/null 2>&1; then | ||
3305 | 22475 | LIBXFCE4UTIL_VERSION=`$PKG_CONFIG --modversion "libxfce4util-1.0"` | ||
3306 | 22476 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_VERSION" >&5 | ||
3307 | 22477 | $as_echo "$LIBXFCE4UTIL_VERSION" >&6; } | ||
3308 | 22478 | |||
3309 | 22479 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4UTIL_CFLAGS" >&5 | ||
3310 | 22480 | $as_echo_n "checking LIBXFCE4UTIL_CFLAGS... " >&6; } | ||
3311 | 22481 | LIBXFCE4UTIL_CFLAGS=`$PKG_CONFIG --cflags "libxfce4util-1.0"` | ||
3312 | 22482 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_CFLAGS" >&5 | ||
3313 | 22483 | $as_echo "$LIBXFCE4UTIL_CFLAGS" >&6; } | ||
3314 | 22484 | |||
3315 | 22485 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4UTIL_LIBS" >&5 | ||
3316 | 22486 | $as_echo_n "checking LIBXFCE4UTIL_LIBS... " >&6; } | ||
3317 | 22487 | LIBXFCE4UTIL_LIBS=`$PKG_CONFIG --libs "libxfce4util-1.0"` | ||
3318 | 22488 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_LIBS" >&5 | ||
3319 | 22489 | $as_echo "$LIBXFCE4UTIL_LIBS" >&6; } | ||
3320 | 22490 | |||
3321 | 22491 | LIBXFCE4UTIL_REQUIRED_VERSION=4.8.0 | ||
3322 | 22492 | |||
3323 | 22493 | |||
3324 | 22494 | |||
3325 | 22495 | |||
3326 | 22496 | |||
3327 | 22497 | |||
3328 | 22498 | |||
3329 | 22499 | elif $PKG_CONFIG --exists "libxfce4util-1.0" >/dev/null 2>&1; then | ||
3330 | 22500 | xdt_cv_version=`$PKG_CONFIG --modversion "libxfce4util-1.0"` | ||
3331 | 22501 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 | ||
3332 | 22502 | $as_echo "found, but $xdt_cv_version" >&6; } | ||
3333 | 22503 | |||
3334 | 22504 | |||
3335 | 22505 | echo "*** The required package libxfce4util-1.0 was found on your system," | ||
3336 | 22506 | echo "*** but the installed version ($xdt_cv_version) is too old." | ||
3337 | 22507 | echo "*** Please upgrade libxfce4util-1.0 to atleast version 4.8.0, or adjust" | ||
3338 | 22508 | echo "*** the PKG_CONFIG_PATH environment variable if you installed" | ||
3339 | 22509 | echo "*** the new version of the package in a nonstandard prefix so" | ||
3340 | 22510 | echo "*** pkg-config is able to find it." | ||
3341 | 22511 | exit 1 | ||
3342 | 22512 | |||
3343 | 22513 | else | ||
3344 | 22514 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 | ||
3345 | 22515 | $as_echo "not found" >&6; } | ||
3346 | 22516 | |||
3347 | 22517 | |||
3348 | 22518 | echo "*** The required package libxfce4util-1.0 was not found on your system." | ||
3349 | 22519 | echo "*** Please install libxfce4util-1.0 (atleast version 4.8.0) or adjust" | ||
3350 | 22520 | echo "*** the PKG_CONFIG_PATH environment variable if you" | ||
3351 | 22521 | echo "*** installed the package in a nonstandard prefix so that" | ||
3352 | 22522 | echo "*** pkg-config is able to find it." | ||
3353 | 22523 | exit 1 | ||
3354 | 22524 | |||
3355 | 22525 | fi | ||
3356 | 22526 | |||
3357 | 22527 | |||
3358 | 22528 | |||
3359 | 22529 | |||
3360 | 22530 | # minimum supported version of pkg-config | ||
3361 | 22531 | xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 | ||
3362 | 22532 | |||
3363 | 22533 | |||
3364 | 22534 | |||
3365 | 22535 | |||
3366 | 22536 | |||
3367 | 22537 | |||
3368 | 22538 | |||
3369 | 22539 | |||
3370 | 22540 | |||
3371 | 22541 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then | ||
3372 | 22542 | if test -n "$ac_tool_prefix"; then | ||
3373 | 22543 | # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. | ||
3374 | 22544 | set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 | ||
3375 | 22545 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
3376 | 22546 | $as_echo_n "checking for $ac_word... " >&6; } | ||
3377 | 22547 | if ${ac_cv_path_PKG_CONFIG+:} false; then : | ||
3378 | 22548 | $as_echo_n "(cached) " >&6 | ||
3379 | 22549 | else | ||
3380 | 22550 | case $PKG_CONFIG in | ||
3381 | 22551 | [\\/]* | ?:[\\/]*) | ||
3382 | 22552 | ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. | ||
3383 | 22553 | ;; | ||
3384 | 22554 | *) | ||
3385 | 22555 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
3386 | 22556 | for as_dir in $PATH | ||
3387 | 22557 | do | ||
3388 | 22558 | IFS=$as_save_IFS | ||
3389 | 22559 | test -z "$as_dir" && as_dir=. | ||
3390 | 22560 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
3391 | 22561 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
3392 | 22562 | ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
3393 | 22563 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
3394 | 22564 | break 2 | ||
3395 | 22565 | fi | ||
3396 | 22566 | done | ||
3397 | 22567 | done | ||
3398 | 22568 | IFS=$as_save_IFS | ||
3399 | 22569 | |||
3400 | 22570 | ;; | ||
3401 | 22571 | esac | ||
3402 | 22572 | fi | ||
3403 | 22573 | PKG_CONFIG=$ac_cv_path_PKG_CONFIG | ||
3404 | 22574 | if test -n "$PKG_CONFIG"; then | ||
3405 | 22575 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 | ||
3406 | 22576 | $as_echo "$PKG_CONFIG" >&6; } | ||
3407 | 22577 | else | ||
3408 | 22578 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
3409 | 22579 | $as_echo "no" >&6; } | ||
3410 | 22580 | fi | ||
3411 | 22581 | |||
3412 | 22582 | |||
3413 | 22583 | fi | ||
3414 | 22584 | if test -z "$ac_cv_path_PKG_CONFIG"; then | ||
3415 | 22585 | ac_pt_PKG_CONFIG=$PKG_CONFIG | ||
3416 | 22586 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
3417 | 22587 | set dummy pkg-config; ac_word=$2 | ||
3418 | 22588 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
3419 | 22589 | $as_echo_n "checking for $ac_word... " >&6; } | ||
3420 | 22590 | if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : | ||
3421 | 22591 | $as_echo_n "(cached) " >&6 | ||
3422 | 22592 | else | ||
3423 | 22593 | case $ac_pt_PKG_CONFIG in | ||
3424 | 22594 | [\\/]* | ?:[\\/]*) | ||
3425 | 22595 | ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. | ||
3426 | 22596 | ;; | ||
3427 | 22597 | *) | ||
3428 | 22598 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
3429 | 22599 | for as_dir in $PATH | ||
3430 | 22600 | do | ||
3431 | 22601 | IFS=$as_save_IFS | ||
3432 | 22602 | test -z "$as_dir" && as_dir=. | ||
3433 | 22603 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
3434 | 22604 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
3435 | 22605 | ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
3436 | 22606 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
3437 | 22607 | break 2 | ||
3438 | 22608 | fi | ||
3439 | 22609 | done | ||
3440 | 22610 | done | ||
3441 | 22611 | IFS=$as_save_IFS | ||
3442 | 22612 | |||
3443 | 22613 | ;; | ||
3444 | 22614 | esac | ||
3445 | 22615 | fi | ||
3446 | 22616 | ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG | ||
3447 | 22617 | if test -n "$ac_pt_PKG_CONFIG"; then | ||
3448 | 22618 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 | ||
3449 | 22619 | $as_echo "$ac_pt_PKG_CONFIG" >&6; } | ||
3450 | 22620 | else | ||
3451 | 22621 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
3452 | 22622 | $as_echo "no" >&6; } | ||
3453 | 22623 | fi | ||
3454 | 22624 | |||
3455 | 22625 | if test "x$ac_pt_PKG_CONFIG" = x; then | ||
3456 | 22626 | PKG_CONFIG="" | ||
3457 | 22627 | else | ||
3458 | 22628 | case $cross_compiling:$ac_tool_warned in | ||
3459 | 22629 | yes:) | ||
3460 | 22630 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
3461 | 22631 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
3462 | 22632 | ac_tool_warned=yes ;; | ||
3463 | 22633 | esac | ||
3464 | 22634 | PKG_CONFIG=$ac_pt_PKG_CONFIG | ||
3465 | 22635 | fi | ||
3466 | 22636 | else | ||
3467 | 22637 | PKG_CONFIG="$ac_cv_path_PKG_CONFIG" | ||
3468 | 22638 | fi | ||
3469 | 22639 | |||
3470 | 22640 | fi | ||
3471 | 22641 | if test -n "$PKG_CONFIG"; then | ||
3472 | 22642 | _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION | ||
3473 | 22643 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 | ||
3474 | 22644 | $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } | ||
3475 | 22645 | if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then | ||
3476 | 22646 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
3477 | 22647 | $as_echo "yes" >&6; } | ||
3478 | 22648 | else | ||
3479 | 22649 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
3480 | 22650 | $as_echo "no" >&6; } | ||
3481 | 22651 | PKG_CONFIG="" | ||
3482 | 22652 | fi | ||
3483 | 22653 | fi | ||
3484 | 22654 | |||
3485 | 22655 | if test x"$PKG_CONFIG" = x""; then | ||
3486 | 22656 | echo | ||
3487 | 22657 | echo "*** Your version of pkg-config is too old. You need atleast" | ||
3488 | 22658 | echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" | ||
3489 | 22659 | echo "*** from the freedesktop.org software repository at" | ||
3490 | 22660 | echo "***" | ||
3491 | 22661 | echo "*** http://www.freedesktop.org/software/pkgconfig" | ||
3492 | 22662 | echo "***" | ||
3493 | 22663 | exit 1; | ||
3494 | 22664 | fi | ||
3495 | 22665 | |||
3496 | 22666 | |||
3497 | 22667 | |||
3498 | 22668 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfconf-0 >= 4.10.0" >&5 | ||
3499 | 22669 | $as_echo_n "checking for libxfconf-0 >= 4.10.0... " >&6; } | ||
3500 | 22670 | if $PKG_CONFIG "--atleast-version=4.10.0" "libxfconf-0" >/dev/null 2>&1; then | ||
3501 | 22671 | XFCONF_VERSION=`$PKG_CONFIG --modversion "libxfconf-0"` | ||
3502 | 22672 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XFCONF_VERSION" >&5 | ||
3503 | 22673 | $as_echo "$XFCONF_VERSION" >&6; } | ||
3504 | 22674 | |||
3505 | 22675 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking XFCONF_CFLAGS" >&5 | ||
3506 | 22676 | $as_echo_n "checking XFCONF_CFLAGS... " >&6; } | ||
3507 | 22677 | XFCONF_CFLAGS=`$PKG_CONFIG --cflags "libxfconf-0"` | ||
3508 | 22678 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XFCONF_CFLAGS" >&5 | ||
3509 | 22679 | $as_echo "$XFCONF_CFLAGS" >&6; } | ||
3510 | 22680 | |||
3511 | 22681 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking XFCONF_LIBS" >&5 | ||
3512 | 22682 | $as_echo_n "checking XFCONF_LIBS... " >&6; } | ||
3513 | 22683 | XFCONF_LIBS=`$PKG_CONFIG --libs "libxfconf-0"` | ||
3514 | 22684 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XFCONF_LIBS" >&5 | ||
3515 | 22685 | $as_echo "$XFCONF_LIBS" >&6; } | ||
3516 | 22686 | |||
3517 | 22687 | XFCONF_REQUIRED_VERSION=4.10.0 | ||
3518 | 22688 | |||
3519 | 22689 | |||
3520 | 22690 | |||
3521 | 22691 | |||
3522 | 22692 | |||
3523 | 22693 | |||
3524 | 22694 | |||
3525 | 22695 | elif $PKG_CONFIG --exists "libxfconf-0" >/dev/null 2>&1; then | ||
3526 | 22696 | xdt_cv_version=`$PKG_CONFIG --modversion "libxfconf-0"` | ||
3527 | 22697 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 | ||
3528 | 22698 | $as_echo "found, but $xdt_cv_version" >&6; } | ||
3529 | 22699 | |||
3530 | 22700 | |||
3531 | 22701 | echo "*** The required package libxfconf-0 was found on your system," | ||
3532 | 22702 | echo "*** but the installed version ($xdt_cv_version) is too old." | ||
3533 | 22703 | echo "*** Please upgrade libxfconf-0 to atleast version 4.10.0, or adjust" | ||
3534 | 22704 | echo "*** the PKG_CONFIG_PATH environment variable if you installed" | ||
3535 | 22705 | echo "*** the new version of the package in a nonstandard prefix so" | ||
3536 | 22706 | echo "*** pkg-config is able to find it." | ||
3537 | 22707 | exit 1 | ||
3538 | 22708 | |||
3539 | 22709 | else | ||
3540 | 22710 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 | ||
3541 | 22711 | $as_echo "not found" >&6; } | ||
3542 | 22712 | |||
3543 | 22713 | |||
3544 | 22714 | echo "*** The required package libxfconf-0 was not found on your system." | ||
3545 | 22715 | echo "*** Please install libxfconf-0 (atleast version 4.10.0) or adjust" | ||
3546 | 22716 | echo "*** the PKG_CONFIG_PATH environment variable if you" | ||
3547 | 22717 | echo "*** installed the package in a nonstandard prefix so that" | ||
3548 | 22718 | echo "*** pkg-config is able to find it." | ||
3549 | 22719 | exit 1 | ||
3550 | 22720 | |||
3551 | 22721 | fi | ||
3552 | 22722 | |||
3553 | 22723 | |||
3554 | 22724 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 | 22769 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 |
3555 | 22725 | $as_echo_n "checking for X... " >&6; } | 22770 | $as_echo_n "checking for X... " >&6; } |
3556 | 22726 | 22771 | ||
3557 | @@ -23470,31 +23515,10 @@ | |||
3558 | 23470 | 23515 | ||
3559 | 23471 | 23516 | ||
3560 | 23472 | 23517 | ||
3561 | 23473 | #=======================================================# | ||
3562 | 23474 | # Gtkrc files # | ||
3563 | 23475 | #=======================================================# | ||
3564 | 23476 | if test "x${prefix}" = "xNONE"; then | ||
3565 | 23477 | |||
3566 | 23478 | cat >>confdefs.h <<_ACEOF | ||
3567 | 23479 | #define GTKRC_DIR "${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/gtk-2.0" | ||
3568 | 23480 | _ACEOF | ||
3569 | 23481 | |||
3570 | 23482 | gtkrcdir="${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/gtk-2.0" | ||
3571 | 23483 | else | ||
3572 | 23484 | |||
3573 | 23485 | cat >>confdefs.h <<_ACEOF | ||
3574 | 23486 | #define GTKRC_DIR "${prefix}/${DATADIRNAME}/${PACKAGE}/gtk-2.0" | ||
3575 | 23487 | _ACEOF | ||
3576 | 23488 | |||
3577 | 23489 | gtkrcdir="${prefix}/${DATADIRNAME}/${PACKAGE}/gtk-2.0" | ||
3578 | 23490 | fi | ||
3579 | 23491 | |||
3580 | 23492 | |||
3581 | 23493 | |||
3582 | 23494 | # Taken from Gnome system tools | 23518 | # Taken from Gnome system tools |
3586 | 23495 | #=======================================================# | 23519 | # ===================================================== # |
3587 | 23496 | # Pixmaps files # | 23520 | # Pixmaps files # |
3588 | 23497 | #=======================================================# | 23521 | # ===================================================== # |
3589 | 23498 | if test "x${prefix}" = "xNONE"; then | 23522 | if test "x${prefix}" = "xNONE"; then |
3590 | 23499 | 23523 | ||
3591 | 23500 | cat >>confdefs.h <<_ACEOF | 23524 | cat >>confdefs.h <<_ACEOF |
3592 | @@ -23513,9 +23537,9 @@ | |||
3593 | 23513 | 23537 | ||
3594 | 23514 | 23538 | ||
3595 | 23515 | 23539 | ||
3599 | 23516 | #=======================================================# | 23540 | # ===================================================== # |
3600 | 23517 | # Check XF86keysysm # | 23541 | # Check XF86keysysm # |
3601 | 23518 | #=======================================================# | 23542 | # ===================================================== # |
3602 | 23519 | # Check for the AudioPlay sym other should exist | 23543 | # Check for the AudioPlay sym other should exist |
3603 | 23520 | # if this one exists. | 23544 | # if this one exists. |
3604 | 23521 | ac_fn_c_check_decl "$LINENO" "XF86XK_AudioPlay" "ac_cv_have_decl_XF86XK_AudioPlay" "#include <X11/XF86keysym.h> | 23545 | ac_fn_c_check_decl "$LINENO" "XF86XK_AudioPlay" "ac_cv_have_decl_XF86XK_AudioPlay" "#include <X11/XF86keysym.h> |
3605 | @@ -23532,9 +23556,9 @@ | |||
3606 | 23532 | 23556 | ||
3607 | 23533 | fi | 23557 | fi |
3608 | 23534 | 23558 | ||
3612 | 23535 | #=======================================================# | 23559 | # ===================================================== # |
3613 | 23536 | # TagLib support # | 23560 | # TagLib support # |
3614 | 23537 | #=======================================================# | 23561 | # ===================================================== # |
3615 | 23538 | TAGLIB_FOUND="no" | 23562 | TAGLIB_FOUND="no" |
3616 | 23539 | 23563 | ||
3617 | 23540 | 23564 | ||
3618 | @@ -23816,7 +23840,7 @@ | |||
3619 | 23816 | ac_fn_c_check_header_mongrel "$LINENO" "taglib/tag_c.h" "ac_cv_header_taglib_tag_c_h" "$ac_includes_default" | 23840 | ac_fn_c_check_header_mongrel "$LINENO" "taglib/tag_c.h" "ac_cv_header_taglib_tag_c_h" "$ac_includes_default" |
3620 | 23817 | if test "x$ac_cv_header_taglib_tag_c_h" = xyes; then : | 23841 | if test "x$ac_cv_header_taglib_tag_c_h" = xyes; then : |
3621 | 23818 | 23842 | ||
3623 | 23819 | TAGLIBC_LIBS="-ltag_c" | 23843 | TAGLIBC_LIBS="-ltag_c" |
3624 | 23820 | 23844 | ||
3625 | 23821 | $as_echo "#define HAVE_TAGLIBC 1" >>confdefs.h | 23845 | $as_echo "#define HAVE_TAGLIBC 1" >>confdefs.h |
3626 | 23822 | 23846 | ||
3627 | @@ -23833,9 +23857,9 @@ | |||
3628 | 23833 | 23857 | ||
3629 | 23834 | fi | 23858 | fi |
3630 | 23835 | 23859 | ||
3634 | 23836 | #=======================================================# | 23860 | # ===================================================== # |
3635 | 23837 | # Check plugins to build # | 23861 | # Check plugins to build # |
3636 | 23838 | #=======================================================# | 23862 | # ===================================================== # |
3637 | 23839 | 23863 | ||
3638 | 23840 | # Notify plugin. | 23864 | # Notify plugin. |
3639 | 23841 | #-------------------------- | 23865 | #-------------------------- |
3640 | @@ -24080,9 +24104,31 @@ | |||
3641 | 24080 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_tray_plugin" >&5 | 24104 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_tray_plugin" >&5 |
3642 | 24081 | $as_echo "$ac_tray_plugin" >&6; } | 24105 | $as_echo "$ac_tray_plugin" >&6; } |
3643 | 24082 | 24106 | ||
3647 | 24083 | #=======================================================# | 24107 | # MPRIS2 plugin. |
3648 | 24084 | # Check for debugging support # | 24108 | #-------------------------- |
3649 | 24085 | #=======================================================# | 24109 | # Check whether --enable-mpris2-plugin was given. |
3650 | 24110 | if test "${enable_mpris2_plugin+set}" = set; then : | ||
3651 | 24111 | enableval=$enable_mpris2_plugin; ac_mpris2_plugin=$enableval | ||
3652 | 24112 | else | ||
3653 | 24113 | ac_mpris2_plugin=yes | ||
3654 | 24114 | fi | ||
3655 | 24115 | |||
3656 | 24116 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the mpris2 plugin" >&5 | ||
3657 | 24117 | $as_echo_n "checking whether to build the mpris2 plugin... " >&6; } | ||
3658 | 24118 | if test x"$ac_mpris2_plugin" = x"yes"; then | ||
3659 | 24119 | PAROLE_MPRIS2_PLUGIN_TRUE= | ||
3660 | 24120 | PAROLE_MPRIS2_PLUGIN_FALSE='#' | ||
3661 | 24121 | else | ||
3662 | 24122 | PAROLE_MPRIS2_PLUGIN_TRUE='#' | ||
3663 | 24123 | PAROLE_MPRIS2_PLUGIN_FALSE= | ||
3664 | 24124 | fi | ||
3665 | 24125 | |||
3666 | 24126 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_mpris2_plugin" >&5 | ||
3667 | 24127 | $as_echo "$ac_mpris2_plugin" >&6; } | ||
3668 | 24128 | |||
3669 | 24129 | # ===================================================== # | ||
3670 | 24130 | # Check for debugging support # | ||
3671 | 24131 | # ===================================================== # | ||
3672 | 24086 | 24132 | ||
3673 | 24087 | # Check whether --enable-debug was given. | 24133 | # Check whether --enable-debug was given. |
3674 | 24088 | if test "${enable_debug+set}" = set; then : | 24134 | if test "${enable_debug+set}" = set; then : |
3675 | @@ -24179,9 +24225,9 @@ | |||
3676 | 24179 | fi | 24225 | fi |
3677 | 24180 | 24226 | ||
3678 | 24181 | 24227 | ||
3682 | 24182 | #=======================================================# | 24228 | # ===================================================== # |
3683 | 24183 | # Check for Gtk doc # | 24229 | # Check for Gtk doc # |
3684 | 24184 | #=======================================================# | 24230 | # ===================================================== # |
3685 | 24185 | 24231 | ||
3686 | 24186 | 24232 | ||
3687 | 24187 | 24233 | ||
3688 | @@ -24488,7 +24534,7 @@ | |||
3689 | 24488 | 24534 | ||
3690 | 24489 | 24535 | ||
3691 | 24490 | 24536 | ||
3693 | 24491 | 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" | 24537 | 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 | 24492 | 24538 | ||
3695 | 24493 | cat >confcache <<\_ACEOF | 24539 | cat >confcache <<\_ACEOF |
3696 | 24494 | # This file is a shell script that caches the results of configure | 24540 | # This file is a shell script that caches the results of configure |
3697 | @@ -24658,6 +24704,10 @@ | |||
3698 | 24658 | as_fn_error $? "conditional \"PAROLE_TRAY_PLUGIN\" was never defined. | 24704 | as_fn_error $? "conditional \"PAROLE_TRAY_PLUGIN\" was never defined. |
3699 | 24659 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 24705 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
3700 | 24660 | fi | 24706 | fi |
3701 | 24707 | if test -z "${PAROLE_MPRIS2_PLUGIN_TRUE}" && test -z "${PAROLE_MPRIS2_PLUGIN_FALSE}"; then | ||
3702 | 24708 | as_fn_error $? "conditional \"PAROLE_MPRIS2_PLUGIN\" was never defined. | ||
3703 | 24709 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
3704 | 24710 | fi | ||
3705 | 24661 | if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then | 24711 | if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then |
3706 | 24662 | as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined. | 24712 | as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined. |
3707 | 24663 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 24713 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
3708 | @@ -25075,7 +25125,7 @@ | |||
3709 | 25075 | # report actual input values of CONFIG_FILES etc. instead of their | 25125 | # report actual input values of CONFIG_FILES etc. instead of their |
3710 | 25076 | # values after options handling. | 25126 | # values after options handling. |
3711 | 25077 | ac_log=" | 25127 | ac_log=" |
3713 | 25078 | This file was extended by parole $as_me 0.5.4, which was | 25128 | This file was extended by parole $as_me 0.6.0, which was |
3714 | 25079 | generated by GNU Autoconf 2.69. Invocation command line was | 25129 | generated by GNU Autoconf 2.69. Invocation command line was |
3715 | 25080 | 25130 | ||
3716 | 25081 | CONFIG_FILES = $CONFIG_FILES | 25131 | CONFIG_FILES = $CONFIG_FILES |
3717 | @@ -25135,13 +25185,13 @@ | |||
3718 | 25135 | Configuration commands: | 25185 | Configuration commands: |
3719 | 25136 | $config_commands | 25186 | $config_commands |
3720 | 25137 | 25187 | ||
3722 | 25138 | Report bugs to <aliov@xfce.org>." | 25188 | Report bugs to <http://docs.xfce.org/apps/parole/bugs>." |
3723 | 25139 | 25189 | ||
3724 | 25140 | _ACEOF | 25190 | _ACEOF |
3725 | 25141 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | 25191 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
3726 | 25142 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" | 25192 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
3727 | 25143 | ac_cs_version="\\ | 25193 | ac_cs_version="\\ |
3729 | 25144 | parole config.status 0.5.4 | 25194 | parole config.status 0.6.0 |
3730 | 25145 | configured by $0, generated by GNU Autoconf 2.69, | 25195 | configured by $0, generated by GNU Autoconf 2.69, |
3731 | 25146 | with options \\"\$ac_cs_config\\" | 25196 | with options \\"\$ac_cs_config\\" |
3732 | 25147 | 25197 | ||
3733 | @@ -25653,7 +25703,6 @@ | |||
3734 | 25653 | "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; | 25703 | "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; |
3735 | 25654 | "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; | 25704 | "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; |
3736 | 25655 | "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; | 25705 | "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; |
3737 | 25656 | "data/gtk-2.0/Makefile") CONFIG_FILES="$CONFIG_FILES data/gtk-2.0/Makefile" ;; | ||
3738 | 25657 | "data/pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES data/pixmaps/Makefile" ;; | 25706 | "data/pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES data/pixmaps/Makefile" ;; |
3739 | 25658 | "data/interfaces/Makefile") CONFIG_FILES="$CONFIG_FILES data/interfaces/Makefile" ;; | 25707 | "data/interfaces/Makefile") CONFIG_FILES="$CONFIG_FILES data/interfaces/Makefile" ;; |
3740 | 25659 | "data/icons/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/Makefile" ;; | 25708 | "data/icons/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/Makefile" ;; |
3741 | @@ -25661,6 +25710,8 @@ | |||
3742 | 25661 | "data/icons/24x24/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/24x24/Makefile" ;; | 25710 | "data/icons/24x24/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/24x24/Makefile" ;; |
3743 | 25662 | "data/icons/32x32/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/32x32/Makefile" ;; | 25711 | "data/icons/32x32/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/32x32/Makefile" ;; |
3744 | 25663 | "data/icons/48x48/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/48x48/Makefile" ;; | 25712 | "data/icons/48x48/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/48x48/Makefile" ;; |
3745 | 25713 | "data/icons/64x64/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/64x64/Makefile" ;; | ||
3746 | 25714 | "data/icons/128x128/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/128x128/Makefile" ;; | ||
3747 | 25664 | "data/icons/scalable/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/scalable/Makefile" ;; | 25715 | "data/icons/scalable/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/scalable/Makefile" ;; |
3748 | 25665 | "data/mime/Makefile") CONFIG_FILES="$CONFIG_FILES data/mime/Makefile" ;; | 25716 | "data/mime/Makefile") CONFIG_FILES="$CONFIG_FILES data/mime/Makefile" ;; |
3749 | 25666 | "data/desktop/Makefile") CONFIG_FILES="$CONFIG_FILES data/desktop/Makefile" ;; | 25717 | "data/desktop/Makefile") CONFIG_FILES="$CONFIG_FILES data/desktop/Makefile" ;; |
3750 | @@ -25674,6 +25725,7 @@ | |||
3751 | 25674 | "src/plugins/sample/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/sample/Makefile" ;; | 25725 | "src/plugins/sample/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/sample/Makefile" ;; |
3752 | 25675 | "src/plugins/notify/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/notify/Makefile" ;; | 25726 | "src/plugins/notify/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/notify/Makefile" ;; |
3753 | 25676 | "src/plugins/tray/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/tray/Makefile" ;; | 25727 | "src/plugins/tray/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/tray/Makefile" ;; |
3754 | 25728 | "src/plugins/mpris2/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/mpris2/Makefile" ;; | ||
3755 | 25677 | "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; | 25729 | "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; |
3756 | 25678 | "docs/plugin-api/version.xml") CONFIG_FILES="$CONFIG_FILES docs/plugin-api/version.xml" ;; | 25730 | "docs/plugin-api/version.xml") CONFIG_FILES="$CONFIG_FILES docs/plugin-api/version.xml" ;; |
3757 | 25679 | "docs/plugin-api/Makefile") CONFIG_FILES="$CONFIG_FILES docs/plugin-api/Makefile" ;; | 25731 | "docs/plugin-api/Makefile") CONFIG_FILES="$CONFIG_FILES docs/plugin-api/Makefile" ;; |
3758 | @@ -27238,6 +27290,7 @@ | |||
3759 | 27238 | Debug: $enable_debug | 27290 | Debug: $enable_debug |
3760 | 27239 | Building plugin api docs: ${enable_gtk_doc} | 27291 | Building plugin api docs: ${enable_gtk_doc} |
3761 | 27240 | GStreamer API version: ${gstreamer_api_version} | 27292 | GStreamer API version: ${gstreamer_api_version} |
3762 | 27293 | GTK+ version: GTK+-3 | ||
3763 | 27241 | 27294 | ||
3764 | 27242 | Optional dependencies: | 27295 | Optional dependencies: |
3765 | 27243 | ====================== | 27296 | ====================== |
3766 | @@ -27247,6 +27300,7 @@ | |||
3767 | 27247 | ================= | 27300 | ================= |
3768 | 27248 | Notify: ${ac_notify_plugin} | 27301 | Notify: ${ac_notify_plugin} |
3769 | 27249 | System Tray icon: ${ac_tray_plugin} | 27302 | System Tray icon: ${ac_tray_plugin} |
3770 | 27303 | MPRIS2: ${ac_mpris2_plugin} | ||
3771 | 27250 | 27304 | ||
3772 | 27251 | ------------------------------------------------------ | 27305 | ------------------------------------------------------ |
3773 | 27252 | 27306 | ||
3774 | 27253 | 27307 | ||
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 | 4 | dnl | 4 | dnl |
3780 | 5 | 5 | ||
3781 | 6 | m4_define([intltool_minimum_version], [0.31]) | 6 | m4_define([intltool_minimum_version], [0.31]) |
3789 | 7 | m4_define([parole_verinfo], [0:5:4]) | 7 | m4_define([parole_verinfo], [0:6:0]) |
3790 | 8 | m4_define([parole_version_api], [0]) | 8 | m4_define([parole_version_api], [0]) |
3791 | 9 | m4_define([parole_version_major], [0]) | 9 | m4_define([parole_version_major], [0]) |
3792 | 10 | m4_define([parole_version_minor], [5]) | 10 | m4_define([parole_version_minor], [6]) |
3793 | 11 | m4_define([parole_version_micro], [4]) | 11 | m4_define([parole_version_micro], [0]) |
3794 | 12 | m4_define([parole_version_build], []) | 12 | m4_define([parole_version_build], []) |
3795 | 13 | m4_define([parole_version_tag], []) | 13 | m4_define([parole_version_tag], []) |
3796 | 14 | 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()])]) | 14 | 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 | 15 | 15 | ||
3799 | 16 | AC_INIT([parole], [parole_version], [aliov@xfce.org]) | 16 | AC_INIT([parole], [parole_version], [http://docs.xfce.org/apps/parole/bugs]) |
3800 | 17 | AC_PREREQ(2.59c) | 17 | AC_PREREQ(2.59c) |
3801 | 18 | 18 | ||
3802 | 19 | AC_CONFIG_MACRO_DIR([m4]) | 19 | AC_CONFIG_MACRO_DIR([m4]) |
3803 | @@ -22,13 +22,13 @@ | |||
3804 | 22 | AM_CONFIG_HEADER([config.h]) | 22 | AM_CONFIG_HEADER([config.h]) |
3805 | 23 | 23 | ||
3806 | 24 | if test x${enable_gtk_doc} = x"yes"; then | 24 | if test x${enable_gtk_doc} = x"yes"; then |
3808 | 25 | AM_MAINTAINER_MODE([enable]) | 25 | AM_MAINTAINER_MODE([enable]) |
3809 | 26 | else | 26 | else |
3815 | 27 | if test x${enable_debug} != x"no"; then | 27 | if test x${enable_debug} != x"no"; then |
3816 | 28 | AM_MAINTAINER_MODE([enable]) | 28 | AM_MAINTAINER_MODE([enable]) |
3817 | 29 | else | 29 | else |
3818 | 30 | AM_MAINTAINER_MODE() | 30 | AM_MAINTAINER_MODE() |
3819 | 31 | fi | 31 | fi |
3820 | 32 | fi | 32 | fi |
3821 | 33 | 33 | ||
3822 | 34 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) | 34 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) |
3823 | @@ -46,14 +46,14 @@ | |||
3824 | 46 | AC_PROG_INTLTOOL([intltool_minimum_version], [no-xml]) | 46 | AC_PROG_INTLTOOL([intltool_minimum_version], [no-xml]) |
3825 | 47 | 47 | ||
3826 | 48 | # ===================================================== # | 48 | # ===================================================== # |
3828 | 49 | # Initialize libtool # | 49 | # Initialize libtool # |
3829 | 50 | # ===================================================== # | 50 | # ===================================================== # |
3830 | 51 | LT_PREREQ([2.2.6]) | 51 | LT_PREREQ([2.2.6]) |
3831 | 52 | LT_INIT([disable-static]) | 52 | LT_INIT([disable-static]) |
3832 | 53 | m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) | 53 | m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) |
3833 | 54 | 54 | ||
3834 | 55 | # ===================================================== # | 55 | # ===================================================== # |
3836 | 56 | # Version information # | 56 | # Version information # |
3837 | 57 | # ===================================================== # | 57 | # ===================================================== # |
3838 | 58 | PAROLE_VERINFO=parole_verinfo() | 58 | PAROLE_VERINFO=parole_verinfo() |
3839 | 59 | PAROLE_VERSION_API=parole_version_api() | 59 | PAROLE_VERSION_API=parole_version_api() |
3840 | @@ -66,34 +66,34 @@ | |||
3841 | 66 | AC_SUBST([PAROLE_VERSION_MINOR]) | 66 | AC_SUBST([PAROLE_VERSION_MINOR]) |
3842 | 67 | AC_SUBST([PAROLE_VERSION_MICRO]) | 67 | AC_SUBST([PAROLE_VERSION_MICRO]) |
3843 | 68 | 68 | ||
3847 | 69 | # ==================================================== # | 69 | # ===================================================== # |
3848 | 70 | # Check for headers needed for standard interfaces # | 70 | # Check for headers needed for standard interfaces # |
3849 | 71 | # ==================================================== # | 71 | # ===================================================== # |
3850 | 72 | AC_HEADER_STDC | 72 | AC_HEADER_STDC |
3851 | 73 | AC_CHECK_HEADERS([errno.h signal.h stddef.h sys/ioctl.h fcntl.h\ | 73 | AC_CHECK_HEADERS([errno.h signal.h stddef.h sys/ioctl.h fcntl.h\ |
3852 | 74 | string.h sys/stat.h sys/types.h sys/wait.h time.h \ | 74 | string.h sys/stat.h sys/types.h sys/wait.h time.h \ |
3853 | 75 | unistd.h]) | 75 | unistd.h]) |
3854 | 76 | 76 | ||
3855 | 77 | # ===================================================== # | 77 | # ===================================================== # |
3865 | 78 | # Check for i18n support # | 78 | # Check for i18n support # |
3866 | 79 | # ===================================================== # | 79 | # ===================================================== # |
3867 | 80 | 80 | ||
3868 | 81 | 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 ]) | 81 | 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 | 82 | 82 | ||
3870 | 83 | #==================================================== # | 83 | # ===================================================== # |
3871 | 84 | # Check for required packages # | 84 | # Check for required packages # |
3872 | 85 | #=====================================================# | 85 | # ===================================================== # |
3873 | 86 | m4_define([gtk_minimum_version], [2.24.0]) | 86 | m4_define([gtk_minimum_version], [3.2.0]) |
3874 | 87 | m4_define([glib_minimum_version], [2.32.0]) | 87 | m4_define([glib_minimum_version], [2.32.0]) |
3875 | 88 | 88 | ||
3876 | 89 | dnl gstreamer version | 89 | dnl gstreamer version |
3877 | 90 | AC_ARG_WITH([gstreamer], | 90 | AC_ARG_WITH([gstreamer], |
3879 | 91 | [AS_HELP_STRING([--with-gstreamer=0.10|1.0],[which gstreamer version to compile against (default: 0.10)])], | 91 | [AS_HELP_STRING([--with-gstreamer=0.10|1.0],[which gstreamer version to compile against (default: 1.0)])], |
3880 | 92 | [case "$with_gstreamer" in | 92 | [case "$with_gstreamer" in |
3881 | 93 | 0.10|1.0) ;; | 93 | 0.10|1.0) ;; |
3882 | 94 | *) AC_MSG_ERROR([invalid gstreamer version specified]) ;; | 94 | *) AC_MSG_ERROR([invalid gstreamer version specified]) ;; |
3883 | 95 | esac], | 95 | esac], |
3885 | 96 | [with_gstreamer=0.10] | 96 | [with_gstreamer=1.0] |
3886 | 97 | ) | 97 | ) |
3887 | 98 | 98 | ||
3888 | 99 | case "$with_gstreamer" in | 99 | case "$with_gstreamer" in |
3889 | @@ -115,18 +115,29 @@ | |||
3890 | 115 | m4_define([dbus_minimum_version], [0.60]) | 115 | m4_define([dbus_minimum_version], [0.60]) |
3891 | 116 | m4_define([dbus_glib_minimum_version], [0.70]) | 116 | m4_define([dbus_glib_minimum_version], [0.70]) |
3892 | 117 | 117 | ||
3895 | 118 | m4_define([libxfce4ui_minimum_version],[4.8.0]) | 118 | m4_define([libxfce4ui_minimum_version],[4.10.0]) |
3896 | 119 | m4_define([libxfce4util_minimum_version],[4.8.0]) | 119 | m4_define([libxfce4util_minimum_version],[4.10.0]) |
3897 | 120 | 120 | ||
3898 | 121 | m4_define([libnotify_minimum_version], [0.4.1]) | 121 | m4_define([libnotify_minimum_version], [0.4.1]) |
3899 | 122 | 122 | ||
3900 | 123 | XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [gtk_minimum_version]) | ||
3901 | 124 | XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [glib_minimum_version]) | 123 | XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [glib_minimum_version]) |
3902 | 125 | XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [glib_minimum_version]) | 124 | XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [glib_minimum_version]) |
3903 | 126 | XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [glib_minimum_version]) | 125 | XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [glib_minimum_version]) |
3904 | 127 | XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [glib_minimum_version]) | 126 | XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [glib_minimum_version]) |
3905 | 128 | XDT_CHECK_PACKAGE([GIO], [gio-2.0], [glib_minimum_version]) | 127 | XDT_CHECK_PACKAGE([GIO], [gio-2.0], [glib_minimum_version]) |
3906 | 129 | 128 | ||
3907 | 129 | XDT_CHECK_PACKAGE([DBUS], [dbus-1], [dbus_minimum_version]) | ||
3908 | 130 | XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [dbus_glib_minimum_version]) | ||
3909 | 131 | |||
3910 | 132 | XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0],[libxfce4util_minimum_version]) | ||
3911 | 133 | XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.10.0]) | ||
3912 | 134 | |||
3913 | 135 | dnl ************************************ | ||
3914 | 136 | dnl *** Compile against GTK3 *** | ||
3915 | 137 | dnl ************************************ | ||
3916 | 138 | XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.10.0]) | ||
3917 | 139 | XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.2.0]) | ||
3918 | 140 | |||
3919 | 130 | XDT_CHECK_PACKAGE([GST], [gstreamer-${gstreamer_api_version}], [${gstreamer_minimum_version}]) | 141 | XDT_CHECK_PACKAGE([GST], [gstreamer-${gstreamer_api_version}], [${gstreamer_minimum_version}]) |
3920 | 131 | XDT_CHECK_PACKAGE([GST_BASE], [gstreamer-base-${gstreamer_api_version}], [${gstreamer_minimum_version}]) | 142 | XDT_CHECK_PACKAGE([GST_BASE], [gstreamer-base-${gstreamer_api_version}], [${gstreamer_minimum_version}]) |
3921 | 132 | XDT_CHECK_PACKAGE([GST_VIDEO], [gstreamer-video-${gstreamer_api_version}], [${gstreamer_minimum_version}]) | 143 | XDT_CHECK_PACKAGE([GST_VIDEO], [gstreamer-video-${gstreamer_api_version}], [${gstreamer_minimum_version}]) |
3922 | @@ -139,33 +150,14 @@ | |||
3923 | 139 | GST_LIBS="$GST_LIBS -lgstbase-$GST_API_VERSION -lgstvideo-$GST_API_VERSION -lgstaudio-$GST_API_VERSION -lgstpbutils-$GST_API_VERSION -lgsttag-$GST_API_VERSION" | 150 | 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 | 140 | fi | 151 | fi |
3925 | 141 | 152 | ||
3933 | 142 | XDT_CHECK_PACKAGE([DBUS], [dbus-1], [dbus_minimum_version]) | 153 | |
3927 | 143 | XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [dbus_glib_minimum_version]) | ||
3928 | 144 | |||
3929 | 145 | XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1],[libxfce4ui_minimum_version]) | ||
3930 | 146 | XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0],[libxfce4util_minimum_version]) | ||
3931 | 147 | |||
3932 | 148 | XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.10.0]) | ||
3934 | 149 | 154 | ||
3935 | 150 | XDT_CHECK_LIBX11() | 155 | XDT_CHECK_LIBX11() |
3936 | 151 | 156 | ||
3937 | 152 | #=======================================================# | ||
3938 | 153 | # Gtkrc files # | ||
3939 | 154 | #=======================================================# | ||
3940 | 155 | if test "x${prefix}" = "xNONE"; then | ||
3941 | 156 | AC_DEFINE_UNQUOTED(GTKRC_DIR, "${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/gtk-2.0", [gtkrc directory]) | ||
3942 | 157 | gtkrcdir="${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/gtk-2.0" | ||
3943 | 158 | else | ||
3944 | 159 | AC_DEFINE_UNQUOTED(GTKRC_DIR, "${prefix}/${DATADIRNAME}/${PACKAGE}/gtk-2.0", [pixmaps directory]) | ||
3945 | 160 | gtkrcdir="${prefix}/${DATADIRNAME}/${PACKAGE}/gtk-2.0" | ||
3946 | 161 | fi | ||
3947 | 162 | |||
3948 | 163 | AC_SUBST(gtkrcdir) | ||
3949 | 164 | |||
3950 | 165 | # Taken from Gnome system tools | 157 | # Taken from Gnome system tools |
3954 | 166 | #=======================================================# | 158 | # ===================================================== # |
3955 | 167 | # Pixmaps files # | 159 | # Pixmaps files # |
3956 | 168 | #=======================================================# | 160 | # ===================================================== # |
3957 | 169 | if test "x${prefix}" = "xNONE"; then | 161 | if test "x${prefix}" = "xNONE"; then |
3958 | 170 | AC_DEFINE_UNQUOTED(PIXMAPS_DIR, "${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps", [pixmaps directory]) | 162 | AC_DEFINE_UNQUOTED(PIXMAPS_DIR, "${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps", [pixmaps directory]) |
3959 | 171 | pixmapsdir="${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps" | 163 | pixmapsdir="${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps" |
3960 | @@ -176,9 +168,9 @@ | |||
3961 | 176 | 168 | ||
3962 | 177 | AC_SUBST(pixmapsdir) | 169 | AC_SUBST(pixmapsdir) |
3963 | 178 | 170 | ||
3967 | 179 | #=======================================================# | 171 | # ===================================================== # |
3968 | 180 | # Check XF86keysysm # | 172 | # Check XF86keysysm # |
3969 | 181 | #=======================================================# | 173 | # ===================================================== # |
3970 | 182 | # Check for the AudioPlay sym other should exist | 174 | # Check for the AudioPlay sym other should exist |
3971 | 183 | # if this one exists. | 175 | # if this one exists. |
3972 | 184 | AC_CHECK_DECL(XF86XK_AudioPlay,have_XF86XK_AudioPlay=1,have_XF86XK_AudioPlay=0,[#include <X11/XF86keysym.h>]) | 176 | AC_CHECK_DECL(XF86XK_AudioPlay,have_XF86XK_AudioPlay=1,have_XF86XK_AudioPlay=0,[#include <X11/XF86keysym.h>]) |
3973 | @@ -186,9 +178,9 @@ | |||
3974 | 186 | AC_DEFINE(HAVE_XF86_KEYSYM, 1, [Define if XF86keysysm.h is available]) | 178 | AC_DEFINE(HAVE_XF86_KEYSYM, 1, [Define if XF86keysysm.h is available]) |
3975 | 187 | fi | 179 | fi |
3976 | 188 | 180 | ||
3980 | 189 | #=======================================================# | 181 | # ===================================================== # |
3981 | 190 | # TagLib support # | 182 | # TagLib support # |
3982 | 191 | #=======================================================# | 183 | # ===================================================== # |
3983 | 192 | TAGLIB_FOUND="no" | 184 | TAGLIB_FOUND="no" |
3984 | 193 | XDT_CHECK_OPTIONAL_PACKAGE([TAGLIB], | 185 | XDT_CHECK_OPTIONAL_PACKAGE([TAGLIB], |
3985 | 194 | [taglib], [1.4], | 186 | [taglib], [1.4], |
3986 | @@ -202,17 +194,17 @@ | |||
3987 | 202 | [ | 194 | [ |
3988 | 203 | AC_CHECK_HEADER([taglib/tag_c.h], | 195 | AC_CHECK_HEADER([taglib/tag_c.h], |
3989 | 204 | [ | 196 | [ |
3992 | 205 | TAGLIBC_LIBS="-ltag_c" | 197 | TAGLIBC_LIBS="-ltag_c" |
3993 | 206 | AC_DEFINE([HAVE_TAGLIBC], [1], [Define to 1 if tag_c is found]) | 198 | AC_DEFINE([HAVE_TAGLIBC], [1], [Define to 1 if tag_c is found]) |
3994 | 207 | ]) | 199 | ]) |
3995 | 208 | ], [-lm]) | 200 | ], [-lm]) |
3996 | 209 | AC_SUBST([TAGLIBC_CFLAGS]) | 201 | AC_SUBST([TAGLIBC_CFLAGS]) |
3997 | 210 | AC_SUBST([TAGLIBC_LIBS]) | 202 | AC_SUBST([TAGLIBC_LIBS]) |
3998 | 211 | fi | 203 | fi |
3999 | 212 | 204 | ||
4003 | 213 | #=======================================================# | 205 | # ===================================================== # |
4004 | 214 | # Check plugins to build # | 206 | # Check plugins to build # |
4005 | 215 | #=======================================================# | 207 | # ===================================================== # |
4006 | 216 | 208 | ||
4007 | 217 | # Notify plugin. | 209 | # Notify plugin. |
4008 | 218 | #-------------------------- | 210 | #-------------------------- |
4009 | @@ -224,8 +216,8 @@ | |||
4010 | 224 | # Depends on Libnotify - if not found cannot build | 216 | # Depends on Libnotify - if not found cannot build |
4011 | 225 | LIBNOTIFY_FOUND="no" | 217 | LIBNOTIFY_FOUND="no" |
4012 | 226 | if test x"$ac_notify_plugin" = x"yes"; then | 218 | if test x"$ac_notify_plugin" = x"yes"; then |
4015 | 227 | XDT_CHECK_PACKAGE([LIBNOTIFY], | 219 | XDT_CHECK_PACKAGE([LIBNOTIFY], |
4016 | 228 | [libnotify], [libnotify_minimum_version]) | 220 | [libnotify], [libnotify_minimum_version]) |
4017 | 229 | fi | 221 | fi |
4018 | 230 | 222 | ||
4019 | 231 | # Tray plugin. | 223 | # Tray plugin. |
4020 | @@ -236,20 +228,27 @@ | |||
4021 | 236 | AM_CONDITIONAL([PAROLE_TRAY_PLUGIN], [test x"$ac_tray_plugin" = x"yes"]) | 228 | AM_CONDITIONAL([PAROLE_TRAY_PLUGIN], [test x"$ac_tray_plugin" = x"yes"]) |
4022 | 237 | AC_MSG_RESULT([$ac_tray_plugin]) | 229 | AC_MSG_RESULT([$ac_tray_plugin]) |
4023 | 238 | 230 | ||
4027 | 239 | #=======================================================# | 231 | # MPRIS2 plugin. |
4028 | 240 | # Check for debugging support # | 232 | #-------------------------- |
4029 | 241 | #=======================================================# | 233 | AC_ARG_ENABLE([mpris2-plugin], AC_HELP_STRING([--disable-mpris2-plugin], [Don't build parole mpris2 plugin]), |
4030 | 234 | [ac_mpris2_plugin=$enableval], [ac_mpris2_plugin=yes]) | ||
4031 | 235 | AC_MSG_CHECKING([whether to build the mpris2 plugin]) | ||
4032 | 236 | AM_CONDITIONAL([PAROLE_MPRIS2_PLUGIN], [test x"$ac_mpris2_plugin" = x"yes"]) | ||
4033 | 237 | AC_MSG_RESULT([$ac_mpris2_plugin]) | ||
4034 | 238 | |||
4035 | 239 | # ===================================================== # | ||
4036 | 240 | # Check for debugging support # | ||
4037 | 241 | # ===================================================== # | ||
4038 | 242 | XDT_FEATURE_DEBUG() | 242 | XDT_FEATURE_DEBUG() |
4039 | 243 | 243 | ||
4043 | 244 | #=======================================================# | 244 | # ===================================================== # |
4044 | 245 | # Check for Gtk doc # | 245 | # Check for Gtk doc # |
4045 | 246 | #=======================================================# | 246 | # ===================================================== # |
4046 | 247 | GTK_DOC_CHECK(1.9) | 247 | GTK_DOC_CHECK(1.9) |
4047 | 248 | 248 | ||
4048 | 249 | AC_OUTPUT([ | 249 | AC_OUTPUT([ |
4049 | 250 | Makefile | 250 | Makefile |
4050 | 251 | data/Makefile | 251 | data/Makefile |
4051 | 252 | data/gtk-2.0/Makefile | ||
4052 | 253 | data/pixmaps/Makefile | 252 | data/pixmaps/Makefile |
4053 | 254 | data/interfaces/Makefile | 253 | data/interfaces/Makefile |
4054 | 255 | data/icons/Makefile | 254 | data/icons/Makefile |
4055 | @@ -257,6 +256,8 @@ | |||
4056 | 257 | data/icons/24x24/Makefile | 256 | data/icons/24x24/Makefile |
4057 | 258 | data/icons/32x32/Makefile | 257 | data/icons/32x32/Makefile |
4058 | 259 | data/icons/48x48/Makefile | 258 | data/icons/48x48/Makefile |
4059 | 259 | data/icons/64x64/Makefile | ||
4060 | 260 | data/icons/128x128/Makefile | ||
4061 | 260 | data/icons/scalable/Makefile | 261 | data/icons/scalable/Makefile |
4062 | 261 | data/mime/Makefile | 262 | data/mime/Makefile |
4063 | 262 | data/desktop/Makefile | 263 | data/desktop/Makefile |
4064 | @@ -270,6 +271,7 @@ | |||
4065 | 270 | src/plugins/sample/Makefile | 271 | src/plugins/sample/Makefile |
4066 | 271 | src/plugins/notify/Makefile | 272 | src/plugins/notify/Makefile |
4067 | 272 | src/plugins/tray/Makefile | 273 | src/plugins/tray/Makefile |
4068 | 274 | src/plugins/mpris2/Makefile | ||
4069 | 273 | docs/Makefile | 275 | docs/Makefile |
4070 | 274 | docs/plugin-api/version.xml | 276 | docs/plugin-api/version.xml |
4071 | 275 | docs/plugin-api/Makefile | 277 | docs/plugin-api/Makefile |
4072 | @@ -288,6 +290,7 @@ | |||
4073 | 288 | Debug: $enable_debug | 290 | Debug: $enable_debug |
4074 | 289 | Building plugin api docs: ${enable_gtk_doc} | 291 | Building plugin api docs: ${enable_gtk_doc} |
4075 | 290 | GStreamer API version: ${gstreamer_api_version} | 292 | GStreamer API version: ${gstreamer_api_version} |
4076 | 293 | GTK+ version: GTK+-3 | ||
4077 | 291 | 294 | ||
4078 | 292 | Optional dependencies: | 295 | Optional dependencies: |
4079 | 293 | ====================== | 296 | ====================== |
4080 | @@ -297,6 +300,7 @@ | |||
4081 | 297 | ================= | 300 | ================= |
4082 | 298 | Notify: ${ac_notify_plugin} | 301 | Notify: ${ac_notify_plugin} |
4083 | 299 | System Tray icon: ${ac_tray_plugin} | 302 | System Tray icon: ${ac_tray_plugin} |
4084 | 303 | MPRIS2: ${ac_mpris2_plugin} | ||
4085 | 300 | 304 | ||
4086 | 301 | ------------------------------------------------------ | 305 | ------------------------------------------------------ |
4087 | 302 | 306 | ||
4088 | 303 | 307 | ||
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 | 1 | SUBDIRS = \ | 1 | SUBDIRS = \ |
4094 | 2 | gtk-2.0 \ | ||
4095 | 3 | interfaces \ | 2 | interfaces \ |
4096 | 4 | pixmaps \ | 3 | pixmaps \ |
4097 | 5 | icons \ | 4 | icons \ |
4098 | 6 | 5 | ||
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 @@ | |||
4104 | 1 | # Makefile.in generated by automake 1.13.3 from Makefile.am. | 1 | # Makefile.in generated by automake 1.14.1 from Makefile.am. |
4105 | 2 | # @configure_input@ | 2 | # @configure_input@ |
4106 | 3 | 3 | ||
4107 | 4 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. | 4 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. |
4108 | @@ -384,7 +384,6 @@ | |||
4109 | 384 | docdir = @docdir@ | 384 | docdir = @docdir@ |
4110 | 385 | dvidir = @dvidir@ | 385 | dvidir = @dvidir@ |
4111 | 386 | exec_prefix = @exec_prefix@ | 386 | exec_prefix = @exec_prefix@ |
4112 | 387 | gtkrcdir = @gtkrcdir@ | ||
4113 | 388 | host = @host@ | 387 | host = @host@ |
4114 | 389 | host_alias = @host_alias@ | 388 | host_alias = @host_alias@ |
4115 | 390 | host_cpu = @host_cpu@ | 389 | host_cpu = @host_cpu@ |
4116 | @@ -417,7 +416,6 @@ | |||
4117 | 417 | top_builddir = @top_builddir@ | 416 | top_builddir = @top_builddir@ |
4118 | 418 | top_srcdir = @top_srcdir@ | 417 | top_srcdir = @top_srcdir@ |
4119 | 419 | SUBDIRS = \ | 418 | SUBDIRS = \ |
4120 | 420 | gtk-2.0 \ | ||
4121 | 421 | interfaces \ | 419 | interfaces \ |
4122 | 422 | pixmaps \ | 420 | pixmaps \ |
4123 | 423 | icons \ | 421 | icons \ |
4124 | 424 | 422 | ||
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 @@ | |||
4130 | 1 | # Makefile.in generated by automake 1.13.3 from Makefile.am. | 1 | # Makefile.in generated by automake 1.14.1 from Makefile.am. |
4131 | 2 | # @configure_input@ | 2 | # @configure_input@ |
4132 | 3 | 3 | ||
4133 | 4 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. | 4 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. |
4134 | @@ -354,7 +354,6 @@ | |||
4135 | 354 | docdir = @docdir@ | 354 | docdir = @docdir@ |
4136 | 355 | dvidir = @dvidir@ | 355 | dvidir = @dvidir@ |
4137 | 356 | exec_prefix = @exec_prefix@ | 356 | exec_prefix = @exec_prefix@ |
4138 | 357 | gtkrcdir = @gtkrcdir@ | ||
4139 | 358 | host = @host@ | 357 | host = @host@ |
4140 | 359 | host_alias = @host_alias@ | 358 | host_alias = @host_alias@ |
4141 | 360 | host_cpu = @host_cpu@ | 359 | host_cpu = @host_cpu@ |
4142 | 361 | 360 | ||
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 | 17 | echo "[Desktop Action Play]" | 17 | echo "[Desktop Action Play]" |
4148 | 18 | echo "Exec=parole --play" | 18 | echo "Exec=parole --play" |
4149 | 19 | echo "_Name=Play/Pause" | 19 | echo "_Name=Play/Pause" |
4151 | 20 | echo "Icon=media-playback-start" | 20 | echo "Icon=media-playback-start-symbolic" |
4152 | 21 | echo "OnlyShowIn=Unity;" | 21 | echo "OnlyShowIn=Unity;" |
4153 | 22 | echo "" | 22 | echo "" |
4154 | 23 | echo "[Desktop Action Previous]" | 23 | echo "[Desktop Action Previous]" |
4156 | 24 | echo "Exec=parole --previous-track" | 24 | echo "Exec=parole --previous" |
4157 | 25 | echo "_Name=Previous Track" | 25 | echo "_Name=Previous Track" |
4159 | 26 | echo "Icon=media-skip-backward" | 26 | echo "Icon=media-skip-backward-symbolic" |
4160 | 27 | echo "OnlyShowIn=Unity;" | 27 | echo "OnlyShowIn=Unity;" |
4161 | 28 | echo "" | 28 | echo "" |
4162 | 29 | echo "[Desktop Action Next]" | 29 | echo "[Desktop Action Next]" |
4164 | 30 | echo "Exec=parole --next-track" | 30 | echo "Exec=parole --next" |
4165 | 31 | echo "_Name=Next Track" | 31 | echo "_Name=Next Track" |
4167 | 32 | echo "Icon=media-skip-forward" | 32 | echo "Icon=media-skip-forward-symbolic" |
4168 | 33 | echo "OnlyShowIn=Unity;" | 33 | echo "OnlyShowIn=Unity;" |
4169 | 34 | echo "" | ||
4170 | 35 | \ No newline at end of file | 34 | \ No newline at end of file |
4171 | 35 | echo "" | ||
4172 | 36 | 36 | ||
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 | 13 | [Desktop Action Play] | 13 | [Desktop Action Play] |
4178 | 14 | Exec=parole --play | 14 | Exec=parole --play |
4179 | 15 | _Name=Play/Pause | 15 | _Name=Play/Pause |
4181 | 16 | Icon=media-playback-start | 16 | Icon=media-playback-start-symbolic |
4182 | 17 | OnlyShowIn=Unity; | 17 | OnlyShowIn=Unity; |
4183 | 18 | 18 | ||
4184 | 19 | [Desktop Action Previous] | 19 | [Desktop Action Previous] |
4186 | 20 | Exec=parole --previous-track | 20 | Exec=parole --previous |
4187 | 21 | _Name=Previous Track | 21 | _Name=Previous Track |
4189 | 22 | Icon=media-skip-backward | 22 | Icon=media-skip-backward-symbolic |
4190 | 23 | OnlyShowIn=Unity; | 23 | OnlyShowIn=Unity; |
4191 | 24 | 24 | ||
4192 | 25 | [Desktop Action Next] | 25 | [Desktop Action Next] |
4194 | 26 | Exec=parole --next-track | 26 | Exec=parole --next |
4195 | 27 | _Name=Next Track | 27 | _Name=Next Track |
4197 | 28 | Icon=media-skip-forward | 28 | Icon=media-skip-forward-symbolic |
4198 | 29 | OnlyShowIn=Unity; | 29 | OnlyShowIn=Unity; |
4199 | 30 | 30 | ||
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 | 1 | EXTRA_DIST = \ | ||
4206 | 2 | $(gtkrc_DATA) | ||
4207 | 3 | |||
4208 | 4 | gtkrcdir = $(datadir)/parole/gtk-2.0 | ||
4209 | 5 | |||
4210 | 6 | gtkrc_DATA = \ | ||
4211 | 7 | parole.gtkrc | ||
4212 | 8 | 0 | ||
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 | 1 | # Makefile.in generated by automake 1.13.3 from Makefile.am. | ||
4218 | 2 | # @configure_input@ | ||
4219 | 3 | |||
4220 | 4 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. | ||
4221 | 5 | |||
4222 | 6 | # This Makefile.in is free software; the Free Software Foundation | ||
4223 | 7 | # gives unlimited permission to copy and/or distribute it, | ||
4224 | 8 | # with or without modifications, as long as this notice is preserved. | ||
4225 | 9 | |||
4226 | 10 | # This program is distributed in the hope that it will be useful, | ||
4227 | 11 | # but WITHOUT ANY WARRANTY, to the extent permitted by law; without | ||
4228 | 12 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||
4229 | 13 | # PARTICULAR PURPOSE. | ||
4230 | 14 | |||
4231 | 15 | @SET_MAKE@ | ||
4232 | 16 | |||
4233 | 17 | VPATH = @srcdir@ | ||
4234 | 18 | am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' | ||
4235 | 19 | am__make_running_with_option = \ | ||
4236 | 20 | case $${target_option-} in \ | ||
4237 | 21 | ?) ;; \ | ||
4238 | 22 | *) echo "am__make_running_with_option: internal error: invalid" \ | ||
4239 | 23 | "target option '$${target_option-}' specified" >&2; \ | ||
4240 | 24 | exit 1;; \ | ||
4241 | 25 | esac; \ | ||
4242 | 26 | has_opt=no; \ | ||
4243 | 27 | sane_makeflags=$$MAKEFLAGS; \ | ||
4244 | 28 | if $(am__is_gnu_make); then \ | ||
4245 | 29 | sane_makeflags=$$MFLAGS; \ | ||
4246 | 30 | else \ | ||
4247 | 31 | case $$MAKEFLAGS in \ | ||
4248 | 32 | *\\[\ \ ]*) \ | ||
4249 | 33 | bs=\\; \ | ||
4250 | 34 | sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ | ||
4251 | 35 | | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ | ||
4252 | 36 | esac; \ | ||
4253 | 37 | fi; \ | ||
4254 | 38 | skip_next=no; \ | ||
4255 | 39 | strip_trailopt () \ | ||
4256 | 40 | { \ | ||
4257 | 41 | flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ | ||
4258 | 42 | }; \ | ||
4259 | 43 | for flg in $$sane_makeflags; do \ | ||
4260 | 44 | test $$skip_next = yes && { skip_next=no; continue; }; \ | ||
4261 | 45 | case $$flg in \ | ||
4262 | 46 | *=*|--*) continue;; \ | ||
4263 | 47 | -*I) strip_trailopt 'I'; skip_next=yes;; \ | ||
4264 | 48 | -*I?*) strip_trailopt 'I';; \ | ||
4265 | 49 | -*O) strip_trailopt 'O'; skip_next=yes;; \ | ||
4266 | 50 | -*O?*) strip_trailopt 'O';; \ | ||
4267 | 51 | -*l) strip_trailopt 'l'; skip_next=yes;; \ | ||
4268 | 52 | -*l?*) strip_trailopt 'l';; \ | ||
4269 | 53 | -[dEDm]) skip_next=yes;; \ | ||
4270 | 54 | -[JT]) skip_next=yes;; \ | ||
4271 | 55 | esac; \ | ||
4272 | 56 | case $$flg in \ | ||
4273 | 57 | *$$target_option*) has_opt=yes; break;; \ | ||
4274 | 58 | esac; \ | ||
4275 | 59 | done; \ | ||
4276 | 60 | test $$has_opt = yes | ||
4277 | 61 | am__make_dryrun = (target_option=n; $(am__make_running_with_option)) | ||
4278 | 62 | am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) | ||
4279 | 63 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
4280 | 64 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
4281 | 65 | pkglibdir = $(libdir)/@PACKAGE@ | ||
4282 | 66 | pkglibexecdir = $(libexecdir)/@PACKAGE@ | ||
4283 | 67 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
4284 | 68 | install_sh_DATA = $(install_sh) -c -m 644 | ||
4285 | 69 | install_sh_PROGRAM = $(install_sh) -c | ||
4286 | 70 | install_sh_SCRIPT = $(install_sh) -c | ||
4287 | 71 | INSTALL_HEADER = $(INSTALL_DATA) | ||
4288 | 72 | transform = $(program_transform_name) | ||
4289 | 73 | NORMAL_INSTALL = : | ||
4290 | 74 | PRE_INSTALL = : | ||
4291 | 75 | POST_INSTALL = : | ||
4292 | 76 | NORMAL_UNINSTALL = : | ||
4293 | 77 | PRE_UNINSTALL = : | ||
4294 | 78 | POST_UNINSTALL = : | ||
4295 | 79 | build_triplet = @build@ | ||
4296 | 80 | host_triplet = @host@ | ||
4297 | 81 | subdir = data/gtk-2.0 | ||
4298 | 82 | DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am | ||
4299 | 83 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | ||
4300 | 84 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac | ||
4301 | 85 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | ||
4302 | 86 | $(ACLOCAL_M4) | ||
4303 | 87 | mkinstalldirs = $(install_sh) -d | ||
4304 | 88 | CONFIG_HEADER = $(top_builddir)/config.h | ||
4305 | 89 | CONFIG_CLEAN_FILES = | ||
4306 | 90 | CONFIG_CLEAN_VPATH_FILES = | ||
4307 | 91 | AM_V_P = $(am__v_P_@AM_V@) | ||
4308 | 92 | am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) | ||
4309 | 93 | am__v_P_0 = false | ||
4310 | 94 | am__v_P_1 = : | ||
4311 | 95 | AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
4312 | 96 | am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
4313 | 97 | am__v_GEN_0 = @echo " GEN " $@; | ||
4314 | 98 | am__v_GEN_1 = | ||
4315 | 99 | AM_V_at = $(am__v_at_@AM_V@) | ||
4316 | 100 | am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
4317 | 101 | am__v_at_0 = @ | ||
4318 | 102 | am__v_at_1 = | ||
4319 | 103 | SOURCES = | ||
4320 | 104 | DIST_SOURCES = | ||
4321 | 105 | am__can_run_installinfo = \ | ||
4322 | 106 | case $$AM_UPDATE_INFO_DIR in \ | ||
4323 | 107 | n|no|NO) false;; \ | ||
4324 | 108 | *) (install-info --version) >/dev/null 2>&1;; \ | ||
4325 | 109 | esac | ||
4326 | 110 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; | ||
4327 | 111 | am__vpath_adj = case $$p in \ | ||
4328 | 112 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ | ||
4329 | 113 | *) f=$$p;; \ | ||
4330 | 114 | esac; | ||
4331 | 115 | am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; | ||
4332 | 116 | am__install_max = 40 | ||
4333 | 117 | am__nobase_strip_setup = \ | ||
4334 | 118 | srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` | ||
4335 | 119 | am__nobase_strip = \ | ||
4336 | 120 | for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" | ||
4337 | 121 | am__nobase_list = $(am__nobase_strip_setup); \ | ||
4338 | 122 | for p in $$list; do echo "$$p $$p"; done | \ | ||
4339 | 123 | sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ | ||
4340 | 124 | $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ | ||
4341 | 125 | if (++n[$$2] == $(am__install_max)) \ | ||
4342 | 126 | { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ | ||
4343 | 127 | END { for (dir in files) print dir, files[dir] }' | ||
4344 | 128 | am__base_list = \ | ||
4345 | 129 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ | ||
4346 | 130 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | ||
4347 | 131 | am__uninstall_files_from_dir = { \ | ||
4348 | 132 | test -z "$$files" \ | ||
4349 | 133 | || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ | ||
4350 | 134 | || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ | ||
4351 | 135 | $(am__cd) "$$dir" && rm -f $$files; }; \ | ||
4352 | 136 | } | ||
4353 | 137 | am__installdirs = "$(DESTDIR)$(gtkrcdir)" | ||
4354 | 138 | DATA = $(gtkrc_DATA) | ||
4355 | 139 | am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) | ||
4356 | 140 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | ||
4357 | 141 | ACLOCAL = @ACLOCAL@ | ||
4358 | 142 | ALL_LINGUAS = @ALL_LINGUAS@ | ||
4359 | 143 | AMTAR = @AMTAR@ | ||
4360 | 144 | AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ | ||
4361 | 145 | AR = @AR@ | ||
4362 | 146 | AUTOCONF = @AUTOCONF@ | ||
4363 | 147 | AUTOHEADER = @AUTOHEADER@ | ||
4364 | 148 | AUTOMAKE = @AUTOMAKE@ | ||
4365 | 149 | AWK = @AWK@ | ||
4366 | 150 | CATALOGS = @CATALOGS@ | ||
4367 | 151 | CATOBJEXT = @CATOBJEXT@ | ||
4368 | 152 | CC = @CC@ | ||
4369 | 153 | CCDEPMODE = @CCDEPMODE@ | ||
4370 | 154 | CFLAGS = @CFLAGS@ | ||
4371 | 155 | CPP = @CPP@ | ||
4372 | 156 | CPPFLAGS = @CPPFLAGS@ | ||
4373 | 157 | CXX = @CXX@ | ||
4374 | 158 | CXXCPP = @CXXCPP@ | ||
4375 | 159 | CXXDEPMODE = @CXXDEPMODE@ | ||
4376 | 160 | CXXFLAGS = @CXXFLAGS@ | ||
4377 | 161 | CYGPATH_W = @CYGPATH_W@ | ||
4378 | 162 | DATADIRNAME = @DATADIRNAME@ | ||
4379 | 163 | DBUS_CFLAGS = @DBUS_CFLAGS@ | ||
4380 | 164 | DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ | ||
4381 | 165 | DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ | ||
4382 | 166 | DBUS_GLIB_REQUIRED_VERSION = @DBUS_GLIB_REQUIRED_VERSION@ | ||
4383 | 167 | DBUS_GLIB_VERSION = @DBUS_GLIB_VERSION@ | ||
4384 | 168 | DBUS_LIBS = @DBUS_LIBS@ | ||
4385 | 169 | DBUS_REQUIRED_VERSION = @DBUS_REQUIRED_VERSION@ | ||
4386 | 170 | DBUS_VERSION = @DBUS_VERSION@ | ||
4387 | 171 | DEFS = @DEFS@ | ||
4388 | 172 | DEPDIR = @DEPDIR@ | ||
4389 | 173 | DLLTOOL = @DLLTOOL@ | ||
4390 | 174 | DSYMUTIL = @DSYMUTIL@ | ||
4391 | 175 | DUMPBIN = @DUMPBIN@ | ||
4392 | 176 | ECHO_C = @ECHO_C@ | ||
4393 | 177 | ECHO_N = @ECHO_N@ | ||
4394 | 178 | ECHO_T = @ECHO_T@ | ||
4395 | 179 | EGREP = @EGREP@ | ||
4396 | 180 | EXEEXT = @EXEEXT@ | ||
4397 | 181 | FGREP = @FGREP@ | ||
4398 | 182 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ | ||
4399 | 183 | GIO_CFLAGS = @GIO_CFLAGS@ | ||
4400 | 184 | GIO_LIBS = @GIO_LIBS@ | ||
4401 | 185 | GIO_REQUIRED_VERSION = @GIO_REQUIRED_VERSION@ | ||
4402 | 186 | GIO_VERSION = @GIO_VERSION@ | ||
4403 | 187 | GLIB_CFLAGS = @GLIB_CFLAGS@ | ||
4404 | 188 | GLIB_LIBS = @GLIB_LIBS@ | ||
4405 | 189 | GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@ | ||
4406 | 190 | GLIB_VERSION = @GLIB_VERSION@ | ||
4407 | 191 | GMODULE_CFLAGS = @GMODULE_CFLAGS@ | ||
4408 | 192 | GMODULE_LIBS = @GMODULE_LIBS@ | ||
4409 | 193 | GMODULE_REQUIRED_VERSION = @GMODULE_REQUIRED_VERSION@ | ||
4410 | 194 | GMODULE_VERSION = @GMODULE_VERSION@ | ||
4411 | 195 | GMOFILES = @GMOFILES@ | ||
4412 | 196 | GMSGFMT = @GMSGFMT@ | ||
4413 | 197 | GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ | ||
4414 | 198 | GOBJECT_LIBS = @GOBJECT_LIBS@ | ||
4415 | 199 | GOBJECT_REQUIRED_VERSION = @GOBJECT_REQUIRED_VERSION@ | ||
4416 | 200 | GOBJECT_VERSION = @GOBJECT_VERSION@ | ||
4417 | 201 | GREP = @GREP@ | ||
4418 | 202 | GST_BASE_CFLAGS = @GST_BASE_CFLAGS@ | ||
4419 | 203 | GST_BASE_LIBS = @GST_BASE_LIBS@ | ||
4420 | 204 | GST_BASE_REQUIRED_VERSION = @GST_BASE_REQUIRED_VERSION@ | ||
4421 | 205 | GST_BASE_VERSION = @GST_BASE_VERSION@ | ||
4422 | 206 | GST_CFLAGS = @GST_CFLAGS@ | ||
4423 | 207 | GST_INTERFACES_CFLAGS = @GST_INTERFACES_CFLAGS@ | ||
4424 | 208 | GST_INTERFACES_LIBS = @GST_INTERFACES_LIBS@ | ||
4425 | 209 | GST_INTERFACES_REQUIRED_VERSION = @GST_INTERFACES_REQUIRED_VERSION@ | ||
4426 | 210 | GST_INTERFACES_VERSION = @GST_INTERFACES_VERSION@ | ||
4427 | 211 | GST_LIBS = @GST_LIBS@ | ||
4428 | 212 | GST_PBUTILS_CFLAGS = @GST_PBUTILS_CFLAGS@ | ||
4429 | 213 | GST_PBUTILS_LIBS = @GST_PBUTILS_LIBS@ | ||
4430 | 214 | GST_PBUTILS_REQUIRED_VERSION = @GST_PBUTILS_REQUIRED_VERSION@ | ||
4431 | 215 | GST_PBUTILS_VERSION = @GST_PBUTILS_VERSION@ | ||
4432 | 216 | GST_REQUIRED_VERSION = @GST_REQUIRED_VERSION@ | ||
4433 | 217 | GST_VERSION = @GST_VERSION@ | ||
4434 | 218 | GST_VIDEO_CFLAGS = @GST_VIDEO_CFLAGS@ | ||
4435 | 219 | GST_VIDEO_LIBS = @GST_VIDEO_LIBS@ | ||
4436 | 220 | GST_VIDEO_REQUIRED_VERSION = @GST_VIDEO_REQUIRED_VERSION@ | ||
4437 | 221 | GST_VIDEO_VERSION = @GST_VIDEO_VERSION@ | ||
4438 | 222 | GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ | ||
4439 | 223 | GTHREAD_LIBS = @GTHREAD_LIBS@ | ||
4440 | 224 | GTHREAD_REQUIRED_VERSION = @GTHREAD_REQUIRED_VERSION@ | ||
4441 | 225 | GTHREAD_VERSION = @GTHREAD_VERSION@ | ||
4442 | 226 | GTKDOC_CHECK = @GTKDOC_CHECK@ | ||
4443 | 227 | GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ | ||
4444 | 228 | GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ | ||
4445 | 229 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ | ||
4446 | 230 | GTKDOC_REBASE = @GTKDOC_REBASE@ | ||
4447 | 231 | GTK_CFLAGS = @GTK_CFLAGS@ | ||
4448 | 232 | GTK_LIBS = @GTK_LIBS@ | ||
4449 | 233 | GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ | ||
4450 | 234 | GTK_VERSION = @GTK_VERSION@ | ||
4451 | 235 | HTML_DIR = @HTML_DIR@ | ||
4452 | 236 | INSTALL = @INSTALL@ | ||
4453 | 237 | INSTALL_DATA = @INSTALL_DATA@ | ||
4454 | 238 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ | ||
4455 | 239 | INSTALL_SCRIPT = @INSTALL_SCRIPT@ | ||
4456 | 240 | INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ | ||
4457 | 241 | INSTOBJEXT = @INSTOBJEXT@ | ||
4458 | 242 | INTLLIBS = @INTLLIBS@ | ||
4459 | 243 | INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ | ||
4460 | 244 | INTLTOOL_MERGE = @INTLTOOL_MERGE@ | ||
4461 | 245 | INTLTOOL_PERL = @INTLTOOL_PERL@ | ||
4462 | 246 | INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ | ||
4463 | 247 | INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ | ||
4464 | 248 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ | ||
4465 | 249 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ | ||
4466 | 250 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ | ||
4467 | 251 | LD = @LD@ | ||
4468 | 252 | LDFLAGS = @LDFLAGS@ | ||
4469 | 253 | LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ | ||
4470 | 254 | LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ | ||
4471 | 255 | LIBNOTIFY_REQUIRED_VERSION = @LIBNOTIFY_REQUIRED_VERSION@ | ||
4472 | 256 | LIBNOTIFY_VERSION = @LIBNOTIFY_VERSION@ | ||
4473 | 257 | LIBOBJS = @LIBOBJS@ | ||
4474 | 258 | LIBS = @LIBS@ | ||
4475 | 259 | LIBTOOL = @LIBTOOL@ | ||
4476 | 260 | LIBX11_CFLAGS = @LIBX11_CFLAGS@ | ||
4477 | 261 | LIBX11_LDFLAGS = @LIBX11_LDFLAGS@ | ||
4478 | 262 | LIBX11_LIBS = @LIBX11_LIBS@ | ||
4479 | 263 | LIBXFCE4UI_CFLAGS = @LIBXFCE4UI_CFLAGS@ | ||
4480 | 264 | LIBXFCE4UI_LIBS = @LIBXFCE4UI_LIBS@ | ||
4481 | 265 | LIBXFCE4UI_REQUIRED_VERSION = @LIBXFCE4UI_REQUIRED_VERSION@ | ||
4482 | 266 | LIBXFCE4UI_VERSION = @LIBXFCE4UI_VERSION@ | ||
4483 | 267 | LIBXFCE4UTIL_CFLAGS = @LIBXFCE4UTIL_CFLAGS@ | ||
4484 | 268 | LIBXFCE4UTIL_LIBS = @LIBXFCE4UTIL_LIBS@ | ||
4485 | 269 | LIBXFCE4UTIL_REQUIRED_VERSION = @LIBXFCE4UTIL_REQUIRED_VERSION@ | ||
4486 | 270 | LIBXFCE4UTIL_VERSION = @LIBXFCE4UTIL_VERSION@ | ||
4487 | 271 | LIPO = @LIPO@ | ||
4488 | 272 | LN_S = @LN_S@ | ||
4489 | 273 | LTLIBOBJS = @LTLIBOBJS@ | ||
4490 | 274 | MAINT = @MAINT@ | ||
4491 | 275 | MAKEINFO = @MAKEINFO@ | ||
4492 | 276 | MANIFEST_TOOL = @MANIFEST_TOOL@ | ||
4493 | 277 | MKDIR_P = @MKDIR_P@ | ||
4494 | 278 | MKINSTALLDIRS = @MKINSTALLDIRS@ | ||
4495 | 279 | MSGFMT = @MSGFMT@ | ||
4496 | 280 | MSGFMT_OPTS = @MSGFMT_OPTS@ | ||
4497 | 281 | MSGMERGE = @MSGMERGE@ | ||
4498 | 282 | NM = @NM@ | ||
4499 | 283 | NMEDIT = @NMEDIT@ | ||
4500 | 284 | OBJDUMP = @OBJDUMP@ | ||
4501 | 285 | OBJEXT = @OBJEXT@ | ||
4502 | 286 | OTOOL = @OTOOL@ | ||
4503 | 287 | OTOOL64 = @OTOOL64@ | ||
4504 | 288 | PACKAGE = @PACKAGE@ | ||
4505 | 289 | PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ | ||
4506 | 290 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
4507 | 291 | PACKAGE_STRING = @PACKAGE_STRING@ | ||
4508 | 292 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
4509 | 293 | PACKAGE_URL = @PACKAGE_URL@ | ||
4510 | 294 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
4511 | 295 | PAROLE_VERINFO = @PAROLE_VERINFO@ | ||
4512 | 296 | PAROLE_VERSION_API = @PAROLE_VERSION_API@ | ||
4513 | 297 | PAROLE_VERSION_MAJOR = @PAROLE_VERSION_MAJOR@ | ||
4514 | 298 | PAROLE_VERSION_MICRO = @PAROLE_VERSION_MICRO@ | ||
4515 | 299 | PAROLE_VERSION_MINOR = @PAROLE_VERSION_MINOR@ | ||
4516 | 300 | PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
4517 | 301 | PKG_CONFIG = @PKG_CONFIG@ | ||
4518 | 302 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
4519 | 303 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
4520 | 304 | POFILES = @POFILES@ | ||
4521 | 305 | POSUB = @POSUB@ | ||
4522 | 306 | PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ | ||
4523 | 307 | PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ | ||
4524 | 308 | RANLIB = @RANLIB@ | ||
4525 | 309 | SED = @SED@ | ||
4526 | 310 | SET_MAKE = @SET_MAKE@ | ||
4527 | 311 | SHELL = @SHELL@ | ||
4528 | 312 | STRIP = @STRIP@ | ||
4529 | 313 | TAGLIBC_CFLAGS = @TAGLIBC_CFLAGS@ | ||
4530 | 314 | TAGLIBC_LIBS = @TAGLIBC_LIBS@ | ||
4531 | 315 | TAGLIB_CFLAGS = @TAGLIB_CFLAGS@ | ||
4532 | 316 | TAGLIB_LIBS = @TAGLIB_LIBS@ | ||
4533 | 317 | TAGLIB_REQUIRED_VERSION = @TAGLIB_REQUIRED_VERSION@ | ||
4534 | 318 | TAGLIB_VERSION = @TAGLIB_VERSION@ | ||
4535 | 319 | USE_NLS = @USE_NLS@ | ||
4536 | 320 | VERSION = @VERSION@ | ||
4537 | 321 | XFCONF_CFLAGS = @XFCONF_CFLAGS@ | ||
4538 | 322 | XFCONF_LIBS = @XFCONF_LIBS@ | ||
4539 | 323 | XFCONF_REQUIRED_VERSION = @XFCONF_REQUIRED_VERSION@ | ||
4540 | 324 | XFCONF_VERSION = @XFCONF_VERSION@ | ||
4541 | 325 | XGETTEXT = @XGETTEXT@ | ||
4542 | 326 | XGETTEXT_ARGS = @XGETTEXT_ARGS@ | ||
4543 | 327 | XMKMF = @XMKMF@ | ||
4544 | 328 | X_CFLAGS = @X_CFLAGS@ | ||
4545 | 329 | X_EXTRA_LIBS = @X_EXTRA_LIBS@ | ||
4546 | 330 | X_LIBS = @X_LIBS@ | ||
4547 | 331 | X_PRE_LIBS = @X_PRE_LIBS@ | ||
4548 | 332 | abs_builddir = @abs_builddir@ | ||
4549 | 333 | abs_srcdir = @abs_srcdir@ | ||
4550 | 334 | abs_top_builddir = @abs_top_builddir@ | ||
4551 | 335 | abs_top_srcdir = @abs_top_srcdir@ | ||
4552 | 336 | ac_ct_AR = @ac_ct_AR@ | ||
4553 | 337 | ac_ct_CC = @ac_ct_CC@ | ||
4554 | 338 | ac_ct_CXX = @ac_ct_CXX@ | ||
4555 | 339 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ | ||
4556 | 340 | am__include = @am__include@ | ||
4557 | 341 | am__leading_dot = @am__leading_dot@ | ||
4558 | 342 | am__quote = @am__quote@ | ||
4559 | 343 | am__tar = @am__tar@ | ||
4560 | 344 | am__untar = @am__untar@ | ||
4561 | 345 | bindir = @bindir@ | ||
4562 | 346 | build = @build@ | ||
4563 | 347 | build_alias = @build_alias@ | ||
4564 | 348 | build_cpu = @build_cpu@ | ||
4565 | 349 | build_os = @build_os@ | ||
4566 | 350 | build_vendor = @build_vendor@ | ||
4567 | 351 | builddir = @builddir@ | ||
4568 | 352 | datadir = @datadir@ | ||
4569 | 353 | datarootdir = @datarootdir@ | ||
4570 | 354 | docdir = @docdir@ | ||
4571 | 355 | dvidir = @dvidir@ | ||
4572 | 356 | exec_prefix = @exec_prefix@ | ||
4573 | 357 | gtkrcdir = $(datadir)/parole/gtk-2.0 | ||
4574 | 358 | host = @host@ | ||
4575 | 359 | host_alias = @host_alias@ | ||
4576 | 360 | host_cpu = @host_cpu@ | ||
4577 | 361 | host_os = @host_os@ | ||
4578 | 362 | host_vendor = @host_vendor@ | ||
4579 | 363 | htmldir = @htmldir@ | ||
4580 | 364 | includedir = @includedir@ | ||
4581 | 365 | infodir = @infodir@ | ||
4582 | 366 | install_sh = @install_sh@ | ||
4583 | 367 | intltool__v_merge_options_ = @intltool__v_merge_options_@ | ||
4584 | 368 | intltool__v_merge_options_0 = @intltool__v_merge_options_0@ | ||
4585 | 369 | libdir = @libdir@ | ||
4586 | 370 | libexecdir = @libexecdir@ | ||
4587 | 371 | localedir = @localedir@ | ||
4588 | 372 | localstatedir = @localstatedir@ | ||
4589 | 373 | mandir = @mandir@ | ||
4590 | 374 | mkdir_p = @mkdir_p@ | ||
4591 | 375 | oldincludedir = @oldincludedir@ | ||
4592 | 376 | pdfdir = @pdfdir@ | ||
4593 | 377 | pixmapsdir = @pixmapsdir@ | ||
4594 | 378 | prefix = @prefix@ | ||
4595 | 379 | program_transform_name = @program_transform_name@ | ||
4596 | 380 | psdir = @psdir@ | ||
4597 | 381 | sbindir = @sbindir@ | ||
4598 | 382 | sharedstatedir = @sharedstatedir@ | ||
4599 | 383 | srcdir = @srcdir@ | ||
4600 | 384 | sysconfdir = @sysconfdir@ | ||
4601 | 385 | target_alias = @target_alias@ | ||
4602 | 386 | top_build_prefix = @top_build_prefix@ | ||
4603 | 387 | top_builddir = @top_builddir@ | ||
4604 | 388 | top_srcdir = @top_srcdir@ | ||
4605 | 389 | EXTRA_DIST = \ | ||
4606 | 390 | $(gtkrc_DATA) | ||
4607 | 391 | |||
4608 | 392 | gtkrc_DATA = \ | ||
4609 | 393 | parole.gtkrc | ||
4610 | 394 | |||
4611 | 395 | all: all-am | ||
4612 | 396 | |||
4613 | 397 | .SUFFIXES: | ||
4614 | 398 | $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | ||
4615 | 399 | @for dep in $?; do \ | ||
4616 | 400 | case '$(am__configure_deps)' in \ | ||
4617 | 401 | *$$dep*) \ | ||
4618 | 402 | ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ | ||
4619 | 403 | && { if test -f $@; then exit 0; else break; fi; }; \ | ||
4620 | 404 | exit 1;; \ | ||
4621 | 405 | esac; \ | ||
4622 | 406 | done; \ | ||
4623 | 407 | echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/gtk-2.0/Makefile'; \ | ||
4624 | 408 | $(am__cd) $(top_srcdir) && \ | ||
4625 | 409 | $(AUTOMAKE) --gnu data/gtk-2.0/Makefile | ||
4626 | 410 | .PRECIOUS: Makefile | ||
4627 | 411 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
4628 | 412 | @case '$?' in \ | ||
4629 | 413 | *config.status*) \ | ||
4630 | 414 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ | ||
4631 | 415 | *) \ | ||
4632 | 416 | echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ | ||
4633 | 417 | cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ | ||
4634 | 418 | esac; | ||
4635 | 419 | |||
4636 | 420 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | ||
4637 | 421 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
4638 | 422 | |||
4639 | 423 | $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | ||
4640 | 424 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
4641 | 425 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | ||
4642 | 426 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
4643 | 427 | $(am__aclocal_m4_deps): | ||
4644 | 428 | |||
4645 | 429 | mostlyclean-libtool: | ||
4646 | 430 | -rm -f *.lo | ||
4647 | 431 | |||
4648 | 432 | clean-libtool: | ||
4649 | 433 | -rm -rf .libs _libs | ||
4650 | 434 | install-gtkrcDATA: $(gtkrc_DATA) | ||
4651 | 435 | @$(NORMAL_INSTALL) | ||
4652 | 436 | @list='$(gtkrc_DATA)'; test -n "$(gtkrcdir)" || list=; \ | ||
4653 | 437 | if test -n "$$list"; then \ | ||
4654 | 438 | echo " $(MKDIR_P) '$(DESTDIR)$(gtkrcdir)'"; \ | ||
4655 | 439 | $(MKDIR_P) "$(DESTDIR)$(gtkrcdir)" || exit 1; \ | ||
4656 | 440 | fi; \ | ||
4657 | 441 | for p in $$list; do \ | ||
4658 | 442 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | ||
4659 | 443 | echo "$$d$$p"; \ | ||
4660 | 444 | done | $(am__base_list) | \ | ||
4661 | 445 | while read files; do \ | ||
4662 | 446 | echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(gtkrcdir)'"; \ | ||
4663 | 447 | $(INSTALL_DATA) $$files "$(DESTDIR)$(gtkrcdir)" || exit $$?; \ | ||
4664 | 448 | done | ||
4665 | 449 | |||
4666 | 450 | uninstall-gtkrcDATA: | ||
4667 | 451 | @$(NORMAL_UNINSTALL) | ||
4668 | 452 | @list='$(gtkrc_DATA)'; test -n "$(gtkrcdir)" || list=; \ | ||
4669 | 453 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ | ||
4670 | 454 | dir='$(DESTDIR)$(gtkrcdir)'; $(am__uninstall_files_from_dir) | ||
4671 | 455 | tags TAGS: | ||
4672 | 456 | |||
4673 | 457 | ctags CTAGS: | ||
4674 | 458 | |||
4675 | 459 | cscope cscopelist: | ||
4676 | 460 | |||
4677 | 461 | |||
4678 | 462 | distdir: $(DISTFILES) | ||
4679 | 463 | @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | ||
4680 | 464 | topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | ||
4681 | 465 | list='$(DISTFILES)'; \ | ||
4682 | 466 | dist_files=`for file in $$list; do echo $$file; done | \ | ||
4683 | 467 | sed -e "s|^$$srcdirstrip/||;t" \ | ||
4684 | 468 | -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ | ||
4685 | 469 | case $$dist_files in \ | ||
4686 | 470 | */*) $(MKDIR_P) `echo "$$dist_files" | \ | ||
4687 | 471 | sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ | ||
4688 | 472 | sort -u` ;; \ | ||
4689 | 473 | esac; \ | ||
4690 | 474 | for file in $$dist_files; do \ | ||
4691 | 475 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | ||
4692 | 476 | if test -d $$d/$$file; then \ | ||
4693 | 477 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | ||
4694 | 478 | if test -d "$(distdir)/$$file"; then \ | ||
4695 | 479 | find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
4696 | 480 | fi; \ | ||
4697 | 481 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | ||
4698 | 482 | cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ | ||
4699 | 483 | find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
4700 | 484 | fi; \ | ||
4701 | 485 | cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ | ||
4702 | 486 | else \ | ||
4703 | 487 | test -f "$(distdir)/$$file" \ | ||
4704 | 488 | || cp -p $$d/$$file "$(distdir)/$$file" \ | ||
4705 | 489 | || exit 1; \ | ||
4706 | 490 | fi; \ | ||
4707 | 491 | done | ||
4708 | 492 | check-am: all-am | ||
4709 | 493 | check: check-am | ||
4710 | 494 | all-am: Makefile $(DATA) | ||
4711 | 495 | installdirs: | ||
4712 | 496 | for dir in "$(DESTDIR)$(gtkrcdir)"; do \ | ||
4713 | 497 | test -z "$$dir" || $(MKDIR_P) "$$dir"; \ | ||
4714 | 498 | done | ||
4715 | 499 | install: install-am | ||
4716 | 500 | install-exec: install-exec-am | ||
4717 | 501 | install-data: install-data-am | ||
4718 | 502 | uninstall: uninstall-am | ||
4719 | 503 | |||
4720 | 504 | install-am: all-am | ||
4721 | 505 | @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am | ||
4722 | 506 | |||
4723 | 507 | installcheck: installcheck-am | ||
4724 | 508 | install-strip: | ||
4725 | 509 | if test -z '$(STRIP)'; then \ | ||
4726 | 510 | $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
4727 | 511 | install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
4728 | 512 | install; \ | ||
4729 | 513 | else \ | ||
4730 | 514 | $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
4731 | 515 | install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
4732 | 516 | "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
4733 | 517 | fi | ||
4734 | 518 | mostlyclean-generic: | ||
4735 | 519 | |||
4736 | 520 | clean-generic: | ||
4737 | 521 | |||
4738 | 522 | distclean-generic: | ||
4739 | 523 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | ||
4740 | 524 | -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) | ||
4741 | 525 | |||
4742 | 526 | maintainer-clean-generic: | ||
4743 | 527 | @echo "This command is intended for maintainers to use" | ||
4744 | 528 | @echo "it deletes files that may require special tools to rebuild." | ||
4745 | 529 | clean: clean-am | ||
4746 | 530 | |||
4747 | 531 | clean-am: clean-generic clean-libtool mostlyclean-am | ||
4748 | 532 | |||
4749 | 533 | distclean: distclean-am | ||
4750 | 534 | -rm -f Makefile | ||
4751 | 535 | distclean-am: clean-am distclean-generic | ||
4752 | 536 | |||
4753 | 537 | dvi: dvi-am | ||
4754 | 538 | |||
4755 | 539 | dvi-am: | ||
4756 | 540 | |||
4757 | 541 | html: html-am | ||
4758 | 542 | |||
4759 | 543 | html-am: | ||
4760 | 544 | |||
4761 | 545 | info: info-am | ||
4762 | 546 | |||
4763 | 547 | info-am: | ||
4764 | 548 | |||
4765 | 549 | install-data-am: install-gtkrcDATA | ||
4766 | 550 | |||
4767 | 551 | install-dvi: install-dvi-am | ||
4768 | 552 | |||
4769 | 553 | install-dvi-am: | ||
4770 | 554 | |||
4771 | 555 | install-exec-am: | ||
4772 | 556 | |||
4773 | 557 | install-html: install-html-am | ||
4774 | 558 | |||
4775 | 559 | install-html-am: | ||
4776 | 560 | |||
4777 | 561 | install-info: install-info-am | ||
4778 | 562 | |||
4779 | 563 | install-info-am: | ||
4780 | 564 | |||
4781 | 565 | install-man: | ||
4782 | 566 | |||
4783 | 567 | install-pdf: install-pdf-am | ||
4784 | 568 | |||
4785 | 569 | install-pdf-am: | ||
4786 | 570 | |||
4787 | 571 | install-ps: install-ps-am | ||
4788 | 572 | |||
4789 | 573 | install-ps-am: | ||
4790 | 574 | |||
4791 | 575 | installcheck-am: | ||
4792 | 576 | |||
4793 | 577 | maintainer-clean: maintainer-clean-am | ||
4794 | 578 | -rm -f Makefile | ||
4795 | 579 | maintainer-clean-am: distclean-am maintainer-clean-generic | ||
4796 | 580 | |||
4797 | 581 | mostlyclean: mostlyclean-am | ||
4798 | 582 | |||
4799 | 583 | mostlyclean-am: mostlyclean-generic mostlyclean-libtool | ||
4800 | 584 | |||
4801 | 585 | pdf: pdf-am | ||
4802 | 586 | |||
4803 | 587 | pdf-am: | ||
4804 | 588 | |||
4805 | 589 | ps: ps-am | ||
4806 | 590 | |||
4807 | 591 | ps-am: | ||
4808 | 592 | |||
4809 | 593 | uninstall-am: uninstall-gtkrcDATA | ||
4810 | 594 | |||
4811 | 595 | .MAKE: install-am install-strip | ||
4812 | 596 | |||
4813 | 597 | .PHONY: all all-am check check-am clean clean-generic clean-libtool \ | ||
4814 | 598 | cscopelist-am ctags-am distclean distclean-generic \ | ||
4815 | 599 | distclean-libtool distdir dvi dvi-am html html-am info info-am \ | ||
4816 | 600 | install install-am install-data install-data-am install-dvi \ | ||
4817 | 601 | install-dvi-am install-exec install-exec-am install-gtkrcDATA \ | ||
4818 | 602 | install-html install-html-am install-info install-info-am \ | ||
4819 | 603 | install-man install-pdf install-pdf-am install-ps \ | ||
4820 | 604 | install-ps-am install-strip installcheck installcheck-am \ | ||
4821 | 605 | installdirs maintainer-clean maintainer-clean-generic \ | ||
4822 | 606 | mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ | ||
4823 | 607 | ps ps-am tags-am uninstall uninstall-am uninstall-gtkrcDATA | ||
4824 | 608 | |||
4825 | 609 | |||
4826 | 610 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | ||
4827 | 611 | # Otherwise a system limit (for SysV at least) may be exceeded. | ||
4828 | 612 | .NOEXPORT: | ||
4829 | 613 | 0 | ||
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 | 1 | style "parole-fullscreen" | ||
4835 | 2 | { | ||
4836 | 3 | fg[NORMAL] = "#EEEEEE" | ||
4837 | 4 | fg[PRELIGHT] = "#FFFFFF" | ||
4838 | 5 | |||
4839 | 6 | bg[NORMAL] = "#000000" | ||
4840 | 7 | bg[ACTIVE] = "#6D6D6D" | ||
4841 | 8 | bg[PRELIGHT] = "#505050" | ||
4842 | 9 | bg[SELECTED] = "#398EE7" | ||
4843 | 10 | bg[INSENSITIVE] = "#C4C4C4" | ||
4844 | 11 | } | ||
4845 | 12 | |||
4846 | 13 | style "parole-scale" = "parole-fullscreen" | ||
4847 | 14 | { | ||
4848 | 15 | bg[NORMAL] = "#CECECE" | ||
4849 | 16 | } | ||
4850 | 17 | |||
4851 | 18 | widget "*ParoleFullscreen*" style "parole-fullscreen" | ||
4852 | 19 | widget "*ParoleFullscreen*ParoleScale*" style "parole-scale" | ||
4853 | 20 | 0 | ||
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 | 1 | EXTRA_DIST = \ | ||
4860 | 2 | $(Data_DATA) | ||
4861 | 3 | |||
4862 | 4 | Datadir = $(datadir)/icons/hicolor/128x128/apps | ||
4863 | 5 | |||
4864 | 6 | Data_DATA = \ | ||
4865 | 7 | parole.png | ||
4866 | 0 | 8 | ||
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 | 1 | # Makefile.in generated by automake 1.14.1 from Makefile.am. | ||
4872 | 2 | # @configure_input@ | ||
4873 | 3 | |||
4874 | 4 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. | ||
4875 | 5 | |||
4876 | 6 | # This Makefile.in is free software; the Free Software Foundation | ||
4877 | 7 | # gives unlimited permission to copy and/or distribute it, | ||
4878 | 8 | # with or without modifications, as long as this notice is preserved. | ||
4879 | 9 | |||
4880 | 10 | # This program is distributed in the hope that it will be useful, | ||
4881 | 11 | # but WITHOUT ANY WARRANTY, to the extent permitted by law; without | ||
4882 | 12 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||
4883 | 13 | # PARTICULAR PURPOSE. | ||
4884 | 14 | |||
4885 | 15 | @SET_MAKE@ | ||
4886 | 16 | |||
4887 | 17 | VPATH = @srcdir@ | ||
4888 | 18 | am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' | ||
4889 | 19 | am__make_running_with_option = \ | ||
4890 | 20 | case $${target_option-} in \ | ||
4891 | 21 | ?) ;; \ | ||
4892 | 22 | *) echo "am__make_running_with_option: internal error: invalid" \ | ||
4893 | 23 | "target option '$${target_option-}' specified" >&2; \ | ||
4894 | 24 | exit 1;; \ | ||
4895 | 25 | esac; \ | ||
4896 | 26 | has_opt=no; \ | ||
4897 | 27 | sane_makeflags=$$MAKEFLAGS; \ | ||
4898 | 28 | if $(am__is_gnu_make); then \ | ||
4899 | 29 | sane_makeflags=$$MFLAGS; \ | ||
4900 | 30 | else \ | ||
4901 | 31 | case $$MAKEFLAGS in \ | ||
4902 | 32 | *\\[\ \ ]*) \ | ||
4903 | 33 | bs=\\; \ | ||
4904 | 34 | sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ | ||
4905 | 35 | | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ | ||
4906 | 36 | esac; \ | ||
4907 | 37 | fi; \ | ||
4908 | 38 | skip_next=no; \ | ||
4909 | 39 | strip_trailopt () \ | ||
4910 | 40 | { \ | ||
4911 | 41 | flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ | ||
4912 | 42 | }; \ | ||
4913 | 43 | for flg in $$sane_makeflags; do \ | ||
4914 | 44 | test $$skip_next = yes && { skip_next=no; continue; }; \ | ||
4915 | 45 | case $$flg in \ | ||
4916 | 46 | *=*|--*) continue;; \ | ||
4917 | 47 | -*I) strip_trailopt 'I'; skip_next=yes;; \ | ||
4918 | 48 | -*I?*) strip_trailopt 'I';; \ | ||
4919 | 49 | -*O) strip_trailopt 'O'; skip_next=yes;; \ | ||
4920 | 50 | -*O?*) strip_trailopt 'O';; \ | ||
4921 | 51 | -*l) strip_trailopt 'l'; skip_next=yes;; \ | ||
4922 | 52 | -*l?*) strip_trailopt 'l';; \ | ||
4923 | 53 | -[dEDm]) skip_next=yes;; \ | ||
4924 | 54 | -[JT]) skip_next=yes;; \ | ||
4925 | 55 | esac; \ | ||
4926 | 56 | case $$flg in \ | ||
4927 | 57 | *$$target_option*) has_opt=yes; break;; \ | ||
4928 | 58 | esac; \ | ||
4929 | 59 | done; \ | ||
4930 | 60 | test $$has_opt = yes | ||
4931 | 61 | am__make_dryrun = (target_option=n; $(am__make_running_with_option)) | ||
4932 | 62 | am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) | ||
4933 | 63 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
4934 | 64 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
4935 | 65 | pkglibdir = $(libdir)/@PACKAGE@ | ||
4936 | 66 | pkglibexecdir = $(libexecdir)/@PACKAGE@ | ||
4937 | 67 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
4938 | 68 | install_sh_DATA = $(install_sh) -c -m 644 | ||
4939 | 69 | install_sh_PROGRAM = $(install_sh) -c | ||
4940 | 70 | install_sh_SCRIPT = $(install_sh) -c | ||
4941 | 71 | INSTALL_HEADER = $(INSTALL_DATA) | ||
4942 | 72 | transform = $(program_transform_name) | ||
4943 | 73 | NORMAL_INSTALL = : | ||
4944 | 74 | PRE_INSTALL = : | ||
4945 | 75 | POST_INSTALL = : | ||
4946 | 76 | NORMAL_UNINSTALL = : | ||
4947 | 77 | PRE_UNINSTALL = : | ||
4948 | 78 | POST_UNINSTALL = : | ||
4949 | 79 | build_triplet = @build@ | ||
4950 | 80 | host_triplet = @host@ | ||
4951 | 81 | subdir = data/icons/128x128 | ||
4952 | 82 | DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am | ||
4953 | 83 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | ||
4954 | 84 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac | ||
4955 | 85 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | ||
4956 | 86 | $(ACLOCAL_M4) | ||
4957 | 87 | mkinstalldirs = $(install_sh) -d | ||
4958 | 88 | CONFIG_HEADER = $(top_builddir)/config.h | ||
4959 | 89 | CONFIG_CLEAN_FILES = | ||
4960 | 90 | CONFIG_CLEAN_VPATH_FILES = | ||
4961 | 91 | AM_V_P = $(am__v_P_@AM_V@) | ||
4962 | 92 | am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) | ||
4963 | 93 | am__v_P_0 = false | ||
4964 | 94 | am__v_P_1 = : | ||
4965 | 95 | AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
4966 | 96 | am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
4967 | 97 | am__v_GEN_0 = @echo " GEN " $@; | ||
4968 | 98 | am__v_GEN_1 = | ||
4969 | 99 | AM_V_at = $(am__v_at_@AM_V@) | ||
4970 | 100 | am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
4971 | 101 | am__v_at_0 = @ | ||
4972 | 102 | am__v_at_1 = | ||
4973 | 103 | SOURCES = | ||
4974 | 104 | DIST_SOURCES = | ||
4975 | 105 | am__can_run_installinfo = \ | ||
4976 | 106 | case $$AM_UPDATE_INFO_DIR in \ | ||
4977 | 107 | n|no|NO) false;; \ | ||
4978 | 108 | *) (install-info --version) >/dev/null 2>&1;; \ | ||
4979 | 109 | esac | ||
4980 | 110 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; | ||
4981 | 111 | am__vpath_adj = case $$p in \ | ||
4982 | 112 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ | ||
4983 | 113 | *) f=$$p;; \ | ||
4984 | 114 | esac; | ||
4985 | 115 | am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; | ||
4986 | 116 | am__install_max = 40 | ||
4987 | 117 | am__nobase_strip_setup = \ | ||
4988 | 118 | srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` | ||
4989 | 119 | am__nobase_strip = \ | ||
4990 | 120 | for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" | ||
4991 | 121 | am__nobase_list = $(am__nobase_strip_setup); \ | ||
4992 | 122 | for p in $$list; do echo "$$p $$p"; done | \ | ||
4993 | 123 | sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ | ||
4994 | 124 | $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ | ||
4995 | 125 | if (++n[$$2] == $(am__install_max)) \ | ||
4996 | 126 | { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ | ||
4997 | 127 | END { for (dir in files) print dir, files[dir] }' | ||
4998 | 128 | am__base_list = \ | ||
4999 | 129 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ | ||
5000 | 130 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
The diff has been truncated for viewing.
Thanks. Uploaded.