diff options
| author | Unknown Author <xfce4-dev@xfce.org> | 2004-02-28 17:23:59 +0000 |
|---|---|---|
| committer | Unknown Author <xfce4-dev@xfce.org> | 2004-02-28 17:23:59 +0000 |
| commit | e3a0f24f881418b1836731c18e6514ee2e0640bd (patch) | |
| tree | f3af5e2eccb3bb62796e0b7b18e4d74273c44097 | |
| parent | 3085ac6b22712986281a64b7b0783a335a473d36 (diff) | |
This commit was manufactured by cvs2svn to create tag 'xfce_4_0_4'.xfce-4.0.4
(Old svn revision: 3979)
| -rw-r--r-- | ChangeLog | 3761 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | Makefile.in | 249 | ||||
| -rw-r--r-- | NEWS | 15 | ||||
| -rw-r--r-- | aclocal.m4 | 2800 | ||||
| -rwxr-xr-x | compile | 105 | ||||
| -rwxr-xr-x | config.guess | 60 | ||||
| -rwxr-xr-x | config.sub | 75 | ||||
| -rwxr-xr-x | configure | 2947 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rwxr-xr-x | depcomp | 96 | ||||
| -rw-r--r-- | doc/C/Makefile.in | 149 | ||||
| -rw-r--r-- | doc/C/images/Makefile.in | 101 | ||||
| -rw-r--r-- | doc/C/xfce4-panel.html | 4 | ||||
| -rw-r--r-- | doc/Makefile.am | 4 | ||||
| -rw-r--r-- | doc/Makefile.in | 143 | ||||
| -rw-r--r-- | doc/fr/Makefile.am | 16 | ||||
| -rw-r--r-- | doc/fr/Makefile.in | 525 | ||||
| -rw-r--r-- | doc/fr/images/Makefile.am | 14 | ||||
| -rw-r--r-- | doc/fr/images/Makefile.in | 387 | ||||
| -rw-r--r-- | doc/fr/images/clock-properties.png | bin | 0 -> 10241 bytes | |||
| -rw-r--r-- | doc/fr/images/default_panel.png | bin | 0 -> 30259 bytes | |||
| -rw-r--r-- | doc/fr/images/handle-popup.png | bin | 0 -> 8397 bytes | |||
| -rw-r--r-- | doc/fr/images/item-popup.png | bin | 0 -> 3564 bytes | |||
| -rw-r--r-- | doc/fr/images/launcher-properties.png | bin | 0 -> 22374 bytes | |||
| -rw-r--r-- | doc/fr/images/mailcheck-properties.png | bin | 0 -> 17689 bytes | |||
| -rw-r--r-- | doc/fr/images/menuitem-properties.png | bin | 0 -> 22285 bytes | |||
| -rw-r--r-- | doc/fr/images/nooptions-properties.png | bin | 0 -> 8062 bytes | |||
| -rw-r--r-- | doc/fr/images/panel-settings.png | bin | 0 -> 21633 bytes | |||
| -rw-r--r-- | doc/fr/images/systembuttons-properties.png | bin | 0 -> 9571 bytes | |||
| -rw-r--r-- | doc/fr/xfce4-panel.html | 191 | ||||
| -rw-r--r-- | doc/fr/xfce4-panel.xml | 713 | ||||
| -rw-r--r-- | icons/Makefile.in | 88 | ||||
| -rw-r--r-- | icons/xfce4-panel-icon.h | 7 | ||||
| -rwxr-xr-x | install-sh | 462 | ||||
| -rw-r--r-- | ltmain.sh | 34 | ||||
| -rwxr-xr-x | missing | 58 | ||||
| -rwxr-xr-x | mkinstalldirs | 58 | ||||
| -rw-r--r-- | panel/Makefile.in | 501 | ||||
| -rw-r--r-- | panel/controls.c | 2 | ||||
| -rw-r--r-- | panel/controls_dialog.c | 21 | ||||
| -rw-r--r-- | panel/groups.c | 26 | ||||
| -rw-r--r-- | panel/groups.h | 4 | ||||
| -rw-r--r-- | panel/main.c | 91 | ||||
| -rw-r--r-- | panel/panel.c | 690 | ||||
| -rw-r--r-- | panel/popup.c | 95 | ||||
| -rw-r--r-- | panel/popup.h | 1 | ||||
| -rw-r--r-- | panel/xfce_support.c | 4 | ||||
| -rw-r--r-- | plugins/Makefile.in | 137 | ||||
| -rw-r--r-- | plugins/clock/Makefile.in | 208 | ||||
| -rw-r--r-- | plugins/mailcheck/Makefile.in | 208 | ||||
| -rw-r--r-- | plugins/pager/Makefile.in | 208 | ||||
| -rw-r--r-- | plugins/pager/pager.c | 14 | ||||
| -rw-r--r-- | plugins/separator/Makefile.in | 208 | ||||
| -rw-r--r-- | plugins/switcher/Makefile.in | 208 | ||||
| -rw-r--r-- | plugins/systembuttons/Makefile.in | 210 | ||||
| -rw-r--r-- | po/ChangeLog | 76 | ||||
| -rw-r--r-- | po/az.gmo | bin | 0 -> 6455 bytes | |||
| -rw-r--r-- | po/az.po | 483 | ||||
| -rw-r--r-- | po/ca.gmo | bin | 6999 -> 6999 bytes | |||
| -rw-r--r-- | po/ca.po | 16 | ||||
| -rw-r--r-- | po/cs.gmo | bin | 0 -> 6881 bytes | |||
| -rw-r--r-- | po/cs.po | 540 | ||||
| -rw-r--r-- | po/de.gmo | bin | 6802 -> 6802 bytes | |||
| -rw-r--r-- | po/de.po | 16 | ||||
| -rw-r--r-- | po/es.gmo | bin | 6967 -> 6284 bytes | |||
| -rw-r--r-- | po/es.po | 261 | ||||
| -rw-r--r-- | po/es_MX.gmo | bin | 6927 -> 6927 bytes | |||
| -rw-r--r-- | po/es_MX.po | 16 | ||||
| -rw-r--r-- | po/fa_IR.gmo | bin | 0 -> 7422 bytes | |||
| -rw-r--r-- | po/fa_IR.po | 484 | ||||
| -rw-r--r-- | po/fi.gmo | bin | 6880 -> 6880 bytes | |||
| -rw-r--r-- | po/fi.po | 16 | ||||
| -rw-r--r-- | po/fr.gmo | bin | 7032 -> 7032 bytes | |||
| -rw-r--r-- | po/fr.po | 16 | ||||
| -rw-r--r-- | po/hi.gmo | bin | 7461 -> 7461 bytes | |||
| -rw-r--r-- | po/hi.po | 16 | ||||
| -rw-r--r-- | po/hu.gmo | bin | 7130 -> 7130 bytes | |||
| -rw-r--r-- | po/hu.po | 16 | ||||
| -rw-r--r-- | po/ja.gmo | bin | 6821 -> 6821 bytes | |||
| -rw-r--r-- | po/ja.po | 16 | ||||
| -rw-r--r-- | po/ko.gmo | bin | 6094 -> 6834 bytes | |||
| -rw-r--r-- | po/ko.po | 25 | ||||
| -rw-r--r-- | po/lt.gmo | bin | 6931 -> 6931 bytes | |||
| -rw-r--r-- | po/lt.po | 16 | ||||
| -rw-r--r-- | po/ms.gmo | bin | 6642 -> 6642 bytes | |||
| -rw-r--r-- | po/ms.po | 16 | ||||
| -rw-r--r-- | po/nl.gmo | bin | 6717 -> 6717 bytes | |||
| -rw-r--r-- | po/nl.po | 16 | ||||
| -rw-r--r-- | po/no.gmo | bin | 0 -> 6164 bytes | |||
| -rw-r--r-- | po/no.po | 480 | ||||
| -rw-r--r-- | po/pl.gmo | bin | 6490 -> 6626 bytes | |||
| -rw-r--r-- | po/pl.po | 83 | ||||
| -rw-r--r-- | po/pt_BR.gmo | bin | 0 -> 6129 bytes | |||
| -rw-r--r-- | po/pt_BR.po | 480 | ||||
| -rw-r--r-- | po/pt_PT.gmo | bin | 7002 -> 7003 bytes | |||
| -rw-r--r-- | po/pt_PT.po | 41 | ||||
| -rw-r--r-- | po/ru.gmo | bin | 8317 -> 8317 bytes | |||
| -rw-r--r-- | po/ru.po | 16 | ||||
| -rw-r--r-- | po/sv.gmo | bin | 0 -> 6195 bytes | |||
| -rw-r--r-- | po/sv.po | 540 | ||||
| -rw-r--r-- | po/ta.gmo | bin | 7545 -> 10165 bytes | |||
| -rw-r--r-- | po/ta.po | 288 | ||||
| -rw-r--r-- | po/tr.gmo | bin | 6804 -> 6235 bytes | |||
| -rw-r--r-- | po/tr.po | 247 | ||||
| -rw-r--r-- | po/uk.gmo | bin | 0 -> 8414 bytes | |||
| -rw-r--r-- | po/uk.po | 540 | ||||
| -rw-r--r-- | po/vi.gmo | bin | 0 -> 7302 bytes | |||
| -rw-r--r-- | po/vi.po | 539 | ||||
| -rw-r--r-- | po/xfce4-panel.pot | 37 | ||||
| -rw-r--r-- | po/zh_CN.gmo | bin | 6566 -> 5897 bytes | |||
| -rw-r--r-- | po/zh_CN.po | 240 | ||||
| -rw-r--r-- | po/zh_TW.gmo | bin | 6667 -> 6667 bytes | |||
| -rwxr-xr-x | po/zh_TW.po | 16 | ||||
| -rw-r--r-- | settings/Makefile.in | 236 | ||||
| -rw-r--r-- | themes/Crystal/Makefile.in | 102 | ||||
| -rw-r--r-- | themes/Curve/Makefile.in | 101 | ||||
| -rw-r--r-- | themes/FreeIcons/Makefile.in | 91 | ||||
| -rw-r--r-- | themes/Gnome/Makefile.in | 101 | ||||
| -rw-r--r-- | themes/Makefile.in | 137 | ||||
| -rw-r--r-- | themes/Noia/Makefile.in | 102 | ||||
| -rw-r--r-- | themes/XFce/Makefile.in | 101 | ||||
| -rw-r--r-- | xfce4rc | 6 | ||||
| -rw-r--r-- | xfce4rc.az | 128 | ||||
| -rw-r--r-- | xfce4rc.ca | 24 | ||||
| -rw-r--r-- | xfce4rc.hu | 6 | ||||
| -rw-r--r-- | xfce4rc.nl | 6 | ||||
| -rw-r--r-- | xfce4rc.vi | 128 |
128 files changed, 13968 insertions, 8803 deletions
@@ -1,3495 +1,386 @@ -2003-09-14 huysmans +2004-01-03 21:54 olivier - * doc/C/: xfce4-panel.html, xfce4-panel.xml: Documentation updates + * po/: pl.gmo, pl.po: Fix Polish translation from Daniel Mróz + <beorn@alpha.pl> -2003-09-14 xfce +2003-12-29 16:20 olivier - * ChangeLog: Update ChangeLog + * ChangeLog, configure, configure.ac, po/no.gmo, po/no.po: Update + version number, Update ChangeLog Fix missing CHARSET in potfiles -2003-09-13 huysmans +2003-12-29 13:16 jasper - * xfce4rc.hu: Fix hungarian translated config files + * configure, configure.ac, po/no.gmo, po/no.po, po/tr.gmo, + po/tr.po: Update Norwegian and Turkish translations -2003-09-10 huysmans +2003-12-28 21:28 olivier - * ChangeLog: Update ChangeLogs + * po/xfce4-panel.pot: Fix removal of properties on unframed windows -2003-09-10 huysmans +2003-12-27 22:52 jasper - * configure, configure.ac, po/ca.gmo, po/ca.po, po/de.gmo, - po/de.po, po/es.gmo, po/es.po, po/es_MX.gmo, po/es_MX.po, - po/fi.gmo, po/fi.po, po/fr.gmo, po/fr.po, po/hi.gmo, po/hi.po, - po/hu.gmo, po/hu.po, po/ja.gmo, po/ja.po, po/ko.gmo, po/ko.po, - po/lt.gmo, po/lt.po, po/ms.gmo, po/ms.po, po/nl.gmo, po/nl.po, - po/pl.gmo, po/pl.po, po/ru.gmo, po/ru.po, po/ta.gmo, po/ta.po, - po/tr.gmo, po/tr.po, po/xfce4-panel.pot, po/zh_CN.gmo, po/zh_CN.po, - po/zh_TW.gmo, po/zh_TW.po: Update version numbers and po files for - release + * po/: pl.gmo, pl.po: Update Polish translations -2003-09-08 huysmans +2003-12-18 00:00 olivier - * po/: ru.gmo, ru.po: Update russian translations + * ChangeLog: Update ChangeLog(s) -2003-09-05 huysmans +2003-12-16 09:21 jasper - * panel/item_dialog.c: Fix crash introduced with last cosmetic - change. Some self-punishment is in order. + * Makefile.am, Makefile.in, xfce4rc.az: Add Azerbaijani + translations -2003-09-04 huysmans +2003-12-15 22:35 jasper - * panel/item_dialog.c: Small aesthetic adjustment + * configure, configure.ac, po/az.gmo, po/az.po: Add Azerbaijani + translations -2003-09-03 huysmans +2003-12-06 22:12 jasper - * panel/: global.h, item_dialog.c, popup.c, popup.h: Small tweaks - to popup positioning + * ChangeLog, configure, configure.ac, panel/panel.c: Fix + positioning when screen size is different from previous session -2003-09-02 huysmans +2003-12-06 17:04 jasper - * po/: ms.gmo, ms.po: Update malaysian translations + * panel/popup.c: Fix panel crash when removing an item with a + detached menu -2003-08-30 huysmans +2003-12-01 12:49 jasper - * Makefile.am, Makefile.in, aclocal.m4, configure, configure.ac, - po/zh_TW.Big5.gmo, po/zh_TW.Big5.po, po/zh_TW.gmo, po/zh_TW.po: - Rename zh_TW.Big5 -> zh_TW + * Makefile.am, Makefile.in, xfce4rc.vi: Update vietnamese + translations -2003-08-30 huysmans +2003-12-01 12:42 jasper - * po/: zh_TW.Big5.gmo, zh_TW.Big5.po: Add traditional chinese - translations + * panel/xfce_support.c: Fix bug with XFCE_DISABLE_USER_CONFIG -2003-08-30 huysmans +2003-12-01 12:04 jasper - * xfce4rc.hu: Add hungarian config files + * xfce4rc.ca: Update catalan translations (2) -2003-08-26 huysmans +2003-11-17 16:08 jasper - * ChangeLog: Update changelogs + * panel/xfce_support.c: Check for cmd != NULL when executing + commands -2003-08-26 huysmans +2003-11-16 09:44 jasper - * po/: ca.gmo, ca.po, de.gmo, de.po, es.gmo, es.po, es_MX.gmo, - es_MX.po, fi.gmo, fi.po, fr.gmo, fr.po, hi.gmo, hi.po, hu.gmo, - hu.po, ja.gmo, ja.po, ko.gmo, ko.po, lt.gmo, lt.po, ms.gmo, ms.po, - nl.gmo, nl.po, pl.gmo, pl.po, ru.gmo, ru.po, ta.gmo, ta.po, tr.gmo, - tr.po, xfce4-panel.pot, zh_CN.gmo, zh_CN.po: Update version numbers - and po files for release + * po/: cs.gmo, cs.po: Update Czech translations -2003-08-26 huysmans +2003-11-12 08:02 jasper - * panel/popup.c: Add debuging statement + * po/: ca.gmo, de.gmo, es.gmo, es_MX.gmo, fi.gmo, fr.gmo, hi.gmo, + hu.gmo, ja.gmo, ko.gmo, lt.gmo, ms.gmo, nl.gmo, pl.gmo, + pt_PT.gmo, ru.gmo, sv.gmo, ta.gmo, tr.gmo, uk.gmo, vi.gmo, + zh_CN.gmo, zh_TW.gmo: Forgot gmo files update -2003-08-17 huysmans +2003-11-11 19:35 jasper - * panel/: item_dialog.c, popup.c, popup.h: Tweak popup positioning + * po/: ca.po, cs.po, de.po, es.po, es_MX.po, fi.po, fr.po, hi.po, + hu.po, ja.po, ko.po, lt.po, ms.po, nl.po, pl.po, pt_PT.po, ru.po, + sv.po, ta.po, tr.po, uk.po, vi.po, zh_CN.po, zh_TW.po: Update po + files, just in case something changed ... -2003-08-17 huysmans +2003-11-09 20:09 jasper - * configure, configure.ac, po/lt.gmo, po/lt.po: Add lithuanian - translations + * configure, configure.ac, po/cs.gmo, po/cs.po: Add Check + translations -2003-08-14 xfce +2003-11-08 10:29 jasper - * po/xfce4-panel.pot: Resync with cvs + * doc/fr/images/: menuitem-properties.png, + menuitems-properties.png: correct wrong image name -2003-08-11 huysmans +2003-11-07 22:09 jasper - * panel/main.c: Close menu before restarting + * configure, configure.ac, doc/Makefile.am, doc/Makefile.in, + doc/C/xfce4-panel.html, doc/fr/Makefile.am, doc/fr/Makefile.in, + doc/fr/xfce4-panel.html, doc/fr/xfce4-panel.xml, + doc/fr/images/Makefile.am, doc/fr/images/Makefile.in, + doc/fr/images/clock-properties.png, + doc/fr/images/default_panel.png, doc/fr/images/handle-popup.png, + doc/fr/images/item-popup.png, + doc/fr/images/launcher-properties.png, + doc/fr/images/mailcheck-properties.png, + doc/fr/images/menuitems-properties.png, + doc/fr/images/nooptions-properties.png, + doc/fr/images/panel-settings.png, + doc/fr/images/systembuttons-properties.png, po/xfce4-panel.pot: + Add French documentation -2003-08-08 huysmans +2003-11-05 17:23 jasper - * Makefile.am, Makefile.in: bleh, silly typo. + * panel/main.c: Make SIGUSR2 quit with confirmation -2003-08-08 huysmans +2003-11-03 19:06 jasper - * Makefile.am, Makefile.in, xfce4rc.ca: Update catalan translations + * configure, configure.ac, po/uk.gmo, po/uk.po: Add Ukranian + translations -2003-08-07 huysmans +2003-11-01 15:16 olivier - * panel/xfce_support.c: Make i18n work + * icons/xfce4-panel-icon.h: Set version to 4.0.1 -2003-08-05 huysmans +2003-10-25 00:31 jasper - * po/: de.gmo, de.po: Updated german translations + * configure, configure.ac, po/vi.gmo, po/vi.po: + Add vietnamese translations by Lam Vinh Nien <nienvl@yahoo.ca>. -2003-08-05 huysmans +2003-10-23 15:07 jasper - * Makefile.am, Makefile.in, xfce4rc, xfce4rc.nl: Add dutch xfce4rc - file + * panel/: controls.c, main.c: Use execlp to restart panel. Fixes + problem with newly installed plugins not showing up in menu as + well. -2003-08-04 xfce +2003-10-21 12:03 jasper - * aclocal.m4, configure, configure.ac, po/ko.gmo, po/ko.po: Add - Korean translation from ByungHyun Choi <byunghyunchoi@hotmail.com> + * panel/main.c: Don't forget to save on SIGHUP (X exit) -2003-08-03 bmeurer +2003-10-17 18:32 jasper - * ChangeLog: Updated ChangeLogs + * configure, configure.ac, po/sv.gmo, po/sv.po: Add/update swedish + translations -2003-08-03 bmeurer +2003-10-15 13:20 jasper - * m4/X11.m4: grep -q does not work with Solaris grep, fixed it. + * po/: ko.gmo, ko.po: Update korean translations -2003-07-31 huysmans +2003-10-13 23:26 olivier - * xfce4rc: most people will not have their mail in - /var/spool/ofourdan ;-) + * xfce4rc.ca, xfce4rc.hu, xfce4rc.nl: Apply changes from my local + tree -2003-07-31 huysmans +2003-10-13 20:30 jasper - * panel/: controls_dialog.c, controls_dialog.h, item_dialog.c, - item_dialog.h, main.c: Fix SIGUSR1 handling when there are open - dialogs - -2003-07-30 huysmans - - * ChangeLog: Update changlogs - -2003-07-30 huysmans - - * config.h.in, configure, configure.ac, po/ca.gmo, po/ca.po, - po/de.gmo, po/de.po, po/es.gmo, po/es.po, po/es_MX.gmo, - po/es_MX.po, po/fi.gmo, po/fi.po, po/fr.gmo, po/fr.po, po/hi.gmo, - po/hi.po, po/hu.gmo, po/hu.po, po/ja.gmo, po/ja.po, po/ms.gmo, - po/ms.po, po/nl.gmo, po/nl.po, po/pl.gmo, po/pl.po, po/ru.gmo, - po/ru.po, po/ta.gmo, po/ta.po, po/tr.gmo, po/tr.po, - po/xfce4-panel.pot, po/zh_CN.gmo, po/zh_CN.po: Update version - numbers and po files for release - -2003-07-29 huysmans - - * doc/C/: xfce4-panel.html, xfce4-panel.xml: Update documentation - to latest versions - -2003-07-29 huysmans - - * doc/C/images/: clock-properties.png, default_panel.png, - handle-popup.png, item-popup.png, launcher-properties.png, - mailcheck-properties.png, menuitem-properties.png, - nooptions-properties.png, panel-settings.png, - systembuttons-properties.png: Update all images to new defaults - -2003-07-29 huysmans - - * po/: ru.gmo, ru.po: Update russian translations - -2003-07-27 huysmans - - * panel/panel.c: Don't place hidden panel outside the screen - -2003-07-26 xfce - - * ChangeLog: Update ChangeLog - -2003-07-26 xfce - - * panel/panel.c: Bugfix: panel loosing EWMH attibuts (skip pager, - skip taskbar, layer, etc) when changing orientation - -2003-07-26 huysmans - - * configure, configure.ac, panel/panel.c, po/xfce4-panel.pot: Fix - autohide bug, I hope - -2003-07-25 xfce - - * panel/panel.c: Remove most of the pending events processing - (where I felt it was not ncessary) Save panel config after a move - or a set_position() so that panel pos get saved. - -2003-07-25 huysmans - - * panel/panel.c: Add some debugging statements - -2003-07-25 huysmans - - * configure, configure.ac, panel/panel.c, po/xfce4-panel.pot, - settings/xfce_settings_dialog.c: More positioning changes - -2003-07-25 huysmans - - * NEWS, configure, configure.ac, po/xfce4-panel.pot, - settings/xfce_settings_dialog.c: Tweaks. startup autohide is still - a problem - -2003-07-25 huysmans - - * plugins/systembuttons/systembuttons.c: Fix some warnings - -2003-07-25 huysmans - - * panel/item_dialog.c, panel/panel.c, - settings/xfce_settings_dialog.c: Try to fix orientation change and - hiding direction on startup - -2003-07-24 huysmans - - * po/: fi.gmo, fi.po: Update finnish translations - -2003-07-23 huysmans - - * plugins/systembuttons/systembuttons.c: Fix systembuttons. Trivial - -2003-07-22 xfce - - * xfce4rc: Fix SN being set on xfterm and mozilla by default - -2003-07-22 xfce - - * xfce4rc: Change defaults - -2003-07-19 huysmans - - * ChangeLog: Update ChangeLogs - -2003-07-19 huysmans - - * configure, configure.ac, po/ca.gmo, po/ca.po, po/de.gmo, - po/de.po, po/es.gmo, po/es.po, po/es_MX.gmo, po/es_MX.po, - po/fi.gmo, po/fi.po, po/fr.gmo, po/fr.po, po/hi.gmo, po/hi.po, - po/hu.gmo, po/hu.po, po/ja.gmo, po/ja.po, po/ms.gmo, po/ms.po, - po/nl.gmo, po/nl.po, po/pl.gmo, po/pl.po, po/ru.gmo, po/ru.po, - po/ta.gmo, po/ta.po, po/tr.gmo, po/tr.po, po/xfce4-panel.pot, - po/zh_CN.gmo, po/zh_CN.po: Update version numbers and po files for - release - -2003-07-18 huysmans - - * xfce4rc: Update default config - -2003-07-18 bmeurer - - * panel/item.c: Fixed item.c - -2003-07-18 bmeurer - - * ChangeLog, configure, configure.ac, panel/item.c: Update version - so panel plugins will fail at configure time instead of compile - time. - -2003-07-18 huysmans - - * panel/controls.c, panel/controls.h, panel/controls_dialog.c, - panel/item.c, panel/item_dialog.c, panel/item_dialog.h, - panel/plugins.h, plugins/clock/clock.c, - plugins/mailcheck/mailcheck.c, - plugins/systembuttons/systembuttons.c: Change panel API again to - prevent old plugins to crah the panel - -2003-07-18 huysmans - - * po/: hu.gmo, hu.po: Update hungarian translations - -2003-07-18 huysmans - - * po/: tr.gmo, tr.po: Update turkish translations - -2003-07-17 huysmans - - * doc/C/xfce4-panel.html, doc/C/xfce4-panel.xml, panel/item.c, - panel/main.c: Add menu popup from laucher patch and updated - documentation. - -2003-07-17 huysmans - - * icons/: xfce4-panel-icon.h, xfce4-panel.png: Tweak panel icon - -2003-07-16 huysmans - - * po/: ru.gmo, ru.po: Update russian translations - -2003-07-16 huysmans - - * configure, configure.ac, po/hu.gmo, po/hu.po, po/zh_CN.gmo, - po/zh_CN.po: Add hungarian translations - -2003-07-13 huysmans - - * ChangeLog: Update ChangeLogs for release - -2003-07-11 huysmans - - * ChangeLog: Update ChangeLog's for release - -2003-07-11 huysmans - - * po/: zh_CN.gmo, zh_CN.po: Update Chinese translations - -2003-07-10 huysmans - - * ChangeLog: Update ChangeLog's for release - -2003-07-10 huysmans - - * configure, configure.ac, po/ca.gmo, po/ca.po, po/de.gmo, - po/de.po, po/es.gmo, po/es.po, po/es_MX.gmo, po/es_MX.po, - po/fi.gmo, po/fi.po, po/fr.gmo, po/fr.po, po/hi.gmo, po/hi.po, - po/ja.gmo, po/ja.po, po/ms.gmo, po/ms.po, po/nl.gmo, po/nl.po, - po/pl.gmo, po/pl.po, po/ru.gmo, po/ru.po, po/ta.gmo, po/ta.po, - po/tr.gmo, po/tr.po, po/xfce4-panel.pot, po/zh_CN.gmo, po/zh_CN.po: - Bump version numbers for release and update po files - -2003-07-09 huysmans - - * xfce4rc: Tweak default config - -2003-07-09 huysmans - - * plugins/switcher/switcher.c: Remove separators from desktop - switcher as well - -2003-07-09 huysmans - - * doc/C/xfce4-panel.xml: Forgot the xml file - -2003-07-09 huysmans - - * doc/C/xfce4-panel.html: Remove reference to ... buttons - -2003-07-09 huysmans - - * doc/C/images/: clock-properties.png, launcher-properties.png, - mailcheck-properties.png, menuitem-properties.png, - nooptions-properties.png, systembuttons-properties.png: Update - images to reflect new item dialogs - -2003-07-09 huysmans - - * ChangeLog, NEWS: Update ChangeLog and NEWS - -2003-07-09 huysmans - - * configure, configure.ac, panel/controls.c, panel/controls.h, - panel/controls_dialog.c, panel/controls_dialog.h, - panel/item_dialog.c, panel/item_dialog.h, panel/plugins.h, - plugins/clock/clock.c, plugins/mailcheck/mailcheck.c, - plugins/systembuttons/systembuttons.c, po/ca.gmo, po/ca.po, - po/de.gmo, po/de.po, po/es.gmo, po/es.po, po/es_MX.gmo, - po/es_MX.po, po/fi.gmo, po/fi.po, po/fr.gmo, po/fr.po, po/hi.gmo, - po/hi.po, po/ja.gmo, po/ja.po, po/ms.gmo, po/ms.po, po/nl.gmo, - po/nl.po, po/pl.gmo, po/pl.po, po/ru.gmo, po/ru.po, po/ta.gmo, - po/ta.po, po/tr.gmo, po/tr.po, po/xfce4-panel.pot, po/zh_CN.gmo, - po/zh_CN.po: Big internal changes. Remove revert button from item - dialogs; this also affects plugin API. API version increased - -2003-07-08 huysmans - - * panel/panel.c: Size tweak - -2003-07-08 huysmans - - * panel/item.c: Don't automatically create tooltip on menu item - when not present - -2003-07-08 huysmans - - * panel/item_dialog.c, plugins/mailcheck/mailcheck.c: Update - dialogs to use open stock icon on buttons instead of ... - -2003-07-08 huysmans - - * panel/item_dialog.c, plugins/pager/pager.c, po/es.gmo: Small - fixes - -2003-07-08 xfce - - * ltmain.sh: Update ltmain.sh with patched version - -2003-07-07 huysmans - - * po/: ca.gmo, ca.po: Update catalan translations - -2003-07-07 huysmans - - * doc/C/images/default_panel.png: Update default panel screenshot - -2003-07-07 huysmans - - * AUTHORS, HACKING, NEWS, README, TODO, po/xfce4-panel.pot: Update - some info - -2003-07-06 huysmans - - * ChangeLog: Updating ChangeLogs - -2003-07-05 xfce - - * Makefile.in, ltconfig: Remove ltconfig script as it is generated - -2003-07-05 huysmans - - * plugins/mailcheck/mailcheck.c: Renew timeout after reading the - config file. Patch by Bernhard Walle. - -2003-07-05 xfce - - * Makefile.in, aclocal.m4, config.h.in, configure, ltcf-c.sh, - ltmain.sh, doc/Makefile.in, doc/C/Makefile.in, - doc/C/images/Makefile.in, icons/Makefile.in, panel/Makefile.in, - plugins/Makefile.in, plugins/clock/Makefile.in, - plugins/mailcheck/Makefile.in, plugins/pager/Makefile.in, - plugins/separator/Makefile.in, plugins/switcher/Makefile.in, - plugins/systembuttons/Makefile.in, settings/Makefile.in, - themes/Makefile.in, themes/Crystal/Makefile.in, - themes/Curve/Makefile.in, themes/FreeIcons/Makefile.in, - themes/Gnome/Makefile.in, themes/Noia/Makefile.in, - themes/XFce/Makefile.in: libttol update and all - -2003-07-04 bmeurer - - * po/: de.gmo, de.po: Small fix. - -2003-07-03 xfce - - * plugins/separator/separator.c, po/es_MX.gmo, po/fr.gmo, po/fr.po: - Tweak new separator plugin and update frnech po - -2003-07-03 edscott - - * po/: es.po, es_MX.po: spanish tranlation updates for 4.0 release. - -2003-07-03 huysmans - - * po/: de.gmo, de.po: Update German translations - -2003-07-03 huysmans - - * po/: fi.gmo, fi.po: Update finish translation - -2003-07-03 huysmans - - * plugins/separator/separator.c: Make separator 80% - -2003-07-03 huysmans - - * Makefile.in, aclocal.m4, config.h.in, configure, configure.ac, - ltcf-c.sh, ltconfig, ltmain.sh, xfce4rc, doc/Makefile.in, - doc/C/Makefile.in, doc/C/xfce4-panel.html, doc/C/xfce4-panel.xml, - doc/C/images/Makefile.in, doc/C/images/default_panel.png, - icons/Makefile.in, panel/Makefile.in, plugins/Makefile.am, - plugins/Makefile.in, plugins/clock/Makefile.in, - plugins/mailcheck/Makefile.in, plugins/mailcheck/mailcheck.c, - plugins/pager/Makefile.in, plugins/pager/pager.c, - plugins/separator/Makefile.am, plugins/separator/Makefile.in, - plugins/separator/separator.c, plugins/switcher/Makefile.in, - plugins/systembuttons/Makefile.in, - plugins/systembuttons/systembuttons.c, po/POTFILES.in, po/ca.gmo, - po/ca.po, po/de.gmo, po/de.po, po/es.gmo, po/es.po, po/es_MX.gmo, - po/es_MX.po, po/fi.gmo, po/fi.po, po/fr.gmo, po/fr.po, po/hi.gmo, - po/hi.po, po/ja.gmo, po/ja.po, po/ms.gmo, po/ms.po, po/nl.gmo, - po/nl.po, po/pl.gmo, po/pl.po, po/ru.gmo, po/ru.po, po/ta.gmo, - po/ta.po, po/tr.gmo, po/tr.po, po/xfce4-panel.pot, po/zh_CN.gmo, - po/zh_CN.po, settings/Makefile.in, themes/Makefile.in, - themes/Crystal/Makefile.in, themes/Curve/Makefile.in, - themes/FreeIcons/Makefile.in, themes/Gnome/Makefile.in, - themes/Noia/Makefile.in, themes/XFce/Makefile.in: Add separator. - Remove separators from pager. Several smaller fixes to plugins. - Update docs. - -2003-07-02 huysmans - - * doc/C/images/panel-settings.png: Update image for panel settings - -2003-06-29 huysmans - - * plugins/systembuttons/systembuttons.c: Fix systembutton sizing. - Patch by Michael Mosier - -2003-06-28 xfce - - * Makefile.in, aclocal.m4, config.h.in, configure, ltmain.sh, - doc/Makefile.in, doc/C/Makefile.in, doc/C/images/Makefile.in, - icons/Makefile.in, panel/Makefile.in, plugins/Makefile.in, - plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in, - plugins/pager/Makefile.in, plugins/switcher/Makefile.in, - plugins/systembuttons/Makefile.in, settings/Makefile.in, - themes/Makefile.in, themes/Crystal/Makefile.in, - themes/Curve/Makefile.in, themes/FreeIcons/Makefile.in, - themes/Gnome/Makefile.in, themes/Noia/Makefile.in, - themes/XFce/Makefile.in: Update to libtool-1.5 Use proper complete - CURRENT:REVISION:AGE scheme for lib versionning - -2003-06-21 bmeurer - - * po/xfce4-panel.pot: Updates. - -2003-06-21 bmeurer - - * configure, configure.ac: Fixes. - -2003-06-21 bmeurer - - * configure, configure.ac: Fixes. - -2003-06-21 bmeurer - - * po/: de.gmo, de.po: Fixed problem with June->Juni translation. - -2003-06-21 bmeurer - - * HACKING, aclocal.m4, configure, po/de.gmo, po/de.po: Updated - german translations. - -2003-06-21 bmeurer - - * aclocal.m4, configure, configure.ac, po/nl.gmo, - po/xfce4-panel.pot: version -> 3.91.0 - -2003-06-21 bmeurer - - * configure.ac: Updated version numbers. - -2003-06-18 xfce - - * panel/controls_dialog.c, panel/item_dialog.c, - settings/xfce_settings_dialog.c: Call gtk_window_set_position () as - late at possible as it seems there is a race cond in gtk+ - -2003-06-15 bmeurer - - * TODO: Added note about libxfce4util. - -2003-06-15 bmeurer - - * panel/xfce_support.c: Added a patch to improve the responsiveness - of the UI by executing commands when the main loop is idle instead - of executing them directly on button click. - -2003-06-14 bmeurer - - * panel/main.c, settings/xfce_settings_dialog.c, - settings/xfce_settings_plugin.c: Introduced xfce_textdomain() - -2003-06-14 xfce - - * panel/controls_dialog.c, panel/item_dialog.c, - settings/xfce_settings_dialog.c: Revert the GTK_POS_WINDOW_CENTER - -2003-06-14 xfce - - * panel/controls_dialog.c, panel/item_dialog.c, - settings/xfce_settings_dialog.c: Use GTK_WIN_POS_CENTER_ALWAYS - instead of GTK_WIN_POS_CENTER when centering dialogs - -2003-06-14 bmeurer - - * m4/i18n.m4, configure, aclocal.m4: Fixed - bind_textdomain_codeset() problem on linux. - -2003-06-12 bmeurer - - * settings/: xfce_settings_dialog.c, xfce_settings_plugin.c: Fixes - bind_textdomain_codeset() - -2003-06-10 bmeurer - - * Makefile.in, aclocal.m4, config.guess, config.h.in, config.sub, - configure, install-sh, ltcf-c.sh, ltconfig, ltmain.sh, - doc/Makefile.in, doc/C/Makefile.in, doc/C/images/Makefile.in, - icons/Makefile.in, panel/Makefile.in, plugins/Makefile.in, - plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in, - plugins/pager/Makefile.in, plugins/switcher/Makefile.in, - plugins/systembuttons/Makefile.in, settings/Makefile.in, - themes/Makefile.in, themes/Crystal/Makefile.in, - themes/Curve/Makefile.in, themes/FreeIcons/Makefile.in, - themes/Gnome/Makefile.in, themes/Noia/Makefile.in, - themes/XFce/Makefile.in: automake 1.7.5 - -2003-06-10 xfce - - * panel/xfce_support.c: Add test for bind_textdomain_codeset() Use - xftree4 as viewer on dirs unless "Open in terminal" is checked - -2003-06-10 bmeurer - - * panel/main.c: Fixed bind_textdomain_codeset() problem - -2003-06-10 xfce - - * panel/: item_dialog.c, xfce_support.c: Add support for - directories as launchers in panel and add extra check for icons - -2003-06-10 bmeurer - - * panel/: controls.c, controls_dialog.c, groups.c: Make - --enable-debug=full work. - -2003-06-10 xfce - - * Makefile.in, aclocal.m4, config.h.in, configure, configure.ac, - doc/Makefile.in, doc/C/Makefile.in, doc/C/images/Makefile.in, - icons/Makefile.in, panel/Makefile.in, plugins/Makefile.in, - plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in, - plugins/pager/Makefile.in, plugins/switcher/Makefile.in, - plugins/systembuttons/Makefile.in, settings/Makefile.in, - settings/xfce_settings_dialog.c, themes/Makefile.in, - themes/Crystal/Makefile.in, themes/Curve/Makefile.in, - themes/FreeIcons/Makefile.in, themes/Gnome/Makefile.in, - themes/Noia/Makefile.in, themes/XFce/Makefile.in: Add new widget - xfce_framebox to unify look across UI Migrate all plugins to this - new widget - -2003-06-08 huysmans - - * panel/global.h: Make Curve the fallback icon theme instead of - XFce - -2003-06-08 huysmans - - * Makefile.in, aclocal.m4, config.h.in, configure, configure.ac, - doc/Makefile.in, doc/C/Makefile.in, doc/C/images/Makefile.in, - icons/Makefile.in, panel/Makefile.in, plugins/Makefile.in, - plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in, - plugins/pager/Makefile.in, plugins/switcher/Makefile.in, - plugins/systembuttons/Makefile.in, po/ru.gmo, po/ru.po, - settings/Makefile.in, themes/Makefile.in, - themes/Crystal/Makefile.in, themes/Curve/Makefile.in, - themes/FreeIcons/Makefile.in, themes/Gnome/Makefile.in, - themes/Noia/Makefile.in, themes/XFce/Makefile.in: Add russian - translation and fix xfdesktop not reading a new local menu - -2003-06-08 bmeurer - - * panel/icons.c: Prefer SVG over PNG. - -2003-06-07 bmeurer - - * panel/icons.c: Added .svg support for themes. (librsvg provides a - gdk-pixbuf loader), pointed out by keke@plskthx.org - -2003-06-06 xfce - - * Makefile.in, aclocal.m4, config.h.in, configure, configure.ac, - doc/Makefile.in, doc/C/Makefile.in, doc/C/images/Makefile.in, - icons/Makefile.in, panel/Makefile.in, plugins/Makefile.in, - plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in, - plugins/pager/Makefile.in, plugins/switcher/Makefile.in, - plugins/systembuttons/Makefile.in, settings/Makefile.in, - themes/Makefile.in, themes/Crystal/Makefile.in, - themes/Curve/Makefile.in, themes/FreeIcons/Makefile.in, - themes/Gnome/Makefile.in, themes/Noia/Makefile.in, - themes/XFce/Makefile.in: Versionning scheme - -2003-06-06 huysmans - - * po/: ca.gmo, ca.po, de.gmo, de.po, es.gmo, es.po, es_MX.gmo, - es_MX.po, fi.gmo, fi.po, fr.gmo, fr.po, hi.gmo, hi.po, ja.gmo, - ja.po, ms.gmo, ms.po, nl.gmo, nl.po, pl.gmo, pl.po, ta.gmo, ta.po, - tr.gmo, tr.po, xfce4-panel.pot, zh_CN.gmo, zh_CN.po: final - update-po before beta 1 - -2003-06-05 huysmans - - * doc/C/: xfce4-panel.html, xfce4-panel.xml: Doc fixes assorti - -2003-06-05 huysmans - - * doc/C/images/: handle-popup.png, item-popup.png: Updated images - -2003-06-05 huysmans - - * po/: de.gmo, de.po: Updated translations and multiple file drop - on backdrop list manager - -2003-06-03 huysmans - - * doc/C/: xfce4-panel.html, xfce4-panel.xml: Remove revision - history - -2003-06-02 huysmans - - * xfce4rc: Fix empty menu item - -2003-06-02 huysmans - - * doc/C/images/default_panel.png: Update default panel image - -2003-06-02 huysmans - - * xfce4rc: change some defaults - -2003-06-01 huysmans - - * po/: fi.gmo, fi.po: Update fi translations and specfile fix - -2003-05-30 huysmans - - * configure, configure.ac, po/ms.gmo, po/ms.po: Add malayan - translations - -2003-05-30 huysmans - - * configure, configure.ac: Build only static libs - -2003-05-30 huysmans - - * doc/C/images/: Makefile.am, Makefile.in: Small tweaks to build - files - -2003-05-29 huysmans - - * doc/xfce-nochunk.xsl: improve stylesheet import - -2003-05-29 huysmans - - * po/: ca.gmo, ca.po: Update catalan translations - -2003-05-29 huysmans - - * plugins/mailcheck/mailcheck.c: Fix crash with empty command - -2003-05-29 huysmans - - * plugins/mailcheck/mailcheck.c, po/ja.gmo, po/nl.po: Translations - update - -2003-05-27 xfce - - * po/ja.po: Add Japanese translation by Zhao-Ji <zhao-ji at awz dot - ne dot jp> - -2003-05-21 huysmans - - * configure, configure.ac, po/hi.gmo, po/hi.po, po/tr.gmo, - po/tr.po: Add Turkish translations - -2003-05-17 huysmans - - * .indent.pro, HACKING, icons/xfce4-panel-icon.h, panel/controls.c, - panel/controls.h, panel/controls_dialog.c, panel/controls_dialog.h, - panel/global.h, panel/groups.c, panel/groups.h, panel/icons.c, - panel/icons.h, panel/item.c, panel/item_dialog.c, - panel/item_dialog.h, panel/main.c, panel/mcs_client.c, - panel/panel.c, panel/panel.h, panel/plugins.h, panel/popup.c, - panel/popup.h, panel/settings.c, panel/xfce_support.c, - panel/xfce_support.h, plugins/clock/clock.c, - plugins/mailcheck/mailcheck.c, plugins/pager/pager.c, - plugins/switcher/switcher.c, plugins/systembuttons/systembuttons.c, - settings/xfce_settings_dialog.c, settings/xfce_settings_plugin.c: - Reindent using Olivier's new .indent.pro file - -2003-05-16 huysmans - - * Makefile.in, aclocal.m4, config.guess, config.sub, configure, - configure.ac, doc/Makefile.in, doc/C/Makefile.in, - doc/C/images/Makefile.in, icons/Makefile.in, panel/Makefile.in, - plugins/Makefile.in, plugins/clock/Makefile.in, - plugins/mailcheck/Makefile.in, plugins/pager/Makefile.in, - plugins/switcher/Makefile.in, plugins/systembuttons/Makefile.in, - po/ta.gmo, po/ta.po, settings/Makefile.in, themes/Makefile.in, - themes/Crystal/Makefile.in, themes/Curve/Makefile.in, - themes/FreeIcons/Makefile.in, themes/Gnome/Makefile.in, - themes/Noia/Makefile.in, themes/XFce/Makefile.in: Add tamil - translations - -2003-05-15 huysmans - - * doc/C/: xfce4-panel.html, xfce4-panel.xml: documentation fixes - (2) - -2003-05-15 huysmans - - * doc/C/: xfce4-panel.html, xfce4-panel.xml: documentation fixes - -2003-05-15 huysmans - - * ChangeLog: Mass update of ChangeLogs - -2003-05-14 huysmans - - * po/: fi.gmo, fi.po: update finnish translations - -2003-05-13 huysmans - - * doc/C/: xfce4-panel.html, xfce4-panel.xml, - images/clock-properties.png, images/default_panel.png, - images/handle-popup.png, images/item-popup.png, - images/launcher-properties.png, images/mailcheck-properties.png, - images/menuitem-properties.png, images/nooptions-properties.png, - images/systembuttons-properties.png: update docs - -2003-05-13 huysmans - - * panel/xfce_support.c: Fix icons with spaces problem. User now - must manually escape commands. - -2003-05-13 huysmans - - * configure, configure.ac, po/ca.gmo, po/ca.po: Add catalan - translations - -2003-05-13 huysmans - - * Makefile.am, Makefile.in, configure, configure.ac, - doc/Makefile.am, doc/Makefile.in, doc/xfce-nochunk.xsl, - doc/C/Makefile.am, doc/C/Makefile.in, doc/C/xfce4-panel.html, - doc/C/xfce4-panel.xml, doc/C/images/Makefile.am, - doc/C/images/Makefile.in, doc/C/images/clock-properties.png, - doc/C/images/default_panel.png, doc/C/images/handle-popup.png, - doc/C/images/item-popup.png, doc/C/images/launcher-properties.png, - doc/C/images/mailcheck-properties.png, - doc/C/images/menuitem-properties.png, - doc/C/images/nooptions-properties.png, - doc/C/images/panel-settings.png, - doc/C/images/systembuttons-properties.png: Move docs to new - location - -2003-05-13 huysmans - - * panel/: item_dialog.c, item_dialog.h: Menu item dialog now has - the same layout as panel item dialogs - -2003-05-13 huysmans - - * ChangeLog, configure, configure.ac, xfce4.spec.in, - panel/Makefile.am, panel/Makefile.in, plugins/clock/Makefile.am, - plugins/clock/Makefile.in, plugins/mailcheck/Makefile.am, - plugins/mailcheck/Makefile.in, plugins/pager/Makefile.am, - plugins/pager/Makefile.in, plugins/switcher/Makefile.am, - plugins/switcher/Makefile.in, plugins/systembuttons/Makefile.am, - plugins/systembuttons/Makefile.in, po/Makefile.in.in, po/de.gmo, - po/de.po, po/es.gmo, po/es.po, po/es_MX.gmo, po/es_MX.po, - po/fi.gmo, po/fi.po, po/fr.gmo, po/fr.po, po/ja.gmo, po/ja.po, - po/nl.gmo, po/nl.po, po/pl.gmo, po/pl.po, po/xfce4-panel.pot, - po/zh_CN.gmo, po/zh_CN.po, settings/Makefile.am, - settings/Makefile.in, themes/Crystal/Makefile.am, - themes/Crystal/Makefile.in, themes/Curve/Makefile.am, - themes/Curve/Makefile.in, themes/FreeIcons/Makefile.am, - themes/FreeIcons/Makefile.in, themes/Gnome/Makefile.am, - themes/Gnome/Makefile.in, themes/Noia/Makefile.am, - themes/Noia/Makefile.in, themes/XFce/Makefile.am, - themes/XFce/Makefile.in: Fix distcheck target. Rename package to - xfce4-panel. Set version to 3.90 (betas will be 3.90, 3.91, 3.92, - etc.) - -2003-05-13 huysmans - - * xfce4.spec.in: spec file tweaks - -2003-05-13 huysmans - - * ChangeLog, panel/controls.c, panel/controls.h, - panel/controls_dialog.c, panel/controls_dialog.h, panel/panel.c: - Add items from popup menu - -2003-05-12 huysmans - - * panel/item_dialog.c, po/de.gmo, po/de.po, po/es.gmo, po/es.po, - po/es_MX.gmo, po/es_MX.po, po/fi.gmo, po/fi.po, po/fr.gmo, - po/fr.po, po/ja.gmo, po/ja.po, po/nl.gmo, po/nl.po, po/pl.gmo, - po/pl.po, po/xfce4-panel.pot, po/zh_CN.gmo, po/zh_CN.po: Renamed - subpanel to menu - -2003-05-12 huysmans - - * panel/controls.c, panel/controls_dialog.c, - panel/controls_dialog.h, panel/groups.c, panel/groups.h, - panel/panel.c, po/de.gmo, po/de.po, po/es.gmo, po/es.po, - po/es_MX.gmo, po/es_MX.po, po/fi.gmo, po/fi.po, po/fr.gmo, - po/fr.po, po/ja.gmo, po/ja.po, po/nl.gmo, po/nl.po, po/pl.gmo, - po/pl.po, po/xfce4-panel.pot, po/zh_CN.gmo, po/zh_CN.po: Get rid of - type option menu from item dialog - -2003-05-12 huysmans - - * po/: de.po, es.po, es_MX.po, fi.po, fr.po, ja.po, nl.po, pl.po, - xfce4-panel.pot, zh_CN.po: Update po files - -2003-05-12 huysmans - - * Makefile.am, Makefile.in, aclocal.m4, configure, panel/item.c, - panel/item.h, panel/item_dialog.c, plugins/mailcheck/mailcheck.c: - Allow hiding of subpanels; remove subpanel from mailcheck plugin - -2003-05-05 huysmans - - * Makefile.am, Makefile.in, configure, configure.ac, xfce4.spec.in, - xfce4rc, xfce4rc.in, icons/Makefile.am, icons/Makefile.in, - panel/Makefile.am, panel/Makefile.in, plugins/clock/Makefile.am, - plugins/clock/Makefile.in, plugins/mailcheck/Makefile.am, - plugins/mailcheck/Makefile.in, plugins/pager/Makefile.am, - plugins/pager/Makefile.in, plugins/switcher/Makefile.am, - plugins/switcher/Makefile.in, plugins/systembuttons/Makefile.am, - plugins/systembuttons/Makefile.in, po/de.gmo, po/de.po, po/es.gmo, - po/es.po, po/es_MX.gmo, po/es_MX.po, po/fi.gmo, po/fi.po, - po/fr.gmo, po/fr.po, po/ja.gmo, po/ja.po, po/nl.gmo, po/nl.po, - po/pl.gmo, po/pl.po, po/xfce4-panel.pot, po/zh_CN.gmo, po/zh_CN.po, - settings/Makefile.am, settings/Makefile.in: Fixes for rpm target - and distcheck stuff - -2003-05-04 xfce - - * po/: fr.gmo, fr.po: Various fixes, added french translation, - fixed desktop switching in xfwm4 - -2003-05-03 huysmans - - * Makefile.in, aclocal.m4, config.h.in, configure, configure.ac, - ltcf-c.sh, ltconfig, ltmain.sh, doc/Makefile.in, icons/Makefile.in, - panel/Makefile.in, plugins/Makefile.in, plugins/clock/Makefile.in, - plugins/mailcheck/Makefile.in, plugins/pager/Makefile.in, - plugins/switcher/Makefile.in, plugins/systembuttons/Makefile.in, - po/zh_CN.gmo, po/zh_CN.po, settings/Makefile.in, - themes/Makefile.in, themes/Crystal/Makefile.in, - themes/Curve/Makefile.in, themes/FreeIcons/Makefile.in, - themes/Gnome/Makefile.in, themes/Noia/Makefile.in, - themes/XFce/Makefile.in: Add chinese translations - -2003-05-03 huysmans - - * panel/controls.c: Ensure item popup menu uses panel domain for - translations - -2003-05-02 huysmans - - * ChangeLog, Makefile.in, aclocal.m4, config.guess, config.h.in, - config.sub, configure, ltmain.sh, doc/Makefile.in, - icons/Makefile.in, panel/Makefile.in, panel/xfce_support.c, - plugins/Makefile.in, plugins/clock/Makefile.am, - plugins/clock/Makefile.in, plugins/mailcheck/Makefile.am, - plugins/mailcheck/Makefile.in, plugins/pager/Makefile.am, - plugins/pager/Makefile.in, plugins/switcher/Makefile.am, - plugins/switcher/Makefile.in, plugins/systembuttons/Makefile.am, - plugins/systembuttons/Makefile.in, settings/Makefile.in, - themes/Makefile.in, themes/Crystal/Makefile.in, - themes/Curve/Makefile.in, themes/FreeIcons/Makefile.in, - themes/Gnome/Makefile.in, themes/Noia/Makefile.in, - themes/XFce/Makefile.in: Update to use the new panel-plugins - location - -2003-05-02 bmeurer - - * Makefile.in, aclocal.m4, configure, configure.ac, - doc/Makefile.in, icons/Makefile.in, m4/depends.m4, - panel/Makefile.in, panel/xfce4-panel-1.0.pc.in, - plugins/Makefile.in, plugins/clock/Makefile.in, - plugins/mailcheck/Makefile.in, plugins/pager/Makefile.in, - plugins/switcher/Makefile.in, plugins/systembuttons/Makefile.in, - plugins/systembuttons/systembuttons.c, settings/Makefile.am, - settings/Makefile.in, themes/Makefile.in, - themes/Crystal/Makefile.in, themes/Curve/Makefile.in, - themes/FreeIcons/Makefile.in, themes/Gnome/Makefile.in, - themes/Noia/Makefile.in, themes/XFce/Makefile.in: Several changes. - See http://www.home.unix-ag.org/bmeurer/xfce/index.html#20030502 - for details. - -2003-05-02 huysmans - - * panel/controls.c: only popup warning dialog about subpanels being - removed when not empty (2) - -2003-05-02 huysmans - - * panel/controls_dialog.c: properly check for return values when - creating controls - -2003-05-02 huysmans - - * panel/: controls_dialog.c, groups.c, groups.h: only popup warning - dialog about subpanels being removed when not empty - -2003-05-01 huysmans - - * po/pl.gmo: Add missing gmo files - -2003-04-30 bmeurer - - * configure, configure.ac, panel/xfce4-panel-1.0.pc.in: Added - themedir variable to pkg-config file and increased version to - 0.10.2 - -2003-04-30 huysmans - - * panel/: main.c, mcs_client.c, panel.c: Use move handler signal to - properly keep the position up-to-date - -2003-04-27 bmeurer - - * configure, configure.ac, po/pl.po: Added polish translations. - -2003-04-26 bmeurer - - * aclocal.m4, configure: Autotools update. - -2003-04-26 bmeurer - - * m4/depends.m4, configure.ac: Updated BM_DEPEND_CHECK. - -2003-04-26 bmeurer - - * m4/debug.m4: Fixed a stupid typo. - -2003-04-25 huysmans - - * plugins/mailcheck/mailcheck.c: Fix startup notification setting - -2003-04-25 bmeurer - - * configure, configure.ac: xfce-mcs-manager version was changed to - 0.1.0. - -2003-04-25 bmeurer - - * aclocal.m4, configure, configure.ac, ltcf-c.sh, ltconfig, - ltmain.sh, panel/Makefile.am, panel/Makefile.in, - panel/item_dialog.c, panel/item_dialog.h: Export more functions - from item*.c - -2003-04-25 huysmans - - * po/: de.gmo, fi.gmo, fi.po: Update finnish translations - -2003-04-25 bmeurer - - * m4/depends.m4: Updated depends.m4 and added macro for use with - panel plugins. Updated libxfce4util to install the common m4 files - into $(datadir)/xfce4/m4. - -2003-04-25 bmeurer - - * po/de.po: German translation. Provided by Moritz Heiber. - -2003-04-24 huysmans - - * aclocal.m4, configure, ltcf-c.sh, ltconfig, ltmain.sh, - icons/Makefile.am, icons/Makefile.in, icons/diag_icon.xpm, - icons/menu_icon.xpm, icons/xfce4-panel-icon.h, - icons/xfce4-panel.png, icons/xfce_icon.xpm, panel/icons.c, - panel/icons.h, panel/panel.c, panel/popup.c, - settings/xfce_settings_dialog.c, settings/xfce_settings_plugin.c: - New panel icon - -2003-04-23 huysmans - - * panel/main.c: Fix signal handling - gtk mainloop interaction - -2003-04-21 huysmans - - * themes/FreeIcons/minipower.png: Use Curve exit icon instead of - confusing gear - -2003-04-21 bmeurer - - * AUTHORS, Makefile.am, Makefile.in, NOTES, aclocal.m4, configure, - configure.ac, ltcf-c.sh, ltconfig, ltmain.sh, panel/Makefile.am, - panel/Makefile.in, panel/controls.h, panel/controls_dialog.h, - panel/groups.h, panel/icons.h, panel/item.h, panel/item_dialog.h, - panel/panel.h, panel/plugins.h, panel/popup.h, panel/settings.h, - panel/xfce.h, panel/xfce4-panel-1.0.pc.in, - plugins/clock/Makefile.am, plugins/clock/Makefile.in, - plugins/clock/clock.c, plugins/mailcheck/Makefile.am, - plugins/mailcheck/Makefile.in, plugins/mailcheck/mailcheck.c, - plugins/pager/Makefile.am, plugins/pager/Makefile.in, - plugins/pager/pager.c, plugins/switcher/Makefile.am, - plugins/switcher/Makefile.in, plugins/switcher/switcher.c, - plugins/systembuttons/Makefile.am, - plugins/systembuttons/Makefile.in, - plugins/systembuttons/systembuttons.c, settings/Makefile.am, - settings/Makefile.in, settings/xfce_settings_plugin.c, - themes/FreeIcons/Makefile.am, themes/FreeIcons/Makefile.in: Its now - possible to write panel plugins outside the panel. See the NOTES - file for details and enjoy writing new panel plugins. - -2003-04-21 huysmans - - * themes/FreeIcons/: Makefile.am, Makefile.in: Really rename the - theme - -2003-04-21 huysmans - - * configure, configure.ac, themes/Makefile.am, themes/Makefile.in, - themes/FreeIcons/Makefile.am, themes/FreeIcons/Makefile.in, - themes/FreeIcons/README, themes/FreeIcons/edit.png, - themes/FreeIcons/file1.png, themes/FreeIcons/file2.png, - themes/FreeIcons/games.png, themes/FreeIcons/man.png, - themes/FreeIcons/miniinfo.png, themes/FreeIcons/minilock.png, - themes/FreeIcons/minipalet.png, themes/FreeIcons/minipower.png, - themes/FreeIcons/multimedia.png, themes/FreeIcons/network.png, - themes/FreeIcons/newmail.png, themes/FreeIcons/nomail.png, - themes/FreeIcons/oldmail.png, themes/FreeIcons/paint.png, - themes/FreeIcons/print.png, themes/FreeIcons/schedule.png, - themes/FreeIcons/sound.png, themes/FreeIcons/terminal.png, - themes/FreeIcons/unknown.png: Rename Carillon to FreeIcons - -2003-04-21 huysmans - - * aclocal.m4, configure, configure.ac, ltcf-c.sh, ltconfig, - ltmain.sh, po/de.gmo, po/de.po, po/es.gmo, po/es.po, po/es_MX.gmo, - po/es_MX.po, po/fi.gmo, po/fi.po, po/fr.gmo, po/fr.po, po/ja.gmo, - po/ja.po, po/nl.gmo, po/nl.po, po/xfce4-panel.pot, - themes/Makefile.am, themes/Makefile.in: Add Carillon icon theme - (FreeIcons by Tomasz Mielnik) - -2003-04-20 bmeurer - - * Makefile.in, configure, configure.ac, doc/Makefile.in, - icons/Makefile.in, panel/Makefile.in, plugins/Makefile.in, - plugins/clock/Makefile.am, plugins/clock/Makefile.in, - plugins/mailcheck/Makefile.am, plugins/mailcheck/Makefile.in, - plugins/pager/Makefile.am, plugins/pager/Makefile.in, - plugins/switcher/Makefile.am, plugins/switcher/Makefile.in, - plugins/systembuttons/Makefile.am, - plugins/systembuttons/Makefile.in, settings/Makefile.am, - settings/Makefile.in, themes/Makefile.in, - themes/Crystal/Makefile.in, themes/Curve/Makefile.in, - themes/Gnome/Makefile.in, themes/Noia/Makefile.in, - themes/XFce/Makefile.in: Some autotools cleanups. - -2003-04-20 huysmans - - * panel/: controls.c, panel.c: unhide panel when adding new items - -2003-04-20 huysmans - - * panel/panel.c: more autohide tweaks - -2003-04-20 huysmans - - * panel/panel.c: autohide related tweaks - -2003-04-20 huysmans - - * panel/panel.c: autohide related tweaks - -2003-04-19 bmeurer - - * plugins/mailcheck/mailcheck.c: The previous change was not ment - to be commited :-) - -2003-04-19 bmeurer - - * Makefile.in, aclocal.m4, config.h.in, configure, configure.ac, - doc/Makefile.in, icons/Makefile.in, m4/X11.m4, m4/rpath.m4, - panel/Makefile.am, panel/Makefile.in, plugins/Makefile.in, - plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in, - plugins/mailcheck/mailcheck.c, plugins/pager/Makefile.in, - plugins/switcher/Makefile.in, plugins/systembuttons/Makefile.in, - settings/Makefile.am, settings/Makefile.in, themes/Makefile.in, - themes/Crystal/Makefile.in, themes/Curve/Makefile.in, - themes/Gnome/Makefile.in, themes/Noia/Makefile.in, - themes/XFce/Makefile.in: Added system tray support to libxfcegui4 - and frontend to xftaskbar4. Lots of cleanups in the autotools - stuff. - -2003-04-18 huysmans - - * po/: POTFILES.in, de.gmo, de.po, es.gmo, es.po, es_MX.gmo, - es_MX.po, fi.gmo, fi.po, fr.gmo, fr.po, ja.gmo, ja.po, nl.gmo, - nl.po, xfce4-panel.pot: Update file list. i18n still broken - -2003-04-18 huysmans - - * panel/panel.c: unhide when dragging something over the collapsed - panel - -2003-04-18 huysmans - - * panel/: controls_dialog.c, panel.c: This is the real fix (tm) ... - I think - -2003-04-18 huysmans - - * panel/panel.c: autohide, position and reorientation ... - -2003-04-18 huysmans - - * ChangeLog, panel/controls_dialog.c, panel/icons.c, panel/icons.h, - panel/main.c, panel/panel.c, po/de.gmo, po/es.gmo, po/es_MX.gmo, - po/fi.gmo, po/fr.gmo, po/ja.gmo, po/nl.gmo: Will this (finally) fix - the autohide <-> positioning problems? - -2003-04-16 huysmans - - * panel/main.c: Bug fix 2 - -2003-04-16 huysmans - - * panel/main.c: Bug fix - -2003-04-16 huysmans - - * panel/: main.c, panel.c: More autohide vs position fixes - -2003-04-15 huysmans - - * panel/panel.c: Try to fix size request issues - -2003-04-14 huysmans - - * panel/panel.c: Fix centering bug - -2003-04-13 huysmans - - * ChangeLog: Update ChangeLog - -2003-04-13 huysmans - - * po/: de.po, es.po, es_MX.po, fi.po, fr.po, ja.po, nl.po, - xfce4-panel.pot: Update pot-file and Dutch translations - -2003-04-13 xfce - - * panel/panel.c: Remove the call to gtk_window_present() that was - causing a focus change when panel was hiding/showing - -2003-04-13 xfce - - * panel/panel.c: Purge gtk events when changing panel orientation - to fix a bug that was placing the panel right in the middle of the - screen when changing orientation from vertical to horizontal - -2003-04-13 huysmans - - * panel/panel.c: Reduce autohide interval to 500msec - -2003-04-13 huysmans - - * panel/panel.c: Reduce hidden size to 5 - -2003-04-13 huysmans - - * AUTHORS, panel/global.h, panel/main.c, panel/mcs_client.c, - panel/panel.c, panel/panel.h, panel/popup.c, panel/xfce_support.c, - settings/xfce_settings.h, settings/xfce_settings_dialog.c, - settings/xfce_settings_plugin.c: Add autohide feature to the panel. - THanks to Erik Touve. - -2003-04-09 bmeurer - - * Makefile.in, aclocal.m4, config.guess, config.sub, configure, - depcomp, ltconfig, doc/Makefile.in, icons/Makefile.in, m4/debug.m4, - panel/Makefile.in, plugins/Makefile.in, plugins/clock/Makefile.in, - plugins/mailcheck/Makefile.in, plugins/pager/Makefile.in, - plugins/switcher/Makefile.in, plugins/systembuttons/Makefile.in, - settings/Makefile.in, themes/Makefile.in, - themes/Crystal/Makefile.in, themes/Curve/Makefile.in, - themes/Gnome/Makefile.in, themes/Noia/Makefile.in, - themes/XFce/Makefile.in: Improved debug.m4: - - 1) --disable-debug no longer disables assert()'s - 2) --enable-profiling now enables profiling code - 3) --disable-asserts allows disabling of assert()'s - -2003-04-05 xfce - - * panel/popup.c: Force popup to be sticky each time the window is - shown - -2003-04-04 bmeurer - - * aclocal.m4, configure, configure.ac, m4/depends.m4: Updated - BM_DEPEND_CHECK to make it possible to disable the test - -2003-04-03 bmeurer - - * Makefile.in, aclocal.m4, config.guess, config.sub, configure, - depcomp, ltcf-c.sh, ltconfig, ltmain.sh, doc/Makefile.in, - icons/Makefile.in, m4/depends.m4, panel/Makefile.in, - plugins/Makefile.in, plugins/clock/Makefile.in, - plugins/mailcheck/Makefile.in, plugins/pager/Makefile.in, - plugins/switcher/Makefile.in, plugins/systembuttons/Makefile.in, - settings/Makefile.in, themes/Makefile.in, - themes/Crystal/Makefile.in, themes/Curve/Makefile.in, - themes/Gnome/Makefile.in, themes/Noia/Makefile.in, - themes/XFce/Makefile.in: Fixed BM_DEPEND_CHECK - -2003-04-02 xfce - - * ChangeLog: Update ChangeLog - -2003-04-02 bmeurer - - * panel/Makefile.am, panel/Makefile.in, panel/debug.h, - panel/global.h, panel/panel.c, panel/popup.c, panel/xfce.h, - plugins/clock/clock.c: Debugging stuff now provided by - libxfce4util. As a result of this change libxfcegui4 now depends on - libxfce4util. Some other updates. added a hint to the libxfcegui4 - README for Xinerama problems with XFree86. - -2003-04-02 bmeurer - - * aclocal.m4, config.h.in, configure, m4/debug.m4: Debugging stuff - now provided by libxfce4util. As a result of this change - libxfcegui4 now depends on libxfce4util. Some other updates. - added a hint to the libxfcegui4 README for Xinerama problems with - XFree86. - -2003-04-02 huysmans - - * ChangeLog, TODO: Update TODO - -2003-04-02 huysmans - - * Makefile.am, Makefile.in: Include .indent.pro in dist target - -2003-04-02 huysmans - - * .indent.pro, HACKING, Makefile.am, Makefile.in, aclocal.m4, - config.guess, config.sub, configure, depcomp, ltcf-c.sh, ltconfig, - ltmain.sh, doc/Makefile.in, icons/Makefile.in, panel/Makefile.in, - panel/controls.c, panel/controls.h, panel/controls_dialog.c, - panel/controls_dialog.h, panel/global.h, panel/groups.c, - panel/groups.h, panel/icons.c, panel/icons.h, panel/item.c, - panel/item.h, panel/item_dialog.c, panel/item_dialog.h, - panel/main.c, panel/main.h, panel/mcs_client.c, panel/mcs_client.h, - panel/panel.c, panel/panel.h, panel/plugins.h, panel/popup.c, - panel/popup.h, panel/settings.c, panel/settings.h, panel/xfce.h, - panel/xfce_support.c, panel/xfce_support.h, plugins/Makefile.in, - plugins/clock/Makefile.in, plugins/clock/clock.c, - plugins/mailcheck/Makefile.in, plugins/mailcheck/mailcheck.c, - plugins/pager/Makefile.in, plugins/pager/pager.c, - plugins/switcher/Makefile.in, plugins/switcher/switcher.c, - plugins/systembuttons/Makefile.in, - plugins/systembuttons/systembuttons.c, settings/Makefile.in, - settings/xfce_settings.h, settings/xfce_settings_dialog.c, - settings/xfce_settings_dialog.h, settings/xfce_settings_plugin.c, - settings/xfce_settings_plugin.h, themes/Makefile.in, - themes/Crystal/Makefile.in, themes/Curve/Makefile.in, - themes/Gnome/Makefile.in, themes/Noia/Makefile.in, - themes/XFce/Makefile.in: Re-indent files. Add HACKING and - .indent.pro - -2003-04-02 bmeurer - - * aclocal.m4, configure, configure.ac, m4/debug.m4: left-over - autostuff for libxfce*, xfcs-mcs-* and xfce4 - -2003-04-02 bmeurer - - * config.h.in, configure, configure.ac, m4/X11.m4, - panel/controls.c, panel/controls_dialog.c, panel/groups.c, - panel/icons.c, panel/item.c, panel/item_dialog.c, panel/main.c, - panel/mcs_client.c, panel/my_gettext.h, panel/panel.c, - panel/popup.c, panel/settings.c, panel/xfce_support.c, - plugins/clock/clock.c, plugins/mailcheck/mailcheck.c, - plugins/pager/pager.c, plugins/switcher/switcher.c, - plugins/systembuttons/systembuttons.c, - settings/xfce_settings_dialog.c, settings/xfce_settings_plugin.c: - Updated i18n stuff (libxfce4util now provides a i18n.h). updated - X11.m4 updated xfwm4 to compile well with -Werror -Wall updated - xfce-mcs-plugins and added a hint to the README for XFree86 users - -2003-04-02 bmeurer - - * Makefile.am, Makefile.in, NOTES, aclocal.m4, autogen.sh, - config.guess, config.h.in, config.sub, configure, configure.ac, - depcomp, example.xfce4rc.in, install-sh, ltcf-c.sh, ltconfig, - ltmain.sh, missing, mkinstalldirs, xfce4.spec.in, xfce4rc.in, - doc/Makefile.in, icons/Makefile.am, icons/Makefile.in, m4/X11.m4, - m4/debug.m4, m4/depends.m4, m4/i18n.m4, m4/rpath.m4, - panel/Makefile.am, panel/Makefile.in, panel/item_dialog.c, - panel/main.c, panel/xfce_support.c, panel/xfce_support.h, - plugins/Makefile.am, plugins/Makefile.in, - plugins/clock/Makefile.am, plugins/clock/Makefile.in, - plugins/clock/clock.c, plugins/mailcheck/Makefile.am, - plugins/mailcheck/Makefile.in, plugins/mailcheck/mailcheck.c, - plugins/pager/Makefile.am, plugins/pager/Makefile.in, - plugins/pager/pager.c, plugins/switcher/Makefile.am, - plugins/switcher/Makefile.in, plugins/switcher/switcher.c, - plugins/systembuttons/Makefile.am, - plugins/systembuttons/Makefile.in, - plugins/systembuttons/systembuttons.c, po/Makefile.in.in, - settings/Makefile.am, settings/Makefile.in, - settings/xfce_settings_dialog.c, settings/xfce_settings_plugin.c, - themes/Makefile.am, themes/Makefile.in, themes/Crystal/Makefile.in, - themes/Curve/Makefile.in, themes/Gnome/Makefile.in, - themes/Noia/Makefile.in, themes/XFce/Makefile.in: Large autotools - update. Should fix James problems with unsubstituted @PKG_LDFLAGS@ - in .pc files. Should also make it easier to port XFce4 to a - non-POSIX (or even non-UNIX) plattform, using autoconf. - -2003-04-01 xfce - - * settings/xfce_settings_plugin.c: Initialize early i18n in mcs - plugins Add Etria theme - -2003-04-01 huysmans - - * panel/main.c: Remove SIGHUP handling - -2003-03-29 huysmans - - * po/: de.gmo, de.po: Update german translations - -2003-03-27 xfce - - * panel/panel.c, panel/popup.c, plugins/pager/pager.c: Prefer - gdk_screen[width|height] instead of XDisplay[Width|Height] - -2003-03-27 xfce - - * ChangeLog: Update ChangeLog - -2003-03-25 huysmans - - * panel/xfce_support.c: escape spaces in paths obtaine from gtk - file selector - -2003-03-24 huysmans - - * panel/item.c: Fix DND bug. Reported by Jens Guballa. - -2003-03-23 huysmans - - * panel/: controls_dialog.c, item_dialog.c, main.c: Make dialogs - appear on top even if panel is in below layer - -2003-03-23 xfce - - * ChangeLog: Update ChangeLog - -2003-03-20 xfce - - * panel/controls_dialog.c, panel/item_dialog.c, - settings/xfce_settings_dialog.c: Add GTK_WIDGET_SET_FLAGS (button, - GTK_CAN_DEFAULT) to the buttons that should have it - -2003-03-19 huysmans - - * autogen.sh: Only add extra autogen parameters when none are given - -2003-03-18 xfce - - * ChangeLog: Update ChangeLog Update build scripts (ie rerun - autogen.sh) Update xfwm4's microdeck theme Remove 1 pix border - arround xffm menu bar - -2003-03-13 bmeurer - - * panel/mcs_client.c, panel/main.c, - plugins/systembuttons/systembuttons.c: show_*() -> xfce_*() - -2003-03-13 xfce - - * ChangeLog: Update Changelogs - -2003-03-10 bmeurer - - * example.xfce4rc.in: Use xfprint-manager in the panel. - -2003-03-09 huysmans - - * panel/: controls_dialog.c, main.c, panel.c: Edge center and - corner snapping. Position saving fixes. - -2003-03-05 huysmans - - * panel/panel.c: check position before saving it - -2003-03-05 huysmans - - * ChangeLog, TODO: Small documentation update - -2003-03-02 xfce - - * po/: fr.gmo, fr.po: Rearrange button events handler in xfwm4 - Update french translation for xfce4 panel - -2003-03-01 xfce - - * Makefile.in, aclocal.m4, config.guess, config.h.in, config.sub, - configure, ltcf-c.sh, ltconfig, ltmain.sh, doc/Makefile.in, - icons/Makefile.in, panel/Makefile.in, plugins/Makefile.in, - plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in, - plugins/pager/Makefile.in, plugins/switcher/Makefile.in, - plugins/systembuttons/Makefile.in, settings/Makefile.in, - themes/Makefile.in, themes/Crystal/Makefile.in, - themes/Curve/Makefile.in, themes/Gnome/Makefile.in, - themes/Noia/Makefile.in, themes/XFce/Makefile.in: [no log message] - -2003-02-28 bmeurer - - * example.xfce4rc.in: Fixed type "xfhelp" -> "xfhelp4" - -2003-02-28 xfce - - * Makefile.in, aclocal.m4, config.guess, configure, ltmain.sh, - doc/Makefile.in, icons/Makefile.in, panel/Makefile.in, - plugins/Makefile.in, plugins/clock/Makefile.in, - plugins/mailcheck/Makefile.in, plugins/pager/Makefile.in, - plugins/switcher/Makefile.in, plugins/systembuttons/Makefile.in, - settings/Makefile.in, themes/Makefile.in, - themes/Crystal/Makefile.in, themes/Curve/Makefile.in, - themes/Gnome/Makefile.in, themes/Noia/Makefile.in, - themes/XFce/Makefile.in: Fix xfce-mcs-manager API/ABI versionning - Update configure/libtool to use libtool 1.4.3 - -2003-02-28 bmeurer - - * configure, Makefile.in, aclocal.m4, config.guess, configure.ac, - ltcf-c.sh, ltconfig, ltmain.sh, doc/Makefile.in, icons/Makefile.in, - panel/Makefile.in, plugins/clock/Makefile.in, plugins/Makefile.in, - plugins/mailcheck/Makefile.in, plugins/pager/Makefile.in, - plugins/switcher/Makefile.in, plugins/systembuttons/Makefile.in, - settings/Makefile.in, themes/Makefile.in, - themes/Crystal/Makefile.in, themes/Curve/Makefile.in, - themes/Gnome/Makefile.in, themes/Noia/Makefile.in, - themes/XFce/Makefile.in: Fixes xfce-mcs-manager issue. - -2003-02-27 xfce - - * configure: Updates (I'm sure you wouldn't have guessed) - -2003-02-26 huysmans - - * panel/main.c: POSIX signal handling - -2003-02-26 huysmans - - * configure, configure.ac, po/ja.gmo, po/ja.po: Add japanese - translations - -2003-02-26 xfce - - * Makefile.in, aclocal.m4, config.guess, config.sub, configure, - ltmain.sh, doc/Makefile.in, icons/Makefile.in, panel/Makefile.in, - panel/xfce_support.c, plugins/Makefile.in, - plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in, - plugins/pager/Makefile.in, plugins/switcher/Makefile.in, - plugins/systembuttons/Makefile.in, settings/Makefile.in, - settings/xfce_settings_dialog.c, settings/xfce_settings_plugin.c, - themes/Makefile.in, themes/Crystal/Makefile.in, - themes/Curve/Makefile.in, themes/Gnome/Makefile.in, - themes/Noia/Makefile.in, themes/XFce/Makefile.in: Apply Benedikt - Meurer <Benedikt.Meurer@unix-ag.uni-siegen.de> patch Replace all - occurences of g_getenv("HOME") with g_get_home_dir() Regenerate all - Makefiles.on and configure scripts - -2003-02-25 huysmans - - * plugins/systembuttons/systembuttons.c: Use xflock4 - -2003-02-25 huysmans - - * autogen.sh: Fix proper use of AC_PROG_LIBTOOL - -2003-02-25 huysmans - - * Makefile.in, aclocal.m4, configure, doc/Makefile.in, - icons/Makefile.in, panel/Makefile.in, plugins/Makefile.in, - plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in, - plugins/pager/Makefile.in, plugins/switcher/Makefile.in, - plugins/systembuttons/Makefile.in, settings/xfce_settings_dialog.c, - themes/Makefile.in, themes/Crystal/Makefile.in, - themes/Curve/Makefile.in, themes/Gnome/Makefile.in, - themes/Noia/Makefile.in, themes/XFce/Makefile.in: Update - screenshots for new dialog style - -2003-02-24 huysmans - - * settings/: Makefile.in, xfce_settings_dialog.c: Use frames in - dialog for the sake of consistency. - -2003-02-24 huysmans - - * panel/: popup.c, panel.c: Revert to using gtk to move the panels. - No more flicker, yay. - -2003-02-23 huysmans - - * panel/popup.c: Use gdk_window_move to position subpanel. gtk does - not ignore margins - -2003-02-22 huysmans - - * ChangeLog: Actually install doc images ... - -2003-02-18 xfce - - * panel/panel.c: Use xflock4 instead of xflock (same file, just a - name change for xfce4) - -2003-02-17 huysmans - - * panel/Makefile.in: Fix make dist. Add my_gettext.h to sources in - Makefile. - -2003-02-17 huysmans - - * Makefile.am, Makefile.in, icons/Makefile.am, icons/Makefile.in, - icons/xfce_slogan.xpm, panel/Makefile.am, panel/Makefile.in, - panel/info.c, panel/info.h, panel/panel.c, - plugins/systembuttons/systembuttons.c, po/ChangeLog, - po/POTFILES.in, po/de.gmo, po/de.po, po/es.gmo, po/es.po, - po/es_MX.gmo, po/es_MX.po, po/fi.gmo, po/fi.po, po/fr.gmo, - po/fr.po, po/nl.gmo, po/nl.po, po/xfce4-panel.pot: Remove info - panel. Use xfce4-about instead. - -2003-02-15 huysmans - - * ChangeLog, configure, configure.ac, example.xfce4rc.in, - panel/controls.c, plugins/Makefile.am, plugins/Makefile.in, - plugins/clock/Makefile.am, plugins/clock/Makefile.in, - plugins/mailcheck/Makefile.am, plugins/mailcheck/Makefile.in, - plugins/pager/Makefile.am, plugins/pager/Makefile.in, - plugins/pager/pager.c, plugins/switcher/Makefile.am, - plugins/switcher/Makefile.in, plugins/switcher/switcher.c, - plugins/systembuttons/Makefile.am, - plugins/systembuttons/Makefile.in: Split graphical pager out from - switcher plugin. Add it to the default configuration - -2003-02-14 xfce - - * panel/xfce_support.c: Use static var for startup notification - internals - -2003-02-14 huysmans - - * panel/xfce_support.c: Fix typo - -2003-02-14 huysmans - - * panel/xfce_support.c: Don't use a variable after freeing it ... - -2003-02-14 xfce - - * panel/xfce_support.c: Fix crash at logout - -2003-02-14 xfce - - * panel/: main.c, xfce_support.c, xfce_support.h: Fix startup - notification/GdkScreen problems - -2003-02-14 xfce - - * panel/xfce_support.c: Fix use of gtk+-2.2 function in - xfce_support - -2003-02-13 huysmans - - * TODO: Update TODO list - -2003-02-13 huysmans - - * panel/: controls.c, panel.c: Small fixes to position setting and - other cleanups - -2003-02-12 huysmans - - * panel/icons.h, panel/item_dialog.c, panel/xfce_support.c, - panel/xfce_support.h, plugins/systembuttons/systembuttons.c: - Properly use const keyword in several places - -2003-02-12 xfce - - * panel/xfce_support.c: [no log message] - -2003-02-12 huysmans - - * panel/: controls.c, panel.c: Fix menu translation functions - -2003-02-11 xfce - - * ChangeLog: Update ChangeLog - -2003-02-11 xfce - - * panel/xfce_support.c: Add additional sanity checks to satrtup - notification code. - -2003-02-11 xfce - - * panel/xfce_support.c: [no log message] - -2003-02-11 xfce - - * panel/xfce_support.c: Make sure we don't free system var environ - by mistake... - -2003-02-10 huysmans - - * configure, configure.ac, po/es_MX.gmo, po/es_MX.po: Forgot to put - old spanish translations back as es_MX - -2003-02-10 huysmans - - * po/: es.gmo, es.po, fi.gmo, fi.po: Update spanish translations - -2003-02-10 xfce - - * panel/xfce_support.c: Increase startup notification timeout to 30 - seconds - -2003-02-10 xfce - - * Makefile.in, aclocal.m4, config.h.in, configure, configure.ac, - doc/Makefile.in, icons/Makefile.in, panel/Makefile.am, - panel/Makefile.in, panel/info.c, panel/item.c, panel/item.h, - panel/item_dialog.c, panel/panel.c, panel/xfce_support.c, - panel/xfce_support.h, plugins/Makefile.in, - plugins/clock/Makefile.in, plugins/mailcheck/Makefile.am, - plugins/mailcheck/Makefile.in, plugins/mailcheck/mailcheck.c, - plugins/switcher/Makefile.in, plugins/systembuttons/Makefile.in, - plugins/systembuttons/systembuttons.c, settings/Makefile.in, - themes/Makefile.in, themes/Crystal/Makefile.in, - themes/Curve/Makefile.in, themes/Gnome/Makefile.in, - themes/Noia/Makefile.in, themes/XFce/Makefile.in: Add support for - startup notification from freedesktop.org standard Fix a few memory - leaks - -2003-02-04 huysmans - - * ChangeLog, example.xfce4rc.in: Fix the default rc file to show - the correct number of items - -2003-02-04 huysmans - - * Makefile.am, Makefile.in, configure, configure.ac, - example.xfce4rc.in, doc/Makefile.am, doc/Makefile.in, po/de.gmo, - po/es.gmo, po/fi.gmo, po/fr.gmo, po/nl.gmo: Add documentation - framework and some preliminary text - -2003-02-03 huysmans - - * settings/xfce_settings_dialog.c: Fix setting the correct theme in - the dialog - -2003-02-03 huysmans - - * plugins/systembuttons/systembuttons.c: Fix systembutton sizing - -2003-02-02 huysmans - - * ChangeLog, po/POTFILES.in, po/de.po, po/es.po, po/fi.po, - po/fr.po, po/nl.po, po/xfce4-panel.pot: Update translatable strings - -2003-02-02 huysmans - - * panel/item_dialog.c, panel/panel.c, - plugins/systembuttons/systembuttons.c, - settings/xfce_settings_dialog.c: Oh, I don't know. Random changes I - guess - -2003-02-02 huysmans - - * ChangeLog, example.xfce4rc.in, panel/controls.c, - plugins/systembuttons/systembuttons.c: Updates assorti, mainly - systembuttons - -2003-02-02 huysmans - - * plugins/systembuttons/systembuttons.c: Improve arranging - systembuttons - -2003-02-02 huysmans - - * plugins/mailcheck/mailcheck.c: Fix mail check. - -2003-02-01 huysmans - - * configure, configure.ac, plugins/Makefile.am, - plugins/Makefile.in, plugins/mailcheck/mailcheck.c, po/de.gmo, - po/es.gmo, po/fi.gmo, po/fr.gmo, po/nl.gmo: Remove trash plugin. - Cleanup mailcheck plugin - -2003-02-01 xfce - - * settings/xfce_settings.h: Use "xfce" lowercase for channel name - -2003-02-01 huysmans - - * plugins/clock/clock.c: Fix crash when changing clock type - -2003-02-01 huysmans - - * AUTHORS, plugins/clock/clock.c: Small cleanup - -2003-02-01 huysmans - - * AUTHORS, ChangeLog, plugins/clock/clock.c, po/de.po, po/es.po, - po/fi.po, po/fr.po, po/nl.po, po/xfce4-panel.pot: Cleanup clock - plugin. Update to gettext 0.11.5 - -2003-02-01 huysmans - - * po/: fi.gmo, fi.po: Update finnish translations - -2003-02-01 huysmans - - * panel/item.c: Fix bug where libxml ate special characters. Patch - by Michael Mosier. - -2003-01-30 huysmans - - * panel/panel.c: Make handle look a bit better when size >= MEDIUM - -2003-01-30 huysmans - - * panel/info.c: Make dialog look a bit better - -2003-01-30 huysmans - - * AUTHORS, COPYING, ChangeLog, icons/xfce_slogan.xpm, panel/info.c, - po/POTFILES.in, po/de.gmo, po/de.po, po/es.gmo, po/es.po, - po/fi.gmo, po/fi.po, po/fr.gmo, po/fr.po, po/nl.gmo, po/nl.po, - po/xfce4-panel.pot: Update info text. Use AUTHORS for the credits - page. Fix strange characters in COPYING - -2003-01-30 huysmans - - * panel/: Makefile.am, Makefile.in, handle.c, handle.h, info.h, - panel.c: Remove handle.[ch]. Code moved to panel.c. - -2003-01-30 huysmans - - * ChangeLog, panel/Makefile.am, panel/Makefile.in, - panel/callbacks.c, panel/callbacks.h, panel/groups.c, - panel/handle.c, panel/item.c, panel/popup.c, panel/popup.h: Remove - callbacks.[ch]. Last remaining functions moved to popup.c - -2003-01-29 huysmans - - * README, TODO, panel/callbacks.c, panel/callbacks.h, - panel/global.h, panel/item.c, panel/item.h, panel/item_dialog.c, - panel/item_dialog.h, panel/popup.c, panel/popup.h, po/de.gmo, - po/es.gmo, po/fi.gmo, po/fr.gmo, po/nl.gmo, - settings/xfce_settings.h: Cleanup. Unify PanelItem and MenuItem to - avoid code duplication. Small bug fixes. - -2003-01-29 huysmans - - * ChangeLog, po/de.po, po/es.po, po/fi.po, panel/Makefile.am, - po/fr.po, po/nl.po, po/xfce4-panel.pot, panel/Makefile.in, - panel/controls.c, panel/groups.c, panel/main.c, panel/mcs_client.c, - panel/mcs_client.h, panel/panel.c, panel/settings.c: Cleanup - configuration handling and other fixes. Includes string changes. - -2003-01-28 huysmans - - * panel/item_dialog.c: Fix menu item reordering - -2003-01-28 huysmans - - * ChangeLog, panel/global.h, panel/groups.c, panel/icons.c, - panel/main.c, panel/panel.c, plugins/switcher/switcher.c: Several - small cleanups and some gratuitous reformating - -2003-01-27 huysmans - - * ChangeLog, configure, panel/controls.c, panel/controls.h, - panel/global.h, panel/groups.c, panel/groups.h, panel/handle.c, - panel/handle.h, panel/mcs_client.c, panel/panel.c, panel/panel.h, - panel/popup.c, panel/popup.h, plugins/switcher/switcher.c, - plugins/systembuttons/systembuttons.c, settings/xfce_settings.h, - settings/xfce_settings_dialog.c, settings/xfce_settings_plugin.c: - Remove old style and switcher minibuttons - -2003-01-26 huysmans - - * configure.ac, po/fi.gmo, po/fi.po: Add Finnish translations - -2003-01-25 huysmans - - * panel/controls_dialog.c: Don't ask for removal confirmation for - controls without popup menu - -2003-01-25 huysmans - - * plugins/systembuttons/systembuttons.c: Add orientation to - systembuttons - -2003-01-25 huysmans - - * po/: de.gmo, de.po: Really add german translation - -2003-01-25 huysmans - - * configure, configure.ac: Add german translation - -2003-01-25 huysmans - - * ChangeLog, plugins/clock/clock.c, plugins/switcher/switcher.c, - plugins/systembuttons/systembuttons.c: Hide popup for clock and - systembuttons - -2003-01-24 xfce - - * plugins/clock/Makefile.am, plugins/clock/Makefile.in, - plugins/clock/clock.c, plugins/mailcheck/Makefile.am, - plugins/mailcheck/Makefile.in, plugins/mailcheck/mailcheck.c, - plugins/switcher/Makefile.am, plugins/switcher/Makefile.in, - plugins/switcher/switcher.c, plugins/systembuttons/Makefile.am, - plugins/systembuttons/Makefile.in, - plugins/systembuttons/systembuttons.c, - settings/xfce_settings_dialog.c: Fix a bunch of i18n problems: - bindtextdomain must be invoked each time a plugin has to display - something otherwise other bindtextdomains take precedence and - display is not translated anymore... - -2003-01-24 xfce - - * po/: es.gmo, es.po, fr.gmo, fr.po, nl.gmo, nl.po, - xfce4-panel.pot: Fix encoding not specified in es.po, regenerate - pot file (required after Edscott fixed a typo in the source) and - adjust french translation. - -2003-01-24 xfce - - * Makefile.in, aclocal.m4, config.h.in, configure, configure.ac, - icons/Makefile.in, panel/Makefile.in, plugins/Makefile.in, - plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in, - plugins/switcher/Makefile.in, plugins/systembuttons/Makefile.in, - po/fr.gmo, po/fr.po, settings/Makefile.in, themes/Makefile.in, - themes/Crystal/Makefile.in, themes/Curve/Makefile.in, - themes/Gnome/Makefile.in, themes/Noia/Makefile.in, - themes/XFce/Makefile.in: Add french xtion. - -2003-01-24 edscott - - * Makefile.in, aclocal.m4, config.h.in, configure, configure.ac, - icons/Makefile.in, panel/Makefile.in, panel/icons.c, - plugins/Makefile.in, plugins/clock/Makefile.in, - plugins/mailcheck/Makefile.in, plugins/switcher/Makefile.in, - plugins/systembuttons/Makefile.in, po/es.gmo, po/es.po, po/nl.gmo, - po/nl.po, settings/Makefile.in, themes/Makefile.in, - themes/Crystal/Makefile.in, themes/Curve/Makefile.in, - themes/Gnome/Makefile.in, themes/Noia/Makefile.in, - themes/XFce/Makefile.in: added spanish translation and fixed a typo - in source code - -2003-01-24 huysmans - - * ChangeLog, Makefile.am, Makefile.in, aclocal.m4, config.h.in, - configure, configure.ac, icons/Makefile.in, panel/Makefile.am, - panel/Makefile.in, panel/callbacks.c, panel/controls.c, - panel/controls_dialog.c, panel/global.h, panel/groups.c, - panel/handle.c, panel/icons.c, panel/info.c, panel/item.c, - panel/item_dialog.c, panel/main.c, panel/mcs_client.c, - panel/my_gettext.h, panel/panel.c, panel/popup.c, panel/settings.c, - panel/xfce_support.c, plugins/Makefile.in, - plugins/clock/Makefile.am, plugins/clock/Makefile.in, - plugins/clock/clock.c, plugins/mailcheck/Makefile.am, - plugins/mailcheck/Makefile.in, plugins/mailcheck/mailcheck.c, - plugins/switcher/Makefile.am, plugins/switcher/Makefile.in, - plugins/switcher/switcher.c, plugins/systembuttons/Makefile.am, - plugins/systembuttons/Makefile.in, - plugins/systembuttons/systembuttons.c, po/Makefile.in.in, - po/POTFILES.in, po/nl.gmo, po/nl.po, po/xfce4-panel.pot, - settings/Makefile.am, settings/Makefile.in, - settings/xfce_settings_dialog.c, settings/xfce_settings_plugin.c, - themes/Makefile.in, themes/Crystal/Makefile.in, - themes/Curve/Makefile.in, themes/Gnome/Makefile.in, - themes/Noia/Makefile.in, themes/XFce/Makefile.in: Add i18n - framework and Dutch translation - -2003-01-21 huysmans - - * ChangeLog, panel/controls.c, panel/panel.c: Small things that - weren't committed yet - -2003-01-19 huysmans - - * panel/controls.c: Fixing popup menu positioning - -2003-01-19 huysmans - - * panel/: controls.c, panel.c: Use edit/remove/add menu on panel - control right-click - -2003-01-19 madkiss - - * panel/xfce_support.c: - Line 209: Change "char c;" to "int c;" since "char" can end in an - infinite loop. Please also refer to Debian GNU/Linux bugreport - #177429, available at http://bugs.debian.org/177429 - -2003-01-19 huysmans - - * panel/: callbacks.c, main.c, panel.c: Fix problem with dragging - files that contain spaces - -2003-01-18 huysmans - - * panel/panel.c: Damnit I must learn some basic math. Got the - ratios the wrong way around - -2003-01-18 huysmans - - * panel/panel.c: Save screen width and height, so we can use a - relative position, when the user logs in with a different screen - resolution - -2003-01-18 huysmans - - * panel/popup.c: Open a menu when dragging over the toggle button. - Thanks to perldude for suggesting it. This is a cool feature - -2003-01-18 huysmans - - * panel/: mcs_client.c, panel.c, panel.h, popup.c: Use - gdk_window_move() to prevent margins from interfering with position - setting - -2003-01-18 huysmans - - * panel/controls_dialog.c: revert changes that made saving changes - fail - -2003-01-17 huysmans - - * ChangeLog, panel/controls_dialog.c, plugins/switcher/switcher.c: - Use updated netk functions for workspace names and other dialog - fixes - -2003-01-17 huysmans - - * Makefile.in, aclocal.m4, configure, icons/Makefile.in, - panel/handle.c, plugins/Makefile.in, plugins/clock/Makefile.in, - plugins/mailcheck/Makefile.in, plugins/switcher/Makefile.in, - plugins/systembuttons/Makefile.in, settings/Makefile.in, - settings/xfce_settings_dialog.c, themes/Makefile.in, - themes/Crystal/Makefile.in, themes/Curve/Makefile.in, - themes/Gnome/Makefile.in, themes/Noia/Makefile.in, - themes/XFce/Makefile.in: Use same border width gtk uses in dialog - action area. Some reordering in the panel dialog. Looks better IMO. - -2003-01-13 huysmans - - * ChangeLog, panel/item_dialog.c: Really fix crash in menu - -2003-01-12 huysmans - - * panel/: Makefile.in, item_dialog.c: Fix panel crash when removing - menu items - -2003-01-12 huysmans - - * panel/callbacks.c: Fix bug in mouse press handling that stopped - the menu from working - -2003-01-12 xfce - - * Makefile.in, aclocal.m4, configure, configure.ac, xfce4.spec.in, - icons/Makefile.in, panel/Makefile.in, plugins/Makefile.in, - plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in, - plugins/switcher/Makefile.in, plugins/systembuttons/Makefile.in, - settings/Makefile.am, settings/Makefile.in, themes/Makefile.in, - themes/Crystal/Makefile.in, themes/Curve/Makefile.in, - themes/Gnome/Makefile.in, themes/Noia/Makefile.in, - themes/XFce/Makefile.in: Add a check for availability of - xfce-mcs-manager - -2003-01-12 huysmans - - * panel/: callbacks.c, controls.c, handle.c: Use SHIFT-button1 as - equivalent for right-click - -2003-01-11 huysmans - - * panel/: Makefile.am, Makefile.in: Rename binary to xfce4-panel - -2003-01-11 huysmans - - * ChangeLog, configure, configure.ac, panel/mcs_client.c, - settings/Makefile.am, settings/Makefile.in: Update to use new - settings manager plugin path - -2003-01-11 huysmans - - * ChangeLog, Makefile.in, aclocal.m4, configure, configure.ac, - icons/Makefile.in, panel/Makefile.in, panel/mcs_client.c, - plugins/Makefile.in, plugins/clock/Makefile.in, - plugins/mailcheck/Makefile.in, plugins/switcher/Makefile.in, - plugins/systembuttons/Makefile.in, settings/Makefile.in, - settings/xfce_settings_dialog.c, themes/Makefile.in, - themes/Crystal/Makefile.in, themes/Curve/Makefile.in, - themes/Gnome/Makefile.in, themes/Noia/Makefile.in, - themes/XFce/Makefile.in: Use new check for running settings manager - -2003-01-10 xfce - - * Makefile.in, config.h.in, configure, configure.ac, xfce4.spec.in, - icons/Makefile.in, panel/Makefile.in, plugins/Makefile.in, - plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in, - plugins/switcher/Makefile.in, plugins/systembuttons/Makefile.in, - settings/Makefile.in, themes/Makefile.in, - themes/Crystal/Makefile.in, themes/Curve/Makefile.in, - themes/Gnome/Makefile.in, themes/Noia/Makefile.in, - themes/XFce/Makefile.in: Update dependencies on libxfcegui4 version - and libxfce4mcs - -2003-01-09 xfce - - * Makefile.in, aclocal.m4, configure, icons/Makefile.in, - panel/Makefile.in, plugins/Makefile.in, plugins/clock/Makefile.in, - plugins/mailcheck/Makefile.in, plugins/switcher/Makefile.in, - plugins/systembuttons/Makefile.in, settings/Makefile.am, - settings/Makefile.in, themes/Makefile.in, - themes/Crystal/Makefile.in, themes/Curve/Makefile.in, - themes/Gnome/Makefile.in, themes/Noia/Makefile.in, - themes/XFce/Makefile.in: Add " -avoid-version " to - libxfce4settings_la_LDFLAGS in settings/Makefile.am - -2003-01-09 huysmans - - * panel/: item_dialog.c, popup.c, popup.h: Fix possible bug in menu - item ordering. See if you can break this one perldude :) - -2003-01-09 huysmans - - * ChangeLog, plugins/switcher/switcher.c, - plugins/systembuttons/systembuttons.c: Fix bug in calling - mcs_dialog(). Thanks to L. Friendman for pointing it out. - -2003-01-08 huysmans - - * panel/: handle.c, mcs_client.c, mcs_client.h: Add option to run - settings manager dialog to right-click menu on move handles - -2003-01-08 huysmans - - * ChangeLog, settings/xfce_settings_dialog.c: Add new header to - xfce4 plugin and add a bit more border - -2003-01-08 huysmans - - * panel/info.c, settings/xfce_settings_dialog.c: Use new dialog - header for settings plugin - -2003-01-05 huysmans - - * ChangeLog, panel/global.h, panel/main.c, panel/mcs_client.c, - panel/xfce_support.c, panel/xfce_support.h, - settings/xfce_settings_dialog.c: Use dialogs from libxfcegui4 - -2003-01-04 huysmans - - * settings/xfce_settings_plugin.c: Use inline icon - -2003-01-02 huysmans - - * panel/xfce_support.c: Fix small bug in localized config file - names - -2002-12-31 huysmans - - * plugins/switcher/switcher.c: Resize on workspace - creation/deletion - -2002-12-31 huysmans - - * ChangeLog, Makefile.in, aclocal.m4, configure, icons/Makefile.am, - icons/Makefile.in, panel/Makefile.in, plugins/Makefile.in, - plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in, - plugins/switcher/Makefile.in, plugins/switcher/switcher.c, - plugins/systembuttons/Makefile.in, settings/Makefile.in, - settings/xfce_settings_dialog.c, settings/xfce_settings_plugin.c, - themes/Makefile.in, themes/Crystal/Makefile.in, - themes/Curve/Makefile.in, themes/Gnome/Makefile.in, - themes/Noia/Makefile.in, themes/XFce/Makefile.in: Several fixes: - minibuttons position, settings plugin icon and non-modal dialog, - netk_pager sizing - -2002-12-30 huysmans - - * panel/handle.c, plugins/switcher/switcher.c: Remove exit and - iconify buttons from handles - -2002-12-28 huysmans - - * panel/main.c: Fix SIGHUP handling. Thanks to Steganos for - pointing it out - -2002-12-28 huysmans - - * ChangeLog, TODO: Update ChangeLog and TODO file - -2002-12-28 huysmans - - * plugins/switcher/switcher.c: Fix minibutton positioning - -2002-12-27 huysmans - - * plugins/switcher/switcher.c: Fix size setting of graphical pager - -2002-12-27 huysmans - - * plugins/switcher/switcher.c: Small fix to dialog - -2002-12-27 huysmans - - * plugins/switcher/switcher.c: Add graphical pager option to - switcher plugin - -2002-12-24 huysmans - - * panel/: callbacks.c, callbacks.h, popup.c: Make ESC close popup - menu - -2002-12-23 huysmans - - * ChangeLog, panel/mcs_client.c, panel/mcs_client.h: Add missing - files - -2002-12-23 huysmans - - * Makefile.am, Makefile.in, configure, configure.ac, - icons/Makefile.in, panel/Makefile.am, panel/Makefile.in, - panel/callbacks.c, panel/dialogs.c, panel/dialogs.h, - panel/handle.c, panel/main.c, panel/panel.c, panel/settings.c, - plugins/Makefile.in, plugins/clock/Makefile.am, - plugins/clock/Makefile.in, plugins/clock/clock.c, - plugins/mailcheck/Makefile.am, plugins/mailcheck/Makefile.in, - plugins/mailcheck/mailcheck.c, plugins/switcher/Makefile.am, - plugins/switcher/Makefile.in, plugins/switcher/switcher.c, - plugins/systembuttons/Makefile.am, - plugins/systembuttons/Makefile.in, - plugins/systembuttons/systembuttons.c, settings/Makefile.am, - settings/Makefile.in, settings/xfce_settings.h, - settings/xfce_settings_dialog.c, settings/xfce_settings_dialog.h, - settings/xfce_settings_plugin.c, settings/xfce_settings_plugin.h, - themes/Makefile.in, themes/Crystal/Makefile.in, - themes/Curve/Makefile.in, themes/Gnome/Makefile.in, - themes/Noia/Makefile.in, themes/XFce/Makefile.in: Add settings - manager plugin and make the panel a settings client. Cool stuff :) - -2002-12-20 huysmans - - * panel/: controls.c, controls.h, controls_dialog.c, panel.c, - settings.c: Fix bug with controls dialog. Thanks to Korbinus for - reporting it. - -2002-12-17 huysmans - - * ChangeLog, README, TODO: Update README and TODO file - -2002-12-17 huysmans - - * plugins/: mailcheck/mailcheck.c, switcher/switcher.c, - systembuttons/systembuttons.c: Another big API change. I think I - got it right this time: control classes providing the interface to - panel controls, including a function to create new instances. - -2002-12-17 huysmans - - * ChangeLog, panel/callbacks.c, panel/callbacks.h, - panel/controls.c, panel/controls.h, panel/controls_dialog.c, - panel/controls_dialog.h, panel/global.h, panel/groups.c, - panel/groups.h, panel/handle.c, panel/item.c, panel/item.h, - panel/item_dialog.c, panel/item_dialog.h, panel/main.c, - panel/panel.c, panel/plugins.h, panel/popup.h, - panel/xfce_support.c, panel/xfce_support.h, plugins/clock/clock.c: - Another big API change. I think I got it right this time: control - classes providing the interface to panel controls, including a - function to create new instances. - -2002-12-16 huysmans - - * ChangeLog, panel/controls.c, panel/plugins.h, - plugins/clock/clock.c, plugins/mailcheck/mailcheck.c, - plugins/switcher/switcher.c, plugins/systembuttons/systembuttons.c: - Fix version checking code - -2002-12-16 huysmans - - * ChangeLog, panel/Makefile.am, panel/Makefile.in, - panel/controls.c, panel/controls.h, panel/controls_dialog.c, - panel/groups.c, panel/plugins.h, plugins/clock/clock.c, - plugins/mailcheck/mailcheck.c, plugins/switcher/switcher.c, - plugins/systembuttons/systembuttons.c: Add new module loading code - -2002-12-16 huysmans - - * plugins/clock/clock.c: Fix date bug - -2002-12-16 huysmans - - * panel/groups.c: Fix bug with handling old config file - -2002-12-13 huysmans - - * ChangeLog, configure, configure.ac, panel/Makefile.am, - panel/Makefile.in, panel/builtins.c, panel/builtins.h, - panel/controls.c, panel/global.h, panel/info.c, - plugins/Makefile.am, plugins/Makefile.in, - plugins/systembuttons/Makefile.am, - plugins/systembuttons/Makefile.in, - plugins/systembuttons/systembuttons.c: remove last builtins and add - new systembuttons plugin - -2002-12-12 huysmans - - * ChangeLog, panel/groups.c, panel/groups.h, panel/handle.c: Allow - user to add a panel control from the handle right-click menu - -2002-12-12 huysmans - - * panel/: main.c, panel.c, panel.h: Improve SIGHUP handling - -2002-12-12 huysmans - - * panel/: panel.c, xfce_support.c: Improve window layer handling - -2002-12-12 huysmans - - * ChangeLog, example.xfce4rc.in: Update default rc file - -2002-12-12 huysmans - - * ChangeLog, configure, configure.ac, panel/Makefile.am, - panel/Makefile.in, panel/builtins.c, panel/callbacks.c, - panel/central.c, panel/central.h, panel/controls.c, - panel/controls.h, panel/controls_dialog.c, panel/dialogs.c, - panel/dialogs.h, panel/global.h, panel/groups.c, panel/groups.h, - panel/handle.c, panel/icons.c, panel/icons.h, panel/item.c, - panel/item_dialog.c, panel/main.c, panel/main.h, panel/panel.c, - panel/panel.h, panel/popup.c, panel/popup.h, panel/settings.c, - panel/settings.h, panel/side.c, panel/side.h, panel/wmhints.c, - panel/wmhints.h, panel/xfce.c, panel/xfce.h, panel/xfce_support.c, - panel/xfce_support.h, plugins/Makefile.am, plugins/Makefile.in, - plugins/switcher/Makefile.am, plugins/switcher/Makefile.in, - plugins/switcher/switcher.c: Huge update. Highlights: switcher - plugin instead of central panel code. Side panels don't exist - anymore; there is one list of panel groups. xfce.c split up into - main and panel modules. New general header file xfce.h that - includes all exported headers. New fixes and probably new bugs - -2002-12-03 huysmans - - * themes/: Crystal/Makefile.am, Crystal/Makefile.in, - Crystal/newmail.png, Crystal/nomail.png, Crystal/oldmail.png, - Noia/Makefile.am, Noia/Makefile.in, Noia/newmail.png, - Noia/nomail.png, Noia/oldmail.png: Add mail icons to Crystal and - Noia themes. Thanks (again) to Jeroen Vloothuis - -2002-11-27 huysmans - - * ChangeLog, panel/icons.c, panel/xfce.c, - plugins/mailcheck/mailcheck.c: Fix a bug in icon handling. Thanks - to Korbinus - -2002-11-26 huysmans - - * themes/XFce/: Makefile.am, Makefile.in: Also update makefiles - -2002-11-26 huysmans - - * themes/XFce/: mail.xpm, newmail.xpm: Fix naming of new mail icon - -2002-11-26 huysmans - - * configure, configure.ac, panel/icons.c, themes/Makefile.am, - themes/Makefile.in, themes/Crystal/Makefile.am, - themes/Crystal/Makefile.in, themes/Crystal/README, - themes/Crystal/edit.png, themes/Crystal/file1.png, - themes/Crystal/file2.png, themes/Crystal/games.png, - themes/Crystal/man.png, themes/Crystal/miniinfo.png, - themes/Crystal/minilock.png, themes/Crystal/minipalet.png, - themes/Crystal/minipower.png, themes/Crystal/multimedia.png, - themes/Crystal/network.png, themes/Crystal/paint.png, - themes/Crystal/print.png, themes/Crystal/schedule.png, - themes/Crystal/sound.png, themes/Crystal/terminal.png, - themes/Crystal/trash_empty.png, themes/Crystal/trash_full.png, - themes/Crystal/unknown.png, themes/Noia/Makefile.am, - themes/Noia/Makefile.in, themes/Noia/README, themes/Noia/edit.png, - themes/Noia/file1.png, themes/Noia/file2.png, - themes/Noia/games.png, themes/Noia/man.png, - themes/Noia/miniinfo.png, themes/Noia/minilock.png, - themes/Noia/minipalet.png, themes/Noia/minipower.png, - themes/Noia/multimedia.png, themes/Noia/network.png, - themes/Noia/paint.png, themes/Noia/print.png, - themes/Noia/schedule.png, themes/Noia/sound.png, - themes/Noia/terminal.png, themes/Noia/trash_empty.png, - themes/Noia/trash_full.png, themes/Noia/unknown.png: Add Crystal - and Noia themes provided by Jeroen Vloothuis (aka slm on IRC) - -2002-11-26 huysmans - - * ChangeLog, aclocal.m4, configure, panel/wmhints.c, - themes/Curve/Makefile.am, themes/Curve/Makefile.in, - themes/Curve/newmail.png, themes/Curve/nomail.png, - themes/Curve/oldmail.png: Fix bug in wmhints and add mail icons to - Curve theme - -2002-11-25 xfce - - * panel/xfce.c: Put back "gtk_widget_show" on toplevel, the panel - doesn't show otherwise :) - -2002-11-24 huysmans - - * panel/: item_dialog.c, xfce_support.c, xfce_support.h: Only show - preview when slecting icons - -2002-11-23 xfce - - * aclocal.m4, configure, panel/builtins.c, panel/callbacks.c, - panel/global.h, panel/handle.c, panel/item.c, panel/popup.c, - panel/xfce.c, plugins/clock/clock.c, plugins/mailcheck/mailcheck.c: - Update for libxfcegui4 new include base dir. - -2002-11-23 huysmans - - * Makefile.am, Makefile.in, example.xfce4rc.in, panel/xfce.c: - Install default xfce4rc - -2002-11-22 huysmans - - * ChangeLog, panel/builtins.c, panel/item_dialog.c: Fix bug where - file dialog stays below control dialog - -2002-11-18 huysmans - - * panel/: builtins.c, controls.c, controls.h, xfce.c: Fix SIGHUP - handling, I'll just quit. Restarting doesn't work - -2002-11-13 huysmans - - * ChangeLog, aclocal.m4, configure, panel/builtins.c, - panel/controls.c, panel/controls.h, panel/controls_dialog.c, - panel/item.c, panel/side.c, panel/side.h, plugins/clock/clock.c, - plugins/mailcheck/mailcheck.c: Panel control API change and several - small fixes - -2002-11-10 huysmans - - * panel/: central.c, dialogs.c: Fix repositioning bug in - preferences dialog - -2002-11-10 huysmans - - * panel/central.c: Fix screen button positioning bug (again./xfce4 - ) - -2002-11-10 huysmans - - * panel/central.c: Fix small screen naming bug - -2002-11-10 huysmans - - * panel/central.c: Update desktop switcher - -2002-11-10 huysmans - - * panel/: controls_dialog.c, side.c, side.h: Allow removal of panel - controls - -2002-11-10 huysmans - - * panel/central.c: Fix a bug in screen name handling - -2002-11-10 huysmans - - * panel/: dialogs.c, global.h, popup.c, side.c, xfce.c, xfce.h: Try - to fix a bug in panel control positioning - -2002-11-09 huysmans - - * panel/: icons.c, xfce.c: Fix a bug whith icon handling when there - is no rc file or theme == NULL - -2002-11-09 huysmans - - * panel/dialogs.c: Add back notebook tabs in global dialog - -2002-11-08 xfce - - * panel/Makefile.in, plugins/Makefile.in, - plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in, - themes/Makefile.in, themes/Curve/Makefile.in, - themes/Gnome/Makefile.in, themes/XFce/Makefile.in: make sure - required libs for build/rpm are listed, with versions and keep the - minimum version required at only one place (configure.ac) - -2002-11-08 xfce - - * Makefile.in, aclocal.m4, config.h.in, configure, configure.ac, - xfce4.spec.in, icons/Makefile.in: make sure required libs for - build/rpm are listed, with versions and keep the minimum version - required at only one place (configure.ac) - -2002-11-08 huysmans - - * ChangeLog, panel/dialogs.c: Add panel centering options to global - dialog - -2002-11-08 huysmans - - * configure, configure.ac, icons/Makefile.am, icons/Makefile.in, - icons/addicon.xpm, icons/down.xpm, icons/edit.xpm, icons/file1.xpm, - icons/file2.xpm, icons/games.xpm, icons/mail.xpm, icons/man.xpm, - icons/miniinfo.xpm, icons/minilock.xpm, icons/minipalet.xpm, - icons/minipower.xpm, icons/multimedia.xpm, icons/network.xpm, - icons/nomail.xpm, icons/oldmail.xpm, icons/paint.xpm, - icons/print.xpm, icons/schedule.xpm, icons/sound.xpm, - icons/terminal.xpm, icons/trash_empty.xpm, icons/trash_full.xpm, - icons/unknown.xpm, icons/up.xpm, panel/builtins.c, panel/central.c, - panel/dialogs.c, panel/global.h, panel/icons.c, panel/icons.h, - plugins/mailcheck/mailcheck.c, themes/Makefile.am, - themes/Makefile.in, themes/XFce/Makefile.am, - themes/XFce/Makefile.in, themes/XFce/edit.xpm, - themes/XFce/file1.xpm, themes/XFce/file2.xpm, - themes/XFce/games.xpm, themes/XFce/mail.xpm, themes/XFce/man.xpm, - themes/XFce/miniinfo.xpm, themes/XFce/minilock.xpm, - themes/XFce/minipalet.xpm, themes/XFce/minipower.xpm, - themes/XFce/multimedia.xpm, themes/XFce/network.xpm, - themes/XFce/nomail.xpm, themes/XFce/oldmail.xpm, - themes/XFce/paint.xpm, themes/XFce/print.xpm, - themes/XFce/schedule.xpm, themes/XFce/sound.xpm, - themes/XFce/terminal.xpm, themes/XFce/trash_empty.xpm, - themes/XFce/trash_full.xpm, themes/XFce/unknown.xpm: Make default - theme a normal theme. Get rid of builtin icons - -2002-11-06 huysmans - - * ChangeLog, panel/central.c, panel/dialogs.c, panel/popup.c: Small - fixes and cleanups - -2002-11-06 huysmans - - * panel/controls_dialog.c: Really fixed control positioning. - -2002-11-06 huysmans - - * panel/: builtins.c, controls_dialog.c, dialogs.c, global.h, - handle.c, side.c: Fixed control positioning. - -2002-11-05 huysmans - - * panel/side.c: This is an 'almost' fix for a control positioning - bug. - -2002-11-05 huysmans - - * ChangeLog, panel/callbacks.c, panel/callbacks.h, panel/central.c, - panel/central.h, panel/controls.c, panel/controls.h, - panel/controls_dialog.c, panel/dialogs.c, panel/global.h, - panel/handle.c, panel/popup.c, panel/popup.h, panel/side.c, - panel/side.h, panel/xfce.c: Major reworking of panel internals. - Work in progress - -2002-10-28 huysmans - - * panel/callbacks.c: Fix positioning bug the right way (Olivier's - suggestion) - -2002-10-27 huysmans - - * panel/: side.c, xfce_support.c: Use putenv instead of setenv. - Solaris doesn't have it. - -2002-10-27 huysmans - - * panel/item_dialog.c: Fix a menu editing bug that caused a crash - -2002-10-27 huysmans - - * panel/callbacks.c: Attempt to fix menu positioning bug - -2002-10-27 huysmans - - * panel/: builtins.c, callbacks.c, callbacks.h, central.c, - global.h, xfce.c: More central panel code rearrangment - -2002-10-27 huysmans - - * aclocal.m4, configure, panel/central.c, panel/central.h, - panel/wmhints.c, panel/xfce.c, panel/xfce.h: separate central panel - more from the panel code. First step to making it a module - -2002-10-27 xfce - - * Makefile.in, aclocal.m4, autogen.sh, configure, - icons/Makefile.in, panel/Makefile.in, panel/global.h, - panel/xfce_support.c, plugins/Makefile.in, - plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in, - themes/Makefile.in, themes/Curve/Makefile.in, - themes/Gnome/Makefile.in: Change autogen.sh script to use env vars - if available (instead of auto*-1.x as it was before) Make use of - preview file selector instead of basic gtk file selector. - -2002-10-25 xfce - - * panel/xfce.c: Increase SM priority to 40 - -2002-10-21 huysmans - - * ChangeLog, panel/xfce.c: Add session management functionality - -2002-10-18 huysmans - - * ChangeLog, autogen.sh, panel/callbacks.c, panel/icons.h, - panel/item_dialog.c, panel/popup.c, panel/popup.h: Use - xfce_menubutton widget in popup menus - -2002-10-11 xfce - - * xfce4.spec.in: Fix xfce4.spec file still pointing on old plugin - location. - -2002-10-11 huysmans - - * panel/Makefile.am, panel/Makefile.in, panel/global.h, - panel/xfce_support.c, plugins/clock/Makefile.am, - plugins/clock/Makefile.in, plugins/mailcheck/Makefile.am, - plugins/mailcheck/Makefile.in: Move plugins under /usr/lib (FHS - compliant). Thanks to Martin Loschwitz for bringing it up. - -2002-10-10 huysmans - - * panel/builtins.c: Fix bug in builtins (stupid gcc 3.2 didn't - complain) - -2002-10-10 huysmans - - * panel/item_dialog.c: Fix bug where popup menu disappears if you - press Add icon - -2002-10-10 huysmans - - * ChangeLog, panel/dialogs.c, panel/global.h, panel/popup.c, - panel/popup.h, panel/side.c, panel/side.h, panel/xfce.c, - panel/xfce.h: Remove popup_size option and change add-to-menu icon - -2002-10-10 huysmans - - * panel/Makefile.am, panel/Makefile.in, panel/builtins.c, - panel/builtins.h, panel/controls.c, panel/iconbutton.c, - panel/iconbutton.h, panel/item.c, panel/item.h, - plugins/mailcheck/mailcheck.c: Use xfce_iconbutton widget for panel - items - -2002-10-09 huysmans - - * panel/: callbacks.c, item_dialog.c, popup.c, popup.h: New popup - buttons. Really this time - -2002-10-09 huysmans - - * panel/: builtins.c, controls.c, controls.h, popup.h: Oops used an - old tree to commit. Revert. - -2002-10-08 huysmans - - * panel/: builtins.c, controls.c, controls.h, popup.h: Use new - xfce_togglebutton from libxfcegui4 - -2002-10-07 huysmans - - * icons/Makefile.am, icons/Makefile.in, icons/close.xpm, - icons/handle.xpm, icons/iconify.xpm, panel/handle.c, panel/icons.c, - panel/icons.h: Fix position saving bug - -2002-10-07 huysmans - - * ChangeLog, panel/xfce.c: Increase size popup buttons by two - pixels - -2002-10-07 huysmans - - * ChangeLog, panel/handle.c: Add new decorbuttons - -2002-10-06 huysmans - - * ChangeLog, panel/handle.c: Fix position saving - -2002-10-06 huysmans - - * configure, configure.ac, panel/handle.c, - plugins/clock/Makefile.am, plugins/clock/Makefile.in, - plugins/clock/clock.c, plugins/clock/xfce_clock.c, - plugins/clock/xfce_clock.h: Use new libxfcegui4 - -2002-10-05 huysmans - - * configure, configure.ac, panel/builtins.c, panel/controls.c, - panel/global.h, plugins/Makefile.am, plugins/Makefile.in: Make - trash can a plugin - -2002-10-05 huysmans - - * ChangeLog, panel/builtins.c, panel/global.h: A few fixes for bugs - created with the clock plugin move - -2002-10-05 huysmans - - * configure, configure.ac, panel/Makefile.am, panel/Makefile.in, - panel/builtins.c, panel/controls.c, panel/xfce_clock.c, - panel/xfce_clock.h, plugins/Makefile.am, plugins/Makefile.in, - plugins/clock/Makefile.am, plugins/clock/Makefile.in, - plugins/clock/clock.c, plugins/clock/xfce_clock.c, - plugins/clock/xfce_clock.h: Make the clock a plugin - -2002-10-05 huysmans - - * ChangeLog, panel/handle.c, panel/handle.h, panel/xfce.c: update - handle layout - -2002-10-03 huysmans - - * panel/: builtins.c, xfce.c: Fix current desktop bug - -2002-10-02 huysmans - - * panel/: handle.c, xfce.c: Re-add frame to move handles, remove - separators. Looks a bit better I think - -2002-10-02 huysmans - - * Makefile.am, Makefile.in, panel/Makefile.am, panel/Makefile.in, - panel/handle.c, panel/handle.h, panel/move.c, panel/move.h, - panel/popup.c, panel/side.c, panel/xfce.c: Initial layout change: - handles on the sides - -2002-09-30 xfce - - * panel/xfce_clock.c: Change length of hour needle to improve - readability, especially in small size. - -2002-09-29 huysmans - - * configure, configure.ac, themes/Makefile.am, themes/Makefile.in, - themes/Curve/Makefile.am, themes/Curve/Makefile.in, - themes/Curve/README, themes/Curve/edit.png, themes/Curve/file1.png, - themes/Curve/file2.png, themes/Curve/games.png, - themes/Curve/man.png, themes/Curve/miniinfo.png, - themes/Curve/minilock.png, themes/Curve/minipalet.png, - themes/Curve/minipower.png, themes/Curve/multimedia.png, - themes/Curve/network.png, themes/Curve/paint.png, - themes/Curve/print.png, themes/Curve/schedule.png, - themes/Curve/sound.png, themes/Curve/terminal.png, - themes/Curve/trash_empty.png, themes/Curve/trash_full.png, - themes/Curve/unknown.png: Change theme name - -2002-09-29 huysmans - - * ChangeLog, panel/Makefile.am, panel/Makefile.in: Fix header - missing from dist tarball - -2002-09-29 huysmans - - * ChangeLog, configure, configure.ac, themes/Makefile.am, - themes/Makefile.in, themes/Gnome/Makefile.am, - themes/Gnome/Makefile.in: Add Bluecurve theme - -2002-09-29 xfce - - * panel/xfce_clock.c: Rendering and optimizations to clock_widget - -2002-09-29 xfce - - * panel/xfce_clock.c: clock tweaking. - -2002-09-29 xfce - - * panel/xfce_clock.c: Use MIN where MIN is meant and not MAX ! - -2002-09-28 xfce - - * panel/builtins.c: Put back main field for builtin clock to - eventbox otherwise the date doesn't show (Jasper was right :) ) - -2002-09-28 xfce - - * panel/: builtins.c, xfce.c, xfce_clock.c: Bug fixes in panel. - When started w/out central panel, changing style - (traditionnal/modern) cause gtk warning on NULL widget, and once - started w/out central panel, it could not be showed anymore. - -2002-09-28 xfce - - * panel/: builtins.c, xfce_clock.c: Change the clock widget so - analog mode stay readable even in tiny mode. Remove the round frame - arround the clock (it looked outdated) and change various - internals. - -2002-09-28 zedek - - * TODO: Update TODO list - -2002-09-28 xfce - - * icons/: Makefile.am, Makefile.in: Err, forgot to remove the - digits.xbm files from the Makefile.am ! - -2002-09-28 xfce - - * icons/digits.xbm, panel/xfce_clock.c, panel/xfce_clock.h: Fix - multiple clock not updating correctly, move digits.xbm inside - xfce_clock.c because I want anybody to be able take up - xfce_clock.[ch] and get all that is needed w/out requiring other - external files. - -2002-09-28 xfce - - * Makefile.am, Makefile.in, configure: Add removal of - autom4te.cache dir at distclean. - -2002-09-27 xfce - - * panel/xfce_clock.c: [no log message] - -2002-09-27 xfce - - * panel/xfce_clock.c: Add _finalize() method to xfce_clock widget. - -2002-09-27 xfce - - * panel/controls.c: Jasper is right (as usual), the eventbox makes - sense. - -2002-09-27 xfce - - * panel/: builtins.c, callbacks.c, central.c, controls.c, - controls_dialog.c, dialogs.c, item_dialog.c, popup.c, side.c, - wmhints.c, xfce_clock.c, xfce_support.c: Fix clock widget as - suggested by Olexiy Avramchenko <ath@beast.stu.cn.ua> on - gtk-app-devel-list, revert g_ref since it's not necessary anymore, - fix various compilation warnings (some being serious) - -2002-09-26 xfce - - * panel/: builtins.c, controls.c, controls_dialog.c, xfce_clock.c: - Bug hunting. Fixed the double free bug when removing clock widget. - -2002-09-26 xfce - - * panel/builtins.c: Fix clock mode not being restored at startup. - -2002-09-26 huysmans - - * panel/: controls.c, controls_dialog.c: Try to fix double free bug - -2002-09-26 huysmans - - * ChangeLog, panel/dialogs.c: Fix embarrassing bug in the code for - finding themes. Thanks Korbinus. - -2002-09-25 xfce - - * panel/builtins.c: Put back clock frame with traditional panel - style for zeDek :) - -2002-09-25 xfce - - * panel/: builtins.c, xfce_clock.c, xfce_clock.h: Change clock - internals. - -2002-09-24 zedek - - * panel/builtins.c: Fixed a bug (again) in the clock code - (unnitialized variable) - -2002-09-24 huysmans - - * ChangeLog, panel/popup.c: Fix sizing Add Icon menu item - -2002-09-24 zedek - - * panel/builtins.c: Fixed (who knows ;) the LED clock - -2002-09-24 zedek - - * ChangeLog: Update ChangeLog - -2002-09-24 zedek - - * panel/: builtins.c, xfce_clock.c: Removed the previous debug - messages Code cleanups Applied Olivie's Patch (another one :p) - Removed xfce_clock_set_shadow_type function (useless) Added a - function to update the clock module size whenever a config option - changes (actually it only make a call to clock_set_size) ... other - things I can't remember :D (I'm a little bit tired you know) - -2002-09-24 zedek - - * panel/: builtins.c, xfce_clock.c, xfce_clock.h: Added lots of - debug messages Fixed (huh?) the LED/Digital display bug (still - needs improvement) Applied Olivier's patch (gtk_draw_rectangles - calls replace the previous gtk_draw_box) Fixed the frame display - bug (was not shown on startup) - -2002-09-23 huysmans - - * panel/xfce.c: Try to fix crash on exit - -2002-09-23 huysmans - - * panel/xfce.c: Fix crash on ctrl-c. - -2002-09-23 huysmans - - * panel/xfce.c: Change default vertical position - -2002-09-23 huysmans - - * panel/: controls_dialog.c, dialogs.c, item_dialog.c: Save - settings after closing any dialog - -2002-09-23 huysmans - - * panel/: builtins.c, central.c, controls.c, dialogs.c, side.c: Fix - resize bug - -2002-09-22 huysmans - - * TODO, config.h.in, configure, panel/side.c: Fixed the move handle - positioning. Or did I? - -2002-09-22 huysmans - - * panel/callbacks.c: Fix popup menu positioning even more ;-) - -2002-09-22 huysmans - - * panel/side.c: Now really fix move handle positioning. Really. - -2002-09-22 zedek - - * configure.ac: Add debug infos at runtime (--enable-debug) - -2002-09-22 huysmans - - * panel/: controls.c, controls.h: Some cleanup - -2002-09-22 zedek - - * panel/debug.h: fix my previous commit (debug macro) - -2002-09-22 zedek - - * panel/global.h: Added debug macros - -2002-09-22 huysmans - - * ChangeLog: Update ChangeLog - -2002-09-22 huysmans - - * panel/: callbacks.c, callbacks.h, controls.c, side.c: Add close - button on move handle (like xfce3) - -2002-09-22 huysmans - - * panel/callbacks.c: Really fix popup menu positioning - -2002-09-22 huysmans - - * panel/callbacks.c: Fix popup menu positioning - -2002-09-22 huysmans - - * panel/: central.c, side.c, xfce.c: Fix move handle positioning in - vertical mode - -2002-09-21 huysmans - - * ChangeLog, panel/central.c: Fix button ordering bug. Quite - embarrassing actually - -2002-09-21 huysmans - - * configure, icons/Makefile.am, icons/Makefile.in, - panel/builtins.c, panel/callbacks.c, panel/callbacks.h, - panel/central.c, panel/controls.c, panel/controls.h, - panel/dialogs.c, panel/global.h, panel/popup.c, panel/popup.h, - panel/side.c, panel/side.h, panel/xfce.c, panel/xfce.h: Fix panel - reorientation - -2002-09-21 zedek - - * TODO: Update the TODO list - -2002-09-21 zedek - - * ChangeLog: ChangeLog updates - -2002-09-21 zedek - - * panel/dialogs.c: Fix the bad number of desktop buttons when - reverting in the panel configuration - -2002-09-20 zedek - - * panel/central.c: Fix the desktop buttons handling - (size,positionning) - -2002-09-20 zedek - - * icons/digits.xbm, panel/builtins.c, panel/xfce_clock.c, - panel/xfce_clock.h: Cosmetic changes Removed the digits data from - the C source (clean up) and set it in a separate file Added tiny - size handle (still not functionnal for the clock :)) - -2002-09-18 zedek - - * panel/builtins.c: Fixed my previous commit (bis) :) - -2002-09-18 zedek - - * panel/builtins.c: Fixed my previous commit :) - -2002-09-18 zedek - - * panel/builtins.c: Added Write/Read to the xfce4 rc file to store - our configuration Fixed minor bugs (sic) Added functions to - apply/revert the configuration in the confi dialog Code clean up - More comments - -2002-09-17 huysmans - - * TODO: Update todo list: we want to add variable width/height - modules - -2002-09-16 huysmans - - * panel/: builtins.c, builtins.h, callbacks.c, callbacks.h, - central.c, central.h, controls.c, controls.h, controls_dialog.c, - dialogs.c, iconbutton.c, iconbutton.h, item.c, item_dialog.c, - popup.c, popup.h, side.c, side.h, wmhints.c, xfce.c, xfce.h, - xfce_clock.c, xfce_clock.h, xfce_support.c, xfce_support.h: Started - fixing issues with the vertical panel - -2002-09-16 huysmans - - * ChangeLog: Update ChangeLog - -2002-09-16 huysmans - - * TODO, panel/callbacks.c, panel/callbacks.h, panel/central.c, - panel/dialogs.c, panel/global.h, panel/xfce.c: Add vertical panel - option by Botsie. Now this is a cool feature. - -2002-09-15 huysmans - - * ChangeLog, panel/Makefile.in: Update ChangeLog and - panel/Makefile.in - -2002-09-14 zedek - - * ChangeLog: Updated the Changelog - -2002-09-14 zedek - - * AUTHORS: updated my informations (addedd email) - -2002-09-14 zedek - - * panel/builtins.c: First commit to support the new clock module. - -2002-09-14 zedek - - * panel/Makefile.am: Added xfce_clock file to the compilation - source list - -2002-09-14 zedek - - * panel/: xfce_clock.c, xfce_clock.h: First commit for the clock - module - -2002-09-10 huysmans - - * panel/dialogs.c: fix problem with saving popup size - -2002-09-06 huysmans - - * panel/central.c: Fix bug in screen button handling - -2002-09-06 huysmans - - * panel/wmhints.c: Hopefully fix bug in panel-on-top option - -2002-09-06 huysmans - - * panel/: builtins.c, item_dialog.c, popup.c: fix small bugs in - popup menu - -2002-09-06 xfce - - * panel/controls.c: Fix crash at quit (g_free on GTK unref'd object - is a bad idea, gtk+ does that itself). - -2002-09-05 huysmans - - * panel/xfce.c: Fix bug that showed central panel, even if option - was FALSE - -2002-09-05 huysmans - - * Makefile.am, Makefile.in, xfce4.spec.in: fix spec file and update - rpm build command (reported by R.P. Herrold) - -2002-09-04 huysmans - - * ChangeLog, Makefile.am, Makefile.in: update ChangeLog and - Makefile.am - -2002-09-04 huysmans - - * AUTHORS, ChangeLog, Makefile.in, README, README.xml, TODO, - example.xfce4rc.in, icons/Makefile.am, icons/Makefile.in, - panel/Makefile.am, panel/Makefile.in, panel/builtins.c, - panel/builtins.h, panel/callbacks.c, panel/callbacks.h, - panel/central.c, panel/central.h, panel/controls.c, - panel/controls.h, panel/controls_dialog.c, panel/controls_dialog.h, - panel/dialogs.c, panel/dialogs.h, panel/global.h, - panel/iconbutton.c, panel/iconbutton.h, panel/icons.c, - panel/icons.h, panel/info.c, panel/item.c, panel/item.h, - panel/item_dialog.c, panel/item_dialog.h, panel/module.c, - panel/module.h, panel/move.c, panel/popup.c, panel/popup.h, - panel/settings.c, panel/settings.h, panel/side.c, panel/side.h, - panel/wmhints.c, panel/wmhints.h, panel/xfce.c, panel/xfce.h, - panel/xfce_support.c, panel/xfce_support.h, - plugins/mailcheck/mailcheck.c: Major rewrite several internals. - Unify panel items and modules in PanelControl structure (and change - the xml file format in the process), make all dialogs - instant-apply, rearrange preferences dialog, add option to keep - panel on top, probably more - -2002-08-16 xfce - - * panel/global.h: Play with sizes, make the "tiny" panel somehow, - well, tiny. - -2002-08-11 huysmans - - * panel/info.c: fix deprecated gtk function - -2002-08-11 huysmans - - * panel/xfce.c: temporarily comment out the DOCK_TYPE window hint - -2002-08-11 huysmans - - * ChangeLog, panel/info.c: Update ChangeLog and update info panel a - bit - -2002-08-11 huysmans - - * ChangeLog, icons/xfce_slogan.xpm, panel/info.c: Really add info - panel by Xavier Maillard - -2002-08-10 huysmans - - * ChangeLog, Makefile.am, Makefile.in, configure, configure.ac, - panel/Makefile.am, panel/Makefile.in, panel/callbacks.c, - panel/dialogs.c, panel/dialogs.h, panel/xfce.c: Add info panel by - Xavier Maillard - -2002-08-08 huysmans - - * panel/builtins.c: Additions to Exit/Lock module - -2002-08-08 huysmans - - * panel/: central.c, dialogs.c, global.h, xfce.c, xfce.h: More - config options for configuring central panel - -2002-08-08 huysmans - - * panel/: builtins.c, dialogs.c, global.h, module.c, module.h, - xfce.c, xfce.h: Add option to hide central panel - -2002-08-06 huysmans - - * Makefile.in, aclocal.m4, icons/Makefile.in, panel/Makefile.in, - panel/central.c, panel/global.h, panel/icons.c, panel/wmhints.c, - panel/wmhints.h, panel/xfce.c, plugins/Makefile.in, - plugins/mailcheck/Makefile.in, themes/Makefile.in, - themes/Gnome/Makefile.am, themes/Gnome/Makefile.in, - themes/Gnome/miniinfo.png, themes/Gnome/minilock.png, - themes/Gnome/minipalet.png, themes/Gnome/minipower.png: Add support - for themeable minibuttons and increased the maximum number of - groups to 16 - -2002-08-05 huysmans - - * ChangeLog, panel/dialogs.c: Don't disable changing number of - desktops when desktop buttons are hidden - -2002-08-04 huysmans - - * panel/: central.c, central.h, dialogs.c, global.h, xfce.c: Add - option to hide desktop buttons - -2002-07-31 huysmans - - * panel/: builtins.c, callbacks.c, callbacks.h, central.c, - dialogs.c, icons.c, icons.h, item.c, item.h, item_dialog.c, - item_dialog.h, module.c, module.h, move.c, popup.c, popup.h, - settings.c, side.c, side.h, wmhints.c, xfce.c, xfce_support.c, - xfce_support.h: Reformat files (missing empty lines at the end) and - remove panel.h includes. Reported by Biju Chacko - -2002-07-29 huysmans - - * panel/xfce.c: Destroy the panel before restarting or you will end - up with ghost panels - -2002-07-28 huysmans - - * panel/: side.c, side.h: Change frame in panel group to - gtk_alignment. Much better size control - -2002-07-28 huysmans - - * panel/: builtins.c, dialogs.c: In global dialog on revert change - position at the end (after resizing) - -2002-07-28 huysmans - - * panel/dialogs.c: Fix bug in finding icon themes - -2002-07-28 huysmans - - * panel/: dialogs.c, xfce.c: Force modern style for tiny panel. - Traditional looks weird. - -2002-07-28 huysmans - - * panel/builtins.c: Update clock plugin to accept new panel size - -2002-07-28 huysmans - - * panel/: side.c, xfce.c: Oops, forgot to add TINY_PANEL_ICONS to - icon_size() - -2002-07-28 huysmans - - * panel/: builtins.c, central.c, dialogs.c, global.h, item.c, - item_dialog.c, popup.c, side.c, side.h, xfce.c: Added new size - (Tiny) - -2002-07-26 huysmans - - * ChangeLog: Updated ChangeLog - -2002-07-26 huysmans - - * panel/xfce.c, README: Updated README and added delete/destroy - callbacks to the panel - -2002-07-18 xfce - - * configure, configure.ac: Change version scheme to YYMMDD instead - of YYYYMMDD to keep consistent with xfwm4 - -2002-07-18 huysmans - - * config.h.in, configure, panel/builtins.c, panel/dialogs.c: - hopefully fix a bug in directory opening - -2002-07-16 huysmans - - * panel/item_dialog.c: refresh preview when leaving text entry in - item dialog - -2002-07-15 huysmans - - * panel/item_dialog.c: fixed bug in panel item dialog - -2002-07-14 huysmans - - * panel/Makefile.am, panel/Makefile.in, panel/builtins.c, - panel/callbacks.c, panel/dialogs.c, panel/dialogs.h, panel/item.c, - panel/item_dialog.c, panel/item_dialog.h, panel/module.c, - panel/module.h, plugins/mailcheck/mailcheck.c: Split up dialogs.c - file and change item dialogs. This changes the module structure - -2002-07-07 huysmans - - * panel/callbacks.c, panel/callbacks.h, panel/xfce.c, - panel/xfce_support.c, panel/xfce_support.h, - plugins/mailcheck/mailcheck.c: add execution in terminal option to - mailcheck - -2002-07-07 huysmans - - * panel/: wmhints.c, xfce.c, xfce.h, xfce_support.c: fix some - startup issues - -2002-07-07 huysmans - - * ChangeLog: Update ChangeLog - -2002-07-07 huysmans - - * panel/: module.c, xfce.c, xfce_support.c, xfce_support.h: Add - exit dialog - -2002-07-06 huysmans - - * Makefile.in, aclocal.m4, configure, icons/Makefile.in, - panel/module.c, panel/settings.c, panel/xfce_support.c, - panel/xfce_support.h, plugins/Makefile.in, - plugins/mailcheck/Makefile.in, plugins/mailcheck/mailcheck.c, - themes/Makefile.in, themes/Gnome/Makefile.in: Add preferences to - mailcheck plugin and probably some other things as well - -2002-07-03 huysmans - - * panel/xfce.c: fix a small bug in global option behaviour and - removed panel forking - -2002-07-03 huysmans - - * panel/: Makefile.am, Makefile.in, builtins.c, callbacks.c, - central.c, dialogs.c, icons.c, icons.h, item.c, popup.c, side.c, - xfce.c, xfce_support.c: improve icon handling - -2002-07-03 huysmans - - * panel/: Makefile.am, callbacks.h, dialogs.h, dnd.c, dnd.h, - icons.c, icons.h, xfce_support.c, xfce_support.h: add new support - module and remove dnd.* - -2002-06-23 huysmans - - * panel/: callbacks.c, dialogs.c, dialogs.h: add dialog for screen - names and fix global dialog when setting number of desktops - -2002-06-22 huysmans - - * panel/callbacks.c: also diable global configuration when - disable_user_config is set - -2002-06-22 huysmans - - * ChangeLog: update ChangeLog - -2002-06-22 huysmans - - * panel/: builtins.c, callbacks.c, dialogs.c, dialogs.h, global.h, - settings.c, xfce.c: handle menu item limits better and honor - disable_user_config - -2002-06-20 huysmans - - * panel/dialogs.c, themes/Gnome/file1.png: make icon themes work - from dialogs - -2002-06-18 xfce - - * COPYING: Forgot COPYING :-( - -2002-06-18 xfce - - * AUTHORS, Makefile.in, aclocal.m4, configure, xfce4.spec.in, - icons/Makefile.in, panel/Makefile.in, plugins/Makefile.in, - plugins/mailcheck/Makefile.in, themes/Makefile.in, - themes/Gnome/Makefile.in: Add (empty) AUTHORS required by automake, - Fix spec file - -2002-06-17 huysmans - - * Makefile, example.xfce4rc: remove some leftovers - -2002-06-17 huysmans - - * ChangeLog, panel/dialogs.c: Update ChangeLog and refixed typo - Olivier fixed earlier - -2002-06-17 huysmans - - * ChangeLog, INSTALL, Makefile.am, Makefile.in, NEWS, aclocal.m4, - autogen.sh, compile, config.guess, config.h.in, config.sub, - configure, configure.ac, depcomp, example.xfce4rc.in, install-sh, - ltmain.sh, missing, mkinstalldirs, xfce4.spec.in, - icons/Makefile.am, icons/Makefile.in, panel/Makefile.am, - panel/Makefile.in, panel/builtins.c, panel/builtins.h, - panel/callbacks.c, panel/callbacks.h, panel/central.c, - panel/central.h, panel/dialogs.c, panel/dialogs.h, panel/dnd.c, - panel/dnd.h, panel/global.h, panel/icons.c, panel/icons.h, - panel/item.c, panel/item.h, panel/module.c, panel/module.h, - panel/move.c, panel/move.h, panel/popup.c, panel/popup.h, - panel/settings.c, panel/settings.h, panel/side.c, panel/side.h, - panel/wmhints.c, panel/wmhints.h, panel/xfce.c, panel/xfce.h, - plugins/Makefile.am, plugins/Makefile.in, - plugins/mailcheck/Makefile.am, plugins/mailcheck/Makefile.in, - plugins/mailcheck/mailcheck.c, themes/Makefile.am, - themes/Makefile.in, themes/Gnome/Makefile.am, - themes/Gnome/Makefile.in, themes/Gnome/edit.png, - themes/Gnome/file1.png, themes/Gnome/file2.png, - themes/Gnome/games.png, themes/Gnome/man.png, - themes/Gnome/multimedia.png, themes/Gnome/network.png, - themes/Gnome/paint.png, themes/Gnome/print.png, - themes/Gnome/schedule.png, themes/Gnome/sound.png, - themes/Gnome/terminal.png, themes/Gnome/trash_empty.png, - themes/Gnome/trash_full.png, themes/Gnome/unknown.png: (Re)add all - files and automake framework - -2002-06-17 huysmans - - * plugins/Makefile: removing old files, before putting them in new - locations (2) - -2002-06-17 huysmans - - * builtins.c, builtins.h, callbacks.c, callbacks.h, central.c, - central.h, dialogs.c, dialogs.h, dnd.c, dnd.h, global.h, icons.c, - icons.h, item.c, item.h, module.c, module.h, move.c, move.h, - popup.c, popup.h, settings.c, settings.h, side.c, side.h, - wmhints.c, wmhints.h, xfce.c, xfce.h, plugins/mailcheck.c: removing - old files, before putting them in new locations - -2002-06-14 xfce - - * dialogs.c: Fixed a typo (Apearance => Appearance) - -2002-06-11 huysmans - - * dialogs.c, icons.c, xfce.c, plugins/mailcheck.c: Panel settings - dialog seems to work now, initial icon theme support - -2002-06-11 huysmans - - * dialogs.c, wmhints.c: Settings dialog now works - -2002-06-11 huysmans - - * callbacks.c, dialogs.c, dialogs.h, wmhints.c, xfce.c, xfce.h: - Initial global settings dialog and fork() panel at startup - -2002-06-09 huysmans - - * callbacks.c, dialogs.c: allow running command in terminal - -2002-06-09 huysmans - - * callbacks.c, callbacks.h, dialogs.c, item.c, item.h, popup.c, - popup.h, settings.c, settings.h, xfce.c: make xml parsing replace - entities - -2002-06-09 huysmans - - * settings.c: Fixed crash when no configuration file was found - -2002-06-09 huysmans - - * Makefile, README, README.xml, builtins.c, builtins.h, - callbacks.c, callbacks.h, central.c, central.h, dialogs.c, - dialogs.h, dnd.c, dnd.h, example.xfce4rc, global.h, icons.c, - icons.h, item.c, item.h, module.c, module.h, move.c, move.h, - popup.c, popup.h, settings.c, settings.h, side.c, side.h, - wmhints.c, wmhints.h, xfce.c, xfce.h, plugins/mailcheck.c: Major - update - -2002-05-21 huysmans - - * dialogs.c, plugins/mailcheck.c: change dialog button order and - other dialog fixes - -2002-05-20 huysmans - - * example.xfce4rc: example config file - -2002-05-20 huysmans - - * Makefile, README, README.xml, builtins.c, builtins.h, - callbacks.c, callbacks.h, central.c, central.h, dialogs.c, - dialogs.h, icons.c, icons.h, item.c, item.h, module.c, module.h, - move.c, move.h, popup.c, popup.h, settings.c, settings.h, side.c, - side.h, wmhints.c, wmhints.h, xfce.c, xfce.h, icons/addicon.xpm, - icons/close.xpm, icons/diag_icon.xpm, icons/down.xpm, - icons/edit.xpm, icons/file1.xpm, icons/file2.xpm, icons/games.xpm, - icons/handle.xpm, icons/iconify.xpm, icons/mail.xpm, icons/man.xpm, - icons/menu_icon.xpm, icons/miniinfo.xpm, icons/minilock.xpm, - icons/minipalet.xpm, icons/minipower.xpm, icons/multimedia.xpm, - icons/network.xpm, icons/nomail.xpm, icons/oldmail.xpm, - icons/paint.xpm, icons/print.xpm, icons/schedule.xpm, - icons/sound.xpm, icons/terminal.xpm, icons/trash_empty.xpm, - icons/trash_full.xpm, icons/unknown.xpm, icons/up.xpm, - icons/xfce_icon.xpm, plugins/Makefile, plugins/mailcheck.c: Add - gtk2 based panel + * ChangeLog: Update ChangeLog's after syncing with SF. Everything + should now be up-to-date. + +2003-10-13 20:01 jasper + + * xfce4rc, plugins/pager/pager.c: + Huge update to get new repository in sync with the one on SF. We + lose some CVS history here, but I will include the missing + ChangeLog entries here: + + +++ + + 2003-10-12 23:13 xfce + + * xfce4/xfce4rc, xfwm4/src/client.c: Add --no-desktop to + default + nautilus entry Use Height/Width on Mwm hints updates + + 2003-10-10 23:51 edscott + + * xffm/libs/: menu_callbacks.c, run.c: fixed another + g_strchug() + bug + + 2003-10-10 23:15 xfce + + * xfce-utils/scripts/xinitrc: Don't use cpp in xrdb so + that DPI + settings load even on workstations w/out cpp + + 2003-10-10 22:38 xfce + + * xfwm4/: configure, configure.ac, themes/Makefile.am, + themes/Makefile.in, themes/tgc-large/Makefile.am, + themes/tgc-large/Makefile.in, themes/tgc-large/README, + themes/tgc-large/bottom-active.xpm, + themes/tgc-large/bottom-inactive.xpm, + themes/tgc-large/bottom-left-active.xpm, + themes/tgc-large/bottom-left-inactive.xpm, + themes/tgc-large/bottom-right-active.xpm, + themes/tgc-large/bottom-right-inactive.xpm, + themes/tgc-large/close-active.xpm, + themes/tgc-large/close-inactive.xpm, + themes/tgc-large/close-pressed.xpm, + themes/tgc-large/hide-active.xpm, + themes/tgc-large/hide-inactive.xpm, + themes/tgc-large/hide-pressed.xpm, + themes/tgc-large/left-active.xpm, + themes/tgc-large/left-inactive.xpm, + themes/tgc-large/maximize-active.xpm, + themes/tgc-large/maximize-inactive.xpm, + themes/tgc-large/maximize-pressed.xpm, + themes/tgc-large/maximize-toggled-active.xpm, + themes/tgc-large/maximize-toggled-inactive.xpm, + themes/tgc-large/maximize-toggled-pressed.xpm, + themes/tgc-large/menu-active.xpm, + themes/tgc-large/menu-inactive.xpm, + themes/tgc-large/menu-pressed.xpm, + themes/tgc-large/right-active.xpm, + themes/tgc-large/right-inactive.xpm, + themes/tgc-large/shade-active.xpm, + themes/tgc-large/shade-inactive.xpm, + themes/tgc-large/shade-pressed.xpm, + themes/tgc-large/shade-toggled-active.xpm, + themes/tgc-large/shade-toggled-inactive.xpm, + themes/tgc-large/shade-toggled-pressed.xpm, + themes/tgc-large/stick-active.xpm, + themes/tgc-large/stick-inactive.xpm, + themes/tgc-large/stick-pressed.xpm, + themes/tgc-large/stick-toggled-active.xpm, + themes/tgc-large/stick-toggled-inactive.xpm, + themes/tgc-large/stick-toggled-pressed.xpm, + themes/tgc-large/themerc, + themes/tgc-large/title-1-active.xpm, + themes/tgc-large/title-1-inactive.xpm, + themes/tgc-large/title-2-active.xpm, + themes/tgc-large/title-2-inactive.xpm, + themes/tgc-large/title-3-active.xpm, + themes/tgc-large/title-3-inactive.xpm, + themes/tgc-large/title-4-active.xpm, + themes/tgc-large/title-4-inactive.xpm, + themes/tgc-large/title-5-active.xpm, + themes/tgc-large/title-5-inactive.xpm, + themes/tgc-large/top-left-active.xpm, + themes/tgc-large/top-left-inactive.xpm, + themes/tgc-large/top-right-active.xpm, + themes/tgc-large/top-right-inactive.xpm: Add tgc-large as + in HEAD + branch + + 2003-10-10 22:06 xfce + + * libxfcegui4/libxfcegui4/netk-pager.c, + xfwm4/themes/default/bottom-active.xpm, + xfwm4/themes/default/bottom-inactive.xpm, + xfwm4/themes/default/bottom-left-active.xpm, + xfwm4/themes/default/bottom-left-inactive.xpm, + xfwm4/themes/default/bottom-right-active.xpm, + xfwm4/themes/default/bottom-right-inactive.xpm, + xfwm4/themes/default/close-active.xpm, + xfwm4/themes/default/close-inactive.xpm, + xfwm4/themes/default/close-pressed.xpm, + xfwm4/themes/default/hide-active.xpm, + xfwm4/themes/default/hide-inactive.xpm, + xfwm4/themes/default/hide-pressed.xpm, + xfwm4/themes/default/left-active.xpm, + xfwm4/themes/default/left-inactive.xpm, + xfwm4/themes/default/maximize-active.xpm, + xfwm4/themes/default/maximize-inactive.xpm, + xfwm4/themes/default/maximize-pressed.xpm, + xfwm4/themes/default/maximize-toggled-active.xpm, + xfwm4/themes/default/maximize-toggled-inactive.xpm, + xfwm4/themes/default/maximize-toggled-pressed.xpm, + xfwm4/themes/default/menu-active.xpm, + xfwm4/themes/default/menu-inactive.xpm, + xfwm4/themes/default/menu-pressed.xpm, + xfwm4/themes/default/right-active.xpm, + xfwm4/themes/default/right-inactive.xpm, + xfwm4/themes/default/shade-active.xpm, + xfwm4/themes/default/shade-inactive.xpm, + xfwm4/themes/default/shade-pressed.xpm, + xfwm4/themes/default/shade-toggled-active.xpm, + xfwm4/themes/default/shade-toggled-inactive.xpm, + xfwm4/themes/default/shade-toggled-pressed.xpm, + xfwm4/themes/default/stick-active.xpm, + xfwm4/themes/default/stick-inactive.xpm, + xfwm4/themes/default/stick-pressed.xpm, + xfwm4/themes/default/stick-toggled-active.xpm, + xfwm4/themes/default/stick-toggled-inactive.xpm, + xfwm4/themes/default/stick-toggled-pressed.xpm, + xfwm4/themes/default/title-1-active.xpm, + xfwm4/themes/default/title-1-inactive.xpm, + xfwm4/themes/default/title-2-active.xpm, + xfwm4/themes/default/title-2-inactive.xpm, + xfwm4/themes/default/title-3-active.xpm, + xfwm4/themes/default/title-3-inactive.xpm, + xfwm4/themes/default/title-4-active.xpm, + xfwm4/themes/default/title-4-inactive.xpm, + xfwm4/themes/default/title-5-active.xpm, + xfwm4/themes/default/title-5-inactive.xpm, + xfwm4/themes/default/top-left-active.xpm, + xfwm4/themes/default/top-left-inactive.xpm, + xfwm4/themes/default/top-right-active.xpm, + xfwm4/themes/default/top-right-inactive.xpm: Basically + revert to + "pre" xfwm4 default style that looked better than 4.0.0 + + 2003-10-10 20:21 huysmans + + * xfce4/plugins/pager/pager.c: Fix resizing bug + + 2003-10-08 23:35 xfce + + * xfwm4/src/: client.c, events.c, settings.c: Fix + raise/lower patch + + 2003-10-08 22:34 xfce + + * xfwm4/: src/settings.c, themes/default.keys/keythemerc: + Fix + raise/lower key shortcut + + 2003-10-07 22:37 xfce + + * xffm/libs/input.c: With gtk 2.2.3/2.2.4 the + gtk_getentrytext_function does not return "" but NULL. + + 2003-10-07 22:31 xfce + + * xfwm4/themes/tgc-large/: Makefile.am, Makefile.in, + README, + bottom-active.xpm, bottom-inactive.xpm, + bottom-left-active.xpm, + bottom-left-inactive.xpm, bottom-right-active.xpm, + bottom-right-inactive.xpm, close-active.xpm, + close-inactive.xpm, + close-pressed.xpm, hide-active.xpm, hide-inactive.xpm, + hide-pressed.xpm, left-active.xpm, left-inactive.xpm, + maximize-active.xpm, maximize-inactive.xpm, + maximize-pressed.xpm, + maximize-toggled-active.xpm, + maximize-toggled-inactive.xpm, + maximize-toggled-pressed.xpm, menu-active.xpm, + menu-inactive.xpm, + menu-pressed.xpm, right-active.xpm, right-inactive.xpm, + shade-active.xpm, shade-inactive.xpm, shade-pressed.xpm, + shade-toggled-active.xpm, shade-toggled-inactive.xpm, + shade-toggled-pressed.xpm, stick-active.xpm, + stick-inactive.xpm, + stick-pressed.xpm, stick-toggled-active.xpm, + stick-toggled-inactive.xpm, stick-toggled-pressed.xpm, + themerc, + title-1-active.xpm, title-1-inactive.xpm, + title-2-active.xpm, + title-2-inactive.xpm, title-3-active.xpm, + title-3-inactive.xpm, + title-4-active.xpm, title-4-inactive.xpm, + title-5-active.xpm, + title-5-inactive.xpm, top-left-active.xpm, + top-left-inactive.xpm, + top-right-active.xpm, top-right-inactive.xpm: Change + default theme, + keep old 4.0 theme as default-4.0 and add tgc-large theme + Include + improvements for fullscreen mode for gst from Arwed von + Merkatz + <v.merkatz@gmx.net> + + 2003-10-07 22:14 xfce + + * xffm/libs/run.c, xfwm4/ChangeLog, xfwm4/configure, + xfwm4/configure.ac, xfwm4/src/client.c, + xfwm4/src/events.c: Include + changes for gst fullscreen mode as suggested by Arwed von + Merkatz + <v.merkatz@gmx.net> Include fix for "run..." in xffm from + Edscott + + +++ + +2003-09-30 22:58 huysmans + + * configure, configure.ac: change version to 4.0.0.1 + +2003-09-30 22:30 huysmans + + * panel/controls_dialog.c: Fix a bug with empty panel. + +2003-09-27 13:20 huysmans + + * po/: ta.gmo, ta.po: Update tamil translations diff --git a/Makefile.am b/Makefile.am index f2cf711b..11313605 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,9 +3,11 @@ confdir = $(sysconfdir)/xfce4 conf_DATA = \ xfce4rc \ + xfce4rc.az \ xfce4rc.nl \ xfce4rc.ca \ - xfce4rc.hu + xfce4rc.hu \ + xfce4rc.vi EXTRA_DIST = \ HACKING \ diff --git a/Makefile.in b/Makefile.in index f6413620..9e71829b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.5 from Makefile.am. +# Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,7 +21,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -36,6 +35,48 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ +DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(srcdir)/xfce4.spec.in $(top_srcdir)/configure AUTHORS \ + COPYING ChangeLog INSTALL NEWS TODO compile config.guess \ + config.sub depcomp install-sh ltmain.sh missing mkinstalldirs +subdir = . +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/X11.m4 \ + $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/depends.m4 \ + $(top_srcdir)/m4/i18n.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno configure.status.lineno +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = config.h +CONFIG_CLEAN_FILES = xfce4.spec +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-exec-recursive install-info-recursive \ + install-recursive installcheck-recursive installdirs-recursive \ + pdf-recursive ps-recursive uninstall-info-recursive \ + uninstall-recursive +am__installdirs = $(DESTDIR)$(confdir) +confDATA_INSTALL = $(INSTALL_DATA) +DATA = $(conf_DATA) +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) +am__remove_distdir = \ + { test ! -d $(distdir) \ + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr $(distdir); }; } +DIST_ARCHIVES = $(distdir).tar.gz +GZIP_ENV = --best +distuninstallcheck_listfiles = find . -type f -print +distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ @@ -166,6 +207,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -173,14 +215,14 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ - confdir = $(sysconfdir)/xfce4 conf_DATA = \ xfce4rc \ + xfce4rc.az \ xfce4rc.nl \ xfce4rc.ca \ - xfce4rc.hu - + xfce4rc.hu \ + xfce4rc.vi EXTRA_DIST = \ HACKING \ @@ -189,7 +231,6 @@ EXTRA_DIST = \ xfce4.spec \ .indent.pro - SUBDIRS = \ po \ doc \ @@ -199,46 +240,43 @@ SUBDIRS = \ plugins \ themes - ACLOCAL_AMFLAGS = -I m4 -subdir = . -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = xfce4.spec -DIST_SOURCES = -DATA = $(conf_DATA) - - -RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ - ps-recursive install-info-recursive uninstall-info-recursive \ - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive -DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ - Makefile.in NEWS TODO aclocal.m4 compile config.guess \ - config.h.in config.sub configure configure.ac depcomp \ - install-sh ltmain.sh missing mkinstalldirs xfce4.spec.in -DIST_SUBDIRS = $(SUBDIRS) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: - -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) +am--refresh: + @: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ + cd $(srcdir) && $(AUTOMAKE) --foreign \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --foreign Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) - -$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + echo ' $(SHELL) ./config.status'; \ + $(SHELL) ./config.status;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) - cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.ac m4/debug.m4 m4/depends.m4 m4/i18n.m4 m4/X11.m4 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(srcdir) && $(AUTOCONF) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) config.h: stamp-h1 @@ -250,14 +288,14 @@ config.h: stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h - -$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.ac $(ACLOCAL_M4) +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_srcdir) && $(AUTOHEADER) - touch $(srcdir)/config.h.in + rm -f stamp-h1 + touch $@ distclean-hdr: -rm -f config.h stamp-h1 -xfce4.spec: $(top_builddir)/config.status xfce4.spec.in +xfce4.spec: $(top_builddir)/config.status $(srcdir)/xfce4.spec.in cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: @@ -269,10 +307,9 @@ clean-libtool: distclean-libtool: -rm -f libtool uninstall-info-am: -confDATA_INSTALL = $(INSTALL_DATA) install-confDATA: $(conf_DATA) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(confdir) + $(mkdir_p) $(DESTDIR)$(confdir) @list='$(conf_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ @@ -347,14 +384,6 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -363,6 +392,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -388,7 +418,6 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ test -z "$(ETAGS_ARGS)$$tags$$unique" \ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique - ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -411,24 +440,11 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = . -distdir = $(PACKAGE)-$(VERSION) - -am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } - -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkinstalldirs) $(distdir)/. $(distdir)/panel $(distdir)/po + $(mkdir_p) $(distdir)/. $(distdir)/m4 $(distdir)/panel $(distdir)/po @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -440,7 +456,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -457,13 +473,13 @@ distdir: $(DISTFILES) done list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ + test -d "$(distdir)/$$subdir" \ + || mkdir "$(distdir)/$$subdir" \ || exit 1; \ (cd $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" \ - distdir=../$(distdir)/$$subdir \ + top_distdir="../$(top_distdir)" \ + distdir="../$(distdir)/$$subdir" \ distdir) \ || exit 1; \ fi; \ @@ -477,6 +493,23 @@ dist-gzip: distdir $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) +dist-bzip2: distdir + $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + +dist-tarZ: distdir + $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z + $(am__remove_distdir) + +dist-shar: distdir + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + $(am__remove_distdir) + +dist-zip: distdir + -rm -f $(distdir).zip + zip -rq $(distdir).zip $(distdir) + $(am__remove_distdir) + dist dist-all: distdir $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) @@ -485,8 +518,18 @@ dist dist-all: distdir # it guarantees that the distribution is self-contained by making another # tarfile. distcheck: dist - $(am__remove_distdir) - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\ + *.tar.bz2*) \ + bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\ + *.shar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac chmod -R a-w $(distdir); chmod a+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst @@ -506,19 +549,20 @@ distcheck: dist distuninstallcheck \ && chmod -R a-w "$$dc_install_base" \ && ({ \ - (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \ + (cd ../.. && $(mkdir_p) "$$dc_destdir") \ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ } || { rm -rf "$$dc_destdir"; exit 1; }) \ && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ - && rm -f $(distdir).tar.gz \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck $(am__remove_distdir) - @echo "$(distdir).tar.gz is ready for distribution" | \ - sed 'h;s/./=/g;p;x;p;x' + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ + sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' distuninstallcheck: @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ @@ -542,8 +586,7 @@ check: check-recursive all-am: Makefile $(DATA) config.h installdirs: installdirs-recursive installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(confdir) - + $(mkdir_p) $(DESTDIR)$(confdir) install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -555,7 +598,7 @@ install-am: all-am installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -563,7 +606,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -574,8 +617,9 @@ clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \ - distclean-local distclean-tags + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-hdr \ + distclean-libtool distclean-local distclean-tags dvi: dvi-recursive @@ -597,7 +641,8 @@ installcheck-am: maintainer-clean: maintainer-clean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf autom4te.cache + -rm -rf $(top_srcdir)/autom4te.cache + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive @@ -616,24 +661,22 @@ uninstall-am: uninstall-confDATA uninstall-info-am uninstall-info: uninstall-info-recursive -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ - clean-generic clean-libtool clean-recursive ctags \ - ctags-recursive dist dist-all dist-gzip distcheck distclean \ +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ + check-am clean clean-generic clean-libtool clean-recursive \ + ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ + dist-shar dist-tarZ dist-zip distcheck distclean \ distclean-generic distclean-hdr distclean-libtool \ distclean-local distclean-recursive distclean-tags \ - distcleancheck distdir distuninstallcheck dvi dvi-am \ - dvi-recursive info info-am info-recursive install install-am \ - install-confDATA install-data install-data-am \ - install-data-recursive install-exec install-exec-am \ - install-exec-recursive install-info install-info-am \ - install-info-recursive install-man install-recursive \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am installdirs-recursive maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive mostlyclean \ - mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ - pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ - tags-recursive uninstall uninstall-am uninstall-confDATA \ - uninstall-info-am uninstall-info-recursive uninstall-recursive + distcleancheck distdir distuninstallcheck dvi dvi-am html \ + html-am info info-am install install-am install-confDATA \ + install-data install-data-am install-exec install-exec-am \ + install-info install-info-am install-man install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic \ + maintainer-clean-recursive mostlyclean mostlyclean-generic \ + mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am uninstall-confDATA \ + uninstall-info-am @SET_MAKE@ @@ -1,3 +1,18 @@ +* 2004-02-26 Jasper Huijsmans <jasper@xfce.org> + +Backport features from development version: +- repositioning when the panel size changes and keep inside the screen. +- Properly update arrow direction on popup buttons. + +* 2003-11-05 Jasper Huijsmans <jasper@xfce.org> + +Make SIGUSR2 quit with confirmation. + +* 2003-10-23 Jasper Huijsmans <jasper@xfce.org> + +Make SIGUSR1 really start a new instance of the panel. Fixes new plugin +installation bug. + * 2003-07-25 Jasper Huijsmans <huysmans@users.sourceforge.net> Improved autohide handling and reorientation. @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.7.5 -*- Autoconf -*- +# generated automatically by aclocal 1.8.2 -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 # Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11,904 +11,386 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Do all the work for Automake. -*- Autoconf -*- - -# This macro actually does too much some checks are only needed if -# your package does certain things. But this isn't really a big deal. - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 10 - -AC_PREREQ([2.54]) - -# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow -# the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl - -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl - AC_REQUIRE([AC_PROG_INSTALL])dnl -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) - -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl - -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_MISSING_PROG(AMTAR, tar) -AM_PROG_INSTALL_SH -AM_PROG_INSTALL_STRIP -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl - -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -]) -]) - - -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. - -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $1 | $1:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) - -# Copyright 2002 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) - -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION so it can be traced. -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.7.5])]) - -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright 2001, 2002 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 2 - -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - -# _AM_SET_OPTION(NAME) -# ------------------------------ -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) - -# _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) - -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) - -# -# Check to make sure that the build environment is sane. +# Copyright (C) 1995-2002 Free Software Foundation, Inc. +# Copyright (C) 2001-2003 Red Hat, Inc. # - -# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 3 - -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - - test "$[2]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT(yes)]) - -# -*- Autoconf -*- - - -# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 3 - -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) - - -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) -fi -]) - -# AM_AUX_DIR_EXPAND - -# Copyright 2001 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# This file is free software, distributed under the terms of the GNU +# General Public License. As a special exception to the GNU General +# Public License, this file may be distributed as part of a program +# that contains a configuration script generated by Autoconf, under +# the same distribution terms as the rest of that program. # -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. # -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir +# Macro to add for using GNU gettext. +# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996 # -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. +# Modified to never use included libintl. +# Owen Taylor <otaylor@redhat.com>, 12/15/1998 # -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. +# Major rework to remove unused code +# Owen Taylor <otaylor@redhat.com>, 12/11/2002 # -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. - -# Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50]) - -AC_DEFUN([AM_AUX_DIR_EXPAND], [ -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` -]) - -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. - -# Copyright 2001 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"$am_aux_dir/install-sh"} -AC_SUBST(install_sh)]) - -# AM_PROG_INSTALL_STRIP - -# Copyright 2001 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) - -# -*- Autoconf -*- -# Copyright (C) 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 1 - -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) - -# serial 5 -*- Autoconf -*- - -# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - - -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... - - +# Added better handling of ALL_LINGUAS from GNU gettext version +# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002 -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". -# We try a few techniques and use that to set a single cache variable. # -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl - -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +# We need this here as well, since someone might use autoconf-2.5x +# to configure GLib then an older version to configure a package +# using AM_GLIB_GNU_GETTEXT +AC_PREREQ(2.53) -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir +dnl +dnl We go to great lengths to make sure that aclocal won't +dnl try to pull in the installed version of these macros +dnl when running aclocal in the glib directory. +dnl +m4_copy([AC_DEFUN],[glib_DEFUN]) +m4_copy([AC_REQUIRE],[glib_REQUIRE]) +dnl +dnl At the end, if we're not within glib, we'll define the public +dnl definitions in terms of our private definitions. +dnl - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` - fi - for depmode in $am_compiler_list; do - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - echo '#include "conftest.h"' > conftest.c - echo 'int i;' > conftest.h - echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf +# GLIB_LC_MESSAGES +#-------------------- +glib_DEFUN([GLIB_LC_MESSAGES], + [AC_CHECK_HEADERS([locale.h]) + if test $ac_cv_header_locale_h = yes; then + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], + am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) + if test $am_cv_val_LC_MESSAGES = yes; then + AC_DEFINE(HAVE_LC_MESSAGES, 1, + [Define if your <locale.h> file defines LC_MESSAGES.]) + fi + fi]) - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else +# GLIB_PATH_PROG_WITH_TEST +#---------------------------- +dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], +[# Extract the first word of "$2", so it can be a program name with args. +set dummy $2; ac_word=[$]2 +AC_MSG_CHECKING([for $ac_word]) +AC_CACHE_VAL(ac_cv_path_$1, +[case "[$]$1" in + /*) + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in ifelse([$5], , $PATH, [$5]); do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if [$3]; then + ac_cv_path_$1="$ac_dir/$ac_word" break fi - ;; - none) break ;; - esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ - source=conftest.c object=conftest.o \ - depfile=conftest.Po tmpdepfile=conftest.TPo \ - $SHELL ./depcomp $depcc -c -o conftest.o conftest.c \ - >/dev/null 2>conftest.err && - grep conftest.h conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break - fi fi done - - cd .. - rm -rf conftest.dir + IFS="$ac_save_ifs" +dnl If no 4th arg is given, leave the cache variable unset, +dnl so AC_PATH_PROGS will keep looking. +ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +])dnl + ;; +esac])dnl +$1="$ac_cv_path_$1" +if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then + AC_MSG_RESULT([$]$1) else - am_cv_$1_dependencies_compiler_type=none + AC_MSG_RESULT(no) fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +AC_SUBST($1)dnl ]) +# GLIB_WITH_NLS +#----------------- +glib_DEFUN([GLIB_WITH_NLS], + dnl NLS is obligatory + [USE_NLS=yes + AC_SUBST(USE_NLS) -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) - + gt_cv_have_gettext=no -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking Speeds up one-time builds - --enable-dependency-tracking Do not reject slow dependency extractors]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH]) -]) + CATOBJEXT=NONE + XGETTEXT=: + INTLLIBS= -# Generate code to set up dependency tracking. -*- Autoconf -*- + AC_CHECK_HEADER(libintl.h, + [gt_cv_func_dgettext_libintl="no" + libintl_extra_libs="" -# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + # + # First check in libc + # + AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, + [AC_TRY_LINK([ +#include <libintl.h> +], + [return (int) dgettext ("","")], + gt_cv_func_dgettext_libc=yes, + gt_cv_func_dgettext_libc=no) + ]) + + if test "$gt_cv_func_dgettext_libc" = "yes" ; then + AC_CHECK_FUNCS(bind_textdomain_codeset) + fi -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. + # + # If we don't have everything we want, check in libintl + # + if test "$gt_cv_func_dgettext_libc" != "yes" \ + || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then + + AC_CHECK_LIB(intl, bindtextdomain, + [AC_CHECK_LIB(intl, dgettext, + gt_cv_func_dgettext_libintl=yes)]) -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. + if test "$gt_cv_func_dgettext_libintl" != "yes" ; then + AC_MSG_CHECKING([if -liconv is needed to use gettext]) + AC_MSG_RESULT([]) + AC_CHECK_LIB(intl, dcgettext, + [gt_cv_func_dgettext_libintl=yes + libintl_extra_libs=-liconv], + :,-liconv) + fi -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. + # + # If we found libintl, then check in it for bind_textdomain_codeset(); + # we'll prefer libc if neither have bind_textdomain_codeset(), + # and both have dgettext + # + if test "$gt_cv_func_dgettext_libintl" = "yes" ; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS -lintl $libintl_extra_libs" + unset ac_cv_func_bind_textdomain_codeset + AC_CHECK_FUNCS(bind_textdomain_codeset) + LIBS="$glib_save_LIBS" -#serial 2 + if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then + gt_cv_func_dgettext_libc=no + else + if test "$gt_cv_func_dgettext_libc" = "yes"; then + gt_cv_func_dgettext_libintl=no + fi + fi + fi + fi -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[for mf in $CONFIG_FILES; do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue - # Extract the definition of DEP_FILES from the Makefile without - # running `make'. - DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` - test -z "$DEPDIR" && continue - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n -e '/^U = / s///p' < "$mf"` - test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" - # We invoke sed twice because it is the simplest approach to - # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n -e ' - /^DEP_FILES = .*\\\\$/ { - s/^DEP_FILES = // - :loop - s/\\\\$// - p - n - /\\\\$/ b loop - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done -done -])# _AM_OUTPUT_DEPENDENCY_COMMANDS + if test "$gt_cv_func_dgettext_libc" = "yes" \ + || test "$gt_cv_func_dgettext_libintl" = "yes"; then + gt_cv_have_gettext=yes + fi + + if test "$gt_cv_func_dgettext_libintl" = "yes"; then + INTLLIBS="-lintl $libintl_extra_libs" + fi + + if test "$gt_cv_have_gettext" = "yes"; then + AC_DEFINE(HAVE_GETTEXT,1, + [Define if the GNU gettext() function is already present or preinstalled.]) + GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl + if test "$MSGFMT" != "no"; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS $INTLLIBS" + AC_CHECK_FUNCS(dcgettext) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr], + [CATOBJEXT=.gmo + DATADIRNAME=share], + [case $host in + *-*-solaris*) + dnl On Solaris, if bind_textdomain_codeset is in libc, + dnl GNU format message catalog is always supported, + dnl since both are added to the libc all together. + dnl Hence, we'd like to go with DATADIRNAME=share and + dnl and CATOBJEXT=.gmo in this case. + AC_CHECK_FUNC(bind_textdomain_codeset, + [CATOBJEXT=.gmo + DATADIRNAME=share], + [CATOBJEXT=.mo + DATADIRNAME=lib]) + ;; + *) + CATOBJEXT=.mo + DATADIRNAME=lib + ;; + esac]) + LIBS="$glib_save_LIBS" + INSTOBJEXT=.mo + else + gt_cv_have_gettext=no + fi + fi + ]) + if test "$gt_cv_have_gettext" = "yes" ; then + AC_DEFINE(ENABLE_NLS, 1, + [always defined to indicate that i18n is enabled]) + fi -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) + dnl Test whether we really found GNU xgettext. + if test "$XGETTEXT" != ":"; then + dnl If it is not GNU xgettext we define it as : so that the + dnl Makefiles still can work. + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else + AC_MSG_RESULT( + [found xgettext program is not GNU xgettext; ignore it]) + XGETTEXT=":" + fi + fi -# Check to see how 'make' treats includes. -*- Autoconf -*- + # We need to process the po/ directory. + POSUB=po -# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. + AC_OUTPUT_COMMANDS( + [case "$CONFIG_FILES" in *po/Makefile.in*) + sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile + esac]) -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. + dnl These rules are solely for the distribution goal. While doing this + dnl we only have to keep exactly one list of the available catalogs + dnl in configure.in. + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. + dnl Make all variables we use known to autoconf. + AC_SUBST(CATALOGS) + AC_SUBST(CATOBJEXT) + AC_SUBST(DATADIRNAME) + AC_SUBST(GMOFILES) + AC_SUBST(INSTOBJEXT) + AC_SUBST(INTLLIBS) + AC_SUBST(PO_IN_DATADIR_TRUE) + AC_SUBST(PO_IN_DATADIR_FALSE) + AC_SUBST(POFILES) + AC_SUBST(POSUB) + ]) -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# AM_GLIB_GNU_GETTEXT +# ------------------- +# Do checks necessary for use of gettext. If a suitable implementation +# of gettext is found in either in libintl or in the C library, +# it will set INTLLIBS to the libraries needed for use of gettext +# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable +# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() +# on various variables needed by the Makefile.in.in installed by +# glib-gettextize. +dnl +glib_DEFUN(GLIB_GNU_GETTEXT, + [AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_HEADER_STDC])dnl + + GLIB_LC_MESSAGES + GLIB_WITH_NLS -# serial 2 + if test "$gt_cv_have_gettext" = "yes"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + AC_MSG_CHECKING(for catalogs to be installed) + NEW_LINGUAS= + for presentlang in $ALL_LINGUAS; do + useit=no + if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then + desiredlanguages="$LINGUAS" + else + desiredlanguages="$ALL_LINGUAS" + fi + for desiredlang in $desiredlanguages; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang"*) useit=yes;; + esac + done + if test $useit = yes; then + NEW_LINGUAS="$NEW_LINGUAS $presentlang" + fi + done + LINGUAS=$NEW_LINGUAS + AC_MSG_RESULT($LINGUAS) + fi -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo done -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD + dnl Construct list of names of catalog files to be constructed. + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done + fi fi -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright 1997, 2000, 2001 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 5 + dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly + dnl find the mkinstalldirs script in another subdir but ($top_srcdir). + dnl Try to locate is. + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + AC_SUBST(MKINSTALLDIRS) -AC_PREREQ(2.52) + dnl Generate list of files to be processed by xgettext which will + dnl be included in po/Makefile. + test -d po || mkdir po + if test "x$srcdir" != "x."; then + if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then + posrcprefix="$srcdir/" + else + posrcprefix="../$srcdir/" + fi + else + posrcprefix="../" + fi + rm -f po/POTFILES + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES + ]) -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE]) -AC_SUBST([$1_FALSE]) -if $2; then - $1_TRUE= - $1_FALSE='#' +# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) +# ------------------------------- +# Define VARIABLE to the location where catalog files will +# be installed by po/Makefile. +glib_DEFUN(GLIB_DEFINE_LOCALEDIR, +[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl +glib_save_prefix="$prefix" +glib_save_exec_prefix="$exec_prefix" +test "x$prefix" = xNONE && prefix=$ac_default_prefix +test "x$exec_prefix" = xNONE && exec_prefix=$prefix +if test "x$CATOBJEXT" = "x.mo" ; then + localedir=`eval echo "${libdir}/locale"` else - $1_TRUE='#' - $1_FALSE= + localedir=`eval echo "${datadir}/locale"` fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]) -fi])]) - -# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- - -# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -AC_PREREQ([2.52]) - -# serial 6 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - -# Add --enable-maintainer-mode option to configure. -# From Jim Meyering - -# Copyright 1996, 1998, 2000, 2001, 2002 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 2 - -AC_DEFUN([AM_MAINTAINER_MODE], -[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode is disabled by default - AC_ARG_ENABLE(maintainer-mode, -[ --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - USE_MAINTAINER_MODE=$enableval, - USE_MAINTAINER_MODE=no) - AC_MSG_RESULT([$USE_MAINTAINER_MODE]) - AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) - MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST(MAINT)dnl -] -) - -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) +prefix="$glib_save_prefix" +exec_prefix="$glib_save_exec_prefix" +AC_DEFINE_UNQUOTED($1, "$localedir", + [Define the location where the catalogs will be installed]) +]) -# isc-posix.m4 serial 2 (gettext-0.11.2) -dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -# This file is not needed with autoconf-2.53 and newer. Remove it in 2005. - -# This test replaces the one in autoconf. -# Currently this macro should have the same name as the autoconf macro -# because gettext's gettext.m4 (distributed in the automake package) -# still uses it. Otherwise, the use in gettext.m4 makes autoheader -# give these diagnostics: -# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX -# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX - -undefine([AC_ISC_POSIX]) - -AC_DEFUN([AC_ISC_POSIX], - [ - dnl This test replaces the obsolescent AC_ISC_POSIX kludge. - AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) - ] -) +dnl +dnl Now the definitions that aclocal will find +dnl +ifdef(glib_configure_in,[],[ +AC_DEFUN(AM_GLIB_GNU_GETTEXT,[GLIB_GNU_GETTEXT($@)]) +AC_DEFUN(AM_GLIB_DEFINE_LOCALEDIR,[GLIB_DEFINE_LOCALEDIR($@)]) +])dnl # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- @@ -2324,6 +1806,26 @@ linux*) # people can always --disable-shared, the test was removed, and we # assume the GNU/Linux dynamic linker is in use. dynamic_linker='GNU/Linux ld.so' + + # Find out which ABI we are using (multilib Linux x86_64 hack). + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '[#]line __oline__ "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + ;; + esac + fi + rm -rf conftest* + ;; + *) + ;; + esac + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" ;; netbsd*) @@ -2909,7 +2411,7 @@ AC_DEFUN([AC_PROG_LD_GNU], [AC_REQUIRE([AC_PROG_EGREP])dnl AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, [# I'd rather use --version here, but apparently some GNU ld's only accept -v. -case `"$LD" -v 2>&1 </dev/null` in +case `$LD -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) lt_cv_prog_gnu_ld=yes ;; @@ -3057,7 +2559,7 @@ irix5* | irix6* | nonstopux*) # This must be Linux ELF. linux*) case $host_cpu in - alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh*) + alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh* | x86_64*) lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM @@ -3586,7 +3088,7 @@ if test "$GXX" = yes; then # linker, instead of GNU ld. If possible, this setting should # overridden to take advantage of the native linker features on # the platform it is being used on. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' fi # Commands to make compiler produce verbose output that lists @@ -5218,7 +4720,7 @@ osf*) symcode='[[BCDEGQRST]]' ;; solaris* | sysv5*) - symcode='[[BDT]]' + symcode='[[BDRT]]' ;; sysv4) symcode='[[DFNSTU]]' @@ -5236,7 +4738,7 @@ esac # If we're using GNU nm, then use its standard symbol codes. case `$NM -V 2>&1` in *GNU* | *'with BFD'*) - symcode='[[ABCDGISTW]]' ;; + symcode='[[ABCDGIRSTW]]' ;; esac # Try without a prefix undercore, then with it. @@ -6005,6 +5507,31 @@ EOF _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ;; + linux*) + if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then + tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds" + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + if test $supports_anon_versioning = yes; then + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ +cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +$echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + else + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds" + fi + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + *) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' @@ -6742,718 +6269,1009 @@ SED=$lt_cv_path_SED AC_MSG_RESULT([$SED]) ]) -dnl I18n support -dnl -dnl Copyright (c) 2003 Benedikt Meurer <benedikt.meurer@unix-ag.uni-siegen.de> -dnl -dnl BM_I18N(pkgname, languages) -AC_DEFUN([BM_I18N], -[ - GETTEXT_PACKAGE=$1 - AC_SUBST([GETTEXT_PACKAGE]) - AC_DEFINE([GETTEXT_PACKAGE], ["$1"], [Name of default gettext domain]) +dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) +dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page +dnl also defines GSTUFF_PKG_ERRORS on error +AC_DEFUN(PKG_CHECK_MODULES, [ + succeeded=no + + if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + fi - ALL_LINGUAS="$2" + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + AC_MSG_CHECKING(for $2) - AM_GLIB_GNU_GETTEXT + if $PKG_CONFIG --exists "$2" ; then + AC_MSG_RESULT(yes) + succeeded=yes - dnl This is required on some linux systems - AC_CHECK_FUNC([bind_textdomain_codeset]) + AC_MSG_CHECKING($1_CFLAGS) + $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` + AC_MSG_RESULT($$1_CFLAGS) - AC_MSG_CHECKING([for locales directory]) - AC_ARG_WITH([locales-dir], - AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR]), - [localedir=$withval], - [localedir=$datadir/locale]) - AC_MSG_RESULT([$localedir]) - AC_SUBST([localedir]) + AC_MSG_CHECKING($1_LIBS) + $1_LIBS=`$PKG_CONFIG --libs "$2"` + AC_MSG_RESULT($$1_LIBS) + else + $1_CFLAGS="" + $1_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + ifelse([$4], ,echo $$1_PKG_ERRORS,) + fi + + AC_SUBST($1_CFLAGS) + AC_SUBST($1_LIBS) + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + ifelse([$3], , :, [$3]) + else + ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) + fi ]) -# Copyright (C) 1995-2002 Free Software Foundation, Inc. -# Copyright (C) 2001-2003 Red Hat, Inc. -# -# This file is free software, distributed under the terms of the GNU -# General Public License. As a special exception to the GNU General -# Public License, this file may be distributed as part of a program -# that contains a configuration script generated by Autoconf, under -# the same distribution terms as the rest of that program. + + +# -*- Autoconf -*- +# Copyright (C) 2002, 2003 Free Software Foundation, Inc. +# Generated from amversion.in; do not edit by hand. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"]) + +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION so it can be traced. +# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], + [AM_AUTOMAKE_VERSION([1.8.2])]) + +# AM_AUX_DIR_EXPAND + +# Copyright (C) 2001, 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +# `$srcdir', `$srcdir/..', or `$srcdir/../..'. # -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. # -# Macro to add for using GNU gettext. -# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996 +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir # -# Modified to never use included libintl. -# Owen Taylor <otaylor@redhat.com>, 12/15/1998 +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is `.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. # -# Major rework to remove unused code -# Owen Taylor <otaylor@redhat.com>, 12/11/2002 +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. # -# Added better handling of ALL_LINGUAS from GNU gettext version -# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002 +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. + +AC_DEFUN([AM_AUX_DIR_EXPAND], +[dnl Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50])dnl +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` +]) + +# AM_CONDITIONAL -*- Autoconf -*- + +# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 6 + +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ(2.52)dnl + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE]) +AC_SUBST([$1_FALSE]) +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]) +fi])]) + +# serial 6 -*- Autoconf -*- + +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 +# Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + + +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "GCJ", or "OBJC". +# We try a few techniques and use that to set a single cache variable. # -# We need this here as well, since someone might use autoconf-2.5x -# to configure GLib then an older version to configure a package -# using AM_GLIB_GNU_GETTEXT -AC_PREREQ(2.53) +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl -dnl -dnl We go to great lengths to make sure that aclocal won't -dnl try to pull in the installed version of these macros -dnl when running aclocal in the glib directory. -dnl -m4_copy([AC_DEFUN],[glib_DEFUN]) -m4_copy([AC_REQUIRE],[glib_REQUIRE]) -dnl -dnl At the end, if we're not within glib, we'll define the public -dnl definitions in terms of our private definitions. -dnl +ifelse([$1], CC, [depcc="$CC" am_compiler_list=], + [$1], CXX, [depcc="$CXX" am_compiler_list=], + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) -# GLIB_LC_MESSAGES -#-------------------- -glib_DEFUN([GLIB_LC_MESSAGES], - [AC_CHECK_HEADERS([locale.h]) - if test $ac_cv_header_locale_h = yes; then - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) - if test $am_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES, 1, - [Define if your <locale.h> file defines LC_MESSAGES.]) - fi - fi]) +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub -# GLIB_PATH_PROG_WITH_TEST -#---------------------------- -dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], -[# Extract the first word of "$2", so it can be a program name with args. -set dummy $2; ac_word=[$]2 -AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, -[case "[$]$1" in - /*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in ifelse([$5], , $PATH, [$5]); do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word" + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + : > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else break fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + if depmode=$depmode \ + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # (even with -Werror). So we grep stderr for any message + # that says an option was ignored. + if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi fi done - IFS="$ac_save_ifs" -dnl If no 4th arg is given, leave the cache variable unset, -dnl so AC_PATH_PROGS will keep looking. -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -])dnl - ;; -esac])dnl -$1="$ac_cv_path_$1" -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) + + cd .. + rm -rf conftest.dir else - AC_MSG_RESULT(no) + am_cv_$1_dependencies_compiler_type=none fi -AC_SUBST($1)dnl +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) ]) -# GLIB_WITH_NLS -#----------------- -glib_DEFUN([GLIB_WITH_NLS], - dnl NLS is obligatory - [USE_NLS=yes - AC_SUBST(USE_NLS) - gt_cv_have_gettext=no +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +]) - CATOBJEXT=NONE - XGETTEXT=: - INTLLIBS= - AC_CHECK_HEADER(libintl.h, - [gt_cv_func_dgettext_libintl="no" - libintl_extra_libs="" +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE(dependency-tracking, +[ --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH]) +]) - # - # First check in libc - # - AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, - [AC_TRY_LINK([ -#include <libintl.h> -], - [return (int) dgettext ("","")], - gt_cv_func_dgettext_libc=yes, - gt_cv_func_dgettext_libc=no) - ]) - - if test "$gt_cv_func_dgettext_libc" = "yes" ; then - AC_CHECK_FUNCS(bind_textdomain_codeset) - fi +# Generate code to set up dependency tracking. -*- Autoconf -*- - # - # If we don't have everything we want, check in libintl - # - if test "$gt_cv_func_dgettext_libc" != "yes" \ - || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - - AC_CHECK_LIB(intl, bindtextdomain, - [AC_CHECK_LIB(intl, dgettext, - gt_cv_func_dgettext_libintl=yes)]) +# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. - if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - AC_MSG_CHECKING([if -liconv is needed to use gettext]) - AC_MSG_RESULT([]) - AC_CHECK_LIB(intl, dcgettext, - [gt_cv_func_dgettext_libintl=yes - libintl_extra_libs=-liconv], - :,-liconv) - fi +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. - # - # If we found libintl, then check in it for bind_textdomain_codeset(); - # we'll prefer libc if neither have bind_textdomain_codeset(), - # and both have dgettext - # - if test "$gt_cv_func_dgettext_libintl" = "yes" ; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS -lintl $libintl_extra_libs" - unset ac_cv_func_bind_textdomain_codeset - AC_CHECK_FUNCS(bind_textdomain_codeset) - LIBS="$glib_save_LIBS" +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. - if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then - gt_cv_func_dgettext_libc=no - else - if test "$gt_cv_func_dgettext_libc" = "yes"; then - gt_cv_func_dgettext_libintl=no - fi - fi - fi - fi +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. - if test "$gt_cv_func_dgettext_libc" = "yes" \ - || test "$gt_cv_func_dgettext_libintl" = "yes"; then - gt_cv_have_gettext=yes - fi - - if test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS="-lintl $libintl_extra_libs" - fi - - if test "$gt_cv_have_gettext" = "yes"; then - AC_DEFINE(HAVE_GETTEXT,1, - [Define if the GNU gettext() function is already present or preinstalled.]) - GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl - if test "$MSGFMT" != "no"; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - AC_CHECK_FUNCS(dcgettext) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr], - [CATOBJEXT=.gmo - DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share and - dnl and CATOBJEXT=.gmo in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [CATOBJEXT=.gmo - DATADIRNAME=share], - [CATOBJEXT=.mo - DATADIRNAME=lib]) - ;; - *) - CATOBJEXT=.mo - DATADIRNAME=lib - ;; - esac]) - LIBS="$glib_save_LIBS" - INSTOBJEXT=.mo - else - gt_cv_have_gettext=no - fi - fi - ]) +#serial 2 - if test "$gt_cv_have_gettext" = "yes" ; then - AC_DEFINE(ENABLE_NLS, 1, - [always defined to indicate that i18n is enabled]) - fi +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[for mf in $CONFIG_FILES; do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # So let's grep whole file. + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue + # Extract the definition of DEP_FILES from the Makefile without + # running `make'. + DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` + test -z "$DEPDIR" && continue + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n -e '/^U = / s///p' < "$mf"` + test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" + # We invoke sed twice because it is the simplest approach to + # changing $(DEPDIR) to its actual value in the expansion. + for file in `sed -n -e ' + /^DEP_FILES = .*\\\\$/ { + s/^DEP_FILES = // + :loop + s/\\\\$// + p + n + /\\\\$/ b loop + p + } + /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done +done +])# _AM_OUTPUT_DEPENDENCY_COMMANDS - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is not GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; - else - AC_MSG_RESULT( - [found xgettext program is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi - fi - # We need to process the po/ directory. - POSUB=po +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each `.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) - AC_OUTPUT_COMMANDS( - [case "$CONFIG_FILES" in *po/Makefile.in*) - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile - esac]) +# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- - dnl These rules are solely for the distribution goal. While doing this - dnl we only have to keep exactly one list of the available catalogs - dnl in configure.in. - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done +# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. - dnl Make all variables we use known to autoconf. - AC_SUBST(CATALOGS) - AC_SUBST(CATOBJEXT) - AC_SUBST(DATADIRNAME) - AC_SUBST(GMOFILES) - AC_SUBST(INSTOBJEXT) - AC_SUBST(INTLLIBS) - AC_SUBST(PO_IN_DATADIR_TRUE) - AC_SUBST(PO_IN_DATADIR_FALSE) - AC_SUBST(POFILES) - AC_SUBST(POSUB) - ]) +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. -# AM_GLIB_GNU_GETTEXT -# ------------------- -# Do checks necessary for use of gettext. If a suitable implementation -# of gettext is found in either in libintl or in the C library, -# it will set INTLLIBS to the libraries needed for use of gettext -# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable -# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() -# on various variables needed by the Makefile.in.in installed by -# glib-gettextize. -dnl -glib_DEFUN(GLIB_GNU_GETTEXT, - [AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl - - GLIB_LC_MESSAGES - GLIB_WITH_NLS +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. - if test "$gt_cv_have_gettext" = "yes"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - AC_MSG_CHECKING(for catalogs to be installed) - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi - done - LINGUAS=$NEW_LINGUAS - AC_MSG_RESULT($LINGUAS) - fi +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. - dnl Construct list of names of catalog files to be constructed. - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi +# serial 7 - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but ($top_srcdir). - dnl Try to locate is. - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - AC_SUBST(MKINSTALLDIRS) +# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. +AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - dnl Generate list of files to be processed by xgettext which will - dnl be included in po/Makefile. - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES - ]) +# Do all the work for Automake. -*- Autoconf -*- -# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) -# ------------------------------- -# Define VARIABLE to the location where catalog files will -# be installed by po/Makefile. -glib_DEFUN(GLIB_DEFINE_LOCALEDIR, -[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl -glib_save_prefix="$prefix" -glib_save_exec_prefix="$exec_prefix" -test "x$prefix" = xNONE && prefix=$ac_default_prefix -test "x$exec_prefix" = xNONE && exec_prefix=$prefix -if test "x$CATOBJEXT" = "x.mo" ; then - localedir=`eval echo "${libdir}/locale"` -else - localedir=`eval echo "${datadir}/locale"` -fi -prefix="$glib_save_prefix" -exec_prefix="$glib_save_exec_prefix" -AC_DEFINE_UNQUOTED($1, "$localedir", - [Define the location where the catalogs will be installed]) -]) +# This macro actually does too much some checks are only needed if +# your package does certain things. But this isn't really a big deal. -dnl -dnl Now the definitions that aclocal will find -dnl -ifdef(glib_configure_in,[],[ -AC_DEFUN(AM_GLIB_GNU_GETTEXT,[GLIB_GNU_GETTEXT($@)]) -AC_DEFUN(AM_GLIB_DEFINE_LOCALEDIR,[GLIB_DEFINE_LOCALEDIR($@)]) -])dnl +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +# Free Software Foundation, Inc. -dnl From Benedikt Meurer (benedikt.meurer@unix-ag.uni-siegen.de) -dnl Check for X11 +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. -AC_DEFUN([BM_LIBX11], -[ - AC_REQUIRE([AC_PATH_XTRA]) - LIBX11_CFLAGS= LIBX11_LDFLAGS= LIBX11_LIBS= - if test "$no_x" != "yes"; then - AC_CHECK_LIB(X11, main, - [ - AC_DEFINE(HAVE_LIBX11, 1, Define if libX11 is available) - LIBX11_CFLAGS="$X_CFLAGS" - for option in $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS; do - case "$option" in - -L*) - path=`echo $option | sed 's/^-L//'` - if test x"$path" != x""; then - LIBX11_LDFLAGS="$LIBX11_LDFLAGS -L$path" - fi - ;; - *) - LIBX11_LIBS="$LIBX11_LIBS $option" - ;; - esac - done - if ! echo $LIBX11_LIBS | grep -- '-lX11' > /dev/null; then - LIBX11_LIBS="$LIBX11_LIBS -lX11" - fi - ], [], [$X_CFLAGS $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS]) - fi - AC_SUBST(LIBX11_CFLAGS) - AC_SUBST(LIBX11_LDFLAGS) - AC_SUBST(LIBX11_LIBS) -]) +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. -AC_DEFUN([BM_LIBX11_REQUIRE], -[ - AC_REQUIRE([BM_LIBX11]) - if test "$no_x" = "yes"; then - AC_MSG_ERROR([X Window system libraries and header files are required]) - fi -]) +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. -AC_DEFUN([BM_LIBSM], -[ - AC_REQUIRE([BM_LIBX11]) - LIBSM_CFLAGS= LIBSM_LDFLAGS= LIBSM_LIBS= - if test "$no_x" != "yes"; then - AC_CHECK_LIB(SM, SmcSaveYourselfDone, - [ - AC_DEFINE(HAVE_LIBSM, 1, Define if libSM is available) - LIBSM_CFLAGS="$LIBX11_CFLAGS" - LIBSM_LDFLAGS="$LIBX11_LDFLAGS" - LIBSM_LIBS="$LIBX11_LIBS" - if ! echo $LIBSM_LIBS | grep -- '-lSM' > /dev/null; then - LIBSM_LIBS="$LIBSM_LIBS -lSM -lICE" - fi - ], [], [$LIBX11_CFLAGS $LIBX11_LDFLAGS $LIBX11_LIBS -lICE]) - fi - AC_SUBST(LIBSM_CFLAGS) - AC_SUBST(LIBSM_LDFLAGS) - AC_SUBST(LIBSM_LIBS) -]) +# serial 11 -AC_DEFUN([BM_LIBXPM], -[ - AC_REQUIRE([BM_LIBX11]) - LIBXPM_CFLAGS= LIBXPM_LDFLAGS= LIBXPM_LIBS= - if test "$no_x" != "yes"; then - AC_CHECK_LIB(Xpm, main, - [ - AC_DEFINE([HAVE_LIBXPM], [1], [Define if libXpm is available]) - LIBXPM_CFLAGS="$LIBX11_CFLAGS" - LIBXPM_LDFLAGS="$LIBX11_LDFLAGS" - LIBXPM_LIBS="$LIBX11_LIBS" - if ! echo $LIBXPM_LIBS | grep -- '-lXpm' > /dev/null; then - LIBXPM_LIBS="$LIBXPM_LIBS -lXpm" - fi - ], [], [$LIBX11_CFLAGS $LIBX11_LDFLAGS $LIBX11_LIBS -lXpm]) - fi - AC_SUBST([LIBXPM_CFLAGS]) - AC_SUBST([LIBXPM_LDFLAGS]) - AC_SUBST([LIBXPM_LIBS]) -]) +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.58])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +# test to see if srcdir already configured +if test "`cd $srcdir && pwd`" != "`pwd`" && + test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +fi -AC_DEFUN([BM_LIBXPM_REQUIRE], -[ - AC_REQUIRE([BM_LIBX11_REQUIRE]) - AC_REQUIRE([BM_LIBXPM]) - if test -z "$LIBXPM_LIBS"; then - AC_MSG_ERROR([The Xpm library was not found on you system]) +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo fi -]) +fi +AC_SUBST([CYGPATH_W]) -AC_DEFUN([BM_LIBXINERAMA], -[ - AC_ARG_ENABLE(xinerama, -AC_HELP_STRING([--enable-xinerama], [enable xinerama extension]) -AC_HELP_STRING([--disable-xinerama], [disable xinerama extension [default]]), - [], [enable_xinerama=no]) - LIBXINERAMA_CFLAGS= LIBXINERAMA_LDFLAGS= LIBXINERAMA_LIBS= - if test "x$enable_xinerama" = "xyes"; then - AC_REQUIRE([BM_LIBX11_REQUIRE]) - AC_CHECK_LIB(Xinerama, XineramaQueryScreens, - [ - AC_DEFINE(HAVE_LIBXINERAMA, 1, Define if XFree86 Xinerama is available) - LIBXINERAMA_CFLAGS="$LIBX11_CFLAGS" - LIBXINERAMA_LDFLAGS="$LIBX11_LDFLAGS" - LIBXINERAMA_LIBS="$LIBX11_LIBS" - if ! echo $LIBXINERAMA_LIBS | grep -- '-lXinerama' > /dev/null; then - LIBXINERAMA_LIBS="$LIBXINERAMA_LIBS -lXinerama" - fi - if ! echo $LIBXINERAMA_LIBS | grep -- '-lXext' > /dev/null; then - LIBXINERAMA_LIBS="$LIBXINERAMA_LIBS -lXext" - fi - ],[], [$LIBX11_CFLAGS $LIBX11_LDFLAGS $LIBX11_LIBS -lXext]) - fi - AC_SUBST(LIBXINERAMA_CFLAGS) - AC_SUBST(LIBXINERAMA_LDFLAGS) - AC_SUBST(LIBXINERAMA_LIBS) -]) +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl -dnl From Benedikt Meurer (benedikt.meurer@unix-ag.uni-siegen.de) -dnl -dnl +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +AM_MISSING_PROG(AUTOCONF, autoconf) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +AM_MISSING_PROG(AUTOHEADER, autoheader) +AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG(AMTAR, tar) +AM_PROG_INSTALL_SH +AM_PROG_INSTALL_STRIP +AC_REQUIRE([AM_PROG_MKDIR_P])dnl +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_DEFUN([BM_DEPEND], -[ - PKG_CHECK_MODULES([$1], [$2 >= $3]) - $1_REQUIRED_VERSION=$3 - AC_SUBST($1_REQUIRED_VERSION) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl ]) - -dnl -dnl BM_DEPEND_CHECK(var, pkg, version, name, helpstring, default) -dnl -AC_DEFUN([BM_DEPEND_CHECK], -[ - AC_ARG_ENABLE([$4], -AC_HELP_STRING([--enable-$4], [Enable checking for $5 (default=$6)]) -AC_HELP_STRING([--disable-$4], [Disable checking for $5]), - [ac_cv_$1_check=$enableval], [ac_cv_$1_check=$6]) - - if test x"$ac_cv_$1_check" = x"yes"; then - AC_MSG_CHECKING([for $2 >= $3]) - if $PKG_CONFIG --atleast-version=$3 $2 2> /dev/null; then - AC_MSG_RESULT([yes]) - BM_DEPEND([$1], [$2], [$3]) - AC_DEFINE([HAVE_$1], [1], [Define if you have $2 >= $3]) - else - AC_MSG_RESULT([no]) - fi - fi ]) -dnl -dnl XFCE_PANEL_PLUGIN(var, version) -dnl -dnl Sets $var_CFLAGS, $var_LIBS and $var_PLUGINSDIR -dnl -AC_DEFUN([XFCE_PANEL_PLUGIN], -[ - BM_DEPEND([$1], [xfce4-panel-1.0], [$2]) - dnl Check where to put the plugins to - AC_MSG_CHECKING([where to install panel plugins]) - $1_PLUGINSDIR=`$PKG_CONFIG --variable=pluginsdir xfce4-panel-1.0` - AC_SUBST([$1_PLUGINSDIR]) - AC_MSG_RESULT([$$1_PLUGINSDIR]) -]) +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. -dnl -dnl XFCE_MCS_PLUGIN(var, version) -dnl -dnl sets $var_CFLAGS, $var_LIBS and $var_PLUGINSDIR -dnl -AC_DEFUN([XFCE_MCS_PLUGIN], -[ - BM_DEPEND([$1], [xfce-mcs-manager], [$2]) +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $1 | $1:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) + +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. + +# Copyright (C) 2001, 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +install_sh=${install_sh-"$am_aux_dir/install-sh"} +AC_SUBST(install_sh)]) + +# -*- Autoconf -*- +# Copyright (C) 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 1 + +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) + +# Add --enable-maintainer-mode option to configure. +# From Jim Meyering + +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004 +# Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 3 + +AC_DEFUN([AM_MAINTAINER_MODE], +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode is disabled by default + AC_ARG_ENABLE(maintainer-mode, +[ --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + USE_MAINTAINER_MODE=$enableval, + USE_MAINTAINER_MODE=no) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST(MAINT)dnl +] +) + +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + +# Check to see how 'make' treats includes. -*- Autoconf -*- + +# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 2 - dnl Check where to put the plugins to - AC_MSG_CHECKING([where to install MCS plugins]) - $1_PLUGINSDIR=`$PKG_CONFIG --variable=pluginsdir xfce-mcs-manager` - AC_SUBST([$1_PLUGINSDIR]) - AC_MSG_RESULT([$$1_PLUGINSDIR]) +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo done +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# We grep out `Entering directory' and `Leaving directory' +# messages which can occur if `w' ends up in MAKEFLAGS. +# In particular we don't look at `^make:' because GNU make might +# be invoked under some other name (usually "gmake"), in which +# case it prints its new name instead of `make'. +if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then + am__include=include + am__quote= + _am_result=GNU +fi +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then + am__include=.include + am__quote="\"" + _am_result=BSD + fi +fi +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf ]) +# -*- Autoconf -*- -dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) -dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page -dnl also defines GSTUFF_PKG_ERRORS on error -AC_DEFUN(PKG_CHECK_MODULES, [ - succeeded=no - if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - fi +# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. - if test "$PKG_CONFIG" = "no" ; then - echo "*** The pkg-config script could not be found. Make sure it is" - echo "*** in your path, or set the PKG_CONFIG environment variable" - echo "*** to the full path to pkg-config." - echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." - else - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - AC_MSG_CHECKING(for $2) +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. - if $PKG_CONFIG --exists "$2" ; then - AC_MSG_RESULT(yes) - succeeded=yes +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. - AC_MSG_CHECKING($1_CFLAGS) - $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` - AC_MSG_RESULT($$1_CFLAGS) +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. - AC_MSG_CHECKING($1_LIBS) - $1_LIBS=`$PKG_CONFIG --libs "$2"` - AC_MSG_RESULT($$1_LIBS) - else - $1_CFLAGS="" - $1_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. - $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` - ifelse([$4], ,echo $$1_PKG_ERRORS,) - fi +# serial 3 - AC_SUBST($1_CFLAGS) - AC_SUBST($1_LIBS) - else - echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." - echo "*** See http://www.freedesktop.org/software/pkgconfig" - fi - fi +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) - if test $succeeded = yes; then - ifelse([$3], , :, [$3]) - else - ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) - fi + +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it supports --run. +# If it does, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " +else + am_missing_run= + AC_MSG_WARN([`missing' script is too old or missing]) +fi ]) +# AM_PROG_MKDIR_P +# --------------- +# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. +# Copyright (C) 2003, 2004 Free Software Foundation, Inc. -dnl From Benedikt Meurer (benedikt.meurer@unix-ag.uni-siegen.de) -dnl -dnl if debug support is requested: -dnl -dnl 1) defines DEBUG to 1 -dnl 2) adds requested debug level flags to CFLAGS -dnl +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. -AC_DEFUN([BM_DEBUG_SUPPORT], -[ - AC_ARG_ENABLE([debug], -AC_HELP_STRING([--enable-debug[=yes|no|full]], [Build with debugging support]) -AC_HELP_STRING([--disable-debug], [Include no debugging support [default]]), - [], [enable_debug=no]) - - AC_MSG_CHECKING([whether to build with debugging support]) - if test x"$enable_debug" != x"no"; then - AC_DEFINE(DEBUG, 1, Define for debugging support) - if test x"$enable_debug" = x"full"; then - AC_DEFINE(DEBUG_TRACE, 1, Define for tracing support) - CFLAGS="$CFLAGS -g3 -Wall -Werror -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED" - AC_MSG_RESULT([full]) - else - CFLAGS="$CFLAGS -g -Wall -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED" - AC_MSG_RESULT([yes]) - fi - else - AC_MSG_RESULT([no]) - fi +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. - AC_ARG_ENABLE([profiling], -AC_HELP_STRING([--enable-profiling], - [Generate extra code to write profile information]) -AC_HELP_STRING([--disable-profiling], - [No extra code for profiling (default)]), - [], [enable_profiling=no]) - - AC_MSG_CHECKING([whether to build with profiling support]) - if test x"$enable_profiling" != x"no"; then - CFLAGS="$CFLAGS -pg" - AC_MSG_RESULT([yes]) +# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories +# created by `make install' are always world readable, even if the +# installer happens to have an overly restrictive umask (e.g. 077). +# This was a mistake. There are at least two reasons why we must not +# use `-m 0755': +# - it causes special bits like SGID to be ignored, +# - it may be too restrictive (some setups expect 775 directories). +# +# Do not use -m 0755 and let people choose whatever they expect by +# setting umask. +AC_DEFUN([AM_PROG_MKDIR_P], +[if mkdir -p -- . 2>/dev/null; then + # Keeping the `.' argument allows $(mkdir_p) to be used without + # argument. Indeed, we sometimes output rules like + # $(mkdir_p) $(somedir) + # where $(somedir) is conditionally defined. + # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more + # expensive solution, as it forces Make to start a sub-shell.) + mkdir_p='mkdir -p -- .' +else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + for d in ./-p ./--; + do + test -d $d && rmdir $d + done + # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. + if test -f "$ac_aux_dir/mkinstalldirs"; then + mkdir_p='$(mkinstalldirs)' else - AC_MSG_RESULT([no]) + mkdir_p='$(install_sh) -d' fi +fi +AC_SUBST([mkdir_p])]) - AC_ARG_ENABLE([asserts], -AC_HELP_STRING([--enable-asserts], [Enable assert statements (default)]) -AC_HELP_STRING([--disable-asserts], - [Disable assert statements (USE WITH CARE!!!)]), - [], [enable_asserts=yes]) +# Helper functions for option handling. -*- Autoconf -*- - AC_MSG_CHECKING([whether to enable assert statements]) - if test x"$enable_asserts" != x"yes"; then - CFLAGS="$CFLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS" - AC_MSG_RESULT([no]) - else - AC_MSG_RESULT([yes]) - fi -]) +# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 2 + +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +# _AM_SET_OPTION(NAME) +# ------------------------------ +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + +# _AM_SET_OPTIONS(OPTIONS) +# ---------------------------------- +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +# +# Check to make sure that the build environment is sane. +# + +# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 3 + +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Just in case +sleep 1 +echo timestamp > conftest.file +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t $srcdir/configure conftest.file` + fi + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +alias in your environment]) + fi + + test "$[2]" = conftest.file + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +AC_MSG_RESULT(yes)]) + +# AM_PROG_INSTALL_STRIP + +# Copyright (C) 2001, 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# One issue with vendor `install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in `make install-strip', and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) +m4_include([m4/X11.m4]) +m4_include([m4/debug.m4]) +m4_include([m4/depends.m4]) +m4_include([m4/i18n.m4]) @@ -1,8 +1,9 @@ #! /bin/sh - # Wrapper for compilers which do not understand `-c -o'. -# Copyright 1999, 2000 Free Software Foundation, Inc. +scriptversion=2003-11-09.00 + +# Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc. # Written by Tom Tromey <tromey@cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -24,9 +25,36 @@ # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. -# Usage: -# compile PROGRAM [ARGS]... -# `-o FOO.o' is removed from the args passed to the actual compile. +# This file is maintained in Automake, please report +# bugs to <bug-automake@gnu.org> or send patches to +# <automake-patches@gnu.org>. + +case $1 in + '') + echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand `-c -o'. +Remove `-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file `INSTALL'. + +Report bugs to <bug-automake@gnu.org>. +EOF + exit 0 + ;; + -v | --v*) + echo "compile $scriptversion" + exit 0 + ;; +esac + prog=$1 shift @@ -35,39 +63,39 @@ ofile= cfile= args= while test $# -gt 0; do - case "$1" in + case "$1" in -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we do something ugly here. - ofile=$2 - shift - case "$ofile" in + # configure might choose to run compile as `compile cc -o foo foo.c'. + # So we do something ugly here. + ofile=$2 + shift + case "$ofile" in *.o | *.obj) - ;; + ;; *) - args="$args -o $ofile" - ofile= - ;; - esac + args="$args -o $ofile" + ofile= + ;; + esac ;; *.c) - cfile=$1 - args="$args $1" - ;; + cfile=$1 + args="$args $1" + ;; *) - args="$args $1" - ;; - esac - shift + args="$args $1" + ;; + esac + shift done if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also - # ok. - exec "$prog" $args + # If no `-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # `.c' file was seen then we are probably linking. That is also + # ok. + exec "$prog" $args fi # Name of file we expect compiler to create. @@ -79,10 +107,10 @@ cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'` # object file name, since that is what matters with a parallel build. lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d while true; do - if mkdir $lockdir > /dev/null 2>&1; then - break - fi - sleep 1 + if mkdir $lockdir > /dev/null 2>&1; then + break + fi + sleep 1 done # FIXME: race condition here if user kills between mkdir and trap. trap "rmdir $lockdir; exit 1" 1 2 15 @@ -92,8 +120,17 @@ trap "rmdir $lockdir; exit 1" 1 2 15 status=$? if test -f "$cofile"; then - mv "$cofile" "$ofile" + mv "$cofile" "$ofile" fi rmdir $lockdir exit $status + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/config.guess b/config.guess index 6bdac8d7..e8c6fc0c 100755 --- a/config.guess +++ b/config.guess @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -timestamp='2003-05-09' +timestamp='2004-01-05' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -106,6 +106,7 @@ trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; dummy=$tmp/dummy ; tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; @@ -220,6 +221,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in mvmeppc:OpenBSD:*:*) echo powerpc-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + pegasos:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; pmax:OpenBSD:*:*) echo mipsel-unknown-openbsd${UNAME_RELEASE} exit 0 ;; @@ -282,6 +286,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; + Alpha*:OpenVMS:*:*) + echo alpha-hp-vms + exit 0 ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -303,6 +310,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:OS/390:*:*) echo i370-ibm-openedition exit 0 ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit 0;; @@ -320,6 +330,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 exit 0 ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit 0 ;; DRS?6000:UNIX_SV:4.2*:7*) case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7 && exit 0 ;; @@ -727,7 +740,7 @@ EOF echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; *:UNICOS/mp:*:*) - echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` @@ -735,6 +748,11 @@ EOF FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; @@ -744,7 +762,7 @@ EOF *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; - *:FreeBSD:*:*|*:GNU/FreeBSD:*:*) + *:FreeBSD:*:*) # Determine whether the default compiler uses glibc. eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -756,7 +774,10 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} + # GNU/KFreeBSD systems have a "k" prefix to indicate we are using + # FreeBSD's kernel, but not the complete OS. + case ${LIBC} in gnu) kernel_only='k' ;; esac + echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -767,8 +788,8 @@ EOF i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit 0 ;; - x86:Interix*:3*) - echo i586-pc-interix3 + x86:Interix*:[34]*) + echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' exit 0 ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks @@ -789,14 +810,22 @@ EOF echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; *:GNU:*:*) + # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit 0 ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit 0 ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit 0 ;; arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu + exit 0 ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; @@ -875,6 +904,9 @@ EOF s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux exit 0 ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; @@ -932,6 +964,9 @@ EOF LIBC=gnuaout #endif #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 @@ -962,6 +997,9 @@ EOF i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos exit 0 ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit 0 ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit 0 ;; @@ -1033,7 +1071,7 @@ EOF exit 0 ;; M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` @@ -1148,7 +1186,7 @@ EOF *:QNX:*:4*) echo i386-pc-qnx exit 0 ;; - NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) + NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *:NonStop-UX:*:*) @@ -1189,6 +1227,12 @@ EOF *:ITS:*:*) echo pdp10-unknown-its exit 0 ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit 0 ;; + *:DRAGONFLY:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE} + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -timestamp='2003-05-09' +timestamp='2004-01-05' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -118,7 +118,8 @@ esac # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ + kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -228,13 +229,14 @@ case $basic_machine in | a29k \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ - | clipper \ + | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ - | ip2k \ + | ip2k | iq2000 \ | m32r | m68000 | m68k | m88k | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ @@ -247,6 +249,7 @@ case $basic_machine in | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ @@ -261,7 +264,7 @@ case $basic_machine in | sh64 | sh64le \ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ | strongarm \ - | tahoe | thumb | tic80 | tron \ + | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ | x86 | xscale | xstormy16 | xtensa \ @@ -304,7 +307,7 @@ case $basic_machine in | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* \ + | ip2k-* | iq2000-* \ | m32r-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | mcore-* \ @@ -319,6 +322,7 @@ case $basic_machine in | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ @@ -376,6 +380,9 @@ case $basic_machine in amd64) basic_machine=x86_64-pc ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; amdahl) basic_machine=580-amdahl os=-sysv @@ -740,6 +747,10 @@ case $basic_machine in basic_machine=or32-unknown os=-coff ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; OSE68000 | ose68000) basic_machine=m68000-ericsson os=-ose @@ -771,18 +782,24 @@ case $basic_machine in pentiumpro | p6 | 6x86 | athlon | athlon_*) basic_machine=i686-pc ;; - pentiumii | pentium2) + pentiumii | pentium2 | pentiumiii | pentium3) basic_machine=i686-pc ;; + pentium4) + basic_machine=i786-pc + ;; pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumii-* | pentium2-*) + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pn) basic_machine=pn-gould ;; @@ -841,6 +858,10 @@ case $basic_machine in sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; sequent) basic_machine=i386-sequent ;; @@ -848,6 +869,9 @@ case $basic_machine in basic_machine=sh-hitachi os=-hms ;; + sh64) + basic_machine=sh64-unknown + ;; sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs os=-vxworks @@ -922,10 +946,6 @@ case $basic_machine in basic_machine=t90-cray os=-unicos ;; - tic4x | c4x*) - basic_machine=tic4x-unknown - os=-coff - ;; tic54x | c54x*) basic_machine=tic54x-unknown os=-coff @@ -951,6 +971,10 @@ case $basic_machine in tower | tower-32) basic_machine=m68k-ncr ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; udi29k) basic_machine=a29k-amd os=-udi @@ -1119,19 +1143,19 @@ case $os in | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ + | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \ | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1155,6 +1179,9 @@ case $os in -mac*) os=`echo $os | sed -e 's|mac|macos|'` ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; @@ -1167,6 +1194,9 @@ case $os in -opened*) os=-openedition ;; + -os400*) + os=-os400 + ;; -wince*) os=-wince ;; @@ -1188,6 +1218,9 @@ case $os in -atheos*) os=-atheos ;; + -syllable*) + os=-syllable + ;; -386bsd) os=-bsd ;; @@ -1210,6 +1243,9 @@ case $os in -sinix*) os=-sysv4 ;; + -tpf*) + os=-tpf + ;; -triton*) os=-sysv3 ;; @@ -1277,6 +1313,9 @@ case $basic_machine in arm*-semi) os=-aout ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 @@ -1455,9 +1494,15 @@ case $basic_machine in -mvs* | -opened*) vendor=ibm ;; + -os400*) + vendor=ibm + ;; -ptx*) vendor=sequent ;; + -tpf*) + vendor=ibm + ;; -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; @@ -1,9 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.57. +# Generated by GNU Autoconf 2.59. # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. +# Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## @@ -20,9 +19,10 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi +DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset else as_unset=false @@ -41,7 +41,7 @@ for as_var in \ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else $as_unset $as_var @@ -218,16 +218,17 @@ rm -f conf$$ conf$$.exe conf$$.file if mkdir -p . 2>/dev/null; then as_mkdir_p=: else + test -d ./-p && rmdir ./-p as_mkdir_p=false fi as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" # Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" # IFS @@ -462,7 +463,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS localedir X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBX11_CFLAGS LIBX11_LDFLAGS LIBX11_LIBS PKG_CONFIG LIBXFCE4MCS_CLIENT_CFLAGS LIBXFCE4MCS_CLIENT_LIBS LIBXFCE4MCS_CLIENT_REQUIRED_VERSION LIBXFCEGUI4_CFLAGS LIBXFCEGUI4_LIBS LIBXFCEGUI4_REQUIRED_VERSION LIBXML_CFLAGS LIBXML_LIBS LIBXML_REQUIRED_VERSION XFCE_MCS_MANAGER_CFLAGS XFCE_MCS_MANAGER_LIBS XFCE_MCS_MANAGER_REQUIRED_VERSION XFCE_MCS_MANAGER_PLUGINSDIR LIBSTARTUP_NOTIFICATION_CFLAGS LIBSTARTUP_NOTIFICATION_LIBS LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS localedir X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBX11_CFLAGS LIBX11_LDFLAGS LIBX11_LIBS PKG_CONFIG LIBXFCE4MCS_CLIENT_CFLAGS LIBXFCE4MCS_CLIENT_LIBS LIBXFCE4MCS_CLIENT_REQUIRED_VERSION LIBXFCEGUI4_CFLAGS LIBXFCEGUI4_LIBS LIBXFCEGUI4_REQUIRED_VERSION LIBXML_CFLAGS LIBXML_LIBS LIBXML_REQUIRED_VERSION XFCE_MCS_MANAGER_CFLAGS XFCE_MCS_MANAGER_LIBS XFCE_MCS_MANAGER_REQUIRED_VERSION XFCE_MCS_MANAGER_PLUGINSDIR LIBSTARTUP_NOTIFICATION_CFLAGS LIBSTARTUP_NOTIFICATION_LIBS LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -821,7 +822,7 @@ done # Be sure to have absolute paths. for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir + localstatedir libdir includedir oldincludedir infodir mandir do eval ac_val=$`echo $ac_var` case $ac_val in @@ -861,10 +862,10 @@ if test -z "$srcdir"; then # Try the directory containing this script, then its parent. ac_confdir=`(dirname "$0") 2>/dev/null || $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$0" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -976,9 +977,9 @@ _ACEOF cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -1026,10 +1027,10 @@ if test -n "$ac_init_help"; then Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer - --disable-dependency-tracking Speeds up one-time builds - --enable-dependency-tracking Do not reject slow dependency extractors + --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer + --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors --enable-static[=PKGS] build static libraries [default=no] --enable-shared[=PKGS] @@ -1111,12 +1112,45 @@ case $srcdir in ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -# absolute. -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` + +# Do not use `cd foo && pwd` to compute absolute paths, because +# the directories may not exist. +case `pwd` in +.) ac_abs_builddir="$ac_dir";; +*) + case "$ac_dir" in + .) ac_abs_builddir=`pwd`;; + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; + *) ac_abs_builddir=`pwd`/"$ac_dir";; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_builddir=${ac_top_builddir}.;; +*) + case ${ac_top_builddir}. in + .) ac_abs_top_builddir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_srcdir=$ac_srcdir;; +*) + case $ac_srcdir in + .) ac_abs_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_srcdir=$ac_top_srcdir;; +*) + case $ac_top_srcdir in + .) ac_abs_top_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; + esac;; +esac cd $ac_dir # Check for guested configure; otherwise get Cygnus style configure. @@ -1127,7 +1161,7 @@ ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` echo $SHELL $ac_srcdir/configure --help=recursive elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then + test -f $ac_srcdir/configure.in; then echo $ac_configure --help else @@ -1141,8 +1175,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 -Free Software Foundation, Inc. +Copyright (C) 2003 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1154,7 +1187,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.57. Invocation command line was +generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1231,19 +1264,19 @@ do 2) ac_configure_args1="$ac_configure_args1 '$ac_arg'" if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. + ac_must_keep_next=false # Got value, back to normal. else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac fi ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" # Get rid of the leading space. @@ -1277,12 +1310,12 @@ _ASBOX case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in *ac_space=\ *) sed -n \ - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" + "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" ;; *) sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; } @@ -1311,7 +1344,7 @@ _ASBOX for ac_var in $ac_subst_files do eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + echo "$ac_var='"'"'$ac_val'"'"'" done | sort echo fi @@ -1330,7 +1363,7 @@ _ASBOX echo "$as_me: caught signal $ac_signal" echo "$as_me: exit $exit_status" } >&5 - rm -f core core.* *.core && + rm -f core *.core && rm -rf conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 @@ -1410,7 +1443,7 @@ fi # value. ac_cache_corrupted=false for ac_var in `(set) 2>&1 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do + sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do eval ac_old_set=\$ac_cv_env_${ac_var}_set eval ac_new_set=\$ac_env_${ac_var}_set eval ac_old_val="\$ac_cv_env_${ac_var}_value" @@ -1427,13 +1460,13 @@ echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + ac_cache_corrupted=: fi;; esac # Pass precious variables to config.status. @@ -1482,7 +1515,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version="1.7" +am__api_version="1.8" ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then @@ -1519,6 +1552,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 @@ -1535,6 +1569,7 @@ do case $as_dir/ in ./ | .// | /cC/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. @@ -1542,20 +1577,20 @@ case $as_dir/ in # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi done done ;; @@ -1643,7 +1678,6 @@ _ACEOF program_transform_name=`echo $program_transform_name | sed -f conftest.sed` rm conftest.sed - # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` @@ -1657,6 +1691,31 @@ else echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi +if mkdir -p -- . 2>/dev/null; then + # Keeping the `.' argument allows $(mkdir_p) to be used without + # argument. Indeed, we sometimes output rules like + # $(mkdir_p) $(somedir) + # where $(somedir) is conditionally defined. + # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more + # expensive solution, as it forces Make to start a sub-shell.) + mkdir_p='mkdir -p -- .' +else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + for d in ./-p ./--; + do + test -d $d && rmdir $d + done + # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. + if test -f "$ac_aux_dir/mkinstalldirs"; then + mkdir_p='$(mkinstalldirs)' + else + mkdir_p='$(install_sh) -d' + fi +fi + for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -1699,7 +1758,7 @@ done echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` +set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1735,7 +1794,7 @@ else fi rmdir .tst 2>/dev/null - # test to see if srcdir already configured +# test to see if srcdir already configured if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 @@ -1755,7 +1814,7 @@ fi # Define the identity of the package. PACKAGE=xfce4-panel - VERSION=4.0.0 + VERSION=4.0.4 cat >>confdefs.h <<_ACEOF @@ -2311,7 +2370,6 @@ ac_compiler=`set X $ac_compile; echo $2` (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2331,8 +2389,8 @@ ac_clean_files="$ac_clean_files a.out a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:$LINENO: checking for C compiler default output" >&5 -echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 @@ -2352,23 +2410,23 @@ do test -f "$ac_file" || continue case $ac_file in *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) - ;; + ;; conftest.$ac_ext ) - # This is the source file. - ;; + # This is the source file. + ;; [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; + # We found the default executable, but exeext='' is most + # certainly right. + break;; *.* ) - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool, - # but it would be cool to find out if it's true. Does anybody - # maintain Libtool? --akim. - export ac_cv_exeext - break;; + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool, + # but it would be cool to find out if it's true. Does anybody + # maintain Libtool? --akim. + export ac_cv_exeext + break;; * ) - break;; + break;; esac done else @@ -2442,8 +2500,8 @@ for ac_file in conftest.exe conftest conftest.*; do case $ac_file in *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext - break;; + export ac_cv_exeext + break;; * ) break;; esac done @@ -2468,7 +2526,6 @@ if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2519,7 +2576,6 @@ if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2539,11 +2595,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2556,7 +2622,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_compiler_gnu=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi @@ -2572,7 +2638,6 @@ if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2589,11 +2654,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2606,7 +2681,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_prog_cc_g=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 @@ -2633,7 +2708,6 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2661,6 +2735,16 @@ static char *f (char * (*g) (char **, int), char **p, ...) va_end (v); return s; } + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std1 is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std1. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);}; @@ -2687,11 +2771,21 @@ do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2704,7 +2798,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext +rm -f conftest.err conftest.$ac_objext done rm -f conftest.$ac_ext conftest.$ac_objext CC=$ac_save_CC @@ -2732,19 +2826,28 @@ cat >conftest.$ac_ext <<_ACEOF _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ - ''\ - '#include <stdlib.h>' \ + '' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \ 'extern "C" void exit (int) throw ();' \ @@ -2752,14 +2855,13 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <stdlib.h> $ac_declaration +#include <stdlib.h> int main () { @@ -2770,11 +2872,21 @@ exit (42); _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2787,9 +2899,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 continue fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2806,11 +2917,21 @@ exit (42); _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2822,7 +2943,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done rm -f conftest* if test -n "$ac_declaration"; then @@ -2836,7 +2957,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -2861,18 +2982,32 @@ else # using a relative directory. cp "$am_depcomp" conftest.dir cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub am_cv_CC_dependencies_compiler_type=none if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # # We need to recreate these files for each test, as the compiler may # overwrite some of them when testing with obscure command lines. # This happens at least with the AIX C compiler. - echo '#include "conftest.h"' > conftest.c - echo 'int i;' > conftest.h - echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + : > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf case $depmode in nosideeffect) @@ -2890,11 +3025,12 @@ else # mode. It turns out that the SunPro C++ compiler does not properly # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=conftest.c object=conftest.o \ - depfile=conftest.Po tmpdepfile=conftest.TPo \ - $SHELL ./depcomp $depcc -c -o conftest.o conftest.c \ + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && - grep conftest.h conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # (even with -Werror). So we grep stderr for any message @@ -2959,7 +3095,6 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2970,7 +3105,7 @@ cat >>conftest.$ac_ext <<_ACEOF #else # include <assert.h> #endif - Syntax error + Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -2982,6 +3117,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag else ac_cpp_err= fi @@ -3002,7 +3138,6 @@ rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3020,6 +3155,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag else ac_cpp_err= fi @@ -3066,7 +3202,6 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3077,7 +3212,7 @@ cat >>conftest.$ac_ext <<_ACEOF #else # include <assert.h> #endif - Syntax error + Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -3089,6 +3224,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag else ac_cpp_err= fi @@ -3109,7 +3245,6 @@ rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3127,6 +3262,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag else ac_cpp_err= fi @@ -3185,7 +3321,6 @@ echo "${ECHO_T}$ac_cv_prog_egrep" >&6 echo "$as_me:$LINENO: checking for AIX" >&5 echo $ECHO_N "checking for AIX... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3211,16 +3346,14 @@ fi rm -f conftest* - - echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5 -echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6 -if test "${ac_cv_lib_cposix_strerror+set}" = set; then +echo "$as_me:$LINENO: checking for library containing strerror" >&5 +echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6 +if test "${ac_cv_search_strerror+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcposix $LIBS" + ac_func_search_save_LIBS=$LIBS +ac_cv_search_strerror=no cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3244,33 +3377,100 @@ strerror (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_cposix_strerror=yes + ac_cv_search_strerror="none required" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_cposix_strerror=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +if test "$ac_cv_search_strerror" = no; then + for ac_lib in cposix; do + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char strerror (); +int +main () +{ +strerror (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_search_strerror="-l$ac_lib" +break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi -echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5 -echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6 -if test $ac_cv_lib_cposix_strerror = yes; then - LIBS="$LIBS -lcposix" +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + done fi +LIBS=$ac_func_search_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 +echo "${ECHO_T}$ac_cv_search_strerror" >&6 +if test "$ac_cv_search_strerror" != no; then + test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS" - +fi echo "$as_me:$LINENO: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 @@ -3278,7 +3478,6 @@ if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3299,11 +3498,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3316,12 +3525,11 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_stdc=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3343,7 +3551,6 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3368,7 +3575,6 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3380,9 +3586,9 @@ cat >>conftest.$ac_ext <<_ACEOF # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else # define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) #endif @@ -3393,7 +3599,7 @@ main () int i; for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) + || toupper (i) != TOUPPER (i)) exit(2); exit (0); } @@ -3418,7 +3624,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi @@ -3443,7 +3649,7 @@ fi for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h + inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_header" >&5 @@ -3452,7 +3658,6 @@ if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3464,11 +3669,21 @@ $ac_includes_default _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3481,7 +3696,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_Header=no" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 @@ -3508,7 +3723,6 @@ else echo "$as_me:$LINENO: checking minix/config.h usability" >&5 echo $ECHO_N "checking minix/config.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3519,11 +3733,21 @@ $ac_includes_default _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3536,7 +3760,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 @@ -3544,7 +3768,6 @@ echo "${ECHO_T}$ac_header_compiler" >&6 echo "$as_me:$LINENO: checking minix/config.h presence" >&5 echo $ECHO_N "checking minix/config.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3562,6 +3785,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag else ac_cpp_err= fi @@ -3581,33 +3805,32 @@ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) { echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) + no:yes:* ) { echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: minix/config.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: minix/config.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: minix/config.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: minix/config.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&2;} { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -3991,7 +4214,6 @@ if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4011,11 +4233,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4028,7 +4260,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_compiler_gnu=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi @@ -4044,7 +4276,6 @@ if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4061,11 +4292,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4078,7 +4319,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_prog_cc_g=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 @@ -4105,7 +4346,6 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4133,6 +4373,16 @@ static char *f (char * (*g) (char **, int), char **p, ...) va_end (v); return s; } + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std1 is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std1. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);}; @@ -4159,11 +4409,21 @@ do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4176,7 +4436,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext +rm -f conftest.err conftest.$ac_objext done rm -f conftest.$ac_ext conftest.$ac_objext CC=$ac_save_CC @@ -4204,19 +4464,28 @@ cat >conftest.$ac_ext <<_ACEOF _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ - ''\ - '#include <stdlib.h>' \ + '' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \ 'extern "C" void exit (int) throw ();' \ @@ -4224,14 +4493,13 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <stdlib.h> $ac_declaration +#include <stdlib.h> int main () { @@ -4242,11 +4510,21 @@ exit (42); _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4259,9 +4537,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 continue fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4278,11 +4555,21 @@ exit (42); _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4294,7 +4581,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done rm -f conftest* if test -n "$ac_declaration"; then @@ -4308,7 +4595,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4333,18 +4620,32 @@ else # using a relative directory. cp "$am_depcomp" conftest.dir cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub am_cv_CC_dependencies_compiler_type=none if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # # We need to recreate these files for each test, as the compiler may # overwrite some of them when testing with obscure command lines. # This happens at least with the AIX C compiler. - echo '#include "conftest.h"' > conftest.c - echo 'int i;' > conftest.h - echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + : > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf case $depmode in nosideeffect) @@ -4362,11 +4663,12 @@ else # mode. It turns out that the SunPro C++ compiler does not properly # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=conftest.c object=conftest.o \ - depfile=conftest.Po tmpdepfile=conftest.TPo \ - $SHELL ./depcomp $depcc -c -o conftest.o conftest.c \ + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && - grep conftest.h conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # (even with -Werror). So we grep stderr for any message @@ -4413,6 +4715,7 @@ fi # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 @@ -4429,6 +4732,7 @@ do case $as_dir/ in ./ | .// | /cC/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. @@ -4436,20 +4740,20 @@ case $as_dir/ in # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi done done ;; @@ -4757,7 +5061,7 @@ if test "${lt_cv_prog_gnu_ld+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else # I'd rather use --version here, but apparently some GNU ld's only accept -v. -case `"$LD" -v 2>&1 </dev/null` in +case `$LD -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) lt_cv_prog_gnu_ld=yes ;; @@ -4961,7 +5265,7 @@ irix5* | irix6* | nonstopux*) # This must be Linux ELF. linux*) case $host_cpu in - alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh*) + alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh* | x86_64*) lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM @@ -5090,7 +5394,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5093 "configure"' > conftest.$ac_ext + echo '#line 5397 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5187,7 +5491,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5204,11 +5507,21 @@ main () _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5221,7 +5534,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 lt_cv_cc_needs_belf=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -5259,7 +5573,6 @@ else echo "$as_me:$LINENO: checking $ac_header usability" >&5 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5270,11 +5583,21 @@ $ac_includes_default _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5287,7 +5610,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 @@ -5295,7 +5618,6 @@ echo "${ECHO_T}$ac_header_compiler" >&6 echo "$as_me:$LINENO: checking $ac_header presence" >&5 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5313,6 +5635,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag else ac_cpp_err= fi @@ -5332,33 +5655,32 @@ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) + no:yes:* ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -5369,7 +5691,7 @@ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - eval "$as_ac_Header=$ac_header_preproc" + eval "$as_ac_Header=\$ac_header_preproc" fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 @@ -5503,7 +5825,6 @@ if test "${ac_cv_cxx_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5523,11 +5844,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5540,7 +5871,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_compiler_gnu=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi @@ -5556,7 +5887,6 @@ if test "${ac_cv_prog_cxx_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5573,11 +5903,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5590,7 +5930,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_prog_cxx_g=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 @@ -5610,8 +5950,7 @@ else fi fi for ac_declaration in \ - ''\ - '#include <stdlib.h>' \ + '' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \ 'extern "C" void exit (int) throw ();' \ @@ -5619,14 +5958,13 @@ for ac_declaration in \ 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <stdlib.h> $ac_declaration +#include <stdlib.h> int main () { @@ -5637,11 +5975,21 @@ exit (42); _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5654,9 +6002,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 continue fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5673,11 +6020,21 @@ exit (42); _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5689,7 +6046,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done rm -f conftest* if test -n "$ac_declaration"; then @@ -5722,18 +6079,32 @@ else # using a relative directory. cp "$am_depcomp" conftest.dir cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub am_cv_CXX_dependencies_compiler_type=none if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # # We need to recreate these files for each test, as the compiler may # overwrite some of them when testing with obscure command lines. # This happens at least with the AIX C compiler. - echo '#include "conftest.h"' > conftest.c - echo 'int i;' > conftest.h - echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + : > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf case $depmode in nosideeffect) @@ -5751,11 +6122,12 @@ else # mode. It turns out that the SunPro C++ compiler does not properly # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=conftest.c object=conftest.o \ - depfile=conftest.Po tmpdepfile=conftest.TPo \ - $SHELL ./depcomp $depcc -c -o conftest.o conftest.c \ + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && - grep conftest.h conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # (even with -Werror). So we grep stderr for any message @@ -5815,7 +6187,6 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5826,7 +6197,7 @@ cat >>conftest.$ac_ext <<_ACEOF #else # include <assert.h> #endif - Syntax error + Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -5838,6 +6209,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag else ac_cpp_err= fi @@ -5858,7 +6230,6 @@ rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5876,6 +6247,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag else ac_cpp_err= fi @@ -5922,7 +6294,6 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5933,7 +6304,7 @@ cat >>conftest.$ac_ext <<_ACEOF #else # include <assert.h> #endif - Syntax error + Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -5945,6 +6316,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag else ac_cpp_err= fi @@ -5965,7 +6337,6 @@ rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5983,6 +6354,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag else ac_cpp_err= fi @@ -6027,7 +6399,7 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_f77_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95 + for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -6069,7 +6441,7 @@ fi fi if test -z "$F77"; then ac_ct_F77=$F77 - for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95 + for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -6114,7 +6486,7 @@ fi # Provide some information about the compiler. -echo "$as_me:6117:" \ +echo "$as_me:6489:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -6132,9 +6504,10 @@ ac_compiler=`set X $ac_compile; echo $2` ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } +rm -f a.out # If we don't use `.F' as extension, the preprocessor is not run on the -# input file. +# input file. (Note that this only needs to work for GNU compilers.) ac_save_ext=$ac_ext ac_ext=F echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 @@ -6152,11 +6525,21 @@ else _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_f77_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6169,14 +6552,13 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_compiler_gnu=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_f77_compiler_gnu=$ac_compiler_gnu fi echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6 ac_ext=$ac_save_ext -G77=`test $ac_compiler_gnu = yes && echo yes` ac_test_FFLAGS=${FFLAGS+set} ac_save_FFLAGS=$FFLAGS FFLAGS= @@ -6193,11 +6575,21 @@ cat >conftest.$ac_ext <<_ACEOF _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_f77_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6210,7 +6602,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_prog_f77_g=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 @@ -6218,18 +6610,20 @@ echo "${ECHO_T}$ac_cv_prog_f77_g" >&6 if test "$ac_test_FFLAGS" = set; then FFLAGS=$ac_save_FFLAGS elif test $ac_cv_prog_f77_g = yes; then - if test "$G77" = yes; then + if test "x$ac_cv_f77_compiler_gnu" = xyes; then FFLAGS="-g -O2" else FFLAGS="-g" fi else - if test "$G77" = yes; then + if test "x$ac_cv_f77_compiler_gnu" = xyes; then FFLAGS="-O2" else FFLAGS= fi fi + +G77=`test $ac_compiler_gnu = yes && echo yes` ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6357,7 +6751,7 @@ osf*) symcode='[BCDEGQRST]' ;; solaris* | sysv5*) - symcode='[BDT]' + symcode='[BDRT]' ;; sysv4) symcode='[DFNSTU]' @@ -6375,7 +6769,7 @@ esac # If we're using GNU nm, then use its standard symbol codes. case `$NM -V 2>&1` in *GNU* | *'with BFD'*) - symcode='[ABCDGISTW]' ;; + symcode='[ABCDGIRSTW]' ;; esac # Try without a prefix undercore, then with it. @@ -7119,11 +7513,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7122: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7516: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7126: \$? = $ac_status" >&5 + echo "$as_me:7520: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -7351,11 +7745,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7354: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7748: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7358: \$? = $ac_status" >&5 + echo "$as_me:7752: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -7418,11 +7812,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7421: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7815: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7425: \$? = $ac_status" >&5 + echo "$as_me:7819: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7630,6 +8024,31 @@ EOF hardcode_shlibpath_var=no ;; + linux*) + if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then + tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds="$tmp_archive_cmds" + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + if test $supports_anon_versioning = yes; then + archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ +cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +$echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + else + archive_expsym_cmds="$tmp_archive_cmds" + fi + else + ld_shlibs=no + fi + ;; + *) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' @@ -7758,7 +8177,6 @@ EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7775,11 +8193,21 @@ main () _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7796,7 +8224,8 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -7809,7 +8238,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7826,11 +8254,21 @@ main () _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7847,7 +8285,8 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -8753,6 +9192,30 @@ linux*) # people can always --disable-shared, the test was removed, and we # assume the GNU/Linux dynamic linker is in use. dynamic_linker='GNU/Linux ld.so' + + # Find out which ABI we are using (multilib Linux x86_64 hack). + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 9200 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + ;; + esac + fi + rm -rf conftest* + ;; + *) + ;; + esac + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" ;; netbsd*) @@ -8946,7 +9409,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8970,11 +9432,21 @@ dlopen (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8987,7 +9459,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dl_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 @@ -9011,21 +9484,28 @@ if test "${ac_cv_func_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define shl_load innocuous_shl_load + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shl_load (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. */ + #ifdef __STDC__ # include <limits.h> #else # include <assert.h> #endif + +#undef shl_load + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -9056,11 +9536,21 @@ return f != shl_load; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9073,7 +9563,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_shl_load=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 echo "${ECHO_T}$ac_cv_func_shl_load" >&6 @@ -9088,7 +9579,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9112,11 +9602,21 @@ shl_load (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9129,7 +9629,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dld_shl_load=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 @@ -9143,21 +9644,28 @@ if test "${ac_cv_func_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define dlopen innocuous_dlopen + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. */ + #ifdef __STDC__ # include <limits.h> #else # include <assert.h> #endif + +#undef dlopen + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -9188,11 +9696,21 @@ return f != dlopen; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9205,7 +9723,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 echo "${ECHO_T}$ac_cv_func_dlopen" >&6 @@ -9220,7 +9739,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9244,11 +9762,21 @@ dlopen (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9261,7 +9789,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dl_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 @@ -9277,7 +9806,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9301,11 +9829,21 @@ dlopen (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9318,7 +9856,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_svld_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 @@ -9334,7 +9873,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9358,11 +9896,21 @@ dld_link (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9375,7 +9923,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dld_dld_link=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 @@ -9430,7 +9979,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9433 "configure" +#line 9982 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9528,7 +10077,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9531 "configure" +#line 10080 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10411,7 +10960,7 @@ if test "${lt_cv_prog_gnu_ld+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else # I'd rather use --version here, but apparently some GNU ld's only accept -v. -case `"$LD" -v 2>&1 </dev/null` in +case `$LD -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) lt_cv_prog_gnu_ld=yes ;; @@ -10456,7 +11005,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld # linker, instead of GNU ld. If possible, this setting should # overridden to take advantage of the native linker features on # the platform it is being used on. - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' fi # Commands to make compiler produce verbose output that lists @@ -10564,7 +11113,6 @@ case $host_os in allow_undefined_flag_CXX='-berok' # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -10581,11 +11129,21 @@ main () _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10602,7 +11160,8 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -10616,7 +11175,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -10633,11 +11191,21 @@ main () _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10654,7 +11222,8 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -11660,11 +12229,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11663: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12232: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11667: \$? = $ac_status" >&5 + echo "$as_me:12236: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -11727,11 +12296,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11730: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12299: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11734: \$? = $ac_status" >&5 + echo "$as_me:12303: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12293,6 +12862,30 @@ linux*) # people can always --disable-shared, the test was removed, and we # assume the GNU/Linux dynamic linker is in use. dynamic_linker='GNU/Linux ld.so' + + # Find out which ABI we are using (multilib Linux x86_64 hack). + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 12870 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + ;; + esac + fi + rm -rf conftest* + ;; + *) + ;; + esac + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" ;; netbsd*) @@ -12486,7 +13079,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -12510,11 +13102,21 @@ dlopen (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12527,7 +13129,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dl_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 @@ -12551,21 +13154,28 @@ if test "${ac_cv_func_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define shl_load innocuous_shl_load + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shl_load (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. */ + #ifdef __STDC__ # include <limits.h> #else # include <assert.h> #endif + +#undef shl_load + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -12596,11 +13206,21 @@ return f != shl_load; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12613,7 +13233,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_shl_load=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 echo "${ECHO_T}$ac_cv_func_shl_load" >&6 @@ -12628,7 +13249,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -12652,11 +13272,21 @@ shl_load (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12669,7 +13299,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dld_shl_load=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 @@ -12683,21 +13314,28 @@ if test "${ac_cv_func_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define dlopen innocuous_dlopen + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. */ + #ifdef __STDC__ # include <limits.h> #else # include <assert.h> #endif + +#undef dlopen + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -12728,11 +13366,21 @@ return f != dlopen; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12745,7 +13393,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 echo "${ECHO_T}$ac_cv_func_dlopen" >&6 @@ -12760,7 +13409,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -12784,11 +13432,21 @@ dlopen (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12801,7 +13459,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dl_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 @@ -12817,7 +13476,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -12841,11 +13499,21 @@ dlopen (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12858,7 +13526,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_svld_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 @@ -12874,7 +13543,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -12898,11 +13566,21 @@ dld_link (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12915,7 +13593,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dld_dld_link=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 @@ -12970,7 +13649,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12973 "configure" +#line 13652 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13068,7 +13747,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 13071 "configure" +#line 13750 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13890,11 +14569,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13893: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14572: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13897: \$? = $ac_status" >&5 + echo "$as_me:14576: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -13957,11 +14636,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13960: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14639: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13964: \$? = $ac_status" >&5 + echo "$as_me:14643: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14169,6 +14848,31 @@ EOF hardcode_shlibpath_var_F77=no ;; + linux*) + if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then + tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds_F77="$tmp_archive_cmds" + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + if test $supports_anon_versioning = yes; then + archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~ +cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +$echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + else + archive_expsym_cmds_F77="$tmp_archive_cmds" + fi + else + ld_shlibs_F77=no + fi + ;; + *) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' @@ -14303,11 +15007,21 @@ EOF _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_f77_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14324,7 +15038,8 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -14343,11 +15058,21 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_f77_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14364,7 +15089,8 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -15270,6 +15996,30 @@ linux*) # people can always --disable-shared, the test was removed, and we # assume the GNU/Linux dynamic linker is in use. dynamic_linker='GNU/Linux ld.so' + + # Find out which ABI we are using (multilib Linux x86_64 hack). + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 16004 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + ;; + esac + fi + rm -rf conftest* + ;; + *) + ;; + esac + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" ;; netbsd*) @@ -15897,11 +16647,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15900: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16650: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15904: \$? = $ac_status" >&5 + echo "$as_me:16654: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -16129,11 +16879,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16132: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16882: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16136: \$? = $ac_status" >&5 + echo "$as_me:16886: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -16196,11 +16946,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16199: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16949: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16203: \$? = $ac_status" >&5 + echo "$as_me:16953: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16408,6 +17158,31 @@ EOF hardcode_shlibpath_var_GCJ=no ;; + linux*) + if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then + tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds_GCJ="$tmp_archive_cmds" + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + if test $supports_anon_versioning = yes; then + archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~ +cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +$echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + else + archive_expsym_cmds_GCJ="$tmp_archive_cmds" + fi + else + ld_shlibs_GCJ=no + fi + ;; + *) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' @@ -16536,7 +17311,6 @@ EOF allow_undefined_flag_GCJ='-berok' # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -16553,11 +17327,21 @@ main () _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16574,7 +17358,8 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -16587,7 +17372,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -16604,11 +17388,21 @@ main () _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16625,7 +17419,8 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -17531,6 +18326,30 @@ linux*) # people can always --disable-shared, the test was removed, and we # assume the GNU/Linux dynamic linker is in use. dynamic_linker='GNU/Linux ld.so' + + # Find out which ABI we are using (multilib Linux x86_64 hack). + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 18334 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + ;; + esac + fi + rm -rf conftest* + ;; + *) + ;; + esac + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" ;; netbsd*) @@ -17724,7 +18543,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -17748,11 +18566,21 @@ dlopen (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17765,7 +18593,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dl_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 @@ -17789,21 +18618,28 @@ if test "${ac_cv_func_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define shl_load innocuous_shl_load + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shl_load (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. */ + #ifdef __STDC__ # include <limits.h> #else # include <assert.h> #endif + +#undef shl_load + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -17834,11 +18670,21 @@ return f != shl_load; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17851,7 +18697,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_shl_load=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 echo "${ECHO_T}$ac_cv_func_shl_load" >&6 @@ -17866,7 +18713,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -17890,11 +18736,21 @@ shl_load (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17907,7 +18763,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dld_shl_load=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 @@ -17921,21 +18778,28 @@ if test "${ac_cv_func_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define dlopen innocuous_dlopen + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. */ + #ifdef __STDC__ # include <limits.h> #else # include <assert.h> #endif + +#undef dlopen + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -17966,11 +18830,21 @@ return f != dlopen; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17983,7 +18857,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 echo "${ECHO_T}$ac_cv_func_dlopen" >&6 @@ -17998,7 +18873,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -18022,11 +18896,21 @@ dlopen (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18039,7 +18923,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dl_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 @@ -18055,7 +18940,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -18079,11 +18963,21 @@ dlopen (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18096,7 +18990,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_svld_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 @@ -18112,7 +19007,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -18136,11 +19030,21 @@ dld_link (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18153,7 +19057,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dld_dld_link=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 @@ -18208,7 +19113,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 18211 "configure" +#line 19116 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18306,7 +19211,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 18309 "configure" +#line 19214 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19319,7 +20224,6 @@ if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19340,11 +20244,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19357,12 +20271,11 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_stdc=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19384,7 +20297,6 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19409,7 +20321,6 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19421,9 +20332,9 @@ cat >>conftest.$ac_ext <<_ACEOF # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else # define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) #endif @@ -19434,7 +20345,7 @@ main () int i; for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) + || toupper (i) != TOUPPER (i)) exit(2); exit (0); } @@ -19459,7 +20370,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi @@ -19493,7 +20404,6 @@ else echo "$as_me:$LINENO: checking $ac_header usability" >&5 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19504,11 +20414,21 @@ $ac_includes_default _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19521,7 +20441,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 @@ -19529,7 +20449,6 @@ echo "${ECHO_T}$ac_header_compiler" >&6 echo "$as_me:$LINENO: checking $ac_header presence" >&5 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19547,6 +20466,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag else ac_cpp_err= fi @@ -19566,33 +20486,32 @@ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) + no:yes:* ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -19603,7 +20522,7 @@ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - eval "$as_ac_Header=$ac_header_preproc" + eval "$as_ac_Header=\$ac_header_preproc" fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 @@ -19628,21 +20547,28 @@ if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. */ + #ifdef __STDC__ # include <limits.h> #else # include <assert.h> #endif + +#undef $ac_func + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -19673,11 +20599,21 @@ return f != $ac_func; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19690,7 +20626,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_var=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 @@ -19712,8 +20649,8 @@ cat >>confdefs.h <<\_ACEOF _ACEOF - ALL_LINGUAS="ca de es es_MX fr fi hi hu lt ms nl ja ko pl pt_PT ru ta - tr zh_CN zh_TW" + ALL_LINGUAS="az ca cs de es es_MX fa_IR fr fi hi hu lt ms nl + ja ko no pl pt_BR pt_PT ru sv ta tr uk vi zh_CN zh_TW" @@ -19733,7 +20670,6 @@ else echo "$as_me:$LINENO: checking $ac_header usability" >&5 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19744,11 +20680,21 @@ $ac_includes_default _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19761,7 +20707,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 @@ -19769,7 +20715,6 @@ echo "${ECHO_T}$ac_header_compiler" >&6 echo "$as_me:$LINENO: checking $ac_header presence" >&5 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19787,6 +20732,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag else ac_cpp_err= fi @@ -19806,33 +20752,32 @@ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) + no:yes:* ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -19843,7 +20788,7 @@ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - eval "$as_ac_Header=$ac_header_preproc" + eval "$as_ac_Header=\$ac_header_preproc" fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 @@ -19865,7 +20810,6 @@ if test "${am_cv_val_LC_MESSAGES+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19882,11 +20826,21 @@ return LC_MESSAGES _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19899,7 +20853,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 am_cv_val_LC_MESSAGES=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6 @@ -19933,7 +20888,6 @@ else echo "$as_me:$LINENO: checking libintl.h usability" >&5 echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19944,11 +20898,21 @@ $ac_includes_default _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19961,7 +20925,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 @@ -19969,7 +20933,6 @@ echo "${ECHO_T}$ac_header_compiler" >&6 echo "$as_me:$LINENO: checking libintl.h presence" >&5 echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19987,6 +20950,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag else ac_cpp_err= fi @@ -20006,33 +20970,32 @@ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) + no:yes:* ) { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;} { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -20062,7 +21025,6 @@ if test "${gt_cv_func_dgettext_libc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20081,11 +21043,21 @@ return (int) dgettext ("","") _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20098,7 +21070,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 gt_cv_func_dgettext_libc=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 @@ -20115,21 +21088,28 @@ if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. */ + #ifdef __STDC__ # include <limits.h> #else # include <assert.h> #endif + +#undef $ac_func + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -20160,11 +21140,21 @@ return f != $ac_func; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20177,7 +21167,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_var=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 @@ -20205,7 +21196,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20229,11 +21219,21 @@ bindtextdomain (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20246,7 +21246,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_intl_bindtextdomain=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 @@ -20260,7 +21261,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20284,11 +21284,21 @@ dgettext (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20301,7 +21311,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_intl_dgettext=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 @@ -20326,7 +21337,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl -liconv $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20350,11 +21360,21 @@ dcgettext (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20367,7 +21387,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_intl_dcgettext=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 @@ -20400,21 +21421,28 @@ if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. */ + #ifdef __STDC__ # include <limits.h> #else # include <assert.h> #endif + +#undef $ac_func + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -20445,11 +21473,21 @@ return f != $ac_func; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20462,7 +21500,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_var=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 @@ -20549,21 +21588,28 @@ if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. */ + #ifdef __STDC__ # include <limits.h> #else # include <assert.h> #endif + +#undef $ac_func + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -20594,11 +21640,21 @@ return f != $ac_func; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20611,7 +21667,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_var=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 @@ -20700,7 +21757,6 @@ echo "${ECHO_T}no" >&6 fi cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20718,11 +21774,21 @@ extern int _nl_msg_cat_cntr; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20742,21 +21808,28 @@ if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define bind_textdomain_codeset innocuous_bind_textdomain_codeset + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char bind_textdomain_codeset (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. */ + #ifdef __STDC__ # include <limits.h> #else # include <assert.h> #endif + +#undef bind_textdomain_codeset + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -20787,11 +21860,21 @@ return f != bind_textdomain_codeset; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20804,7 +21887,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_bind_textdomain_codeset=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6 @@ -20823,7 +21907,8 @@ fi ;; esac fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS="$glib_save_LIBS" INSTOBJEXT=.mo else @@ -20944,21 +22029,28 @@ if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define bind_textdomain_codeset innocuous_bind_textdomain_codeset + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char bind_textdomain_codeset (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. */ + #ifdef __STDC__ # include <limits.h> #else # include <assert.h> #endif + +#undef bind_textdomain_codeset + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -20989,11 +22081,21 @@ return f != bind_textdomain_codeset; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21006,7 +22108,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_bind_textdomain_codeset=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6 @@ -21064,8 +22167,8 @@ _ACEOF # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. for ac_extension in a so sl; do if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && - test -f $ac_im_libdir/libX11.$ac_extension; then - ac_im_usrlibdir=$ac_im_libdir; break + test -f $ac_im_libdir/libX11.$ac_extension; then + ac_im_usrlibdir=$ac_im_libdir; break fi done # Screen out bogus values from the imake configuration. They are @@ -21125,7 +22228,6 @@ if test "$ac_x_includes" = no; then # Guess where to find include files, by looking for Intrinsic.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21143,6 +22245,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag else ac_cpp_err= fi @@ -21173,7 +22276,6 @@ if test "$ac_x_libraries" = no; then ac_save_LIBS=$LIBS LIBS="-lXt $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21190,11 +22292,21 @@ XtMalloc (0) _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21219,7 +22331,8 @@ do done done fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi # $ac_x_libraries = no if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then @@ -21228,7 +22341,7 @@ if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then else # Record where we found X for the cache. ac_cv_have_x="have_x=yes \ - ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" + ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" fi fi @@ -21275,7 +22388,6 @@ else echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21292,11 +22404,21 @@ main () _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21309,7 +22431,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_R_nospace=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test $ac_R_nospace = yes; then echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 @@ -21317,7 +22440,6 @@ echo "${ECHO_T}no" >&6 else LIBS="$ac_xsave_LIBS -R $x_libraries" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21334,11 +22456,21 @@ main () _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21351,7 +22483,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_R_space=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test $ac_R_space = yes; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 @@ -21377,7 +22510,6 @@ echo "${ECHO_T}neither works" >&6 # the Alpha needs dnet_stub (dnet does not exist). ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21401,11 +22533,21 @@ XOpenDisplay (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21424,7 +22566,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21448,11 +22589,21 @@ dnet_ntoa (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21465,7 +22616,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dnet_dnet_ntoa=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 @@ -21483,7 +22635,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21507,11 +22658,21 @@ dnet_ntoa (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21524,7 +22685,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dnet_stub_dnet_ntoa=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 @@ -21535,7 +22697,8 @@ fi fi fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS="$ac_xsave_LIBS" # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, @@ -21552,21 +22715,28 @@ if test "${ac_cv_func_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define gethostbyname innocuous_gethostbyname + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. */ + #ifdef __STDC__ # include <limits.h> #else # include <assert.h> #endif + +#undef gethostbyname + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -21597,11 +22767,21 @@ return f != gethostbyname; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21614,7 +22794,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_gethostbyname=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 @@ -21628,7 +22809,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21652,11 +22832,21 @@ gethostbyname (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21669,7 +22859,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_nsl_gethostbyname=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 @@ -21679,7 +22870,7 @@ if test $ac_cv_lib_nsl_gethostbyname = yes; then fi if test $ac_cv_lib_nsl_gethostbyname = no; then - echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 + echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21687,7 +22878,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21711,11 +22901,21 @@ gethostbyname (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21728,7 +22928,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_bsd_gethostbyname=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 @@ -21753,21 +22954,28 @@ if test "${ac_cv_func_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define connect to an innocuous variant, in case <limits.h> declares connect. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define connect innocuous_connect + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. */ + #ifdef __STDC__ # include <limits.h> #else # include <assert.h> #endif + +#undef connect + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -21798,11 +23006,21 @@ return f != connect; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21815,7 +23033,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_connect=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 echo "${ECHO_T}$ac_cv_func_connect" >&6 @@ -21829,7 +23048,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21853,11 +23071,21 @@ connect (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21870,7 +23098,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_socket_connect=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 @@ -21888,21 +23117,28 @@ if test "${ac_cv_func_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define remove to an innocuous variant, in case <limits.h> declares remove. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define remove innocuous_remove + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. */ + #ifdef __STDC__ # include <limits.h> #else # include <assert.h> #endif + +#undef remove + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -21933,11 +23169,21 @@ return f != remove; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21950,7 +23196,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_remove=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 echo "${ECHO_T}$ac_cv_func_remove" >&6 @@ -21964,7 +23211,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21988,11 +23234,21 @@ remove (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22005,7 +23261,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_posix_remove=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 @@ -22023,21 +23280,28 @@ if test "${ac_cv_func_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define shmat to an innocuous variant, in case <limits.h> declares shmat. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define shmat innocuous_shmat + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. */ + #ifdef __STDC__ # include <limits.h> #else # include <assert.h> #endif + +#undef shmat + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -22068,11 +23332,21 @@ return f != shmat; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22085,7 +23359,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_shmat=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 echo "${ECHO_T}$ac_cv_func_shmat" >&6 @@ -22099,7 +23374,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22123,11 +23397,21 @@ shmat (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22140,7 +23424,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_ipc_shmat=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 @@ -22169,7 +23454,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22193,11 +23477,21 @@ IceConnectionNumber (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22210,7 +23504,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_ICE_IceConnectionNumber=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 @@ -22235,7 +23530,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $X_CFLAGS $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22253,11 +23547,21 @@ main (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22270,7 +23574,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_X11_main=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_X11_main" >&5 @@ -22939,7 +24244,7 @@ echo "${ECHO_T}yes" >&6 fi - ac_config_files="$ac_config_files xfce4.spec Makefile doc/Makefile doc/C/Makefile doc/C/images/Makefile po/Makefile.in icons/Makefile panel/Makefile panel/xfce4-panel-1.0.pc plugins/Makefile plugins/mailcheck/Makefile plugins/clock/Makefile plugins/switcher/Makefile plugins/systembuttons/Makefile plugins/pager/Makefile plugins/separator/Makefile settings/Makefile themes/Makefile themes/Crystal/Makefile themes/Curve/Makefile themes/FreeIcons/Makefile themes/Gnome/Makefile themes/Noia/Makefile themes/XFce/Makefile" + ac_config_files="$ac_config_files xfce4.spec Makefile doc/Makefile doc/C/Makefile doc/C/images/Makefile doc/fr/Makefile doc/fr/images/Makefile po/Makefile.in icons/Makefile panel/Makefile panel/xfce4-panel-1.0.pc plugins/Makefile plugins/mailcheck/Makefile plugins/clock/Makefile plugins/switcher/Makefile plugins/systembuttons/Makefile plugins/pager/Makefile plugins/separator/Makefile settings/Makefile themes/Makefile themes/Crystal/Makefile themes/Curve/Makefile themes/FreeIcons/Makefile themes/Gnome/Makefile themes/Noia/Makefile themes/XFce/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -22968,13 +24273,13 @@ _ACEOF # `set' does not quote correctly, so add quotes (double-quote # substitution turns \\\\ into \\, and sed turns \\ into \). sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ;; *) # `set' quotes correctly as required by POSIX, so do not add quotes. sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; } | @@ -23004,13 +24309,13 @@ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ + ac_vpsub='/^[ ]*VPATH[ ]*=/{ s/:*\$(srcdir):*/:/; s/:*\${srcdir}:*/:/; s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; +s/^\([^=]*=[ ]*\):*/\1/; s/:*$//; -s/^[^=]*=[ ]*$//; +s/^[^=]*=[ ]*$//; }' fi @@ -23021,7 +24326,7 @@ ac_ltlibobjs= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` + sed 's/\$U\././;s/\.o$//;s/\.obj$//'` # 2. Add them. ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' @@ -23100,9 +24405,10 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi +DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset else as_unset=false @@ -23121,7 +24427,7 @@ for as_var in \ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else $as_unset $as_var @@ -23300,16 +24606,17 @@ rm -f conf$$ conf$$.exe conf$$.file if mkdir -p . 2>/dev/null; then as_mkdir_p=: else + test -d ./-p && rmdir ./-p as_mkdir_p=false fi as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" # Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" # IFS @@ -23336,7 +24643,7 @@ _ASBOX cat >&5 <<_CSEOF This file was extended by $as_me, which was -generated by GNU Autoconf 2.57. Invocation command line was +generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -23380,9 +24687,9 @@ Usage: $0 [OPTIONS] [FILE]... -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] - instantiate the configuration file FILE + instantiate the configuration file FILE --header=FILE[:TEMPLATE] - instantiate the configuration header FILE + instantiate the configuration header FILE Configuration files: $config_files @@ -23399,11 +24706,10 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.57, +configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright (C) 2003 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." srcdir=$srcdir @@ -23515,6 +24821,8 @@ do "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "doc/C/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/C/Makefile" ;; "doc/C/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/C/images/Makefile" ;; + "doc/fr/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/fr/Makefile" ;; + "doc/fr/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/fr/images/Makefile" ;; "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES icons/Makefile" ;; "panel/Makefile" ) CONFIG_FILES="$CONFIG_FILES panel/Makefile" ;; @@ -23638,6 +24946,7 @@ s,@install_sh@,$install_sh,;t t s,@STRIP@,$STRIP,;t t s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t +s,@mkdir_p@,$mkdir_p,;t t s,@AWK@,$AWK,;t t s,@SET_MAKE@,$SET_MAKE,;t t s,@am__leading_dot@,$am__leading_dot,;t t @@ -23759,9 +25068,9 @@ _ACEOF (echo ':t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" + ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" + ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" fi ac_sed_frag=`expr $ac_sed_frag + 1` ac_beg=$ac_end @@ -23779,21 +25088,21 @@ for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; * ) ac_file_in=$ac_file.in ;; esac # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. ac_dir=`(dirname "$ac_file") 2>/dev/null || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -23809,10 +25118,10 @@ echo X"$ac_file" | as_dirs="$as_dir $as_dirs" as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -23850,12 +25159,45 @@ case $srcdir in ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -# absolute. -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` + +# Do not use `cd foo && pwd` to compute absolute paths, because +# the directories may not exist. +case `pwd` in +.) ac_abs_builddir="$ac_dir";; +*) + case "$ac_dir" in + .) ac_abs_builddir=`pwd`;; + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; + *) ac_abs_builddir=`pwd`/"$ac_dir";; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_builddir=${ac_top_builddir}.;; +*) + case ${ac_top_builddir}. in + .) ac_abs_top_builddir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_srcdir=$ac_srcdir;; +*) + case $ac_srcdir in + .) ac_abs_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_srcdir=$ac_top_srcdir;; +*) + case $ac_top_srcdir in + .) ac_abs_top_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; + esac;; +esac case $INSTALL in @@ -23877,7 +25219,7 @@ echo "$as_me: creating $ac_file" >&6;} configure_input="$ac_file. " fi configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." + sed 's,.*/,,'` by configure." # First look for the input files in the build tree, otherwise in the # src tree. @@ -23886,24 +25228,24 @@ echo "$as_me: creating $ac_file" >&6;} case $f in -) echo $tmp/stdin ;; [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - echo $f;; + echo "$f";; *) # Relative - if test -f "$f"; then - # Build tree - echo $f - elif test -f "$srcdir/$f"; then - # Source tree - echo $srcdir/$f - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + if test -f "$f"; then + # Build tree + echo "$f" + elif test -f "$srcdir/$f"; then + # Source tree + echo "$srcdir/$f" + else + # /dev/null tree + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - fi;; + fi;; esac done` || { (exit 1); exit 1; } _ACEOF @@ -23945,12 +25287,12 @@ cat >>$CONFIG_STATUS <<\_ACEOF # NAME is the cpp macro being defined and VALUE is the value it is being given. # # ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='[ ].*$,\1#\2' +ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' +ac_dB='[ ].*$,\1#\2' ac_dC=' ' ac_dD=',;t' # ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' ac_uB='$,\1#\2define\3' ac_uC=' ' ac_uD=',;t' @@ -23959,11 +25301,11 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; * ) ac_file_in=$ac_file.in ;; esac @@ -23977,28 +25319,29 @@ echo "$as_me: creating $ac_file" >&6;} case $f in -) echo $tmp/stdin ;; [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - echo $f;; + # Do quote $f, to prevent DOS paths from being IFS'd. + echo "$f";; *) # Relative - if test -f "$f"; then - # Build tree - echo $f - elif test -f "$srcdir/$f"; then - # Source tree - echo $srcdir/$f - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + if test -f "$f"; then + # Build tree + echo "$f" + elif test -f "$srcdir/$f"; then + # Source tree + echo "$srcdir/$f" + else + # /dev/null tree + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - fi;; + fi;; esac done` || { (exit 1); exit 1; } # Remove the trailing spaces. - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in + sed 's/[ ]*$//' $ac_file_inputs >$tmp/in _ACEOF @@ -24021,9 +25364,9 @@ s/[\\&,]/\\&/g s,[\\$`],\\&,g t clear : clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp t end -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp : end _ACEOF # If some macros were called several times there might be several times @@ -24037,13 +25380,13 @@ rm -f confdef2sed.sed # example, in the case of _POSIX_SOURCE, which is predefined and required # on some systems where configure will not decide to define it. cat >>conftest.undefs <<\_ACEOF -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, +s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, _ACEOF # Break up conftest.defines because some shells have a limit on the size # of here documents, and old seds have small limits too (100 cmds). echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS -echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS +echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS echo ' :' >>$CONFIG_STATUS rm -f conftest.tail @@ -24052,7 +25395,7 @@ do # Write a limited-size here document to $tmp/defines.sed. echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS # Speed up: don't consider the non `#define' lines. - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS + echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS # Work around the forget-to-reset-the-flag bug. echo 't clr' >>$CONFIG_STATUS echo ': clr' >>$CONFIG_STATUS @@ -24079,7 +25422,7 @@ do # Write a limited-size here document to $tmp/undefs.sed. echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS # Speed up: don't consider the non `#undef' - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS + echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS # Work around the forget-to-reset-the-flag bug. echo 't clr' >>$CONFIG_STATUS echo ': clr' >>$CONFIG_STATUS @@ -24113,10 +25456,10 @@ echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`(dirname "$ac_file") 2>/dev/null || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -24132,10 +25475,10 @@ echo X"$ac_file" | as_dirs="$as_dir $as_dirs" as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -24167,10 +25510,10 @@ for _am_header in $config_headers :; do done echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X$ac_file : 'X\(//\)[^/]' \| \ - X$ac_file : 'X\(//\)$' \| \ - X$ac_file : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X$ac_file : 'X\(//\)[^/]' \| \ + X$ac_file : 'X\(//\)$' \| \ + X$ac_file : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X$ac_file | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -24189,16 +25532,41 @@ for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` ac_dir=`(dirname "$ac_dest") 2>/dev/null || $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_dest" : 'X\(//\)[^/]' \| \ - X"$ac_dest" : 'X\(//\)$' \| \ - X"$ac_dest" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_dest" : 'X\(//\)[^/]' \| \ + X"$ac_dest" : 'X\(//\)$' \| \ + X"$ac_dest" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$ac_dest" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` + { if $as_mkdir_p; then + mkdir -p "$ac_dir" + else + as_dir="$ac_dir" + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; }; } + ac_builddir=. if test "$ac_dir" != .; then @@ -24224,12 +25592,45 @@ case $srcdir in ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -# absolute. -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` + +# Do not use `cd foo && pwd` to compute absolute paths, because +# the directories may not exist. +case `pwd` in +.) ac_abs_builddir="$ac_dir";; +*) + case "$ac_dir" in + .) ac_abs_builddir=`pwd`;; + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; + *) ac_abs_builddir=`pwd`/"$ac_dir";; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_builddir=${ac_top_builddir}.;; +*) + case ${ac_top_builddir}. in + .) ac_abs_top_builddir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_srcdir=$ac_srcdir;; +*) + case $ac_srcdir in + .) ac_abs_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_srcdir=$ac_top_srcdir;; +*) + case $ac_top_srcdir in + .) ac_abs_top_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; + esac;; +esac { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 @@ -24247,10 +25648,10 @@ echo "$as_me: executing $ac_dest commands" >&6;} if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then dirpart=`(dirname "$mf") 2>/dev/null || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -24286,10 +25687,10 @@ echo X"$mf" | test -f "$dirpart/$file" && continue fdir=`(dirname "$file") 2>/dev/null || $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -24305,10 +25706,10 @@ echo X"$file" | as_dirs="$as_dir $as_dirs" as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } diff --git a/configure.ac b/configure.ac index dd7620d9..15bced34 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ dnl AC_INIT([panel/main.c]) -AM_INIT_AUTOMAKE([xfce4-panel], [4.0.0]) +AM_INIT_AUTOMAKE([xfce4-panel], [4.0.4]) AM_CONFIG_HEADER([config.h]) @@ -32,8 +32,8 @@ AC_CHECK_HEADERS([signal.h stddef.h sys/wait.h time.h]) AC_CHECK_FUNCS([sigaction]) dnl Check for i18n support -BM_I18N([xfce4-panel], [ca de es es_MX fr fi hi hu lt ms nl ja ko pl pt_PT ru ta - tr zh_CN zh_TW]) +BM_I18N([xfce4-panel], [az ca cs de es es_MX fa_IR fr fi hi hu lt ms nl + ja ko no pl pt_BR pt_PT ru sv ta tr uk vi zh_CN zh_TW]) dnl Check for X11 installed BM_LIBX11_REQUIRE @@ -59,6 +59,8 @@ Makefile doc/Makefile doc/C/Makefile doc/C/images/Makefile +doc/fr/Makefile +doc/fr/images/Makefile po/Makefile.in icons/Makefile panel/Makefile @@ -1,7 +1,9 @@ #! /bin/sh - # depcomp - compile a program generating dependencies as side-effects -# Copyright 1999, 2000 Free Software Foundation, Inc. + +scriptversion=2003-11-08.23 + +# Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -25,6 +27,36 @@ # Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>. +case $1 in + '') + echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: depcomp [--help] [--version] PROGRAM [ARGS] + +Run PROGRAMS ARGS to compile a file, generating dependencies +as side-effects. + +Environment variables: + depmode Dependency tracking mode. + source Source file read by `PROGRAMS ARGS'. + object Object file output by `PROGRAMS ARGS'. + depfile Dependency file to output. + tmpdepfile Temporary file to use when outputing dependencies. + libtool Whether libtool is used (yes/no). + +Report bugs to <bug-automake@gnu.org>. +EOF + exit 0 + ;; + -v | --v*) + echo "depcomp $scriptversion" + exit 0 + ;; +esac + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -172,19 +204,25 @@ sgi) aix) # The C for AIX Compiler uses -M and outputs the dependencies - # in a .u file. This file always lives in the current directory. - # Also, the AIX compiler puts `$object:' at the start of each line; - # $object doesn't have directory information. - stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'` + # in a .u file. In older versions, this file always lives in the + # current directory. Also, the AIX compiler puts `$object:' at the + # start of each line; $object doesn't have directory information. + # Version 6 uses the directory in both cases. + stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` tmpdepfile="$stripped.u" - outname="$stripped.o" if test "$libtool" = yes; then "$@" -Wc,-M else "$@" -M fi - stat=$? + + if test -f "$tmpdepfile"; then : + else + stripped=`echo "$stripped" | sed 's,^.*/,,'` + tmpdepfile="$stripped.u" + fi + if test $stat -eq 0; then : else rm -f "$tmpdepfile" @@ -192,6 +230,7 @@ aix) fi if test -f "$tmpdepfile"; then + outname="$stripped.o" # Each line is of the form `foo.o: dependent.h'. # Do two passes, one to just change these to # `$object: dependent.h' and one to simply `dependent.h:'. @@ -207,11 +246,9 @@ aix) ;; icc) - # Must come before tru64. - - # Intel's C compiler understands `-MD -MF file'. However + # Intel's C compiler understands `-MD -MF file'. However on # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # will fill foo.d with something like + # ICC 7.0 will fill foo.d with something like # foo.o: sub/foo.c # foo.o: sub/foo.h # which is wrong. We want: @@ -219,6 +256,12 @@ icc) # sub/foo.o: sub/foo.h # sub/foo.c: # sub/foo.h: + # ICC 7.1 will output + # foo.o: sub/foo.c sub/foo.h + # and will wrap long lines using \ : + # foo.o: sub/foo.c ... \ + # sub/foo.h ... \ + # ... "$@" -MD -MF "$tmpdepfile" stat=$? @@ -228,11 +271,15 @@ icc) exit $stat fi rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h'. + # Each line is of the form `foo.o: dependent.h', + # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. # Do two passes, one to just change these to # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - sed -e "s,^[^:]*: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" + sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process this invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | + sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -270,8 +317,8 @@ tru64) fi if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a space and a tab in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + # That's a tab and a space in the []. + sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi @@ -284,7 +331,7 @@ tru64) dashmstdout) # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout, regardless of -o. + # always write the preprocessed file to stdout, regardless of -o. "$@" || exit $? # Remove the call to Libtool. @@ -380,7 +427,7 @@ makedepend) cpp) # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout. + # always write the preprocessed file to stdout. "$@" || exit $? # Remove the call to Libtool. @@ -422,7 +469,7 @@ cpp) msvisualcpp) # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout, regardless of -o, + # always write the preprocessed file to stdout, regardless of -o, # because we must use -o when running libtool. "$@" || exit $? IFS=" " @@ -462,3 +509,12 @@ none) esac exit 0 + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/doc/C/Makefile.in b/doc/C/Makefile.in index 3d303352..ede257b2 100644 --- a/doc/C/Makefile.in +++ b/doc/C/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.5 from Makefile.am. +# Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,7 +21,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -36,6 +35,32 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ +subdir = doc/C +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/X11.m4 \ + $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/depends.m4 \ + $(top_srcdir)/m4/i18n.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-exec-recursive install-info-recursive \ + install-recursive installcheck-recursive installdirs-recursive \ + pdf-recursive ps-recursive uninstall-info-recursive \ + uninstall-recursive +am__installdirs = $(DESTDIR)$(docdir) +docDATA_INSTALL = $(INSTALL_DATA) +DATA = $(doc_DATA) $(noinst_DATA) +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ @@ -166,6 +191,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -176,42 +202,46 @@ target_alias = @target_alias@ SUBDIRS = \ images - noinst_DATA = \ xfce4-panel.xml - docdir = $(datadir)/xfce4/doc/C - doc_DATA = \ xfce4-panel.html - EXTRA_DIST = $(noinst_DATA) $(doc_DATA) -subdir = doc/C -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = -DATA = $(doc_DATA) $(noinst_DATA) - - -RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ - ps-recursive install-info-recursive uninstall-info-recursive \ - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive -DIST_COMMON = Makefile.am Makefile.in -DIST_SUBDIRS = $(SUBDIRS) all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/C/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --foreign doc/C/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: -rm -f *.lo @@ -222,10 +252,9 @@ clean-libtool: distclean-libtool: -rm -f libtool uninstall-info-am: -docDATA_INSTALL = $(INSTALL_DATA) install-docDATA: $(doc_DATA) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(docdir) + $(mkdir_p) $(DESTDIR)$(docdir) @list='$(doc_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ @@ -300,14 +329,6 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -316,6 +337,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -341,7 +363,6 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ test -z "$(ETAGS_ARGS)$$tags$$unique" \ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique - ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -364,10 +385,6 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = ../.. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -381,7 +398,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -398,13 +415,13 @@ distdir: $(DISTFILES) done list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ + test -d "$(distdir)/$$subdir" \ + || mkdir "$(distdir)/$$subdir" \ || exit 1; \ (cd $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" \ - distdir=../$(distdir)/$$subdir \ + top_distdir="../$(top_distdir)" \ + distdir="../$(distdir)/$$subdir" \ distdir) \ || exit 1; \ fi; \ @@ -414,8 +431,7 @@ check: check-recursive all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(docdir) - + $(mkdir_p) $(DESTDIR)$(docdir) install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -427,7 +443,7 @@ install-am: all-am installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -435,7 +451,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -445,7 +461,7 @@ clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-recursive - + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-libtool \ distclean-tags @@ -468,7 +484,7 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-recursive - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive @@ -487,22 +503,19 @@ uninstall-am: uninstall-docDATA uninstall-info-am uninstall-info: uninstall-info-recursive -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ - clean-generic clean-libtool clean-recursive ctags \ +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ + clean clean-generic clean-libtool clean-recursive ctags \ ctags-recursive distclean distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distdir dvi dvi-am \ - dvi-recursive info info-am info-recursive install install-am \ - install-data install-data-am install-data-recursive \ - install-docDATA install-exec install-exec-am \ - install-exec-recursive install-info install-info-am \ - install-info-recursive install-man install-recursive \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am installdirs-recursive maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive mostlyclean \ - mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ - pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ - tags-recursive uninstall uninstall-am uninstall-docDATA \ - uninstall-info-am uninstall-info-recursive uninstall-recursive + distclean-recursive distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-docDATA install-exec install-exec-am \ + install-info install-info-am install-man install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic \ + maintainer-clean-recursive mostlyclean mostlyclean-generic \ + mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am uninstall-docDATA \ + uninstall-info-am html: diff --git a/doc/C/images/Makefile.in b/doc/C/images/Makefile.in index 2fdca0ff..95fe4d72 100644 --- a/doc/C/images/Makefile.in +++ b/doc/C/images/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.5 from Makefile.am. +# Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,7 +21,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../../.. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -36,6 +35,23 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ +subdir = doc/C/images +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/X11.m4 \ + $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/depends.m4 \ + $(top_srcdir)/m4/i18n.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +am__installdirs = $(DESTDIR)$(imagesdir) +imagesDATA_INSTALL = $(INSTALL_DATA) +DATA = $(images_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ @@ -166,6 +182,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -186,25 +203,39 @@ images_DATA = \ panel-settings.png \ systembuttons-properties.png - EXTRA_DIST = $(images_DATA) -subdir = doc/C/images -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = -DATA = $(images_DATA) - -DIST_COMMON = Makefile.am Makefile.in all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/C/images/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --foreign doc/C/images/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: -rm -f *.lo @@ -215,10 +246,9 @@ clean-libtool: distclean-libtool: -rm -f libtool uninstall-info-am: -imagesDATA_INSTALL = $(INSTALL_DATA) install-imagesDATA: $(images_DATA) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(imagesdir) + $(mkdir_p) $(DESTDIR)$(imagesdir) @list='$(images_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ @@ -239,10 +269,6 @@ TAGS: ctags: CTAGS CTAGS: -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = ../../.. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -256,7 +282,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -274,9 +300,8 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile $(DATA) - installdirs: - $(mkinstalldirs) $(DESTDIR)$(imagesdir) + $(mkdir_p) $(DESTDIR)$(imagesdir) install: install-am install-exec: install-exec-am install-data: install-data-am @@ -288,7 +313,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -296,7 +321,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -306,13 +331,15 @@ clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-libtool dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -328,7 +355,7 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -347,13 +374,13 @@ uninstall-am: uninstall-imagesDATA uninstall-info-am .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-imagesDATA \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-imagesDATA uninstall-info-am + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-exec install-exec-am \ + install-imagesDATA install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am uninstall-imagesDATA uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/doc/C/xfce4-panel.html b/doc/C/xfce4-panel.html index 602fd6fd..43af0bce 100644 --- a/doc/C/xfce4-panel.html +++ b/doc/C/xfce4-panel.html @@ -1,6 +1,6 @@ -<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>XFce 4 Panel</title><link rel="stylesheet" href="../xfce.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.61.2"><link rel="home" href="#xfce4-panel" title="XFce 4 Panel"><link rel="next" href="#panel-intro" title="Introduction"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="xfce4-panel"></a>XFce 4 Panel</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Jasper</span> <span class="surname">Huijsmans</span></h3><div class="affiliation"><div class="address"><p><tt class="email"><<a href="mailto:huysmans@users.sourceforge.net">huysmans@users.sourceforge.net</a>></tt></p></div></div></div></div></div><div><span xmlns="http://www.w3.org/TR/xhtml1/transitional" class="releaseinfo">This manual describes <b xmlns="" class="application"><tt>xfce4-panel</tt></b> version 4.0. +<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>XFce 4 Panel</title><link rel="stylesheet" href="../xfce.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.62.4"><link rel="home" href="#xfce4-panel" title="XFce 4 Panel"><link rel="next" href="#panel-intro" title="Introduction"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="xfce4-panel"></a>XFce 4 Panel</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Jasper</span> <span class="surname">Huijsmans</span></h3><div class="affiliation"><div class="address"><p><tt class="email"><<a href="mailto:huysmans@users.sourceforge.net">huysmans@users.sourceforge.net</a>></tt></p></div></div></div></div></div><div><span xmlns="http://www.w3.org/TR/xhtml1/transitional" class="releaseinfo">This manual describes <b xmlns="" class="application"><tt>xfce4-panel</tt></b> version 4.0. Last updated: Sep 2003 - <br></br></span></div><div><p class="copyright">Copyright 2003 Jasper Huijsmans</p></div></div><div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><a href="#panel-intro">Introduction</a></dt><dt><a href="#panel-getting-started">Getting Started</a></dt><dt><a href="#panel-items">Panel Items</a></dt><dd><dl><dt><a href="#launcher-item">Launcher</a></dt><dt><a href="#clock-item">XFce Clock</a></dt><dt><a href="#mailcheck-item">Mail Check</a></dt><dt><a href="#switcher-item">Desktop Switcher and Graphical Pager</a></dt><dt><a href="#systembuttons-item">System Buttons</a></dt><dt><a href="#separator-item">Separator</a></dt></dl></dd><dt><a href="#subpanels">Panel Menus</a></dt><dt><a href="#panel-settings">Panel Preferences</a></dt><dd><dl><dt><a href="#panel-apearance">Appearance</a></dt><dt><a href="#panel-position">Position</a></dt></dl></dd><dt><a href="#panel-copyright">About xfce4-panel</a></dt></dl></div><p></p><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="panel-intro"></a>Introduction</h2></div></div><div></div></div><p> + <br></br></span></div><div><p class="copyright">Copyright 2003 Jasper Huijsmans</p></div></div><div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#panel-intro">Introduction</a></span></dt><dt><span class="sect1"><a href="#panel-getting-started">Getting Started</a></span></dt><dt><span class="sect1"><a href="#panel-items">Panel Items</a></span></dt><dd><dl><dt><span class="sect2"><a href="#launcher-item">Launcher</a></span></dt><dt><span class="sect2"><a href="#clock-item">XFce Clock</a></span></dt><dt><span class="sect2"><a href="#mailcheck-item">Mail Check</a></span></dt><dt><span class="sect2"><a href="#switcher-item">Desktop Switcher and Graphical Pager</a></span></dt><dt><span class="sect2"><a href="#systembuttons-item">System Buttons</a></span></dt><dt><span class="sect2"><a href="#separator-item">Separator</a></span></dt></dl></dd><dt><span class="sect1"><a href="#subpanels">Panel Menus</a></span></dt><dt><span class="sect1"><a href="#panel-settings">Panel Preferences</a></span></dt><dd><dl><dt><span class="sect2"><a href="#panel-apearance">Appearance</a></span></dt><dt><span class="sect2"><a href="#panel-position">Position</a></span></dt></dl></dd><dt><span class="sect1"><a href="#panel-copyright">About xfce4-panel</a></span></dt></dl></div><p></p><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="panel-intro"></a>Introduction</h2></div></div><div></div></div><p> The XFce 4 panel is part of the <a href="http://www.xfce.org" target="_top">XFce 4 Desktop Environment</a> and features program launchers, panel menus, a clock, a desktop switcher and more. The actual command to run is <b class="application"><tt>xfce4-panel</tt></b>. Many aspects of the panel can be configured diff --git a/doc/Makefile.am b/doc/Makefile.am index a81b74ec..99ee8693 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,5 +1,6 @@ SUBDIRS = \ - C + C \ + fr noinst_DATA = \ xfce-nochunk.xsl @@ -8,4 +9,5 @@ EXTRA_DIST = $(noinst_DATA) html: Makefile make -C C html + make -C fr html diff --git a/doc/Makefile.in b/doc/Makefile.in index c04a1e38..53c499d9 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.5 from Makefile.am. +# Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,7 +21,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -36,6 +35,30 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ +subdir = doc +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/X11.m4 \ + $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/depends.m4 \ + $(top_srcdir)/m4/i18n.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-exec-recursive install-info-recursive \ + install-recursive installcheck-recursive installdirs-recursive \ + pdf-recursive ps-recursive uninstall-info-recursive \ + uninstall-recursive +DATA = $(noinst_DATA) +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ @@ -166,6 +189,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -174,38 +198,45 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ SUBDIRS = \ - C - + C \ + fr noinst_DATA = \ xfce-nochunk.xsl - EXTRA_DIST = $(noinst_DATA) -subdir = doc -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = -DATA = $(noinst_DATA) - - -RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ - ps-recursive install-info-recursive uninstall-info-recursive \ - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive -DIST_COMMON = Makefile.am Makefile.in -DIST_SUBDIRS = $(SUBDIRS) all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --foreign doc/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: -rm -f *.lo @@ -276,14 +307,6 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -292,6 +315,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -317,7 +341,6 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ test -z "$(ETAGS_ARGS)$$tags$$unique" \ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique - ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -340,10 +363,6 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -357,7 +376,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -374,13 +393,13 @@ distdir: $(DISTFILES) done list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ + test -d "$(distdir)/$$subdir" \ + || mkdir "$(distdir)/$$subdir" \ || exit 1; \ (cd $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" \ - distdir=../$(distdir)/$$subdir \ + top_distdir="../$(top_distdir)" \ + distdir="../$(distdir)/$$subdir" \ distdir) \ || exit 1; \ fi; \ @@ -390,7 +409,6 @@ check: check-recursive all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: - install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -402,7 +420,7 @@ install-am: all-am installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -410,7 +428,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -420,7 +438,7 @@ clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-recursive - + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-libtool \ distclean-tags @@ -443,7 +461,7 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-recursive - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive @@ -462,26 +480,23 @@ uninstall-am: uninstall-info-am uninstall-info: uninstall-info-recursive -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ - clean-generic clean-libtool clean-recursive ctags \ +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ + clean clean-generic clean-libtool clean-recursive ctags \ ctags-recursive distclean distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distdir dvi dvi-am \ - dvi-recursive info info-am info-recursive install install-am \ - install-data install-data-am install-data-recursive \ - install-exec install-exec-am install-exec-recursive \ - install-info install-info-am install-info-recursive install-man \ - install-recursive install-strip installcheck installcheck-am \ - installdirs installdirs-am installdirs-recursive \ - maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ - pdf-recursive ps ps-am ps-recursive tags tags-recursive \ - uninstall uninstall-am uninstall-info-am \ - uninstall-info-recursive uninstall-recursive + distclean-recursive distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive \ + mostlyclean mostlyclean-generic mostlyclean-libtool \ + mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-info-am html: Makefile make -C C html + make -C fr html # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/doc/fr/Makefile.am b/doc/fr/Makefile.am new file mode 100644 index 00000000..fe97d42b --- /dev/null +++ b/doc/fr/Makefile.am @@ -0,0 +1,16 @@ +SUBDIRS = \ + images + +noinst_DATA = \ + xfce4-panel.xml + +docdir=$(datadir)/xfce4/doc/fr + +doc_DATA= \ + xfce4-panel.html + +EXTRA_DIST = $(noinst_DATA) $(doc_DATA) + +html: + xsltproc $(srcdir)/../xfce-nochunk.xsl $(srcdir)/xfce4-panel.xml + diff --git a/doc/fr/Makefile.in b/doc/fr/Makefile.in new file mode 100644 index 00000000..6befb5f1 --- /dev/null +++ b/doc/fr/Makefile.in @@ -0,0 +1,525 @@ +# Makefile.in generated by automake 1.8.2 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = ../.. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_triplet = @host@ +subdir = doc/fr +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/X11.m4 \ + $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/depends.m4 \ + $(top_srcdir)/m4/i18n.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-exec-recursive install-info-recursive \ + install-recursive installcheck-recursive installdirs-recursive \ + pdf-recursive ps-recursive uninstall-info-recursive \ + uninstall-recursive +am__installdirs = $(DESTDIR)$(docdir) +docDATA_INSTALL = $(INSTALL_DATA) +DATA = $(doc_DATA) $(noinst_DATA) +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@ +LIBSTARTUP_NOTIFICATION_LIBS = @LIBSTARTUP_NOTIFICATION_LIBS@ +LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION = @LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION@ +LIBTOOL = @LIBTOOL@ +LIBX11_CFLAGS = @LIBX11_CFLAGS@ +LIBX11_LDFLAGS = @LIBX11_LDFLAGS@ +LIBX11_LIBS = @LIBX11_LIBS@ +LIBXFCE4MCS_CLIENT_CFLAGS = @LIBXFCE4MCS_CLIENT_CFLAGS@ +LIBXFCE4MCS_CLIENT_LIBS = @LIBXFCE4MCS_CLIENT_LIBS@ +LIBXFCE4MCS_CLIENT_REQUIRED_VERSION = @LIBXFCE4MCS_CLIENT_REQUIRED_VERSION@ +LIBXFCEGUI4_CFLAGS = @LIBXFCEGUI4_CFLAGS@ +LIBXFCEGUI4_LIBS = @LIBXFCEGUI4_LIBS@ +LIBXFCEGUI4_REQUIRED_VERSION = @LIBXFCEGUI4_REQUIRED_VERSION@ +LIBXML_CFLAGS = @LIBXML_CFLAGS@ +LIBXML_LIBS = @LIBXML_LIBS@ +LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +XFCE_MCS_MANAGER_CFLAGS = @XFCE_MCS_MANAGER_CFLAGS@ +XFCE_MCS_MANAGER_LIBS = @XFCE_MCS_MANAGER_LIBS@ +XFCE_MCS_MANAGER_PLUGINSDIR = @XFCE_MCS_MANAGER_PLUGINSDIR@ +XFCE_MCS_MANAGER_REQUIRED_VERSION = @XFCE_MCS_MANAGER_REQUIRED_VERSION@ +XGETTEXT = @XGETTEXT@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +SUBDIRS = \ + images + +noinst_DATA = \ + xfce4-panel.xml + +docdir = $(datadir)/xfce4/doc/fr +doc_DATA = \ + xfce4-panel.html + +EXTRA_DIST = $(noinst_DATA) $(doc_DATA) +all: all-recursive + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/fr/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --foreign doc/fr/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: +install-docDATA: $(doc_DATA) + @$(NORMAL_INSTALL) + $(mkdir_p) $(DESTDIR)$(docdir) + @list='$(doc_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(docDATA_INSTALL) $$d$$p $(DESTDIR)$(docdir)/$$f"; \ + $(docDATA_INSTALL) $$d$$p $(DESTDIR)$(docdir)/$$f; \ + done + +uninstall-docDATA: + @$(NORMAL_UNINSTALL) + @list='$(doc_DATA)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f $(DESTDIR)$(docdir)/$$f"; \ + rm -f $(DESTDIR)$(docdir)/$$f; \ + done + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +mostlyclean-recursive clean-recursive distclean-recursive \ +maintainer-clean-recursive: + @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + else \ + include_option=--include; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$tags$$unique" \ + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique +ctags: CTAGS +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || mkdir "$(distdir)/$$subdir" \ + || exit 1; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="../$(top_distdir)" \ + distdir="../$(distdir)/$$subdir" \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-recursive +all-am: Makefile $(DATA) +installdirs: installdirs-recursive +installdirs-am: + $(mkdir_p) $(DESTDIR)$(docdir) +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-recursive + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-libtool \ + distclean-tags + +dvi: dvi-recursive + +dvi-am: + +info: info-recursive + +info-am: + +install-data-am: install-docDATA + +install-exec-am: + +install-info: install-info-recursive + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: uninstall-docDATA uninstall-info-am + +uninstall-info: uninstall-info-recursive + +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ + clean clean-generic clean-libtool clean-recursive ctags \ + ctags-recursive distclean distclean-generic distclean-libtool \ + distclean-recursive distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-docDATA install-exec install-exec-am \ + install-info install-info-am install-man install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic \ + maintainer-clean-recursive mostlyclean mostlyclean-generic \ + mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am uninstall-docDATA \ + uninstall-info-am + + +html: + xsltproc $(srcdir)/../xfce-nochunk.xsl $(srcdir)/xfce4-panel.xml +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/doc/fr/images/Makefile.am b/doc/fr/images/Makefile.am new file mode 100644 index 00000000..a5f10923 --- /dev/null +++ b/doc/fr/images/Makefile.am @@ -0,0 +1,14 @@ +imagesdir = $(datadir)/xfce4/doc/fr/images +images_DATA = \ + clock-properties.png \ + default_panel.png \ + handle-popup.png \ + item-popup.png \ + launcher-properties.png \ + mailcheck-properties.png \ + menuitem-properties.png \ + nooptions-properties.png \ + panel-settings.png \ + systembuttons-properties.png + +EXTRA_DIST = $(images_DATA) diff --git a/doc/fr/images/Makefile.in b/doc/fr/images/Makefile.in new file mode 100644 index 00000000..8650dc32 --- /dev/null +++ b/doc/fr/images/Makefile.in @@ -0,0 +1,387 @@ +# Makefile.in generated by automake 1.8.2 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = ../../.. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_triplet = @host@ +subdir = doc/fr/images +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/X11.m4 \ + $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/depends.m4 \ + $(top_srcdir)/m4/i18n.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +am__installdirs = $(DESTDIR)$(imagesdir) +imagesDATA_INSTALL = $(INSTALL_DATA) +DATA = $(images_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@ +LIBSTARTUP_NOTIFICATION_LIBS = @LIBSTARTUP_NOTIFICATION_LIBS@ +LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION = @LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION@ +LIBTOOL = @LIBTOOL@ +LIBX11_CFLAGS = @LIBX11_CFLAGS@ +LIBX11_LDFLAGS = @LIBX11_LDFLAGS@ +LIBX11_LIBS = @LIBX11_LIBS@ +LIBXFCE4MCS_CLIENT_CFLAGS = @LIBXFCE4MCS_CLIENT_CFLAGS@ +LIBXFCE4MCS_CLIENT_LIBS = @LIBXFCE4MCS_CLIENT_LIBS@ +LIBXFCE4MCS_CLIENT_REQUIRED_VERSION = @LIBXFCE4MCS_CLIENT_REQUIRED_VERSION@ +LIBXFCEGUI4_CFLAGS = @LIBXFCEGUI4_CFLAGS@ +LIBXFCEGUI4_LIBS = @LIBXFCEGUI4_LIBS@ +LIBXFCEGUI4_REQUIRED_VERSION = @LIBXFCEGUI4_REQUIRED_VERSION@ +LIBXML_CFLAGS = @LIBXML_CFLAGS@ +LIBXML_LIBS = @LIBXML_LIBS@ +LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +XFCE_MCS_MANAGER_CFLAGS = @XFCE_MCS_MANAGER_CFLAGS@ +XFCE_MCS_MANAGER_LIBS = @XFCE_MCS_MANAGER_LIBS@ +XFCE_MCS_MANAGER_PLUGINSDIR = @XFCE_MCS_MANAGER_PLUGINSDIR@ +XFCE_MCS_MANAGER_REQUIRED_VERSION = @XFCE_MCS_MANAGER_REQUIRED_VERSION@ +XGETTEXT = @XGETTEXT@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +imagesdir = $(datadir)/xfce4/doc/fr/images +images_DATA = \ + clock-properties.png \ + default_panel.png \ + handle-popup.png \ + item-popup.png \ + launcher-properties.png \ + mailcheck-properties.png \ + menuitem-properties.png \ + nooptions-properties.png \ + panel-settings.png \ + systembuttons-properties.png + +EXTRA_DIST = $(images_DATA) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/fr/images/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --foreign doc/fr/images/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: +install-imagesDATA: $(images_DATA) + @$(NORMAL_INSTALL) + $(mkdir_p) $(DESTDIR)$(imagesdir) + @list='$(images_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(imagesDATA_INSTALL) $$d$$p $(DESTDIR)$(imagesdir)/$$f"; \ + $(imagesDATA_INSTALL) $$d$$p $(DESTDIR)$(imagesdir)/$$f; \ + done + +uninstall-imagesDATA: + @$(NORMAL_UNINSTALL) + @list='$(images_DATA)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f $(DESTDIR)$(imagesdir)/$$f"; \ + rm -f $(DESTDIR)$(imagesdir)/$$f; \ + done +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + $(mkdir_p) $(DESTDIR)$(imagesdir) +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-libtool + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-imagesDATA + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-imagesDATA uninstall-info-am + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-exec install-exec-am \ + install-imagesDATA install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am uninstall-imagesDATA uninstall-info-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/doc/fr/images/clock-properties.png b/doc/fr/images/clock-properties.png Binary files differnew file mode 100644 index 00000000..0065e74d --- /dev/null +++ b/doc/fr/images/clock-properties.png diff --git a/doc/fr/images/default_panel.png b/doc/fr/images/default_panel.png Binary files differnew file mode 100644 index 00000000..387c19e0 --- /dev/null +++ b/doc/fr/images/default_panel.png diff --git a/doc/fr/images/handle-popup.png b/doc/fr/images/handle-popup.png Binary files differnew file mode 100644 index 00000000..cb513833 --- /dev/null +++ b/doc/fr/images/handle-popup.png diff --git a/doc/fr/images/item-popup.png b/doc/fr/images/item-popup.png Binary files differnew file mode 100644 index 00000000..81ce5d70 --- /dev/null +++ b/doc/fr/images/item-popup.png diff --git a/doc/fr/images/launcher-properties.png b/doc/fr/images/launcher-properties.png Binary files differnew file mode 100644 index 00000000..8d9891b9 --- /dev/null +++ b/doc/fr/images/launcher-properties.png diff --git a/doc/fr/images/mailcheck-properties.png b/doc/fr/images/mailcheck-properties.png Binary files differnew file mode 100644 index 00000000..63f8d73d --- /dev/null +++ b/doc/fr/images/mailcheck-properties.png diff --git a/doc/fr/images/menuitem-properties.png b/doc/fr/images/menuitem-properties.png Binary files differnew file mode 100644 index 00000000..f3a1ddc6 --- /dev/null +++ b/doc/fr/images/menuitem-properties.png diff --git a/doc/fr/images/nooptions-properties.png b/doc/fr/images/nooptions-properties.png Binary files differnew file mode 100644 index 00000000..19587106 --- /dev/null +++ b/doc/fr/images/nooptions-properties.png diff --git a/doc/fr/images/panel-settings.png b/doc/fr/images/panel-settings.png Binary files differnew file mode 100644 index 00000000..0cad7457 --- /dev/null +++ b/doc/fr/images/panel-settings.png diff --git a/doc/fr/images/systembuttons-properties.png b/doc/fr/images/systembuttons-properties.png Binary files differnew file mode 100644 index 00000000..4184a86f --- /dev/null +++ b/doc/fr/images/systembuttons-properties.png diff --git a/doc/fr/xfce4-panel.html b/doc/fr/xfce4-panel.html new file mode 100644 index 00000000..002db65a --- /dev/null +++ b/doc/fr/xfce4-panel.html @@ -0,0 +1,191 @@ +<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Le panneau de XFce 4</title><link rel="stylesheet" href="../xfce.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.62.4"><link rel="home" href="#xfce4-panel" title="Le panneau de XFce 4"><link rel="next" href="#panel-intro" title="Introduction"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article" lang="fr"><div class="titlepage"><div><div><h1 class="title"><a name="xfce4-panel"></a>Le panneau de XFce 4</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Jasper</span> <span class="surname">Huijsmans</span></h3><div class="affiliation"><div class="address"><p><tt class="email"><<a href="mailto:huysmans@users.sourceforge.net">huysmans@users.sourceforge.net</a>></tt></p></div></div></div><p class="othercredit"><span class="contrib">French translation</span>: <span class="firstname">Marie-Claude</span> <span class="surname">Collilieux</span></p><div class="affiliation"><span class="orgname">French Translation Team<br></span><div class="address"><p><tt class="email"><<a href="mailto:m.collilieux@free.fr">m.collilieux@free.fr</a>></tt></p></div></div></div></div><div><span xmlns="http://www.w3.org/TR/xhtml1/transitional" class="releaseinfo">Ce manuel dcrit <b xmlns="" class="application"><tt>xfce4-panel</tt></b> version 4.0. + Dernire mise jour : Sep 2003 + <br></br></span></div><div><p class="copyright">Copyright 2003 Jasper Huijsmans</p></div><div><p class="copyright">Copyright 2003 M.C. Collilieux (French + translation)</p></div></div><div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#panel-intro">Introduction</a></span></dt><dt><span class="sect1"><a href="#panel-getting-started">Dmarrer</a></span></dt><dt><span class="sect1"><a href="#panel-items">lments du panneau</a></span></dt><dd><dl><dt><span class="sect2"><a href="#launcher-item">Lanceur</a></span></dt><dt><span class="sect2"><a href="#clock-item">Horloge XFce</a></span></dt><dt><span class="sect2"><a href="#mailcheck-item">Moniteur de courrier</a></span></dt><dt><span class="sect2"><a href="#switcher-item">Changeur de bureaux et changeur de bureaux graphique</a></span></dt><dt><span class="sect2"><a href="#systembuttons-item">Boutons systme</a></span></dt><dt><span class="sect2"><a href="#separator-item">Sparateur</a></span></dt></dl></dd><dt><span class="sect1"><a href="#subpanels">Menus du panneau</a></span></dt><dt><span class="sect1"><a href="#panel-settings">Prfrences du panneau</a></span></dt><dd><dl><dt><span class="sect2"><a href="#panel-apearance">Apparence</a></span></dt><dt><span class="sect2"><a href="#panel-position">Position</a></span></dt></dl></dd><dt><span class="sect1"><a href="#panel-copyright">A propos de xfce4-panel</a></span></dt></dl></div><p></p><div class="sect1" lang="fr"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="panel-intro"></a>Introduction</h2></div></div><div></div></div><p>Le panneau XFce 4 fait partie de l'<a href="http://www.xfce.org" target="_top">environnement de bureau XFce 4</a> et comprend des + lanceurs de programmes, des menus, une horloge, un changeur de bureau, + et plus encore. La commande pour le lancer est <b class="application"><tt>xfce4-panel</tt></b>. Beaucoup d'lments + de ce panneau peuvent tre configurs partir d'une interface graphique. + </p><p>Si vous tiez habitu aux prcdentes versions de XFce, vous trouverez + beaucoup de nouvelles possibilits. Parmi les plus remarquables : + la possibilit de mettre le panneau verticalement, les thmes d'icnes, le + nouveau pager graphique et la possibilit de configurer la position des + boutons des menus popup. La manire dont les paramtres sont prservs + est compltement modifie, cela pourra prendre un peu de temps pour s'y + habituer. Ce manuel devrait vous fournir toute l'information ncessaire + pour adapter le panneau vos prfrences. + </p></div><p></p><div class="sect1" lang="fr"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="panel-getting-started"></a>Dmarrer</h2></div></div><div></div></div><p>Quand vous lancez le panneau, vous voyez une barre au bas de + votre cran, comme ceci : + </p><div class="figure"><a name="default-panel-fig"></a><p class="title"><b>Figure1.Panneau XFce par dfaut</b></p><div class="screenshot"><div class="mediaobject"><img src="images/default_panel.png" alt="Montre la configuration par dfaut du panneau XFce. + Il contient plusieurs lanceurs, un moniteur de courrier, + une horloge et un changeur de bureau. Montre aussi un + menu ouvert. + "></div></div></div><p>L'illustration montre la configuration par dfaut du panneau + avec un menu ouvert et la souris au-dessus d'un bouton lanceur, + faisant apparatre un message d'aide. + </p><p>Il y a une poigne de dplacement chaque extrmit du panneau. + Vous pouvez les utiliser pour dplacer le panneau sur l'cran. Cliquer + avec le bouton droit (ou Maj + clic gauche) sur l'une d'elles fait + apparatre un menu popup... + Allez-y, testez ;-) + </p><div class="figure"><a name="handle-popup-fig"></a><p class="title"><b>Figure2.Menu popup des poignes de dplacement</b></p><div class="screenshot"><div class="mediaobject"><img src="images/handle-popup.png" alt="Montre le menu popup des poignes de dplacement."></div></div></div><p>La zone situe entre les poignes de dplacement contient les lments + du panneau. Les lments disponibles sont dcrits dans la section + "<a href="#panel-items" target="_top">lments du panneau</a>". La plupart + des lments ralisent une action lors d'un clic. Le paramtrage des + lments se fait dans un menu accessible par un clic droit. + </p><p>Un clic droit sur un item ouvre un menu popup partir duquel vous + pouvez ouvrir les proprits de l'lment, supprimer l'lment ou ajouter + un nouvel lment. Les lments peuvent aussi tre ajouts partir du menu + popup des poignes de dplacement (voir au-dessus). Un sous-menu propose + une liste des lments disponibles dans laquelle choisir. + Quand vous ajoutez un nouvel lment, le panneau ouvre le dialogue des + proprits, vous pouvez alors modifier les options de l'lment ainsi + que sa position dans le panneau. + </p><div class="figure"><a name="item-popup-fig"></a><p class="title"><b>Figure3.Elments du menu popup</b></p><div class="screenshot"><div class="mediaobject"><img src="images/item-popup.png" alt="Montre les lments du menu popup."></div></div></div><p>Les prfrences globales du panneau peuvent tre modifies partir + du gestionnaire de paramtres du panneau XFce 4. Celui-ci peut tre lanc, + soit partir du bouton lanceur du panneau, soit en choisissant 'Proprits...' + dans le menu popup des poignes de dplacement. Voir "<a href="#panel-settings" target="_top"> + Prfrences du panneau</a>" pour une explication des options disponibles. + </p></div><p></p><div class="sect1" lang="fr"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="panel-items"></a>lments du panneau</h2></div></div><div></div></div><p>Le panneau Xfce 4 peut charger aussi bien des plugins externes que + les plugins internes. Dans cette partie, nous dcrirons seulement les + lments qui sont installs en mme temps que le panneau. + </p><p>La fentre de dialogue des proprits d'un lment du panneau peut tre ouverte + avec un clic droit sur l'lment. Chaque type d'lment a son propre + dialogue de configuration. Chaque fentre de dialogue possde au minimum ces + options : + </p><div class="itemizedlist"><ul type="disc"><li>Changer la position d'un lment dans le panneau.</li><li>Supprimer cet lment. </li></ul></div><div class="sect2" lang="fr"><div class="titlepage"><div><div><h3 class="title"><a name="launcher-item"></a>Lanceur</h3></div></div><div></div></div><p>L'lment le plus courant est le lanceur. Il vous permet + de dmarrer un programme partir du panneau. La fentre de dialogue propose les options suivantes : + </p><div class="variablelist"><dl><dt><span class="term">Commande</span></dt><dd>Vous pouvez entrer la commande lancer ou le chemin suivre dans + le systme de fichiers. Il existe une option pour lancer un + programme dans un terminal et pour utiliser la notification + de dmarrage. Cette dernire option signifie que le gestionnaire + de fentres montre un sablier pendant le chargement de l'application, + condition que celle-ci supporte cette fonctionnalit, ce qui est le cas de peu de + programmes actuellement. Les programmes bass sur Gtk 2.2 sont censs la + supporter. + </dd><dt><span class="term">Icne</span></dt><dd>Le panneau fournit un certain nombre d'icnes qui peuvent tre + utilises en standard.Ces icnes peuvent aussi tre harmonises avec + le thme d'icnes que vous avez choisi dans les <a href="#panel-settings" target="_top"> + prfrences globales</a>. Bien sr, vous pouvez aussi slectionner + vos propres icnes en parcourant les rpertoires grce au bouton + cot de la zone de saisie, ou en dposant une image partir du + gestionnaire de fichier sur la zone de prvisualisation. + </dd><dt><span class="term">Bulle d'aide</span></dt><dd>Les lments du panneau affichent cette aide si vous laissez + la souris au-dessus d'eux. + </dd><dt><span class="term">Menu</span></dt><dd>Un lanceur peut contenir un menu. Quand cette option est + choisie, un bouton avec une petite flche apparat cot de + l'lment. Reportez-vous <a href="#subpanels" target="_top">menus du panneau</a> + pour plus d'information. La position du bouton peut tre modifie dans + les prfrences gnrales. + </dd></dl></div><div class="figure"><a name="launcher-fig"></a><p class="title"><b>Figure4.lment lanceur</b></p><div class="screenshot"><div class="mediaobject"><img src="images/launcher-properties.png" alt="Montre les proprits de l'lment lanceur."></div></div></div></div><div class="sect2" lang="fr"><div class="titlepage"><div><div><h3 class="title"><a name="clock-item"></a>Horloge XFce</h3></div></div><div></div></div><p>Le style de l'horloge Xfce peut tre modifi par certaines options. + Il existe trois types d'horloge possibles : analogique, numrique et + LED. Une option permet d'afficher ou non les secondes, et pour les modles + numrique et LED vous pouvez choisir un affichage sur 24 ou 12 heures + (avec possibilit d'ajouter un mode AM/PM). L'horloge affiche en outre + la date en bulle d'aide. Cliquer sur l'horloge n'apporte rien. + </p><div class="figure"><a name="clock-fig"></a><p class="title"><b>Figure5.lment horloge</b></p><div class="screenshot"><div class="mediaobject"><img src="images/clock-properties.png" alt="Montre les proprits de l'horloge."></div></div></div></div><div class="sect2" lang="fr"><div class="titlepage"><div><div><h3 class="title"><a name="mailcheck-item"></a>Moniteur de courrier</h3></div></div><div></div></div><p>Le moniteur de courrier surveille la bote aux lettres locale + de votre choix, condition qu'elle soit au format mbox. + L'icne de courrier s'accorde avec votre thme d'icnes. Vous + pouvez choisir l'emplacement de votre bote, la commande lancer + lorsque vous cliquez sur le bouton et l'intervalle entre chaque + vrification. La commande a les mmes options que celles des + lments lanceurs voir <a href="#launcher-item" target="_top"> + au-dessus</a>). + </p><div class="figure"><a name="mailcheck-fig"></a><p class="title"><b>Figure6.Moniteur de courrier</b></p><div class="screenshot"><div class="mediaobject"><img src="images/mailcheck-properties.png" alt="Montre les proprits du moniteur de courrier."></div></div></div></div><div class="sect2" lang="fr"><div class="titlepage"><div><div><h3 class="title"><a name="switcher-item"></a>Changeur de bureaux et changeur de bureaux graphique</h3></div></div><div></div></div><p>Le panneau fournit deux lments pour interagir avec les + bureaux virtuels. Un changeur d'espace de travail de type CDE + qui montre des boutons avec le nom des bureaux, et un changeur + graphique qui affiche une vue miniature du bureau et vous permet + mme de dplacer une fentre vers un autre espace par un + glisser-dposer. Le changeur graphique permet aussi de passer d'un + espace l'autre avec la molette de la souris quand le curseur est maintenu au-dessus. + </p><div class="figure"><a name="nooptions-fig"></a><p class="title"><b>Figure7.lments sans option</b></p><div class="screenshot"><div class="mediaobject"><img src="images/nooptions-properties.png" alt="Montre les proprits d'un lment sans option. + "></div></div></div></div><div class="sect2" lang="fr"><div class="titlepage"><div><div><h3 class="title"><a name="systembuttons-item"></a>Boutons systme</h3></div></div><div></div></div><p>Un lment "Boutons sytme" possde un ou deux boutons qui + peuvent raliser des actions spcifiques. Le bouton + s'accorde avec votre thme d'icne. Il existe quatre boutons : + </p><div class="variablelist"><dl><dt><span class="term">Verrouiller</span></dt><dd>Lance <b class="application"><tt>xfrun4</tt></b> qui tente de + verrouiller l'cran soit avec xscreensaver, soit, en cas d'chec, + avec xlock. + </dd><dt><span class="term">Quitter</span></dt><dd>Ceci permet de fermer le panneau, et permet aussi de + terminer votre session X (si vous utilisez <b class="application"><tt>startxfce4 + </tt></b> ou avez plac le lancement du panneau la fin de + votre fichier de dmarrage de X). + </dd><dt><span class="term">Information</span></dt><dd>Le bouton information amne le dialogue <span class="emphasis"><em> propos</em></span> + de XFce 4. + </dd><dt><span class="term">Paramtres</span></dt><dd>Le bouton Paramtres ouvre le gestionnaire de paramtres + de XFce, partir duquel, vous accdez aux rglages de tous les + composants, ainsi qu' certains rglages du systme, tels le comportement de la souris + et les paramtres de l'interface utilisateur. + </dd></dl></div><div class="figure"><a name="systembuttons-fig"></a><p class="title"><b>Figure8.lment boutons systme</b></p><div class="screenshot"><div class="mediaobject"><img src="images/systembuttons-properties.png" alt="Montre les proprits de l'lment boutons systme. + "></div></div></div></div><div class="sect2" lang="fr"><div class="titlepage"><div><div><h3 class="title"><a name="separator-item"></a>Sparateur</h3></div></div><div></div></div><p>Cet lment est simplement une ligne de sparation sur le + panneau. Il n'a pas d'autre option que sa position. + </p><p>Notez qu'il peut tre difficile d'ouvrir son menu popup car vous avez + trs peu de surface sur laquelle cliquer. + </p></div><p></p></div><div class="sect1" lang="fr"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="subpanels"></a>Menus du panneau</h2></div></div><div></div></div><p>Les lments lanceurs du panneau peuvent tre associs avec un + menu, lequel peut tre ouvert en cliquant sur le bouton flch cot. + La position de ce bouton est configurable dans les prfrences globales. + Vous pouvez aussi ouvrir le menu en cliquant sur le bouton lanceur et + en prolongeant l'appui, le menu s'ouvre aprs un court dlai. + </p><p>Utilisez le choix 'Ajouter un lanceur' en premire ligne du menu + du lanceur, ou dposez un excutable partir du gestionnaire de fichier + sur cette ligne, pour ajouter un nouveau choix au menu. Pour supprimer + un lment du menu, utilisez le bouton 'supprimer' dans la fentre + des proprits de l'lment. + </p><p>Une possibilit particulire des menus du panneau est qu'ils + peuvent tre dtachs du panneau et rester dans leur propre fentre. + Pour dtacher un menu, cliquer sur la petite ligne en bas du menu + (voir la <a href="#default-panel-fig" target="_top">copie d'cran</a> du + panneau par dfaut). + </p><p>Le dialogue des proprits d'un lment du menu s'ouvre de suite + quand vous faites un clic droit (ou Maj + clic gauche) sur celui-ci. + Ce dialogue est trs semblable celui de l'lment lanceur. + </p><div class="figure"><a name="menuitem-fig"></a><p class="title"><b>Figure9.Elment de menu</b></p><div class="screenshot"><div class="mediaobject"><img src="images/menuitem-properties.png" alt="Montre les proprits d'un lment du menu. + "></div></div></div></div><p></p><div class="sect1" lang="fr"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="panel-settings"></a>Prfrences du panneau</h2></div></div><div></div></div><p>La fentre des proprits du panneau XFce 4 peut tre ouverte + partir du gestionnaire de paramtres de Xfce 4, lequel peut tre + ouvert par un lanceur du panneau ou par un clic droit sur les + poignes de dplacement du panneau. + </p><div class="figure"><a name="panel-settings-fig"></a><p class="title"><b>Figure10.Paramtres du panneau</b></p><div class="screenshot"><div class="mediaobject"><img src="images/panel-settings.png" alt="Montre les proprits des prfrences du panneau. + "></div></div></div><div class="sect2" lang="fr"><div class="titlepage"><div><div><h3 class="title"><a name="panel-apearance"></a>Apparence</h3></div></div><div></div></div><div class="variablelist"><dl><dt><span class="term">Taille</span></dt><dd><p>Il y a quatre tailles disponibles : tout petit, + petit, moyen, grand. La taille par dfaut est petit. + </p></dd><dt><span class="term">Orientation</span></dt><dd><p>Une nouvelle fonctionnalit du panneau de XFce 4 est la possibilit + d'tre plac dans le sens vertical, aussi bien que dans le sens + horizontal habituel. + </p></dd><dt><span class="term">Position des popup</span></dt><dd><p>Cette option modifie la position du bouton qui ouvre + un menu du panneau. Il peut tre plac au-dessus, en-dessous, + gauche ou droite de l'lment lanceur. + </p></dd><dt><span class="term">Thme d'icnes</span></dt><dd><p>Une autre nouveaut de XFce 4 est la possibilit de choisir + un thme d'icnes. Les icnes pour les lanceurs et les autres + lments du panneau suivent le thme d'icnes du panneau. + + </p></dd></dl></div></div><div class="sect2" lang="fr"><div class="titlepage"><div><div><h3 class="title"><a name="panel-position"></a>Position</h3></div></div><div></div></div><div class="variablelist"><dl><dt><span class="term">Niveau</span></dt><dd><p>Le niveau du panneau conditionne sa position par + rapport aux autres fentres. Le panneau peut tre en + permanence au-dessus, cach par les autres fentres, + ou agir comme les autres fentres. Par dfaut, le panneau + se situe au-dessus. + </p></dd><dt><span class="term">Centrage</span></dt><dd><p>Il est trs facile de dplacer le panneau sur l'cran. Le + dialogue de paramtrage vous permet de centrer le panneau sur + l'un des cots de l'cran. Notez que le panneau 'se colle' + aux coins de l'cran tout comme au milieu d'un cot de celui-ci + si vous l'amenez suffisamment prs d'une de ces positions. + </p></dd><dt><span class="term">Comportement</span></dt><dd><p>Si vous cochez le choix 'Masquer automatiquement', le panneau + se transforme en une fine barre. Dplacer la souris au-dessus de + celle-ci dcouvre le panneau. Ceci fonctionne mieux quand le + panneau est sur un bord de l'cran (la cible est plus facile + toucher). + </p></dd></dl></div></div></div><p></p><div class="sect1" lang="fr"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="panel-copyright"></a>A propos de <b class="application"><tt>xfce4-panel</tt></b></h2></div></div><div></div></div><p><b class="application"><tt>xfce4-panel</tt></b> est crit par Jasper Huijsmans + (<tt class="email"><<a href="mailto:huysmans@users.sourceforge.net">huysmans@users.sourceforge.net</a>></tt>). Vous trouverez + des informations + supplmentaires sur le <a href="http://www.xfce.org" target="_top">site XFce</a>.</p><p>Pour soumettre un bug ou faire une suggestion sur l'application + ou sur le manuel, envoyez un e-mail la liste de diffusion + <a href="http://www.moongroup.com/mailman/listinfo/xfce4-dev/" target="_top">xfce4-dev</a> — mthode recommande + — ou utilisez le systme de gestion des bugs sur + <a href="http://sourceforge.net/projects/xfce" target="_top">XFce SourceForge project site</a>. + Si vous avez des questions sur l'utilisation ou l'installation de ce + paquetage, vous pouvez les poser sur la liste de diffusion + <a href="http://www.moongroup.com/mailman/listinfo/xfce/" target="_top">xfce</a> + </p><p>Ce programme est distribu selon les termes de la licence publique + gnrale GNU, publie par la Free Software Foundation, soit la version 2 + de cette licence, soit (selon votre choix) toute version ultrieure. + </p><p>Vous devez avoir reçu une copie de la licence publique + gnrale GNU avec ce programme. Sinon, crivez la Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. + </p></div></div></body></html> diff --git a/doc/fr/xfce4-panel.xml b/doc/fr/xfce4-panel.xml new file mode 100644 index 00000000..bb1ab345 --- /dev/null +++ b/doc/fr/xfce4-panel.xml @@ -0,0 +1,713 @@ +<?xml version='1.0'?> +<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" + "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ + <!ENTITY copyright SYSTEM "copyright.xml"> + <!ENTITY manrevision "0.99"> + <!ENTITY date "Sep 2003"> + <!ENTITY appversion "4.0"> + <!ENTITY app "<application>xfce4-panel</application>"> +]> + +<article id="xfce4-panel" lang="fr"> + +<!-- Header --> +<articleinfo> + + <title>Le panneau de XFce 4</title> + + <copyright> + <year>2003</year> <holder>Jasper Huijsmans</holder> + </copyright> + + <copyright> + <year>2003</year> <holder>M.C. Collilieux (French + translation)</holder> + </copyright> + +<!-- I don't know about this + <legalnotice id="legalnotice"> + <para> + This document is provided under the terms of the GNU GPL, version + 2 or (at your option) any later version. + </para> + </legalnotice> +--> + <authorgroup> + + <author> + <firstname>Jasper</firstname> <surname>Huijsmans</surname> + <affiliation> + <address><email>huysmans@users.sourceforge.net</email></address> + </affiliation> + </author> + + <othercredit role="translator"> + <firstname>Marie-Claude</firstname> <surname>Collilieux</surname> + <affiliation> + <orgname>French Translation Team</orgname> + <address><email>m.collilieux@free.fr</email> </address> + </affiliation> <contrib>French translation</contrib> + </othercredit> + + </authorgroup> + + <!-- + <revhistory> + <revision> + <revnumber>0.4</revnumber> + <date>May 2003</date> + <authorinitials>jbh</authorinitials> + </revision> + <revision> + <revnumber>0.3</revnumber> + <date>February 2003</date> + <authorinitials>jbh</authorinitials> + </revision> + </revhistory> + --> + + <releaseinfo>Ce manuel décrit &app; version &appversion;. + Dernière mise à jour : &date; + </releaseinfo> + +</articleinfo> + + <!-- extra space --> + <para> </para> + +<sect1 id="panel-intro"> + <title>Introduction</title> + + <para>Le panneau XFce 4 fait partie de l'<ulink url="http://www.xfce.org" + type="html">environnement de bureau XFce 4</ulink> et comprend des + lanceurs de programmes, des menus, une horloge, un changeur de bureau, + et plus encore. La commande pour le lancer est &app;. Beaucoup d'éléments + de ce panneau peuvent être configurés à partir d'une interface graphique. + </para> + + <para>Si vous êtiez habitué aux précédentes versions de XFce, vous trouverez + beaucoup de nouvelles possibilités. Parmi les plus remarquables : + la possibilité de mettre le panneau verticalement, les thèmes d'icônes, le + nouveau pager graphique et la possibilité de configurer la position des + boutons des menus popup. La manière dont les paramètres sont préservés + est complétement modifiée, cela pourra prendre un peu de temps pour s'y + habituer. Ce manuel devrait vous fournir toute l'information nécessaire + pour adapter le panneau à vos préférences. + </para> + +</sect1> + + <!-- extra space --> + <para> </para> + +<sect1 id="panel-getting-started"> + <title>Démarrer</title> + + <para>Quand vous lancez le panneau, vous voyez une barre au bas de + votre écran, comme ceci : + </para> + + <figure id="default-panel-fig"> + <title>Panneau XFce par défaut</title> + <screenshot> + <mediaobject> + <imageobject> + <imagedata fileref="images/default_panel.png" format="PNG"/> + </imageobject> + <!-- + <imageobject> + <imagedata fileref="images/default_panel.eps" format="EPS"/> + </imageobject> + --> + <textobject> + <phrase>Montre la configuration par défaut du panneau XFce. + Il contient plusieurs lanceurs, un moniteur de courrier, + une horloge et un changeur de bureau. Montre aussi un + menu ouvert. + </phrase> + </textobject> + </mediaobject> + </screenshot> + </figure> + + <para>L'illustration montre la configuration par défaut du panneau + avec un menu ouvert et la souris au-dessus d'un bouton lanceur, + faisant apparaître un message d'aide. + </para> + + <para>Il y a une poignée de déplacement à chaque extrémité du panneau. + Vous pouvez les utiliser pour déplacer le panneau sur l'écran. Cliquer + avec le bouton droit (ou Maj + clic gauche) sur l'une d'elles fait + apparaître un menu popup... + Allez-y, testez ;-) + </para> + + <figure id="handle-popup-fig"> + <title>Menu popup des poignées de déplacement</title> + <screenshot> + <mediaobject> + <imageobject> + <imagedata fileref="images/handle-popup.png" format="PNG"/> + </imageobject> + <!-- + <imageobject> + <imagedata fileref="images/handle-popup.eps" format="EPS"/> + </imageobject> + --> + <textobject> + <phrase>Montre le menu popup des poignées de déplacement.</phrase> + </textobject> + </mediaobject> + </screenshot> + </figure> + + <para>La zone située entre les poignées de déplacement contient les éléments + du panneau. Les éléments disponibles sont décrits dans la section + "<ulink url="#panel-items">Éléments du panneau</ulink>". La plupart + des éléments réalisent une action lors d'un clic. Le paramétrage des + éléments se fait dans un menu accessible par un clic droit. + </para> + + <para>Un clic droit sur un item ouvre un menu popup à partir duquel vous + pouvez ouvrir les propriétés de l'élément, supprimer l'élément ou ajouter + un nouvel élément. Les éléments peuvent aussi être ajoutés à partir du menu + popup des poignées de déplacement (voir au-dessus). Un sous-menu propose + une liste des éléments disponibles dans laquelle choisir. + Quand vous ajoutez un nouvel élément, le panneau ouvre le dialogue des + propriétés, vous pouvez alors modifier les options de l'élément ainsi + que sa position dans le panneau. + </para> + + <figure id="item-popup-fig"> + <title>Eléments du menu popup</title> + <screenshot> + <mediaobject> + <imageobject> + <imagedata fileref="images/item-popup.png" format="PNG"/> + </imageobject> + <!-- + <imageobject> + <imagedata fileref="images/item-popup.eps" format="EPS"/> + </imageobject> + --> + <textobject> + <phrase>Montre les éléments du menu popup.</phrase> + </textobject> + </mediaobject> + </screenshot> + </figure> + + <para>Les préférences globales du panneau peuvent être modifiées à partir + du gestionnaire de paramètres du panneau XFce 4. Celui-ci peut être lancé, + soit à partir du bouton lanceur du panneau, soit en choisissant 'Propriétés...' + dans le menu popup des poignées de déplacement. Voir "<ulink url="#panel-settings"> + Préférences du panneau</ulink>" pour une explication des options disponibles. + </para> + +</sect1> + + <!-- extra space --> + <para> </para> + +<sect1 id="panel-items"> + <title>Éléments du panneau</title> + + <para>Le panneau Xfce 4 peut charger aussi bien des plugins externes que + les plugins internes. Dans cette partie, nous décrirons seulement les + éléments qui sont installés en même temps que le panneau. + </para> + + <para>La fenêtre de dialogue des propriétés d'un élément du panneau peut être ouverte + avec un clic droit sur l'élément. Chaque type d'élément a son propre + dialogue de configuration. Chaque fenêtre de dialogue possède au minimum ces + options : + </para> + + <itemizedlist> + <listitem>Changer la position d'un élément dans le panneau.</listitem> + <listitem>Supprimer cet élément. </listitem> + </itemizedlist> + + + <sect2 id="launcher-item"> + <title>Lanceur</title> + + <para>L'élément le plus courant est le lanceur. Il vous permet + de démarrer un programme à partir du panneau. La fenêtre de dialogue propose les options suivantes : + </para> + + <variablelist> + <varlistentry> + <term>Commande</term> + <listitem>Vous pouvez entrer la commande à lancer ou le chemin à suivre dans + le système de fichiers. Il existe une option pour lancer un + programme dans un terminal et pour utiliser la notification + de démarrage. Cette dernière option signifie que le gestionnaire + de fenêtres montre un sablier pendant le chargement de l'application, + à condition que celle-ci supporte cette fonctionnalité, ce qui est le cas de peu de + programmes actuellement. Les programmes basés sur Gtk 2.2 sont censés la + supporter. + </listitem> + </varlistentry> + + <varlistentry> + <term>Icône</term> + <listitem>Le panneau fournit un certain nombre d'icônes qui peuvent être + utilisées en standard.Ces icônes peuvent aussi être harmonisées avec + le thème d'icônes que vous avez choisi dans les <ulink url="#panel-settings"> + préférences globales</ulink>. Bien sûr, vous pouvez aussi sélectionner + vos propres icônes en parcourant les répertoires grâce au bouton à + coté de la zone de saisie, ou en déposant une image à partir du + gestionnaire de fichier sur la zone de prévisualisation. + </listitem> + </varlistentry> + + <varlistentry> + <term>Bulle d'aide</term> + <listitem>Les éléments du panneau affichent cette aide si vous laissez + la souris au-dessus d'eux. + </listitem> + </varlistentry> + + <varlistentry> + <term>Menu</term> + <listitem>Un lanceur peut contenir un menu. Quand cette option est + choisie, un bouton avec une petite flêche apparaît à coté de + l'élément. Reportez-vous à <ulink url="#subpanels">menus du panneau</ulink> + pour plus d'information. La position du bouton peut être modifiée dans + les préférences générales. + </listitem> + </varlistentry> + </variablelist> + + <figure id="launcher-fig"> + <title>Élément lanceur</title> + <screenshot> + <mediaobject> + <imageobject> + <imagedata fileref="images/launcher-properties.png" + format="PNG"/> + </imageobject> + <!-- + <imageobject> + <imagedata fileref="images/launcher-properties.eps" + format="EPS"/> + </imageobject> + --> + <textobject> + <phrase>Montre les propriétés de l'élément lanceur.</phrase> + </textobject> + </mediaobject> + </screenshot> + </figure> + + + </sect2> + + <sect2 id="clock-item"> + <title>Horloge XFce</title> + + <para>Le style de l'horloge Xfce peut être modifié par certaines options. + Il existe trois types d'horloge possibles : analogique, numérique et + LED. Une option permet d'afficher ou non les secondes, et pour les modèles + numérique et LED vous pouvez choisir un affichage sur 24 ou 12 heures + (avec possibilité d'ajouter un mode AM/PM). L'horloge affiche en outre + la date en bulle d'aide. Cliquer sur l'horloge n'apporte rien. + </para> + + <figure id="clock-fig"> + <title>Élément horloge</title> + <screenshot> + <mediaobject> + <imageobject> + <imagedata fileref="images/clock-properties.png" + format="PNG"/> + </imageobject> + <!-- + <imageobject> + <imagedata fileref="images/clock-properties.eps" + format="EPS"/> + </imageobject> + --> + <textobject> + <phrase>Montre les propriétés de l'horloge.</phrase> + </textobject> + </mediaobject> + </screenshot> + </figure> + + + </sect2> + + <sect2 id="mailcheck-item"> + <title>Moniteur de courrier</title> + + <para>Le moniteur de courrier surveille la boîte aux lettres locale + de votre choix, à condition qu'elle soit au format mbox. + L'icône de courrier s'accorde avec votre thème d'icônes. Vous + pouvez choisir l'emplacement de votre boîte, la commande à lancer + lorsque vous cliquez sur le bouton et l'intervalle entre chaque + vérification. La commande a les mêmes options que celles des + éléments lanceurs voir <ulink url="#launcher-item" type="html"> + au-dessus</ulink>). + </para> + + <figure id="mailcheck-fig"> + <title>Moniteur de courrier</title> + <screenshot> + <mediaobject> + <imageobject> + <imagedata fileref="images/mailcheck-properties.png" + format="PNG"/> + </imageobject> + <!-- + <imageobject> + <imagedata fileref="images/mailcheck-properties.eps" + format="EPS"/> + </imageobject> + --> + <textobject> + <phrase>Montre les propriétés du moniteur de courrier.</phrase> + </textobject> + </mediaobject> + </screenshot> + </figure> + + + </sect2> + + <sect2 id="switcher-item"> + <title>Changeur de bureaux et changeur de bureaux graphique</title> + + <para>Le panneau fournit deux éléments pour interagir avec les + bureaux virtuels. Un changeur d'espace de travail de type CDE + qui montre des boutons avec le nom des bureaux, et un changeur + graphique qui affiche une vue miniature du bureau et vous permet + même de déplacer une fenêtre vers un autre espace par un + glisser-déposer. Le changeur graphique permet aussi de passer d'un + espace à l'autre avec la molette de la souris quand le curseur est maintenu au-dessus. + </para> + + <figure id="nooptions-fig"> + <title>Éléments sans option</title> + <screenshot> + <mediaobject> + <imageobject> + <imagedata fileref="images/nooptions-properties.png" + format="PNG"/> + </imageobject> + <!-- + <imageobject> + <imagedata fileref="images/nooptions-properties.eps" + format="EPS"/> + </imageobject> + --> + <textobject> + <phrase>Montre les propriétés d'un élément sans option. + </phrase> + </textobject> + </mediaobject> + </screenshot> + </figure> + + + </sect2> + + <sect2 id="systembuttons-item"> + <title>Boutons système</title> + + <para>Un élément "Boutons sytème" possède un ou deux boutons qui + peuvent réaliser des actions spécifiques. Le bouton + s'accorde avec votre thème d'icône. Il existe quatre boutons : + </para> + + <variablelist> + <varlistentry> + <term>Verrouiller</term> + <listitem>Lance <application>xfrun4</application> qui tente de + verrouiller l'écran soit avec xscreensaver, soit, en cas d'échec, + avec xlock. + </listitem> + </varlistentry> + <varlistentry> + <term>Quitter</term> + <listitem>Ceci permet de fermer le panneau, et permet aussi de + terminer votre session X (si vous utilisez <application>startxfce4 + </application> ou avez placé le lancement du panneau à la fin de + votre fichier de démarrage de X). + </listitem> + </varlistentry> + <varlistentry> + <term>Information</term> + <listitem>Le bouton information amène le dialogue <emphasis>À propos</emphasis> + de XFce 4. + </listitem> + </varlistentry> + <varlistentry> + <term>Paramètres</term> + <listitem>Le bouton Paramètres ouvre le gestionnaire de paramètres + de XFce, à partir duquel, vous accèdez aux réglages de tous les + composants, ainsi qu'à certains réglages du système, tels le comportement de la souris + et les paramètres de l'interface utilisateur. + </listitem> + </varlistentry> + </variablelist> + + <figure id="systembuttons-fig"> + <title>Élément boutons système</title> + <screenshot> + <mediaobject> + <imageobject> + <imagedata fileref="images/systembuttons-properties.png" + format="PNG"/> + </imageobject> + <!-- + <imageobject> + <imagedata fileref="images/systembuttons-properties.eps" + format="EPS"/> + </imageobject> + --> + <textobject> + <phrase>Montre les propriétés de l'élément boutons système. + </phrase> + </textobject> + </mediaobject> + </screenshot> + </figure> + + + </sect2> + + <sect2 id="separator-item"> + <title>Séparateur</title> + + <para>Cet élément est simplement une ligne de séparation sur le + panneau. Il n'a pas d'autre option que sa position. + </para> + + <para>Notez qu'il peut être difficile d'ouvrir son menu popup car vous avez + trés peu de surface sur laquelle cliquer. + </para> + + </sect2> + + <!-- extra space --> + <para> </para> + +</sect1> + +<sect1 id="subpanels"> + <title>Menus du panneau</title> + + <para>Les éléments lanceurs du panneau peuvent être associés avec un + menu, lequel peut être ouvert en cliquant sur le bouton fléché à coté. + La position de ce bouton est configurable dans les préférences globales. + Vous pouvez aussi ouvrir le menu en cliquant sur le bouton lanceur et + en prolongeant l'appui, le menu s'ouvre aprés un court délai. + </para> + + <para>Utilisez le choix 'Ajouter un lanceur' en première ligne du menu + du lanceur, ou déposez un exécutable à partir du gestionnaire de fichier + sur cette ligne, pour ajouter un nouveau choix au menu. Pour supprimer + un élément du menu, utilisez le bouton 'supprimer' dans la fenêtre + des propriétés de l'élément. + </para> + + <para>Une possibilité particulière des menus du panneau est qu'ils + peuvent être détachés du panneau et rester dans leur propre fenêtre. + Pour détacher un menu, cliquer sur la petite ligne en bas du menu + (voir la <ulink url="#default-panel-fig">copie d'écran</ulink> du + panneau par défaut). + </para> + + <para>Le dialogue des propriétés d'un élément du menu s'ouvre de suite + quand vous faites un clic droit (ou Maj + clic gauche) sur celui-ci. + Ce dialogue est trés semblable à celui de l'élément lanceur. + </para> + + <figure id="menuitem-fig"> + <title>Elément de menu</title> + <screenshot> + <mediaobject> + <imageobject> + <imagedata fileref="images/menuitem-properties.png" + format="PNG"/> + </imageobject> + <!-- + <imageobject> + <imagedata fileref="images/menuitem-properties.eps" + format="EPS"/> + </imageobject> + --> + <textobject> + <phrase>Montre les propriétés d'un élément du menu. + </phrase> + </textobject> + </mediaobject> + </screenshot> + </figure> + +</sect1> + + <!-- extra space --> + <para> </para> + +<sect1 id="panel-settings"> + <title>Préférences du panneau</title> + + <para>La fenêtre des propriétés du panneau XFce 4 peut être ouverte + à partir du gestionnaire de paramètres de Xfce 4, lequel peut être + ouvert par un lanceur du panneau ou par un clic droit sur les + poignées de déplacement du panneau. + </para> + + <figure id="panel-settings-fig"> + <title>Paramètres du panneau</title> + <screenshot> + <mediaobject> + <imageobject> + <imagedata fileref="images/panel-settings.png" + format="PNG"/> + </imageobject> + <!-- + <imageobject> + <imagedata fileref="images/panel-settings.eps" + format="EPS"/> + </imageobject> + --> + <textobject> + <phrase>Montre les propriétés des préférences du panneau. + </phrase> + </textobject> + </mediaobject> + </screenshot> + </figure> + + <sect2 id="panel-apearance"> + <title>Apparence</title> + + <variablelist> + <varlistentry> + <term>Taille</term> + <listitem> + <para>Il y a quatre tailles disponibles : tout petit, + petit, moyen, grand. La taille par défaut est petit. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term>Orientation</term> + <listitem> + <para>Une nouvelle fonctionnalité du panneau de XFce 4 est la possibilité + d'être placé dans le sens vertical, aussi bien que dans le sens + horizontal habituel. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term>Position des popup</term> + <listitem> + <para>Cette option modifie la position du bouton qui ouvre + un menu du panneau. Il peut être placé au-dessus, en-dessous, + à gauche ou à droite de l'élément lanceur. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term>Thème d'icônes</term> + <listitem> + <para>Une autre nouveauté de XFce 4 est la possibilité de choisir + un thème d'icônes. Les icônes pour les lanceurs et les autres + éléments du panneau suivent le thème d'icônes du panneau. + + </para> + </listitem> + </varlistentry> + </variablelist> + + </sect2> + + <sect2 id="panel-position"> + <title>Position</title> + + <variablelist> + <varlistentry> + <term>Niveau</term> + <listitem> + <para>Le niveau du panneau conditionne sa position par + rapport aux autres fenêtres. Le panneau peut être en + permanence au-dessus, caché par les autres fenêtres, + ou agir comme les autres fenêtres. Par défaut, le panneau + se situe au-dessus. + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term>Centrage</term> + <listitem> + <para>Il est trés facile de déplacer le panneau sur l'écran. Le + dialogue de paramétrage vous permet de centrer le panneau sur + l'un des cotés de l'écran. Notez que le panneau 'se colle' + aux coins de l'écran tout comme au milieu d'un coté de celui-ci + si vous l'amenez suffisamment prés d'une de ces positions. + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term>Comportement</term> + <listitem> + <para>Si vous cochez le choix 'Masquer automatiquement', le panneau + se transforme en une fine barre. Déplacer la souris au-dessus de + celle-ci découvre le panneau. Ceci fonctionne mieux quand le + panneau est sur un bord de l'écran (la cible est plus facile à + toucher). + </para> + </listitem> + </varlistentry> + </variablelist> + + </sect2> + +</sect1> + + <!-- extra space --> + <para> </para> + +<sect1 id="panel-copyright"> + <title>A propos de &app;</title> + + <para>&app; est écrit par Jasper Huijsmans + (<email>huysmans@users.sourceforge.net</email>). Vous trouverez + des informations + supplémentaires sur le <ulink url="http://www.xfce.org" + type="http">site XFce</ulink>.</para> + + <para>Pour soumettre un bug ou faire une suggestion sur l'application + ou sur le manuel, envoyez un e-mail à la liste de diffusion + <ulink url="http://www.moongroup.com/mailman/listinfo/xfce4-dev/" + type="http">xfce4-dev</ulink> — méthode recommandée + — ou utilisez le système de gestion des bugs sur + <ulink url="http://sourceforge.net/projects/xfce" + type="http">XFce SourceForge project site</ulink>. + Si vous avez des questions sur l'utilisation ou l'installation de ce + paquetage, vous pouvez les poser sur la liste de diffusion + <ulink url="http://www.moongroup.com/mailman/listinfo/xfce/" + type="http">xfce</ulink> + </para> + + <para>Ce programme est distribué selon les termes de la licence publique + générale GNU, publiée par la Free Software Foundation, soit la version 2 + de cette licence, soit (selon votre choix) toute version ultérieure. + </para> + + <para>Vous devez avoir reçu une copie de la licence publique + générale GNU avec ce programme. Sinon, écrivez à la Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. + </para> + +</sect1> + +</article> diff --git a/icons/Makefile.in b/icons/Makefile.in index d0203256..3a21b7f6 100644 --- a/icons/Makefile.in +++ b/icons/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.5 from Makefile.am. +# Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,7 +21,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -36,6 +35,21 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ +subdir = icons +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/X11.m4 \ + $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/depends.m4 \ + $(top_srcdir)/m4/i18n.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DATA = $(noinst_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ @@ -166,6 +180,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -174,25 +189,39 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ noinst_DATA = xfce4-panel-icon.h xfce4-panel.png - EXTRA_DIST = $(noinst_DATA) -subdir = icons -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = -DATA = $(noinst_DATA) - -DIST_COMMON = Makefile.am Makefile.in all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign icons/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --foreign icons/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: -rm -f *.lo @@ -209,10 +238,6 @@ TAGS: ctags: CTAGS CTAGS: -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -226,7 +251,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -244,7 +269,6 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile $(DATA) - installdirs: install: install-am install-exec: install-exec-am @@ -257,7 +281,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -265,7 +289,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -275,13 +299,15 @@ clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-libtool dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -297,7 +323,7 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -316,10 +342,10 @@ uninstall-am: uninstall-info-am .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-exec install-exec-am \ + install-info install-info-am install-man install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ uninstall-info-am diff --git a/icons/xfce4-panel-icon.h b/icons/xfce4-panel-icon.h index 32f9b9b1..f5fc670f 100644 --- a/icons/xfce4-panel-icon.h +++ b/icons/xfce4-panel-icon.h @@ -1,6 +1,13 @@ /* GdkPixbuf RGBA C-Source image dump */ +#ifdef __SUNPRO_C +#pragma align 4 (panel_icon_data) +#endif +#ifdef __GNUC__ +static const guint8 panel_icon_data[] __attribute__ ((__aligned__ (4))) = +#else static const guint8 panel_icon_data[] = +#endif { "" /* Pixbuf magic (0x47646b50) */ "GdkP" @@ -1,7 +1,8 @@ #!/bin/sh -# # install - install a program, script, or datafile -# + +scriptversion=2004-01-12.10 + # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the # following copyright and license. @@ -41,13 +42,11 @@ # from scratch. It can only install one file at a time, a restriction # shared with many OS's install programs. - # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it. doit="${DOITPROG-}" - # put in absolute paths if you don't have them in your path; or use env. vars. mvprog="${MVPROG-mv}" @@ -59,236 +58,253 @@ stripprog="${STRIPPROG-strip}" rmprog="${RMPROG-rm}" mkdirprog="${MKDIRPROG-mkdir}" -transformbasename="" -transform_arg="" +transformbasename= +transform_arg= instcmd="$mvprog" chmodcmd="$chmodprog 0755" -chowncmd="" -chgrpcmd="" -stripcmd="" +chowncmd= +chgrpcmd= +stripcmd= rmcmd="$rmprog -f" mvcmd="$mvprog" -src="" -dst="" -dir_arg="" - -while [ x"$1" != x ]; do - case $1 in - -c) instcmd=$cpprog - shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - -s) stripcmd=$stripprog - shift - continue;; - - -t=*) transformarg=`echo $1 | sed 's/-t=//'` - shift - continue;; - - -b=*) transformbasename=`echo $1 | sed 's/-b=//'` - shift - continue;; - - *) if [ x"$src" = x ] - then - src=$1 - else - # this colon is to work around a 386BSD /bin/sh bug - : - dst=$1 - fi - shift - continue;; - esac +src= +dst= +dir_arg= + +usage="Usage: $0 [OPTION]... SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 -d DIRECTORIES... + +In the first form, install SRCFILE to DSTFILE, removing SRCFILE by default. +In the second, create the directory path DIR. + +Options: +-b=TRANSFORMBASENAME +-c copy source (using $cpprog) instead of moving (using $mvprog). +-d create directories instead of installing files. +-g GROUP $chgrp installed files to GROUP. +-m MODE $chmod installed files to MODE. +-o USER $chown installed files to USER. +-s strip installed files (using $stripprog). +-t=TRANSFORM +--help display this help and exit. +--version display version info and exit. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG +" + +while test -n "$1"; do + case $1 in + -b=*) transformbasename=`echo $1 | sed 's/-b=//'` + shift + continue;; + + -c) instcmd=$cpprog + shift + continue;; + + -d) dir_arg=true + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + --help) echo "$usage"; exit 0;; + + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -s) stripcmd=$stripprog + shift + continue;; + + -t=*) transformarg=`echo $1 | sed 's/-t=//'` + shift + continue;; + + --version) echo "$0 $scriptversion"; exit 0;; + + *) # When -d is used, all remaining arguments are directories to create. + test -n "$dir_arg" && break + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dstarg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dstarg" + shift # fnord + fi + shift # arg + dstarg=$arg + done + break;; + esac done -if [ x"$src" = x ] -then - echo "$0: no input file specified" >&2 - exit 1 -else - : +if test -z "$1"; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 fi -if [ x"$dir_arg" != x ]; then - dst=$src - src="" - - if [ -d "$dst" ]; then - instcmd=: - chmodcmd="" - else - instcmd=$mkdirprog - fi -else - -# Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) contains '*'. - - if [ -f "$src" ] || [ -d "$src" ] - then - : - else - echo "$0: $src does not exist" >&2 - exit 1 - fi - - if [ x"$dst" = x ] - then - echo "$0: no destination specified" >&2 - exit 1 - else - : - fi - -# If destination is a directory, append the input filename; if your system -# does not like double slashes in filenames, you may need to add some logic - - if [ -d "$dst" ] - then - dst=$dst/`basename "$src"` - else - : - fi -fi - -## this sed command emulates the dirname command -dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - -# Make sure that the destination directory exists. -# this part is taken from Noah Friedman's mkinstalldirs script - -# Skip lots of stat calls in the usual case. -if [ ! -d "$dstdir" ]; then -defaultIFS=' - ' -IFS="${IFS-$defaultIFS}" - -oIFS=$IFS -# Some sh's can't handle IFS=/ for some reason. -IFS='%' -set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` -IFS=$oIFS - -pathcomp='' - -while [ $# -ne 0 ] ; do - pathcomp=$pathcomp$1 - shift - - if [ ! -d "$pathcomp" ] ; - then - $mkdirprog "$pathcomp" - else - : - fi +for src +do + # Protect names starting with `-'. + case $src in + -*) src=./$src ;; + esac + + if test -n "$dir_arg"; then + dst=$src + src= + + if test -d "$dst"; then + instcmd=: + chmodcmd= + else + instcmd=$mkdirprog + fi + else + # Waiting for this to be detected by the "$instcmd $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dstarg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + + dst=$dstarg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst ;; + esac - pathcomp=$pathcomp/ + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + dst=$dst/`basename "$src"` + fi + fi + + # This sed command emulates the dirname command. + dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` + + # Make sure that the destination directory exists. + + # Skip lots of stat calls in the usual case. + if test ! -d "$dstdir"; then + defaultIFS=' + ' + IFS="${IFS-$defaultIFS}" + + oIFS=$IFS + # Some sh's can't handle IFS=/ for some reason. + IFS='%' + set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + IFS=$oIFS + + pathcomp= + + while test $# -ne 0 ; do + pathcomp=$pathcomp$1 + shift + test -d "$pathcomp" || $mkdirprog "$pathcomp" + pathcomp=$pathcomp/ + done + fi + + if test -n "$dir_arg"; then + $doit $instcmd "$dst" \ + && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } + + else + # If we're going to rename the final executable, determine the name now. + if test -z "$transformarg"; then + dstfile=`basename "$dst"` + else + dstfile=`basename "$dst" $transformbasename \ + | sed $transformarg`$transformbasename + fi + + # don't allow the sed command to completely eliminate the filename. + test -z "$dstfile" && dstfile=`basename "$dst"` + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 + trap '(exit $?); exit' 1 2 13 15 + + # Move or copy the file name to the temp name + $doit $instcmd "$src" "$dsttmp" && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $instcmd $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && + + # Now remove or move aside any old file at destination location. We + # try this two ways since rm can't unlink itself on some systems and + # the destination file might be busy for other reasons. In this case, + # the final cleanup might fail but the new file should still install + # successfully. + { + if test -f "$dstdir/$dstfile"; then + $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ + || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + || { + echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + (exit 1); exit + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + fi || { (exit 1); exit; } done -fi - -if [ x"$dir_arg" != x ] -then - $doit $instcmd "$dst" && - - if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi -else - -# If we're going to rename the final executable, determine the name now. - - if [ x"$transformarg" = x ] - then - dstfile=`basename "$dst"` - else - dstfile=`basename "$dst" $transformbasename | - sed $transformarg`$transformbasename - fi - -# don't allow the sed command to completely eliminate the filename - - if [ x"$dstfile" = x ] - then - dstfile=`basename "$dst"` - else - : - fi - -# Make a couple of temp file names in the proper directory. - - dsttmp=$dstdir/#inst.$$# - rmtmp=$dstdir/#rm.$$# - -# Trap to clean up temp files at exit. - - trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 - trap '(exit $?); exit' 1 2 13 15 - -# Move or copy the file name to the temp name - - $doit $instcmd "$src" "$dsttmp" && - -# and set any options; do chmod last to preserve setuid bits - -# If any of these fail, we abort the whole thing. If we want to -# ignore errors from any of these, just make sure not to ignore -# errors from the above "$doit $instcmd $src $dsttmp" command. - - if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi && - -# Now remove or move aside any old file at destination location. We try this -# two ways since rm can't unlink itself on some systems and the destination -# file might be busy for other reasons. In this case, the final cleanup -# might fail but the new file should still install successfully. - -{ - if [ -f "$dstdir/$dstfile" ] - then - $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null || - $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null || - { - echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 - (exit 1); exit - } - else - : - fi -} && - -# Now rename the file to the real destination. - - $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" - -fi && # The final little trick to "correctly" pass the exit status to the exit trap. - { - (exit 0); exit + (exit 0); exit } + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: @@ -48,6 +48,9 @@ EOF exit 0 fi +# define SED for historic ltconfig's generated by Libtool 1.3 +test -z "$SED" && SED=sed + # The name of this program. progname=`$echo "$0" | ${SED} 's%^.*/%%'` modename="$progname" @@ -56,7 +59,7 @@ modename="$progname" PROGRAM=ltmain.sh PACKAGE=libtool VERSION=1.5 -TIMESTAMP=" (1.1220 2003/04/05 19:32:58)" +TIMESTAMP=" (1.1220.2.1 2003/04/14 22:48:00)" default_mode= help="Try \`$progname --help' for more information." @@ -2352,7 +2355,7 @@ EOF if test -n "$inst_prefix_dir"; then case "$libdir" in [\\/]*) - add_dir="-L$inst_prefix_dir$libdir $add_dir" + add_dir="$add_dir -L$inst_prefix_dir$libdir" ;; esac fi @@ -2424,7 +2427,7 @@ EOF if test -n "$inst_prefix_dir"; then case "$libdir" in [\\/]*) - add_dir="-L$inst_prefix_dir$libdir $add_dir" + add_dir="$add_dir -L$inst_prefix_dir$libdir" ;; esac fi @@ -2866,7 +2869,7 @@ EOF # Check that each of the things are valid numbers. case $current in - 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; + [0-9]*) ;; *) $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 @@ -2875,7 +2878,7 @@ EOF esac case $revision in - 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; + [0-9]*) ;; *) $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 @@ -2884,7 +2887,7 @@ EOF esac case $age in - 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; + [0-9]*) ;; *) $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 @@ -3783,18 +3786,7 @@ EOF if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then eval cmds=\"$archive_expsym_cmds\" else - save_deplibs="$deplibs" - for conv in $convenience; do - tmp_deplibs= - for test_deplib in $deplibs; do - if test "$test_deplib" != "$conv"; then - tmp_deplibs="$tmp_deplibs $test_deplib" - fi - done - deplibs="$tmp_deplibs" - done eval cmds=\"$archive_cmds\" - deplibs="$save_deplibs" fi # Append the command to remove the reloadable object files @@ -5580,7 +5572,13 @@ relink_command=\"$relink_command\"" if test "$finalize" = yes && test -z "$run"; then tmpdir="/tmp" test -n "$TMPDIR" && tmpdir="$TMPDIR" - tmpdir="$tmpdir/libtool-$$" + tmpdir_mktemp=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null` + if test "$?" = 0 ; then + tmpdir="$tmpdir_mktemp" + unset tmpdir_mktemp + else + tmpdir="$tmpdir/libtool-$$" + fi if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then : else $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc. + +scriptversion=2003-09-02.23 + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 +# Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -38,12 +42,23 @@ else configure_ac=configure.in fi +msg="missing on your system" + case "$1" in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; esac @@ -74,11 +89,13 @@ Supported PROGRAM values: lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch]" + yacc create \`y.tab.[ch]', if possible, from existing .[ch] + +Send bug reports to <bug-automake@gnu.org>." ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" ;; -*) @@ -94,7 +111,7 @@ Supported PROGRAM values: fi echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." @@ -108,7 +125,7 @@ WARNING: \`$1' is missing on your system. You should only need it if fi echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." @@ -122,7 +139,7 @@ WARNING: \`$1' is missing on your system. You should only need it if fi echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." @@ -146,7 +163,7 @@ WARNING: \`$1' is missing on your system. You should only need it if fi echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." @@ -162,10 +179,10 @@ WARNING: \`$1' is missing on your system. You should only need it if fi echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. - You can get \`$1Help2man' as part of \`Autoconf' from any GNU + You can get \`$1' as part of \`Autoconf' from any GNU archive site." file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` @@ -185,7 +202,7 @@ WARNING: \`$1' is needed, and you do not seem to have it handy on your bison|yacc) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." @@ -215,7 +232,7 @@ WARNING: \`$1' is missing on your system. You should only need it if lex|flex) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." @@ -243,7 +260,7 @@ WARNING: \`$1' is missing on your system. You should only need it if fi echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." @@ -268,7 +285,7 @@ WARNING: \`$1' is missing on your system. You should only need it if fi echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy \`make' (AIX, @@ -323,10 +340,10 @@ WARNING: I can't seem to be able to run \`tar' with the given arguments. *) echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: \`$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequirements for installing + it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case some other package would contain this missing \`$1' program." exit 1 @@ -334,3 +351,10 @@ WARNING: \`$1' is needed, and you do not seem to have it handy on your esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/mkinstalldirs b/mkinstalldirs index d2d5f21b..6504b744 100755 --- a/mkinstalldirs +++ b/mkinstalldirs @@ -1,20 +1,32 @@ #! /bin/sh # mkinstalldirs --- make directory hierarchy -# Author: Noah Friedman <friedman@prep.ai.mit.edu> + +scriptversion=2003-11-08.23 + +# Original author: Noah Friedman <friedman@prep.ai.mit.edu> # Created: 1993-05-16 -# Public domain +# Public domain. +# +# This file is maintained in Automake, please report +# bugs to <bug-automake@gnu.org> or send patches to +# <automake-patches@gnu.org>. errstatus=0 dirmode="" usage="\ -Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." +Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... + +Create each directory DIR (with mode MODE, if specified), including all +leading file name components. + +Report bugs to <bug-automake@gnu.org>." # process command line arguments while test $# -gt 0 ; do case $1 in -h | --help | --h*) # -h for help - echo "$usage" 1>&2 + echo "$usage" exit 0 ;; -m) # -m PERM arg @@ -23,6 +35,10 @@ while test $# -gt 0 ; do dirmode=$1 shift ;; + --version) + echo "$0 $scriptversion" + exit 0 + ;; --) # stop option processing shift break @@ -55,12 +71,25 @@ case $dirmode in if mkdir -p -- . 2>/dev/null; then echo "mkdir -p -- $*" exec mkdir -p -- "$@" + else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + test -d ./-p && rmdir ./-p + test -d ./-- && rmdir ./-- fi ;; *) if mkdir -m "$dirmode" -p -- . 2>/dev/null; then echo "mkdir -m $dirmode -p -- $*" exec mkdir -m "$dirmode" -p -- "$@" + else + # Clean up after NextStep and OpenStep mkdir. + for d in ./-m ./-p ./-- "./$dirmode"; + do + test -d $d && rmdir $d + done fi ;; esac @@ -84,17 +113,17 @@ do mkdir "$pathcomp" || lasterr=$? if test ! -d "$pathcomp"; then - errstatus=$lasterr + errstatus=$lasterr else - if test ! -z "$dirmode"; then + if test ! -z "$dirmode"; then echo "chmod $dirmode $pathcomp" - lasterr="" - chmod "$dirmode" "$pathcomp" || lasterr=$? + lasterr="" + chmod "$dirmode" "$pathcomp" || lasterr=$? - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi + if test ! -z "$lasterr"; then + errstatus=$lasterr + fi + fi fi fi @@ -107,5 +136,8 @@ exit $errstatus # Local Variables: # mode: shell-script # sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" # End: -# mkinstalldirs ends here diff --git a/panel/Makefile.in b/panel/Makefile.in index 601d7299..d55311b1 100644 --- a/panel/Makefile.in +++ b/panel/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.5 from Makefile.am. +# Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,6 +14,10 @@ @SET_MAKE@ + + +SOURCES = $(xfce4_panel_SOURCES) + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -21,7 +25,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -36,6 +39,64 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ +bin_PROGRAMS = xfce4-panel$(EXEEXT) +subdir = panel +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/xfce4-panel-1.0.pc.in $(xfce4_panelinclude_HEADERS) +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/X11.m4 \ + $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/depends.m4 \ + $(top_srcdir)/m4/i18n.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = xfce4-panel-1.0.pc +am__installdirs = $(DESTDIR)$(bindir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(xfce4_panelincludedir) +binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +PROGRAMS = $(bin_PROGRAMS) +am_xfce4_panel_OBJECTS = xfce4_panel-controls.$(OBJEXT) \ + xfce4_panel-controls_dialog.$(OBJEXT) \ + xfce4_panel-groups.$(OBJEXT) xfce4_panel-icons.$(OBJEXT) \ + xfce4_panel-item.$(OBJEXT) xfce4_panel-item_dialog.$(OBJEXT) \ + xfce4_panel-main.$(OBJEXT) xfce4_panel-mcs_client.$(OBJEXT) \ + xfce4_panel-panel.$(OBJEXT) xfce4_panel-popup.$(OBJEXT) \ + xfce4_panel-settings.$(OBJEXT) \ + xfce4_panel-xfce_support.$(OBJEXT) +xfce4_panel_OBJECTS = $(am_xfce4_panel_OBJECTS) +xfce4_panel_DEPENDENCIES = +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/xfce4_panel-controls.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/xfce4_panel-controls_dialog.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/xfce4_panel-groups.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/xfce4_panel-icons.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/xfce4_panel-item.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/xfce4_panel-item_dialog.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/xfce4_panel-main.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/xfce4_panel-mcs_client.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/xfce4_panel-panel.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/xfce4_panel-popup.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/xfce4_panel-settings.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/xfce4_panel-xfce_support.Po +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(xfce4_panel_SOURCES) +DIST_SOURCES = $(xfce4_panel_SOURCES) +pkgconfigDATA_INSTALL = $(INSTALL_DATA) +DATA = $(pkgconfig_DATA) +xfce4_panelincludeHEADERS_INSTALL = $(INSTALL_HEADER) +HEADERS = $(xfce4_panelinclude_HEADERS) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ @@ -166,6 +227,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -173,8 +235,6 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -bin_PROGRAMS = xfce4-panel - xfce4_panel_SOURCES = \ controls.c \ controls.h \ @@ -204,9 +264,7 @@ xfce4_panel_SOURCES = \ xfce_support.c \ xfce_support.h - xfce4_panelincludedir = $(includedir)/xfce4/panel - xfce4_panelinclude_HEADERS = \ controls.h \ global.h \ @@ -219,7 +277,6 @@ xfce4_panelinclude_HEADERS = \ xfce_support.h \ xfce.h - xfce4_panel_CFLAGS = \ -I$(top_srcdir) \ @LIBSTARTUP_NOTIFICATION_CFLAGS@ \ @@ -232,11 +289,9 @@ xfce4_panel_CFLAGS = \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DLOCALEDIR=\"$(localedir)\" - xfce4_panel_LDFLAGS = \ -export-dynamic - xfce4_panel_LDADD = \ @LIBSTARTUP_NOTIFICATION_LIBS@ \ @LIBX11_LIBS@ \ @@ -244,74 +299,46 @@ xfce4_panel_LDADD = \ @LIBXFCE4MCS_CLIENT_LIBS@ \ @LIBXML_LIBS@ - pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xfce4-panel-1.0.pc -subdir = panel -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = xfce4-panel-1.0.pc -bin_PROGRAMS = xfce4-panel$(EXEEXT) -PROGRAMS = $(bin_PROGRAMS) - -am_xfce4_panel_OBJECTS = xfce4_panel-controls.$(OBJEXT) \ - xfce4_panel-controls_dialog.$(OBJEXT) \ - xfce4_panel-groups.$(OBJEXT) xfce4_panel-icons.$(OBJEXT) \ - xfce4_panel-item.$(OBJEXT) xfce4_panel-item_dialog.$(OBJEXT) \ - xfce4_panel-main.$(OBJEXT) xfce4_panel-mcs_client.$(OBJEXT) \ - xfce4_panel-panel.$(OBJEXT) xfce4_panel-popup.$(OBJEXT) \ - xfce4_panel-settings.$(OBJEXT) \ - xfce4_panel-xfce_support.$(OBJEXT) -xfce4_panel_OBJECTS = $(am_xfce4_panel_OBJECTS) -xfce4_panel_DEPENDENCIES = - -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/xfce4_panel-controls.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xfce4_panel-controls_dialog.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xfce4_panel-groups.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xfce4_panel-icons.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xfce4_panel-item.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xfce4_panel-item_dialog.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xfce4_panel-main.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xfce4_panel-mcs_client.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xfce4_panel-panel.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xfce4_panel-popup.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xfce4_panel-settings.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xfce4_panel-xfce_support.Po -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(xfce4_panel_SOURCES) -DATA = $(pkgconfig_DATA) - -HEADERS = $(xfce4_panelinclude_HEADERS) - -DIST_COMMON = $(xfce4_panelinclude_HEADERS) Makefile.am Makefile.in \ - xfce4-panel-1.0.pc.in -SOURCES = $(xfce4_panel_SOURCES) - all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign panel/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --foreign panel/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -xfce4-panel-1.0.pc: $(top_builddir)/config.status xfce4-panel-1.0.pc.in +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +xfce4-panel-1.0.pc: $(top_builddir)/config.status $(srcdir)/xfce4-panel-1.0.pc.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) + $(mkdir_p) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -342,7 +369,7 @@ xfce4-panel$(EXEEXT): $(xfce4_panel_OBJECTS) $(xfce4_panel_DEPENDENCIES) $(LINK) $(xfce4_panel_LDFLAGS) $(xfce4_panel_OBJECTS) $(xfce4_panel_LDADD) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core + -rm -f *.$(OBJEXT) distclean-compile: -rm -f *.tab.c @@ -360,433 +387,313 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_panel-settings.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_panel-xfce_support.Po@am__quote@ -distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< xfce4_panel-controls.o: controls.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-controls.o -MD -MP -MF "$(DEPDIR)/xfce4_panel-controls.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-controls.o `test -f 'controls.c' || echo '$(srcdir)/'`controls.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-controls.Tpo" "$(DEPDIR)/xfce4_panel-controls.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-controls.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-controls.o -MD -MP -MF "$(DEPDIR)/xfce4_panel-controls.Tpo" -c -o xfce4_panel-controls.o `test -f 'controls.c' || echo '$(srcdir)/'`controls.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-controls.Tpo" "$(DEPDIR)/xfce4_panel-controls.Po"; else rm -f "$(DEPDIR)/xfce4_panel-controls.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='controls.c' object='xfce4_panel-controls.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-controls.Po' tmpdepfile='$(DEPDIR)/xfce4_panel-controls.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-controls.o `test -f 'controls.c' || echo '$(srcdir)/'`controls.c xfce4_panel-controls.obj: controls.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-controls.obj -MD -MP -MF "$(DEPDIR)/xfce4_panel-controls.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-controls.obj `if test -f 'controls.c'; then $(CYGPATH_W) 'controls.c'; else $(CYGPATH_W) '$(srcdir)/controls.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-controls.Tpo" "$(DEPDIR)/xfce4_panel-controls.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-controls.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-controls.obj -MD -MP -MF "$(DEPDIR)/xfce4_panel-controls.Tpo" -c -o xfce4_panel-controls.obj `if test -f 'controls.c'; then $(CYGPATH_W) 'controls.c'; else $(CYGPATH_W) '$(srcdir)/controls.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-controls.Tpo" "$(DEPDIR)/xfce4_panel-controls.Po"; else rm -f "$(DEPDIR)/xfce4_panel-controls.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='controls.c' object='xfce4_panel-controls.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-controls.Po' tmpdepfile='$(DEPDIR)/xfce4_panel-controls.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-controls.obj `if test -f 'controls.c'; then $(CYGPATH_W) 'controls.c'; else $(CYGPATH_W) '$(srcdir)/controls.c'; fi` xfce4_panel-controls.lo: controls.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-controls.lo -MD -MP -MF "$(DEPDIR)/xfce4_panel-controls.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-controls.lo `test -f 'controls.c' || echo '$(srcdir)/'`controls.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-controls.Tpo" "$(DEPDIR)/xfce4_panel-controls.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-controls.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-controls.lo -MD -MP -MF "$(DEPDIR)/xfce4_panel-controls.Tpo" -c -o xfce4_panel-controls.lo `test -f 'controls.c' || echo '$(srcdir)/'`controls.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-controls.Tpo" "$(DEPDIR)/xfce4_panel-controls.Plo"; else rm -f "$(DEPDIR)/xfce4_panel-controls.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='controls.c' object='xfce4_panel-controls.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-controls.Plo' tmpdepfile='$(DEPDIR)/xfce4_panel-controls.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-controls.lo `test -f 'controls.c' || echo '$(srcdir)/'`controls.c xfce4_panel-controls_dialog.o: controls_dialog.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-controls_dialog.o -MD -MP -MF "$(DEPDIR)/xfce4_panel-controls_dialog.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-controls_dialog.o `test -f 'controls_dialog.c' || echo '$(srcdir)/'`controls_dialog.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-controls_dialog.Tpo" "$(DEPDIR)/xfce4_panel-controls_dialog.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-controls_dialog.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-controls_dialog.o -MD -MP -MF "$(DEPDIR)/xfce4_panel-controls_dialog.Tpo" -c -o xfce4_panel-controls_dialog.o `test -f 'controls_dialog.c' || echo '$(srcdir)/'`controls_dialog.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-controls_dialog.Tpo" "$(DEPDIR)/xfce4_panel-controls_dialog.Po"; else rm -f "$(DEPDIR)/xfce4_panel-controls_dialog.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='controls_dialog.c' object='xfce4_panel-controls_dialog.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-controls_dialog.Po' tmpdepfile='$(DEPDIR)/xfce4_panel-controls_dialog.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-controls_dialog.o `test -f 'controls_dialog.c' || echo '$(srcdir)/'`controls_dialog.c xfce4_panel-controls_dialog.obj: controls_dialog.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-controls_dialog.obj -MD -MP -MF "$(DEPDIR)/xfce4_panel-controls_dialog.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-controls_dialog.obj `if test -f 'controls_dialog.c'; then $(CYGPATH_W) 'controls_dialog.c'; else $(CYGPATH_W) '$(srcdir)/controls_dialog.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-controls_dialog.Tpo" "$(DEPDIR)/xfce4_panel-controls_dialog.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-controls_dialog.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-controls_dialog.obj -MD -MP -MF "$(DEPDIR)/xfce4_panel-controls_dialog.Tpo" -c -o xfce4_panel-controls_dialog.obj `if test -f 'controls_dialog.c'; then $(CYGPATH_W) 'controls_dialog.c'; else $(CYGPATH_W) '$(srcdir)/controls_dialog.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-controls_dialog.Tpo" "$(DEPDIR)/xfce4_panel-controls_dialog.Po"; else rm -f "$(DEPDIR)/xfce4_panel-controls_dialog.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='controls_dialog.c' object='xfce4_panel-controls_dialog.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-controls_dialog.Po' tmpdepfile='$(DEPDIR)/xfce4_panel-controls_dialog.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-controls_dialog.obj `if test -f 'controls_dialog.c'; then $(CYGPATH_W) 'controls_dialog.c'; else $(CYGPATH_W) '$(srcdir)/controls_dialog.c'; fi` xfce4_panel-controls_dialog.lo: controls_dialog.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-controls_dialog.lo -MD -MP -MF "$(DEPDIR)/xfce4_panel-controls_dialog.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-controls_dialog.lo `test -f 'controls_dialog.c' || echo '$(srcdir)/'`controls_dialog.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-controls_dialog.Tpo" "$(DEPDIR)/xfce4_panel-controls_dialog.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-controls_dialog.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-controls_dialog.lo -MD -MP -MF "$(DEPDIR)/xfce4_panel-controls_dialog.Tpo" -c -o xfce4_panel-controls_dialog.lo `test -f 'controls_dialog.c' || echo '$(srcdir)/'`controls_dialog.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-controls_dialog.Tpo" "$(DEPDIR)/xfce4_panel-controls_dialog.Plo"; else rm -f "$(DEPDIR)/xfce4_panel-controls_dialog.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='controls_dialog.c' object='xfce4_panel-controls_dialog.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-controls_dialog.Plo' tmpdepfile='$(DEPDIR)/xfce4_panel-controls_dialog.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-controls_dialog.lo `test -f 'controls_dialog.c' || echo '$(srcdir)/'`controls_dialog.c xfce4_panel-groups.o: groups.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-groups.o -MD -MP -MF "$(DEPDIR)/xfce4_panel-groups.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-groups.o `test -f 'groups.c' || echo '$(srcdir)/'`groups.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-groups.Tpo" "$(DEPDIR)/xfce4_panel-groups.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-groups.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-groups.o -MD -MP -MF "$(DEPDIR)/xfce4_panel-groups.Tpo" -c -o xfce4_panel-groups.o `test -f 'groups.c' || echo '$(srcdir)/'`groups.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-groups.Tpo" "$(DEPDIR)/xfce4_panel-groups.Po"; else rm -f "$(DEPDIR)/xfce4_panel-groups.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='groups.c' object='xfce4_panel-groups.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-groups.Po' tmpdepfile='$(DEPDIR)/xfce4_panel-groups.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-groups.o `test -f 'groups.c' || echo '$(srcdir)/'`groups.c xfce4_panel-groups.obj: groups.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-groups.obj -MD -MP -MF "$(DEPDIR)/xfce4_panel-groups.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-groups.obj `if test -f 'groups.c'; then $(CYGPATH_W) 'groups.c'; else $(CYGPATH_W) '$(srcdir)/groups.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-groups.Tpo" "$(DEPDIR)/xfce4_panel-groups.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-groups.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-groups.obj -MD -MP -MF "$(DEPDIR)/xfce4_panel-groups.Tpo" -c -o xfce4_panel-groups.obj `if test -f 'groups.c'; then $(CYGPATH_W) 'groups.c'; else $(CYGPATH_W) '$(srcdir)/groups.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-groups.Tpo" "$(DEPDIR)/xfce4_panel-groups.Po"; else rm -f "$(DEPDIR)/xfce4_panel-groups.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='groups.c' object='xfce4_panel-groups.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-groups.Po' tmpdepfile='$(DEPDIR)/xfce4_panel-groups.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-groups.obj `if test -f 'groups.c'; then $(CYGPATH_W) 'groups.c'; else $(CYGPATH_W) '$(srcdir)/groups.c'; fi` xfce4_panel-groups.lo: groups.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-groups.lo -MD -MP -MF "$(DEPDIR)/xfce4_panel-groups.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-groups.lo `test -f 'groups.c' || echo '$(srcdir)/'`groups.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-groups.Tpo" "$(DEPDIR)/xfce4_panel-groups.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-groups.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-groups.lo -MD -MP -MF "$(DEPDIR)/xfce4_panel-groups.Tpo" -c -o xfce4_panel-groups.lo `test -f 'groups.c' || echo '$(srcdir)/'`groups.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-groups.Tpo" "$(DEPDIR)/xfce4_panel-groups.Plo"; else rm -f "$(DEPDIR)/xfce4_panel-groups.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='groups.c' object='xfce4_panel-groups.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-groups.Plo' tmpdepfile='$(DEPDIR)/xfce4_panel-groups.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-groups.lo `test -f 'groups.c' || echo '$(srcdir)/'`groups.c xfce4_panel-icons.o: icons.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-icons.o -MD -MP -MF "$(DEPDIR)/xfce4_panel-icons.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-icons.o `test -f 'icons.c' || echo '$(srcdir)/'`icons.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-icons.Tpo" "$(DEPDIR)/xfce4_panel-icons.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-icons.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-icons.o -MD -MP -MF "$(DEPDIR)/xfce4_panel-icons.Tpo" -c -o xfce4_panel-icons.o `test -f 'icons.c' || echo '$(srcdir)/'`icons.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-icons.Tpo" "$(DEPDIR)/xfce4_panel-icons.Po"; else rm -f "$(DEPDIR)/xfce4_panel-icons.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='icons.c' object='xfce4_panel-icons.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-icons.Po' tmpdepfile='$(DEPDIR)/xfce4_panel-icons.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-icons.o `test -f 'icons.c' || echo '$(srcdir)/'`icons.c xfce4_panel-icons.obj: icons.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-icons.obj -MD -MP -MF "$(DEPDIR)/xfce4_panel-icons.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-icons.obj `if test -f 'icons.c'; then $(CYGPATH_W) 'icons.c'; else $(CYGPATH_W) '$(srcdir)/icons.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-icons.Tpo" "$(DEPDIR)/xfce4_panel-icons.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-icons.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-icons.obj -MD -MP -MF "$(DEPDIR)/xfce4_panel-icons.Tpo" -c -o xfce4_panel-icons.obj `if test -f 'icons.c'; then $(CYGPATH_W) 'icons.c'; else $(CYGPATH_W) '$(srcdir)/icons.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-icons.Tpo" "$(DEPDIR)/xfce4_panel-icons.Po"; else rm -f "$(DEPDIR)/xfce4_panel-icons.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='icons.c' object='xfce4_panel-icons.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-icons.Po' tmpdepfile='$(DEPDIR)/xfce4_panel-icons.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-icons.obj `if test -f 'icons.c'; then $(CYGPATH_W) 'icons.c'; else $(CYGPATH_W) '$(srcdir)/icons.c'; fi` xfce4_panel-icons.lo: icons.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-icons.lo -MD -MP -MF "$(DEPDIR)/xfce4_panel-icons.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-icons.lo `test -f 'icons.c' || echo '$(srcdir)/'`icons.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-icons.Tpo" "$(DEPDIR)/xfce4_panel-icons.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-icons.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-icons.lo -MD -MP -MF "$(DEPDIR)/xfce4_panel-icons.Tpo" -c -o xfce4_panel-icons.lo `test -f 'icons.c' || echo '$(srcdir)/'`icons.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-icons.Tpo" "$(DEPDIR)/xfce4_panel-icons.Plo"; else rm -f "$(DEPDIR)/xfce4_panel-icons.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='icons.c' object='xfce4_panel-icons.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-icons.Plo' tmpdepfile='$(DEPDIR)/xfce4_panel-icons.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-icons.lo `test -f 'icons.c' || echo '$(srcdir)/'`icons.c xfce4_panel-item.o: item.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-item.o -MD -MP -MF "$(DEPDIR)/xfce4_panel-item.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-item.o `test -f 'item.c' || echo '$(srcdir)/'`item.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-item.Tpo" "$(DEPDIR)/xfce4_panel-item.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-item.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-item.o -MD -MP -MF "$(DEPDIR)/xfce4_panel-item.Tpo" -c -o xfce4_panel-item.o `test -f 'item.c' || echo '$(srcdir)/'`item.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-item.Tpo" "$(DEPDIR)/xfce4_panel-item.Po"; else rm -f "$(DEPDIR)/xfce4_panel-item.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='item.c' object='xfce4_panel-item.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-item.Po' tmpdepfile='$(DEPDIR)/xfce4_panel-item.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-item.o `test -f 'item.c' || echo '$(srcdir)/'`item.c xfce4_panel-item.obj: item.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-item.obj -MD -MP -MF "$(DEPDIR)/xfce4_panel-item.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-item.obj `if test -f 'item.c'; then $(CYGPATH_W) 'item.c'; else $(CYGPATH_W) '$(srcdir)/item.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-item.Tpo" "$(DEPDIR)/xfce4_panel-item.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-item.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-item.obj -MD -MP -MF "$(DEPDIR)/xfce4_panel-item.Tpo" -c -o xfce4_panel-item.obj `if test -f 'item.c'; then $(CYGPATH_W) 'item.c'; else $(CYGPATH_W) '$(srcdir)/item.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-item.Tpo" "$(DEPDIR)/xfce4_panel-item.Po"; else rm -f "$(DEPDIR)/xfce4_panel-item.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='item.c' object='xfce4_panel-item.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-item.Po' tmpdepfile='$(DEPDIR)/xfce4_panel-item.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-item.obj `if test -f 'item.c'; then $(CYGPATH_W) 'item.c'; else $(CYGPATH_W) '$(srcdir)/item.c'; fi` xfce4_panel-item.lo: item.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-item.lo -MD -MP -MF "$(DEPDIR)/xfce4_panel-item.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-item.lo `test -f 'item.c' || echo '$(srcdir)/'`item.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-item.Tpo" "$(DEPDIR)/xfce4_panel-item.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-item.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-item.lo -MD -MP -MF "$(DEPDIR)/xfce4_panel-item.Tpo" -c -o xfce4_panel-item.lo `test -f 'item.c' || echo '$(srcdir)/'`item.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-item.Tpo" "$(DEPDIR)/xfce4_panel-item.Plo"; else rm -f "$(DEPDIR)/xfce4_panel-item.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='item.c' object='xfce4_panel-item.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-item.Plo' tmpdepfile='$(DEPDIR)/xfce4_panel-item.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-item.lo `test -f 'item.c' || echo '$(srcdir)/'`item.c xfce4_panel-item_dialog.o: item_dialog.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-item_dialog.o -MD -MP -MF "$(DEPDIR)/xfce4_panel-item_dialog.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-item_dialog.o `test -f 'item_dialog.c' || echo '$(srcdir)/'`item_dialog.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-item_dialog.Tpo" "$(DEPDIR)/xfce4_panel-item_dialog.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-item_dialog.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-item_dialog.o -MD -MP -MF "$(DEPDIR)/xfce4_panel-item_dialog.Tpo" -c -o xfce4_panel-item_dialog.o `test -f 'item_dialog.c' || echo '$(srcdir)/'`item_dialog.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-item_dialog.Tpo" "$(DEPDIR)/xfce4_panel-item_dialog.Po"; else rm -f "$(DEPDIR)/xfce4_panel-item_dialog.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='item_dialog.c' object='xfce4_panel-item_dialog.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-item_dialog.Po' tmpdepfile='$(DEPDIR)/xfce4_panel-item_dialog.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-item_dialog.o `test -f 'item_dialog.c' || echo '$(srcdir)/'`item_dialog.c xfce4_panel-item_dialog.obj: item_dialog.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-item_dialog.obj -MD -MP -MF "$(DEPDIR)/xfce4_panel-item_dialog.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-item_dialog.obj `if test -f 'item_dialog.c'; then $(CYGPATH_W) 'item_dialog.c'; else $(CYGPATH_W) '$(srcdir)/item_dialog.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-item_dialog.Tpo" "$(DEPDIR)/xfce4_panel-item_dialog.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-item_dialog.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-item_dialog.obj -MD -MP -MF "$(DEPDIR)/xfce4_panel-item_dialog.Tpo" -c -o xfce4_panel-item_dialog.obj `if test -f 'item_dialog.c'; then $(CYGPATH_W) 'item_dialog.c'; else $(CYGPATH_W) '$(srcdir)/item_dialog.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-item_dialog.Tpo" "$(DEPDIR)/xfce4_panel-item_dialog.Po"; else rm -f "$(DEPDIR)/xfce4_panel-item_dialog.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='item_dialog.c' object='xfce4_panel-item_dialog.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-item_dialog.Po' tmpdepfile='$(DEPDIR)/xfce4_panel-item_dialog.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-item_dialog.obj `if test -f 'item_dialog.c'; then $(CYGPATH_W) 'item_dialog.c'; else $(CYGPATH_W) '$(srcdir)/item_dialog.c'; fi` xfce4_panel-item_dialog.lo: item_dialog.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-item_dialog.lo -MD -MP -MF "$(DEPDIR)/xfce4_panel-item_dialog.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-item_dialog.lo `test -f 'item_dialog.c' || echo '$(srcdir)/'`item_dialog.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-item_dialog.Tpo" "$(DEPDIR)/xfce4_panel-item_dialog.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-item_dialog.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-item_dialog.lo -MD -MP -MF "$(DEPDIR)/xfce4_panel-item_dialog.Tpo" -c -o xfce4_panel-item_dialog.lo `test -f 'item_dialog.c' || echo '$(srcdir)/'`item_dialog.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-item_dialog.Tpo" "$(DEPDIR)/xfce4_panel-item_dialog.Plo"; else rm -f "$(DEPDIR)/xfce4_panel-item_dialog.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='item_dialog.c' object='xfce4_panel-item_dialog.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-item_dialog.Plo' tmpdepfile='$(DEPDIR)/xfce4_panel-item_dialog.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-item_dialog.lo `test -f 'item_dialog.c' || echo '$(srcdir)/'`item_dialog.c xfce4_panel-main.o: main.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-main.o -MD -MP -MF "$(DEPDIR)/xfce4_panel-main.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-main.Tpo" "$(DEPDIR)/xfce4_panel-main.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-main.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-main.o -MD -MP -MF "$(DEPDIR)/xfce4_panel-main.Tpo" -c -o xfce4_panel-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-main.Tpo" "$(DEPDIR)/xfce4_panel-main.Po"; else rm -f "$(DEPDIR)/xfce4_panel-main.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='main.c' object='xfce4_panel-main.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-main.Po' tmpdepfile='$(DEPDIR)/xfce4_panel-main.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c xfce4_panel-main.obj: main.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-main.obj -MD -MP -MF "$(DEPDIR)/xfce4_panel-main.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-main.Tpo" "$(DEPDIR)/xfce4_panel-main.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-main.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-main.obj -MD -MP -MF "$(DEPDIR)/xfce4_panel-main.Tpo" -c -o xfce4_panel-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-main.Tpo" "$(DEPDIR)/xfce4_panel-main.Po"; else rm -f "$(DEPDIR)/xfce4_panel-main.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='main.c' object='xfce4_panel-main.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-main.Po' tmpdepfile='$(DEPDIR)/xfce4_panel-main.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` xfce4_panel-main.lo: main.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-main.lo -MD -MP -MF "$(DEPDIR)/xfce4_panel-main.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-main.lo `test -f 'main.c' || echo '$(srcdir)/'`main.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-main.Tpo" "$(DEPDIR)/xfce4_panel-main.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-main.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-main.lo -MD -MP -MF "$(DEPDIR)/xfce4_panel-main.Tpo" -c -o xfce4_panel-main.lo `test -f 'main.c' || echo '$(srcdir)/'`main.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-main.Tpo" "$(DEPDIR)/xfce4_panel-main.Plo"; else rm -f "$(DEPDIR)/xfce4_panel-main.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='main.c' object='xfce4_panel-main.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-main.Plo' tmpdepfile='$(DEPDIR)/xfce4_panel-main.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-main.lo `test -f 'main.c' || echo '$(srcdir)/'`main.c xfce4_panel-mcs_client.o: mcs_client.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-mcs_client.o -MD -MP -MF "$(DEPDIR)/xfce4_panel-mcs_client.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-mcs_client.o `test -f 'mcs_client.c' || echo '$(srcdir)/'`mcs_client.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-mcs_client.Tpo" "$(DEPDIR)/xfce4_panel-mcs_client.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-mcs_client.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-mcs_client.o -MD -MP -MF "$(DEPDIR)/xfce4_panel-mcs_client.Tpo" -c -o xfce4_panel-mcs_client.o `test -f 'mcs_client.c' || echo '$(srcdir)/'`mcs_client.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-mcs_client.Tpo" "$(DEPDIR)/xfce4_panel-mcs_client.Po"; else rm -f "$(DEPDIR)/xfce4_panel-mcs_client.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mcs_client.c' object='xfce4_panel-mcs_client.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-mcs_client.Po' tmpdepfile='$(DEPDIR)/xfce4_panel-mcs_client.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-mcs_client.o `test -f 'mcs_client.c' || echo '$(srcdir)/'`mcs_client.c xfce4_panel-mcs_client.obj: mcs_client.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-mcs_client.obj -MD -MP -MF "$(DEPDIR)/xfce4_panel-mcs_client.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-mcs_client.obj `if test -f 'mcs_client.c'; then $(CYGPATH_W) 'mcs_client.c'; else $(CYGPATH_W) '$(srcdir)/mcs_client.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-mcs_client.Tpo" "$(DEPDIR)/xfce4_panel-mcs_client.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-mcs_client.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-mcs_client.obj -MD -MP -MF "$(DEPDIR)/xfce4_panel-mcs_client.Tpo" -c -o xfce4_panel-mcs_client.obj `if test -f 'mcs_client.c'; then $(CYGPATH_W) 'mcs_client.c'; else $(CYGPATH_W) '$(srcdir)/mcs_client.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-mcs_client.Tpo" "$(DEPDIR)/xfce4_panel-mcs_client.Po"; else rm -f "$(DEPDIR)/xfce4_panel-mcs_client.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mcs_client.c' object='xfce4_panel-mcs_client.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-mcs_client.Po' tmpdepfile='$(DEPDIR)/xfce4_panel-mcs_client.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-mcs_client.obj `if test -f 'mcs_client.c'; then $(CYGPATH_W) 'mcs_client.c'; else $(CYGPATH_W) '$(srcdir)/mcs_client.c'; fi` xfce4_panel-mcs_client.lo: mcs_client.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-mcs_client.lo -MD -MP -MF "$(DEPDIR)/xfce4_panel-mcs_client.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-mcs_client.lo `test -f 'mcs_client.c' || echo '$(srcdir)/'`mcs_client.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-mcs_client.Tpo" "$(DEPDIR)/xfce4_panel-mcs_client.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-mcs_client.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-mcs_client.lo -MD -MP -MF "$(DEPDIR)/xfce4_panel-mcs_client.Tpo" -c -o xfce4_panel-mcs_client.lo `test -f 'mcs_client.c' || echo '$(srcdir)/'`mcs_client.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-mcs_client.Tpo" "$(DEPDIR)/xfce4_panel-mcs_client.Plo"; else rm -f "$(DEPDIR)/xfce4_panel-mcs_client.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mcs_client.c' object='xfce4_panel-mcs_client.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-mcs_client.Plo' tmpdepfile='$(DEPDIR)/xfce4_panel-mcs_client.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-mcs_client.lo `test -f 'mcs_client.c' || echo '$(srcdir)/'`mcs_client.c xfce4_panel-panel.o: panel.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-panel.o -MD -MP -MF "$(DEPDIR)/xfce4_panel-panel.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-panel.o `test -f 'panel.c' || echo '$(srcdir)/'`panel.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-panel.Tpo" "$(DEPDIR)/xfce4_panel-panel.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-panel.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-panel.o -MD -MP -MF "$(DEPDIR)/xfce4_panel-panel.Tpo" -c -o xfce4_panel-panel.o `test -f 'panel.c' || echo '$(srcdir)/'`panel.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-panel.Tpo" "$(DEPDIR)/xfce4_panel-panel.Po"; else rm -f "$(DEPDIR)/xfce4_panel-panel.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='panel.c' object='xfce4_panel-panel.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-panel.Po' tmpdepfile='$(DEPDIR)/xfce4_panel-panel.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-panel.o `test -f 'panel.c' || echo '$(srcdir)/'`panel.c xfce4_panel-panel.obj: panel.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-panel.obj -MD -MP -MF "$(DEPDIR)/xfce4_panel-panel.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-panel.obj `if test -f 'panel.c'; then $(CYGPATH_W) 'panel.c'; else $(CYGPATH_W) '$(srcdir)/panel.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-panel.Tpo" "$(DEPDIR)/xfce4_panel-panel.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-panel.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-panel.obj -MD -MP -MF "$(DEPDIR)/xfce4_panel-panel.Tpo" -c -o xfce4_panel-panel.obj `if test -f 'panel.c'; then $(CYGPATH_W) 'panel.c'; else $(CYGPATH_W) '$(srcdir)/panel.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-panel.Tpo" "$(DEPDIR)/xfce4_panel-panel.Po"; else rm -f "$(DEPDIR)/xfce4_panel-panel.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='panel.c' object='xfce4_panel-panel.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-panel.Po' tmpdepfile='$(DEPDIR)/xfce4_panel-panel.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-panel.obj `if test -f 'panel.c'; then $(CYGPATH_W) 'panel.c'; else $(CYGPATH_W) '$(srcdir)/panel.c'; fi` xfce4_panel-panel.lo: panel.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-panel.lo -MD -MP -MF "$(DEPDIR)/xfce4_panel-panel.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-panel.lo `test -f 'panel.c' || echo '$(srcdir)/'`panel.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-panel.Tpo" "$(DEPDIR)/xfce4_panel-panel.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-panel.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-panel.lo -MD -MP -MF "$(DEPDIR)/xfce4_panel-panel.Tpo" -c -o xfce4_panel-panel.lo `test -f 'panel.c' || echo '$(srcdir)/'`panel.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-panel.Tpo" "$(DEPDIR)/xfce4_panel-panel.Plo"; else rm -f "$(DEPDIR)/xfce4_panel-panel.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='panel.c' object='xfce4_panel-panel.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-panel.Plo' tmpdepfile='$(DEPDIR)/xfce4_panel-panel.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-panel.lo `test -f 'panel.c' || echo '$(srcdir)/'`panel.c xfce4_panel-popup.o: popup.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-popup.o -MD -MP -MF "$(DEPDIR)/xfce4_panel-popup.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-popup.o `test -f 'popup.c' || echo '$(srcdir)/'`popup.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-popup.Tpo" "$(DEPDIR)/xfce4_panel-popup.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-popup.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-popup.o -MD -MP -MF "$(DEPDIR)/xfce4_panel-popup.Tpo" -c -o xfce4_panel-popup.o `test -f 'popup.c' || echo '$(srcdir)/'`popup.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-popup.Tpo" "$(DEPDIR)/xfce4_panel-popup.Po"; else rm -f "$(DEPDIR)/xfce4_panel-popup.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='popup.c' object='xfce4_panel-popup.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-popup.Po' tmpdepfile='$(DEPDIR)/xfce4_panel-popup.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-popup.o `test -f 'popup.c' || echo '$(srcdir)/'`popup.c xfce4_panel-popup.obj: popup.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-popup.obj -MD -MP -MF "$(DEPDIR)/xfce4_panel-popup.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-popup.obj `if test -f 'popup.c'; then $(CYGPATH_W) 'popup.c'; else $(CYGPATH_W) '$(srcdir)/popup.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-popup.Tpo" "$(DEPDIR)/xfce4_panel-popup.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-popup.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-popup.obj -MD -MP -MF "$(DEPDIR)/xfce4_panel-popup.Tpo" -c -o xfce4_panel-popup.obj `if test -f 'popup.c'; then $(CYGPATH_W) 'popup.c'; else $(CYGPATH_W) '$(srcdir)/popup.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-popup.Tpo" "$(DEPDIR)/xfce4_panel-popup.Po"; else rm -f "$(DEPDIR)/xfce4_panel-popup.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='popup.c' object='xfce4_panel-popup.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-popup.Po' tmpdepfile='$(DEPDIR)/xfce4_panel-popup.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-popup.obj `if test -f 'popup.c'; then $(CYGPATH_W) 'popup.c'; else $(CYGPATH_W) '$(srcdir)/popup.c'; fi` xfce4_panel-popup.lo: popup.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-popup.lo -MD -MP -MF "$(DEPDIR)/xfce4_panel-popup.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-popup.lo `test -f 'popup.c' || echo '$(srcdir)/'`popup.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-popup.Tpo" "$(DEPDIR)/xfce4_panel-popup.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-popup.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-popup.lo -MD -MP -MF "$(DEPDIR)/xfce4_panel-popup.Tpo" -c -o xfce4_panel-popup.lo `test -f 'popup.c' || echo '$(srcdir)/'`popup.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-popup.Tpo" "$(DEPDIR)/xfce4_panel-popup.Plo"; else rm -f "$(DEPDIR)/xfce4_panel-popup.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='popup.c' object='xfce4_panel-popup.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-popup.Plo' tmpdepfile='$(DEPDIR)/xfce4_panel-popup.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-popup.lo `test -f 'popup.c' || echo '$(srcdir)/'`popup.c xfce4_panel-settings.o: settings.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-settings.o -MD -MP -MF "$(DEPDIR)/xfce4_panel-settings.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-settings.o `test -f 'settings.c' || echo '$(srcdir)/'`settings.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-settings.Tpo" "$(DEPDIR)/xfce4_panel-settings.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-settings.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-settings.o -MD -MP -MF "$(DEPDIR)/xfce4_panel-settings.Tpo" -c -o xfce4_panel-settings.o `test -f 'settings.c' || echo '$(srcdir)/'`settings.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-settings.Tpo" "$(DEPDIR)/xfce4_panel-settings.Po"; else rm -f "$(DEPDIR)/xfce4_panel-settings.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='settings.c' object='xfce4_panel-settings.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-settings.Po' tmpdepfile='$(DEPDIR)/xfce4_panel-settings.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-settings.o `test -f 'settings.c' || echo '$(srcdir)/'`settings.c xfce4_panel-settings.obj: settings.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-settings.obj -MD -MP -MF "$(DEPDIR)/xfce4_panel-settings.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-settings.obj `if test -f 'settings.c'; then $(CYGPATH_W) 'settings.c'; else $(CYGPATH_W) '$(srcdir)/settings.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-settings.Tpo" "$(DEPDIR)/xfce4_panel-settings.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-settings.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-settings.obj -MD -MP -MF "$(DEPDIR)/xfce4_panel-settings.Tpo" -c -o xfce4_panel-settings.obj `if test -f 'settings.c'; then $(CYGPATH_W) 'settings.c'; else $(CYGPATH_W) '$(srcdir)/settings.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-settings.Tpo" "$(DEPDIR)/xfce4_panel-settings.Po"; else rm -f "$(DEPDIR)/xfce4_panel-settings.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='settings.c' object='xfce4_panel-settings.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-settings.Po' tmpdepfile='$(DEPDIR)/xfce4_panel-settings.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-settings.obj `if test -f 'settings.c'; then $(CYGPATH_W) 'settings.c'; else $(CYGPATH_W) '$(srcdir)/settings.c'; fi` xfce4_panel-settings.lo: settings.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-settings.lo -MD -MP -MF "$(DEPDIR)/xfce4_panel-settings.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-settings.lo `test -f 'settings.c' || echo '$(srcdir)/'`settings.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-settings.Tpo" "$(DEPDIR)/xfce4_panel-settings.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-settings.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-settings.lo -MD -MP -MF "$(DEPDIR)/xfce4_panel-settings.Tpo" -c -o xfce4_panel-settings.lo `test -f 'settings.c' || echo '$(srcdir)/'`settings.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-settings.Tpo" "$(DEPDIR)/xfce4_panel-settings.Plo"; else rm -f "$(DEPDIR)/xfce4_panel-settings.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='settings.c' object='xfce4_panel-settings.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-settings.Plo' tmpdepfile='$(DEPDIR)/xfce4_panel-settings.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-settings.lo `test -f 'settings.c' || echo '$(srcdir)/'`settings.c xfce4_panel-xfce_support.o: xfce_support.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-xfce_support.o -MD -MP -MF "$(DEPDIR)/xfce4_panel-xfce_support.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-xfce_support.o `test -f 'xfce_support.c' || echo '$(srcdir)/'`xfce_support.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-xfce_support.Tpo" "$(DEPDIR)/xfce4_panel-xfce_support.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-xfce_support.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-xfce_support.o -MD -MP -MF "$(DEPDIR)/xfce4_panel-xfce_support.Tpo" -c -o xfce4_panel-xfce_support.o `test -f 'xfce_support.c' || echo '$(srcdir)/'`xfce_support.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-xfce_support.Tpo" "$(DEPDIR)/xfce4_panel-xfce_support.Po"; else rm -f "$(DEPDIR)/xfce4_panel-xfce_support.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce_support.c' object='xfce4_panel-xfce_support.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-xfce_support.Po' tmpdepfile='$(DEPDIR)/xfce4_panel-xfce_support.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-xfce_support.o `test -f 'xfce_support.c' || echo '$(srcdir)/'`xfce_support.c xfce4_panel-xfce_support.obj: xfce_support.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-xfce_support.obj -MD -MP -MF "$(DEPDIR)/xfce4_panel-xfce_support.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-xfce_support.obj `if test -f 'xfce_support.c'; then $(CYGPATH_W) 'xfce_support.c'; else $(CYGPATH_W) '$(srcdir)/xfce_support.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-xfce_support.Tpo" "$(DEPDIR)/xfce4_panel-xfce_support.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-xfce_support.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-xfce_support.obj -MD -MP -MF "$(DEPDIR)/xfce4_panel-xfce_support.Tpo" -c -o xfce4_panel-xfce_support.obj `if test -f 'xfce_support.c'; then $(CYGPATH_W) 'xfce_support.c'; else $(CYGPATH_W) '$(srcdir)/xfce_support.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-xfce_support.Tpo" "$(DEPDIR)/xfce4_panel-xfce_support.Po"; else rm -f "$(DEPDIR)/xfce4_panel-xfce_support.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce_support.c' object='xfce4_panel-xfce_support.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-xfce_support.Po' tmpdepfile='$(DEPDIR)/xfce4_panel-xfce_support.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -c -o xfce4_panel-xfce_support.obj `if test -f 'xfce_support.c'; then $(CYGPATH_W) 'xfce_support.c'; else $(CYGPATH_W) '$(srcdir)/xfce_support.c'; fi` xfce4_panel-xfce_support.lo: xfce_support.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-xfce_support.lo -MD -MP -MF "$(DEPDIR)/xfce4_panel-xfce_support.Tpo" \ -@am__fastdepCC_TRUE@ -c -o xfce4_panel-xfce_support.lo `test -f 'xfce_support.c' || echo '$(srcdir)/'`xfce_support.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-xfce_support.Tpo" "$(DEPDIR)/xfce4_panel-xfce_support.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_panel-xfce_support.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_panel_CFLAGS) $(CFLAGS) -MT xfce4_panel-xfce_support.lo -MD -MP -MF "$(DEPDIR)/xfce4_panel-xfce_support.Tpo" -c -o xfce4_panel-xfce_support.lo `test -f 'xfce_support.c' || echo '$(srcdir)/'`xfce_support.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_panel-xfce_support.Tpo" "$(DEPDIR)/xfce4_panel-xfce_support.Plo"; else rm -f "$(DEPDIR)/xfce4_panel-xfce_support.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce_support.c' object='xfce4_panel-xfce_support.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_panel-xfce_support.Plo' tmpdepfile='$(DEPDIR)/xfce4_panel-xfce_support.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @@ -801,10 +708,9 @@ clean-libtool: distclean-libtool: -rm -f libtool uninstall-info-am: -pkgconfigDATA_INSTALL = $(INSTALL_DATA) install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) + $(mkdir_p) $(DESTDIR)$(pkgconfigdir) @list='$(pkgconfig_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ @@ -819,10 +725,9 @@ uninstall-pkgconfigDATA: echo " rm -f $(DESTDIR)$(pkgconfigdir)/$$f"; \ rm -f $(DESTDIR)$(pkgconfigdir)/$$f; \ done -xfce4_panelincludeHEADERS_INSTALL = $(INSTALL_HEADER) install-xfce4_panelincludeHEADERS: $(xfce4_panelinclude_HEADERS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(xfce4_panelincludedir) + $(mkdir_p) $(DESTDIR)$(xfce4_panelincludedir) @list='$(xfce4_panelinclude_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ @@ -838,14 +743,6 @@ uninstall-xfce4_panelincludeHEADERS: rm -f $(DESTDIR)$(xfce4_panelincludedir)/$$f; \ done -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -854,6 +751,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -868,7 +766,6 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ test -z "$(ETAGS_ARGS)$$tags$$unique" \ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique - ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -891,10 +788,6 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -908,7 +801,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -926,9 +819,8 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile $(PROGRAMS) $(DATA) $(HEADERS) - installdirs: - $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(xfce4_panelincludedir) + $(mkdir_p) $(DESTDIR)$(bindir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(xfce4_panelincludedir) install: install-am install-exec: install-exec-am install-data: install-data-am @@ -940,7 +832,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -948,7 +840,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -958,19 +850,23 @@ clean: clean-am clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am distclean: distclean-am - -distclean-am: clean-am distclean-compile distclean-depend \ - distclean-generic distclean-libtool distclean-tags + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-tags dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: -install-data-am: install-pkgconfigDATA install-xfce4_panelincludeHEADERS +install-data-am: install-pkgconfigDATA \ + install-xfce4_panelincludeHEADERS install-exec-am: install-binPROGRAMS @@ -981,7 +877,8 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -rf ./$(DEPDIR) + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -1002,11 +899,11 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am \ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ clean-generic clean-libtool ctags distclean distclean-compile \ - distclean-depend distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am info info-am install \ - install-am install-binPROGRAMS install-data install-data-am \ - install-exec install-exec-am install-info install-info-am \ - install-man install-pkgconfigDATA install-strip \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-binPROGRAMS install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-pkgconfigDATA install-strip \ install-xfce4_panelincludeHEADERS installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-compile mostlyclean-generic \ diff --git a/panel/controls.c b/panel/controls.c index fa976903..e24e49be 100644 --- a/panel/controls.c +++ b/panel/controls.c @@ -375,7 +375,7 @@ static GtkWidget * get_control_menu (void) { static GtkItemFactory *factory; - GtkWidget *menu = NULL; + static GtkWidget *menu = NULL; if (!menu) { diff --git a/panel/controls_dialog.c b/panel/controls_dialog.c index 2473be4b..9548afff 100644 --- a/panel/controls_dialog.c +++ b/panel/controls_dialog.c @@ -289,14 +289,25 @@ controls_dialog (Control * control) gtk_size_group_add_widget (sg, label); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - pos_spin = gtk_spin_button_new_with_range (1, settings.num_groups, 1); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (pos_spin), backup_index + 1); + if (settings.num_groups > 1) + { + pos_spin = gtk_spin_button_new_with_range (1, settings.num_groups, 1); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (pos_spin), + backup_index + 1); + + g_signal_connect (pos_spin, "value-changed", G_CALLBACK (pos_changed), + NULL); + } + else + { + char postext[2]; + sprintf(postext, "%d", 1); + pos_spin = gtk_label_new(postext); + } + gtk_widget_show (pos_spin); gtk_box_pack_start (GTK_BOX (hbox), pos_spin, FALSE, FALSE, 0); - g_signal_connect (pos_spin, "value-changed", G_CALLBACK (pos_changed), - NULL); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); /* separator */ diff --git a/panel/groups.c b/panel/groups.c index 2d7a8e9c..f571de52 100644 --- a/panel/groups.c +++ b/panel/groups.c @@ -40,6 +40,7 @@ static GSList *group_list = NULL; static GSList *removed_list = NULL; +static GtkArrowType popup_arrow_type = GTK_ARROW_UP; static GtkBox *groupbox; @@ -659,3 +660,28 @@ groups_set_num_groups (int n) settings.num_groups--; } } + +/* arrow direction */ + +void +groups_set_arrow_direction (GtkArrowType type) +{ + GSList *li; + PanelGroup *group; + + popup_arrow_type = type; + + for (li = group_list; li; li = li->next) + { + group = li->data; + + panel_popup_set_arrow_type (group->popup, type); + } +} + +GtkArrowType +groups_get_arrow_direction (void) +{ + return popup_arrow_type; +} + diff --git a/panel/groups.h b/panel/groups.h index 33dcebe8..7f7f69c1 100644 --- a/panel/groups.h +++ b/panel/groups.h @@ -51,4 +51,8 @@ void groups_set_theme (const char *theme); void groups_set_num_groups (int n); void groups_add_control (int id, const char *filename, int index); +/* arrow direction */ +void groups_set_arrow_direction (GtkArrowType type); +GtkArrowType groups_get_arrow_direction (void); + #endif /* __XFCE_GROUPS_H__ */ diff --git a/panel/main.c b/panel/main.c index 23ab066f..66cabf0f 100644 --- a/panel/main.c +++ b/panel/main.c @@ -46,6 +46,7 @@ #endif #include <libxfce4util/i18n.h> +#include <libxfce4util/debug.h> #include <libxfcegui4/session-client.h> #include <libxfcegui4/netk-util.h> @@ -62,12 +63,15 @@ typedef enum NOSIGNAL, RESTART, QUIT, + QUIT_CONFIRM, NUM_SIGNALS, } SignalState; static SignalState sigstate = NOSIGNAL; +static char *progname = NULL; + /* session management * ------------------ */ @@ -77,29 +81,8 @@ static gboolean session_managed = FALSE; static void save_panel (void) { -#if 0 - gboolean hidden = settings.autohide; - - if (panel.toplevel) - { - if (hidden) - { - panel_set_autohide (FALSE); - - while (gtk_events_pending ()) - gtk_main_iteration (); - } - - gtk_window_get_position (GTK_WINDOW (panel.toplevel), - &panel.position.x, &panel.position.y); - - gtk_widget_hide (panel.toplevel); - } - - if (hidden && panel.toplevel) - panel_set_autohide (TRUE); -#endif - write_panel_config (); + if (!disable_user_config) + write_panel_config (); } static void @@ -148,36 +131,12 @@ quit (gboolean force) if (gtk_main_level ()) gtk_main_quit (); - exit (0); -} - -void -restart (void) -{ -/* int x, y; - - x = panel.position.x; - y = panel.position.y; -*/ - hide_current_popup_menu(); - - save_panel (); - - if (panel.toplevel) - gtk_widget_hide (panel.toplevel); - -#ifdef HAVE_LIBSTARTUP_NOTIFICATION - free_startup_timeout (); -#endif - - panel_cleanup (); - gtk_widget_destroy (panel.main_frame); - - create_panel (); -/* - panel.position.x = x; - panel.position.y = y; - panel_set_position ();*/ + DBG("sigstate: %d", sigstate); + if (sigstate != RESTART) + { + g_message("%s: Exit", PACKAGE); + exit (0); + } } /* Main program @@ -197,14 +156,24 @@ check_signal_state (void) if (sigstate == RESTART && !restarting) { restarting = TRUE; - sigstate = NOSIGNAL; - restart (); - restarting = FALSE; + + /* calls gtk_main_quit() */ + quit(TRUE); + + /* progname is saved on startup + * TODO: do we need to pass on arguments? */ + g_message("%s: restarting %s ...", PACKAGE, progname); + execlp(progname,progname,NULL); } else if (sigstate == QUIT) { quit (TRUE); } + else if (sigstate == QUIT_CONFIRM) + { + sigstate = NOSIGNAL; + quit (FALSE); + } } /* keep running */ @@ -225,6 +194,10 @@ sighandler (int sig) sigstate = RESTART; break; + case SIGUSR2: + sigstate = QUIT_CONFIRM; + break; + case SIGINT: /* hack: prevent the panel from saving config on ^C */ disable_user_config = TRUE; @@ -244,6 +217,8 @@ main (int argc, char **argv) gboolean net_wm_support; int i; + progname = argv[0]; + net_wm_support = FALSE; #if 0 @@ -304,11 +279,15 @@ main (int argc, char **argv) #else act.sa_flags = 0; #endif + sigaction (SIGHUP, &act, NULL); sigaction (SIGUSR1, &act, NULL); + sigaction (SIGUSR2, &act, NULL); sigaction (SIGINT, &act, NULL); sigaction (SIGTERM, &act, NULL); #else + signal (SIGHUP, sighandler); signal (SIGUSR1, sighandler); + signal (SIGUSR2, sighandler); signal (SIGINT, sighandler); signal (SIGTERM, sighandler); #endif diff --git a/panel/panel.c b/panel/panel.c index bdfb5769..8ac8e85d 100644 --- a/panel/panel.c +++ b/panel/panel.c @@ -30,6 +30,8 @@ #undef GDK_MULTIHEAD_SAFE #endif +#include <math.h> + #include <X11/Xlib.h> #include <libxfce4util/debug.h> @@ -68,15 +70,289 @@ int top_height[] = { 14, 16, 18, 20 }; int popup_icon_size[] = { 22, 26, 26, 32 }; /* lock settings update when panel is not yet (re)build */ + static gboolean panel_created = FALSE; +/* original screen sizes, used if screen is not the same + * size as in previous session */ +static int old_screen_width = 0; +static int old_screen_height = 0; + /* screen properties */ + static Display *dpy = NULL; +Screen *xscreen = NULL; static int scr = 0; static int screen_width = 0; static int screen_height = 0; +/* (re)positioning */ + +struct XineramaScreen +{ + int xmin, ymin; + int xmax, ymax; +}; + +struct XineramaScreen xinerama_scr = { 0 }; + +typedef enum +{ + FLOATING, + EDGE, + CENTER, + CORNER +} +XfcePositionState; + +static XfcePositionState pos_state = FLOATING; + +static GtkRequisition panel_req = { 0 }; + +/* prototypes */ + +static void update_arrow_direction (int x, int y); +static void update_xinerama_coordinates (Panel * p); +static void update_position (Panel * p, int *x, int *y); +static void panel_reallocate (Panel * p, GtkRequisition * previous); static void panel_set_hidden (Panel * p, gboolean hide); +static void init_settings (); + + +/** + * update_arrow_direction + * + * adjust arrow direction based on which quarter of the screen we + * are (Xinerama aware, of course ;) + **/ +static void +update_arrow_direction (int x, int y) +{ + int center; + GtkArrowType type; + + if (settings.orientation == HORIZONTAL) + { + center = xinerama_scr.ymin + + (xinerama_scr.ymax - xinerama_scr.ymin) / 2 - + panel_req.height / 2; + + if (y > center) + type = GTK_ARROW_UP; + else + type = GTK_ARROW_DOWN; + } + else + { + center = xinerama_scr.xmin + + (xinerama_scr.xmax - xinerama_scr.xmin) / 2 - panel_req.width / 2; + + if (x > center) + type = GTK_ARROW_LEFT; + else + type = GTK_ARROW_RIGHT; + } + + groups_set_arrow_direction (type); +} + +static void +update_xinerama_coordinates (Panel * p) +{ + int x, y; + + g_return_if_fail (dpy != NULL); + + gtk_window_get_position (GTK_WINDOW (p->toplevel), &x, &y); + x += p->toplevel->allocation.width / 2; + y += p->toplevel->allocation.height / 2; + + xinerama_scr.xmin = MyDisplayX (x, y); + xinerama_scr.xmax = MyDisplayMaxX (dpy, scr, x, y); + xinerama_scr.ymin = MyDisplayY (x, y); + xinerama_scr.ymax = MyDisplayMaxY (dpy, scr, x, y); + + DBG ("screen: %d,%d+%dx%d", + xinerama_scr.xmin, xinerama_scr.ymin, + xinerama_scr.xmax - xinerama_scr.xmin, + xinerama_scr.ymax - xinerama_scr.ymin); +} + +/** + * update_position + * + * - keep inside the screen + * - update position status (see above) + * - if on the edge, move slightly over the edge by the width of the shadow + * to take advantage of Fitts law: putting the mouse pointer on the edge + * will hit the buttons, instead of the window border. + * + * Assumes panel_req and xinerama_scr are up-to-date. + **/ +static void +update_position (Panel * p, int *x, int *y) +{ + if (!p || !p->toplevel) + return; + + pos_state = FLOATING; + + DBG ("desired position: %d,%d", *x, *y); + + /* use an 'error' margin of 2 */ + if (settings.orientation == HORIZONTAL) + { + if (*y + panel_req.height > xinerama_scr.ymax - 2) + { + *y = xinerama_scr.ymax - panel_req.height; + pos_state = EDGE; + } + + if (*y < xinerama_scr.ymin + 2) + { + *y = xinerama_scr.ymin; + pos_state = EDGE; + } + + if (pos_state == EDGE) + { + if (*x + panel_req.width > xinerama_scr.xmax - 2) + { + *x = xinerama_scr.xmax - panel_req.width; + pos_state = CORNER; + } + + if (*x < xinerama_scr.xmin + 2) + { + *x = xinerama_scr.xmin; + pos_state = CORNER; + } + } + + if (pos_state == EDGE) + { + int xcenter = xinerama_scr.xmin + + (xinerama_scr.xmax - xinerama_scr.xmin) / 2 - + panel_req.width / 2; + + if (xcenter > xinerama_scr.xmin && + *x > xcenter - 2 && *x < xcenter + 2) + { + *x = xcenter; + pos_state = CENTER; + } + } + } + else + { + if (*x + panel_req.width > xinerama_scr.xmax - 2) + { + *x = xinerama_scr.xmax - panel_req.width; + pos_state = EDGE; + } + + if (*x < xinerama_scr.xmin + 2) + { + *x = xinerama_scr.xmin; + pos_state = EDGE; + } + + if (pos_state == EDGE) + { + if (*y + panel_req.height > xinerama_scr.ymax - 2) + { + *y = xinerama_scr.ymax - panel_req.height; + pos_state = CORNER; + } + + if (*y < xinerama_scr.ymin + 2) + { + *y = xinerama_scr.ymin; + pos_state = CORNER; + } + } + + if (pos_state == EDGE) + { + int ycenter = xinerama_scr.ymin + + (xinerama_scr.ymax - xinerama_scr.ymin) / 2 - + panel_req.height / 2; + + if (ycenter > xinerama_scr.ymin && + *y > ycenter - 2 && *y < ycenter + 2) + { + *y = ycenter; + pos_state = CENTER; + } + } + } + + DBG ("new position: %d,%d", *x, *y); +} + +static void +panel_reallocate (Panel * p, GtkRequisition * previous) +{ + GtkRequisition new; + int xold, yold, xnew, ynew, xcenter, ycenter; + + gtk_widget_size_request (p->toplevel, &new); + + xold = xnew = p->position.x; + yold = ynew = p->position.y; + + xcenter = xinerama_scr.xmin + (xinerama_scr.xmax - xinerama_scr.xmin) / 2; + ycenter = xinerama_scr.ymin + (xinerama_scr.ymax - xinerama_scr.ymin) / 2; + + /* initial new coordinates depend on centering */ + if (pos_state == CENTER) + { + if (settings.orientation == HORIZONTAL) + { + xnew = xcenter - new.width / 2; + } + else + { + ynew = ycenter - new.height / 2; + } + } + + /* only right and bottom edge/corner can change */ + /* use an 'error' margin of 2 */ + if (pos_state == EDGE || pos_state == CORNER) + { + if (xold + previous->width > xinerama_scr.xmax - 2) + { + xnew = xinerama_scr.xmax - new.width; + } + + if (yold + previous->height > xinerama_scr.ymax - 2) + { + ynew = xinerama_scr.ymax - new.height; + } + } + + panel_req = new; + + update_position (p, &xnew, &ynew); + + DBG ("reallocate: %d,%d+%dx%d -> %d,%d+%dx%d", + xold, yold, previous->width, previous->height, + xnew, ynew, new.width, new.height); + + if (xnew != xold || ynew != yold) + { + gtk_window_move (GTK_WINDOW (p->toplevel), xnew, ynew); + + p->position.x = xnew; + p->position.y = ynew; + + /* Need to save position here... */ + write_panel_config (); + + /* FIXME: to we need to update the arrow direction here? */ + } +} /* Move handle menu * ---------------- @@ -213,22 +489,37 @@ handler_pressed_cb (GtkWidget * h, GdkEventButton * event) } static void -handler_move_end_cb (GtkWidget * h, gpointer data) +handler_move_end_cb (GtkWidget * h, Panel * p) { + int x, y; + gtk_window_get_position (GTK_WINDOW (panel.toplevel), - &panel.position.x, &panel.position.y); + &p->position.x, &p->position.y); - DBG ("Move end: (x,y) = (%d,%d)", panel.position.x, panel.position.y); + DBG ("move end: %d,%d", p->position.x, p->position.y); - /* TODO: adjust arrow direction based on which quarter of the screen we - * are (Xinerama aware, of course ;) */ + update_xinerama_coordinates (p); - /* Need to save position here... */ - write_panel_config (); + x = panel.position.x; + y = panel.position.y; + + update_position (p, &x, &y); + + if (x != p->position.x || y != p->position.y) + { + gtk_window_move (GTK_WINDOW (p->toplevel), x, y); + p->position.x = x; + p->position.y = y; + + /* Need to save position here... */ + write_panel_config (); + } + + update_arrow_direction (x, y); } GtkWidget * -handle_new (void) +handle_new (Panel * p) { GtkWidget *mh; @@ -238,9 +529,9 @@ handle_new (void) gtk_widget_set_name (mh, "xfce_panel"); g_signal_connect (mh, "button-press-event", - G_CALLBACK (handler_pressed_cb), NULL); + G_CALLBACK (handler_pressed_cb), p); - g_signal_connect (mh, "move-end", G_CALLBACK (handler_move_end_cb), NULL); + g_signal_connect (mh, "move-end", G_CALLBACK (handler_move_end_cb), p); /* protect against destruction when removed from box */ g_object_ref (mh); @@ -258,81 +549,47 @@ extern PanelPopup *open_popup; static void panel_set_hidden (Panel * p, gboolean hide) { - GtkRequisition req; - int x, y; - Position pos; - static int minx = 0, maxx = 0, miny = 0, maxy = 0, centerx = 0, centery = - 0; + Position pos = p->position; + int x, y, w, h; - /* Get the size */ - gtk_widget_size_request (p->toplevel, &req); - pos = p->position; - - /* xinerama aware screen coordinates */ - if (pos.x < minx || pos.x >= maxx || pos.y < miny || pos.y >= maxy) - { - minx = MyDisplayX (pos.x, pos.y); - maxx = MyDisplayMaxX (dpy, scr, pos.x, pos.y); - miny = MyDisplayY (pos.x, pos.y); - maxy = MyDisplayMaxY (dpy, scr, pos.x, pos.y); - - centerx = minx + (maxx - minx) / 2; - centery = miny + (maxy - miny) / 2; - } + x = pos.x; + y = pos.y; + w = panel_req.width; + h = panel_req.height; - DBG("\n\tCoordinates:\n\t min x, max x, min y, max y: %d, %d, %d, %d", - minx,maxx,miny,maxy); - DBG("\n\tPanel position (x,y): %d, %d", pos.x, pos.y); - DBG("\n\tPanel size: %d x %d\n", req.width, req.height); - - /* Handle the resize */ if (hide) { + /* Only hide when the panel is on the edge of the screen + * Thanks to Eduard Rocatello for pointing this out */ + if (pos_state == FLOATING) + return; + /* Depending on orientation, resize */ if (settings.orientation == VERTICAL) { - if (pos.x < centerx) + if (pos.x - xinerama_scr.xmin < xinerama_scr.xmax - pos.x) x = pos.x; else - x = pos.x + req.width - HIDDEN_SIZE; - - y = pos.y; + x = pos.x + panel_req.width - HIDDEN_SIZE + 1; - req.width = HIDDEN_SIZE; + w = HIDDEN_SIZE; } else { - if (pos.y < centery) + if (pos.y - xinerama_scr.ymin < xinerama_scr.ymax - pos.y) y = pos.y; else - y = pos.y + req.height - HIDDEN_SIZE; + y = pos.y + panel_req.height - HIDDEN_SIZE + 1; - x = pos.x; - - req.height = HIDDEN_SIZE; + h = HIDDEN_SIZE; } } - else + else /* unhide */ { - req.width = -1; - req.height = -1; - x = pos.x; - y = pos.y; + w = -1; + h = -1; } - /* keep inside the screen */ - if (x < 0) - x = 0; - else if (x > maxx - HIDDEN_SIZE) - x = maxx - HIDDEN_SIZE; - - if (y < 0) - y = 0; - else if (y > maxy - HIDDEN_SIZE) - y = maxy - HIDDEN_SIZE; - - DBG("\n\tMove panel: (x=%d,y=%d) => (x=%d,y=%d)\n", pos.x, pos.y, x, y); - if (hide) gtk_widget_hide (p->main_frame); else @@ -340,11 +597,13 @@ panel_set_hidden (Panel * p, gboolean hide) p->hidden = hide; - gtk_widget_set_size_request (p->toplevel, req.width, req.height); + gtk_widget_set_size_request (p->toplevel, w, h); while (gtk_events_pending ()) gtk_main_iteration (); + DBG ("move: %d,%d\n", x, y); + /* gtk_window_present(GTK_WINDOW(p->toplevel)); */ gtk_window_move (GTK_WINDOW (p->toplevel), x, y); } @@ -352,17 +611,12 @@ panel_set_hidden (Panel * p, gboolean hide) gboolean panel_hide_timeout (Panel * p) { - /* keep trying while a subpanel is open */ + /* if popup is open, keep trying */ if (open_popup) return TRUE; if (!p->hidden) { -#if 0 - gtk_window_get_position (GTK_WINDOW (p->toplevel), &(p->position.x), - &(p->position.y)); -#endif - panel_set_hidden (p, TRUE); } @@ -379,14 +633,10 @@ panel_unhide_timeout (Panel * p) } gboolean -panel_enter (GtkWindow * w, GdkEventCrossing * event, gpointer data) +panel_enter (GtkWindow * w, GdkEventCrossing * event, Panel * p) { - Panel *p = (Panel *) data; - if (!(settings.autohide)) - { return FALSE; - } if (event->detail != GDK_NOTIFY_INFERIOR) { @@ -408,14 +658,10 @@ panel_enter (GtkWindow * w, GdkEventCrossing * event, gpointer data) } gboolean -panel_leave (GtkWidget * w, GdkEventCrossing * event, gpointer data) +panel_leave (GtkWidget * w, GdkEventCrossing * event, Panel * p) { - Panel *p = (Panel *) data; - if (!(settings.autohide)) - { return FALSE; - } if (event->detail != GDK_NOTIFY_INFERIOR) { @@ -476,8 +722,68 @@ panel_delete_cb (GtkWidget * window, GdkEvent * ev, gpointer data) return TRUE; } +static void +panel_allocate_cb (GtkWidget * window, GtkAllocation * allocation, Panel * p) +{ + if (p->hidden) + return; + + if (panel_req.width != allocation->width || + panel_req.height != allocation->height) + { + if (!(panel_req.width == 0 && panel_req.height == 0)) + { + GtkRequisition prev = panel_req; + + panel_req.width = allocation->width; + panel_req.height = allocation->height; + + panel_reallocate (p, &prev); + } + else + { + panel_req.width = allocation->width; + panel_req.height = allocation->height; + } + } +} + +static void +screen_size_changed (GdkScreen * screen, Panel * p) +{ + double xalign, yalign; + int width, height, x, y; + + width = xinerama_scr.xmax - xinerama_scr.xmin; + height = xinerama_scr.ymax - xinerama_scr.ymin; + + xalign = (double) p->position.x / (width - panel_req.width); + yalign = (double) p->position.y / (height - panel_req.height); + + DBG ("relative position: %.2f x %.2f", xalign, yalign); + + update_xinerama_coordinates (p); + + width = xinerama_scr.xmax - xinerama_scr.xmin; + height = xinerama_scr.ymax - xinerama_scr.ymin; + + DBG ("new screen size: %dx%d", width, height); + + x = rint (xalign * (width - panel_req.width)); + y = rint (yalign * (height - panel_req.height)); + + update_position (p, &x, &y); + + gtk_window_move (GTK_WINDOW (p->toplevel), x, y); + + p->position.x = x; + p->position.y = y; + + write_panel_config (); +} + static GtkWidget * -create_panel_window (void) +create_panel_window (Panel * p) { GtkWidget *w; GtkWindow *window; @@ -495,7 +801,14 @@ create_panel_window (void) gtk_window_set_icon (window, pb); g_object_unref (pb); - g_signal_connect (w, "delete-event", G_CALLBACK (panel_delete_cb), NULL); + g_signal_connect (w, "delete-event", G_CALLBACK (panel_delete_cb), p); + + g_signal_connect (w, "size-allocate", G_CALLBACK (panel_allocate_cb), p); + +#if GTK_CHECK_VERSION(2,2,0) + g_signal_connect (G_OBJECT (gdk_screen_get_default ()), "size-changed", + G_CALLBACK (screen_size_changed), p); +#endif return w; } @@ -508,7 +821,7 @@ create_panel_framework (Panel * p) /* toplevel window */ if (!p->toplevel) { - p->toplevel = create_panel_window (); + p->toplevel = create_panel_window (p); g_object_add_weak_pointer (G_OBJECT (p->toplevel), (gpointer *) & (p->toplevel)); } @@ -517,16 +830,17 @@ create_panel_framework (Panel * p) gtk_window_stick (GTK_WINDOW (p->toplevel)); /* Connect signalers to window for autohide */ - g_signal_connect (GTK_WINDOW (p->toplevel), "enter-notify-event", - G_CALLBACK (panel_enter), &panel); + g_signal_connect (p->toplevel, "enter-notify-event", + G_CALLBACK (panel_enter), p); - g_signal_connect (GTK_WINDOW (p->toplevel), "leave-notify-event", - G_CALLBACK (panel_leave), &panel); + g_signal_connect (p->toplevel, "leave-notify-event", + G_CALLBACK (panel_leave), p); gtk_drag_dest_set (p->toplevel, GTK_DEST_DEFAULT_ALL, entry, 2, GDK_ACTION_COPY); - g_signal_connect (p->toplevel, "drag-motion", G_CALLBACK (drag_motion), - p); + + g_signal_connect (p->toplevel, "drag-motion", + G_CALLBACK (drag_motion), p); /* main frame */ p->main_frame = gtk_frame_new (NULL); @@ -552,8 +866,8 @@ create_panel_framework (Panel * p) gtk_widget_show (p->group_box); /* create handles */ - p->handles[LEFT] = handle_new (); - p->handles[RIGHT] = handle_new (); + p->handles[LEFT] = handle_new (p); + p->handles[RIGHT] = handle_new (p); /* pack the widgets into the main frame */ gtk_container_add (GTK_CONTAINER (p->main_frame), p->panel_box); @@ -570,8 +884,6 @@ panel_cleanup (void) groups_cleanup (); } -static void init_settings (); - void create_panel (void) { @@ -588,6 +900,7 @@ create_panel (void) /* TODO: for gtk 2.2 we could use gtk_widget_get_display() et al. */ dpy = gdk_display; scr = DefaultScreen (dpy); + xscreen = DefaultScreenOfDisplay (dpy); screen_width = gdk_screen_width (); screen_height = gdk_screen_height (); @@ -612,15 +925,15 @@ create_panel (void) /* unhide panel initially */ hidden = settings.autohide; - settings.autohide=FALSE; - + settings.autohide = FALSE; + /* FIXME * somehow the position gets set differently in the code below * we just save it here and restore it before reading the config * file */ x = panel.position.x; y = panel.position.y; - + /* panel framework */ create_panel_framework (&panel); @@ -630,14 +943,32 @@ create_panel (void) * This function creates the panel items and popup menus */ get_panel_config (); + if (old_screen_width > 0) + { + double xscale, yscale; + + gtk_widget_size_request (panel.toplevel, &panel_req); + + xscale = (double) x / (double) (old_screen_width - panel_req.width); + yscale = (double) y / (double) (old_screen_height - panel_req.height); + + x = rint (xscale * (screen_width - panel_req.width)); + y = rint (yscale * (screen_height - panel_req.height)); + + old_screen_width = old_screen_height = 0; + } + panel.position.x = x; panel.position.y = y; - panel_set_position (); + gtk_window_move (GTK_WINDOW (panel.toplevel), x, y); gtk_widget_show (panel.toplevel); set_window_layer (panel.toplevel, settings.layer); set_window_skip (panel.toplevel); + gtk_widget_size_request (panel.toplevel, &panel_req); + update_xinerama_coordinates (&panel); + /* this must be before set_autohide() and after set_position() * otherwise the initial position will be messed up */ panel_created = TRUE; @@ -647,13 +978,7 @@ create_panel (void) panel_set_position (); if (hidden) - panel_set_autohide(TRUE); -} - -void -panel_add_control (void) -{ - groups_set_num_groups (settings.num_groups + 1); + panel_set_autohide (TRUE); } /* Panel settings @@ -678,8 +1003,8 @@ panel_set_orientation (int orientation) panel_set_autohide (FALSE); } - gtk_widget_hide(panel.toplevel); - + gtk_widget_hide (panel.toplevel); + /* change popup position to make it look better * done here, because it's needed for size calculation * the setttings dialog will also change, we just @@ -701,7 +1026,7 @@ panel_set_orientation (int orientation) pos = RIGHT; break; } - panel_set_popup_position(pos); + panel_set_popup_position (pos); /* save panel controls */ groups_unpack (); @@ -713,18 +1038,32 @@ panel_set_orientation (int orientation) groups_pack (GTK_BOX (panel.group_box)); groups_set_orientation (orientation); + /* approximate reset panel requisition to prevent 'size-allocate' + * handler from wrongly adjusting the position */ + panel_req.width = panel_req.height = 0; + + /* TODO: find out why position doesn't get properly set in + * set_size function */ panel.position.x = panel.position.y = -1; - /* also sets position */ panel_set_size (settings.size); - gtk_widget_show(panel.toplevel); + gtk_widget_size_request (panel.toplevel, &panel_req); + if (orientation == HORIZONTAL) + panel_center (BOTTOM); + else + panel_center (LEFT); + + gtk_widget_show_now (panel.toplevel); set_window_layer (panel.toplevel, settings.layer); set_window_skip (panel.toplevel); - - if (hidden) - panel_set_autohide(TRUE); - DBG("done"); + /* FIXME: the window doesn't always get moved properly by gtk + * when hidden. */ + gtk_window_move (GTK_WINDOW (panel.toplevel), + panel.position.x, panel.position.y); + + if (hidden) + panel_set_autohide (TRUE); } void @@ -736,9 +1075,9 @@ panel_set_layer (int layer) return; set_window_layer (panel.toplevel, layer); - - if (layer == TOP) - gtk_window_present(GTK_WINDOW(panel.toplevel)); + + if (layer == ABOVE) + gtk_window_present (GTK_WINDOW (panel.toplevel)); } void @@ -754,8 +1093,6 @@ panel_set_size (int size) groups_set_size (size); handle_set_size (panel.handles[LEFT], size); handle_set_size (panel.handles[RIGHT], size); - - panel_set_position (); } void @@ -769,6 +1106,7 @@ panel_set_popup_position (int position) hide_current_popup_menu (); groups_set_popup_position (position); + update_arrow_direction (panel.position.x, panel.position.y); /* this is necessary to get the right proportions */ panel_set_size (settings.size); @@ -786,19 +1124,6 @@ panel_set_theme (const char *theme) groups_set_theme (theme); } -/* FIXME: this should probably NOT be a global option. - * Just add and remove controls based on the config file */ -void -panel_set_num_groups (int n) -{ - settings.num_groups = n; - - if (!panel_created) - return; - - groups_set_num_groups (n); -} - void panel_set_settings (void) { @@ -806,50 +1131,36 @@ panel_set_settings (void) panel_set_popup_position (settings.popup_position); panel_set_theme (settings.theme); - - panel_set_num_groups (settings.num_groups); } void panel_center (int side) { - GtkRequisition req; int w, h; DesktopMargins margins; - Screen *xscreen; - gboolean hidden; w = screen_width; h = screen_height; - hidden = settings.autohide; - if (hidden) - { - panel_set_autohide (FALSE); - } - - gtk_widget_size_request (panel.toplevel, &req); - - xscreen = DefaultScreenOfDisplay (GDK_DISPLAY ()); netk_get_desktop_margins (xscreen, &margins); switch (side) { case LEFT: panel.position.x = margins.left; - panel.position.y = h / 2 - req.height / 2; + panel.position.y = h / 2 - panel_req.height / 2; break; case RIGHT: - panel.position.x = w - req.width - margins.right; - panel.position.y = h / 2 - req.height / 2; + panel.position.x = w - panel_req.width - margins.right; + panel.position.y = h / 2 - panel_req.height / 2; break; case TOP: - panel.position.x = w / 2 - req.width / 2; + panel.position.x = w / 2 - panel_req.width / 2; panel.position.y = margins.top; break; default: - panel.position.x = w / 2 - req.width / 2; - panel.position.y = h - req.height - margins.bottom; + panel.position.x = w / 2 - panel_req.width / 2; + panel.position.y = h - panel_req.height - margins.bottom; } if (panel.position.x < 0) @@ -859,14 +1170,25 @@ panel_center (int side) panel.position.y = 0; panel_set_position (); - - if (hidden) - panel_set_autohide (TRUE); } void panel_set_position (void) { + gboolean hidden = settings.autohide; + + if (!panel_created) + return; + + if (hidden) + { + DBG ("unhide panel before repositioning\n"); + + panel_set_autohide (FALSE); + } + + gtk_widget_size_request (panel.toplevel, &panel_req); + if (panel.position.x == -1 && panel.position.y == -1) { if (settings.orientation == HORIZONTAL) @@ -876,46 +1198,21 @@ panel_set_position (void) } else { - GtkRequisition req; - int w, h; - gboolean hidden; - - hidden = settings.autohide; - if (hidden) - { - DBG ("unhide panel before repositioning\n"); - - panel_set_autohide (FALSE); - } - - w = screen_width; - h = screen_height; + update_position (&panel, &panel.position.x, &panel.position.y); - gtk_widget_size_request (panel.toplevel, &req); - - if (panel.position.x + req.width > w && req.width <= w) - panel.position.x = w - req.width; - - if (panel.position.y + req.height > h && req.height <= h) - panel.position.y = h - req.height; - - if (panel.position.x < 0) - panel.position.x = 0; - - if (panel.position.y < 0) - panel.position.y = 0; - - DBG ("position: (%d, %d)\n", panel.position.x, panel.position.y); + DBG ("move: %d,%d", panel.position.x, panel.position.y); gtk_window_move (GTK_WINDOW (panel.toplevel), panel.position.x, panel.position.y); - /* Need to save position here... */ - write_panel_config (); + /* Need to save position here... */ + write_panel_config (); - if (hidden) - panel_set_autohide (TRUE); + update_arrow_direction (panel.position.x, panel.position.y); } + + if (hidden) + panel_set_autohide (TRUE); } void @@ -928,10 +1225,10 @@ panel_set_autohide (gboolean hide) if (hide) { - DBG("add hide timeout"); + DBG ("add hide timeout"); - panel.hide_timeout = g_timeout_add (1000, - (GSourceFunc) panel_hide_timeout, + panel.hide_timeout = g_timeout_add (1000, + (GSourceFunc) panel_hide_timeout, &panel); } else @@ -1014,7 +1311,6 @@ panel_parse_xml (xmlNodePtr node) if (value) { - DBG ("number of groups: %s", value); settings.num_groups = atoi (value); g_free (value); } @@ -1079,12 +1375,8 @@ panel_parse_xml (xmlNodePtr node) * save the panel width as well to do it right */ if (w != screen_width || h != screen_height) { - panel.position.x = - (int) ((double) (panel.position.x * screen_width) / - (double) w); - panel.position.y = - (int) ((double) (panel.position.y * screen_height) / - (double) h); + old_screen_width = w; + old_screen_height = h; } } } @@ -1094,8 +1386,6 @@ panel_parse_xml (xmlNodePtr node) settings.orientation = HORIZONTAL; if (settings.size < TINY || settings.size > LARGE) settings.size = SMALL; -/* if (settings.num_groups < 1 || settings.num_groups > 2 * NBGROUPS) - settings.num_groups = 2*NBGROUPS; */ } void diff --git a/panel/popup.c b/panel/popup.c index 395cad3c..24357fa6 100644 --- a/panel/popup.c +++ b/panel/popup.c @@ -48,6 +48,9 @@ hide_popup (PanelPopup * pp) if (open_popup == pp) open_popup = NULL; + if (!pp) + return; + xfce_togglebutton_set_active (XFCE_TOGGLEBUTTON (pp->button), FALSE); gtk_widget_hide (pp->window); @@ -61,15 +64,18 @@ hide_popup (PanelPopup * pp) } static void -position_popup (PanelPopup * pp) +position_popup (PanelPopup * pp) { GtkRequisition req; GdkWindow *p; int xbutton, ybutton, xparent, yparent, x, y; int w, h; gboolean vertical = settings.orientation == VERTICAL; - int pos = settings.popup_position; - GtkAllocation alloc1 = {0,}, alloc2 = {0,}; + GtkAllocation alloc1 = {0}, alloc2 = {0}; + GtkArrowType at; + + if (!pp) + return; if (pp->detached) return; @@ -84,6 +90,8 @@ position_popup (PanelPopup * pp) w = gdk_screen_width (); h = gdk_screen_height (); + at = xfce_togglebutton_get_arrow_type (XFCE_TOGGLEBUTTON (pp->button)); + if (!GTK_WIDGET_REALIZED (pp->window)) gtk_widget_realize (pp->window); @@ -93,8 +101,6 @@ position_popup (PanelPopup * pp) alloc2.height = req.height; gtk_widget_size_allocate (pp->window, &alloc2); - /*gtk_widget_realize (pp->window);*/ - /* this is necessary, because the icons are resized on allocation */ gtk_widget_size_request (pp->window, &req); @@ -117,7 +123,7 @@ position_popup (PanelPopup * pp) if (vertical) { /* left if buttons left ... */ - if (pos == LEFT && x - req.width >= 0) + if (at == GTK_ARROW_LEFT && x - req.width >= 0) { x = x - req.width; y = y + alloc1.height - req.height; @@ -141,7 +147,7 @@ position_popup (PanelPopup * pp) else { /* down if buttons on bottom ... */ - if (pos == BOTTOM && y + alloc1.height + req.height <= h) + if (at == GTK_ARROW_DOWN && y + alloc1.height + req.height <= h) { x = x + alloc1.width / 2 - req.width / 2; y = y + alloc1.height; @@ -165,9 +171,6 @@ position_popup (PanelPopup * pp) x = w - req.width; } -#if 0 - g_print(" *** Position: %d, %d\n", x, y); -#endif gtk_window_move (GTK_WINDOW (pp->window), x, y); gtk_window_stick (GTK_WINDOW (pp->window)); gtk_widget_show (pp->window); @@ -176,6 +179,9 @@ position_popup (PanelPopup * pp) static void show_popup (PanelPopup * pp) { + if (!pp) + return; + if (open_popup) hide_popup (open_popup); @@ -198,7 +204,7 @@ show_popup (PanelPopup * pp) gtk_widget_show (pp->separator); } - position_popup(pp); + position_popup (pp); } void @@ -339,9 +345,9 @@ create_panel_popup (void) pp->window = gtk_window_new (GTK_WINDOW_TOPLEVEL); set_popup_window_properties (pp->window); - g_signal_connect_swapped(pp->window, "size-allocate", - G_CALLBACK(position_popup), pp); - + g_signal_connect_swapped (pp->window, "size-allocate", + G_CALLBACK (position_popup), pp); + pp->frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (pp->frame), GTK_SHADOW_OUT); gtk_container_add (GTK_CONTAINER (pp->window), pp->frame); @@ -393,13 +399,21 @@ create_panel_popup (void) void panel_popup_pack (PanelPopup * pp, GtkBox * box) { + if (!pp) + return; + gtk_box_pack_start (box, pp->button, FALSE, FALSE, 0); } void panel_popup_unpack (PanelPopup * pp) { - GtkWidget *container = pp->button->parent; + GtkWidget *container; + + if (!pp) + return; + + container = pp->button->parent; gtk_container_remove (GTK_CONTAINER (container), pp->button); } @@ -449,6 +463,9 @@ panel_popup_set_from_xml (PanelPopup * pp, xmlNodePtr node) xmlNodePtr child; int i; + if (!pp) + return; + for (i = 0, child = node->children; child; i++, child = child->next) { Item *mi; @@ -472,6 +489,9 @@ panel_popup_write_xml (PanelPopup * pp, xmlNodePtr root) xmlNodePtr node, child; GList *li; + if (!pp || !pp->items) + return; + node = xmlNewTextChild (root, NULL, "Popup", NULL); for (li = pp->items; li; li = li->next) @@ -490,6 +510,11 @@ panel_popup_free (PanelPopup * pp) /* only items contain non-gtk elements to be freed */ GList *li; + if (!pp) + return; + + gtk_widget_destroy (pp->window); + for (li = pp->items; li && li->data; li = li->next) { Item *mi = li->data; @@ -507,6 +532,9 @@ panel_popup_set_size (PanelPopup * pp, int size) int w, h; GList *li; + if (!pp) + return; + w = icon_size[size] + border_width; h = top_height[size]; @@ -529,33 +557,20 @@ panel_popup_set_size (PanelPopup * pp, int size) void panel_popup_set_popup_position (PanelPopup * pp, int position) { - GtkArrowType at; - gboolean vertical = settings.orientation == VERTICAL; - settings.popup_position = position; - if (vertical) - { - if (settings.popup_position == LEFT) - at = GTK_ARROW_LEFT; - else - at = GTK_ARROW_RIGHT; - } - else - { - if (settings.popup_position == BOTTOM) - at = GTK_ARROW_DOWN; - else - at = GTK_ARROW_UP; - } - - xfce_togglebutton_set_arrow_type (XFCE_TOGGLEBUTTON (pp->button), at); + if (!pp) + return; + panel_popup_set_size (pp, settings.size); } void panel_popup_set_layer (PanelPopup * pp, int layer) { + if (!pp) + return; + set_window_layer (pp->window, layer); } @@ -564,6 +579,9 @@ panel_popup_set_theme (PanelPopup * pp, const char *theme) { GList *li; + if (!pp) + return; + for (li = pp->items; li && li->data; li = li->next) { Item *mi = li->data; @@ -571,3 +589,12 @@ panel_popup_set_theme (PanelPopup * pp, const char *theme) item_set_theme (mi, theme); } } + +void +panel_popup_set_arrow_type (PanelPopup * pp, GtkArrowType type) +{ + if (!pp || !pp->button) + return; + + xfce_togglebutton_set_arrow_type (XFCE_TOGGLEBUTTON (pp->button), type); +} diff --git a/panel/popup.h b/panel/popup.h index 4c022110..92717ecb 100644 --- a/panel/popup.h +++ b/panel/popup.h @@ -59,6 +59,7 @@ void panel_popup_set_size (PanelPopup * pp, int size); void panel_popup_set_popup_position (PanelPopup * pp, int position); void panel_popup_set_layer (PanelPopup * pp, int layer); void panel_popup_set_theme (PanelPopup * pp, const char *theme); +void panel_popup_set_arrow_type (PanelPopup * pp, GtkArrowType type); void hide_current_popup_menu (void); diff --git a/panel/xfce_support.c b/panel/xfce_support.c index f325e14c..35aee3ba 100644 --- a/panel/xfce_support.c +++ b/panel/xfce_support.c @@ -160,7 +160,7 @@ get_theme_dirs (void) dirs = g_new (gchar *, 2); dirs[0] = g_build_filename (DATADIR, "themes", NULL); - dirs[2] = NULL; + dirs[1] = NULL; } else { @@ -982,6 +982,7 @@ schedule_exec(const gchar *cmd, gboolean in_terminal, gboolean use_sn, void exec_cmd (const char *cmd, gboolean in_terminal, gboolean use_sn) { + g_return_if_fail (cmd != NULL); schedule_exec(cmd, in_terminal, use_sn, FALSE); } @@ -989,5 +990,6 @@ exec_cmd (const char *cmd, gboolean in_terminal, gboolean use_sn) void exec_cmd_silent (const char *cmd, gboolean in_terminal, gboolean use_sn) { + g_return_if_fail (cmd != NULL); schedule_exec(cmd, in_terminal, use_sn, TRUE); } diff --git a/plugins/Makefile.in b/plugins/Makefile.in index c37c1140..f8423189 100644 --- a/plugins/Makefile.in +++ b/plugins/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.5 from Makefile.am. +# Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,7 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -21,7 +20,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -36,6 +34,29 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ +subdir = plugins +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/X11.m4 \ + $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/depends.m4 \ + $(top_srcdir)/m4/i18n.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-exec-recursive install-info-recursive \ + install-recursive installcheck-recursive installdirs-recursive \ + pdf-recursive ps-recursive uninstall-info-recursive \ + uninstall-recursive +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ @@ -166,6 +187,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -181,28 +203,38 @@ SUBDIRS = \ pager \ separator -subdir = plugins -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = - -RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ - ps-recursive install-info-recursive uninstall-info-recursive \ - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive -DIST_COMMON = Makefile.am Makefile.in -DIST_SUBDIRS = $(SUBDIRS) all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --foreign plugins/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: -rm -f *.lo @@ -273,14 +305,6 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -289,6 +313,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -314,7 +339,6 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ test -z "$(ETAGS_ARGS)$$tags$$unique" \ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique - ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -337,10 +361,6 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -354,7 +374,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -371,13 +391,13 @@ distdir: $(DISTFILES) done list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ + test -d "$(distdir)/$$subdir" \ + || mkdir "$(distdir)/$$subdir" \ || exit 1; \ (cd $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" \ - distdir=../$(distdir)/$$subdir \ + top_distdir="../$(top_distdir)" \ + distdir="../$(distdir)/$$subdir" \ distdir) \ || exit 1; \ fi; \ @@ -387,7 +407,6 @@ check: check-recursive all-am: Makefile installdirs: installdirs-recursive installdirs-am: - install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -399,7 +418,7 @@ install-am: all-am installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -407,7 +426,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -417,7 +436,7 @@ clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-recursive - + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-libtool \ distclean-tags @@ -425,6 +444,8 @@ dvi: dvi-recursive dvi-am: +html: html-recursive + info: info-recursive info-am: @@ -440,7 +461,7 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-recursive - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive @@ -459,22 +480,18 @@ uninstall-am: uninstall-info-am uninstall-info: uninstall-info-recursive -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ - clean-generic clean-libtool clean-recursive ctags \ +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ + clean clean-generic clean-libtool clean-recursive ctags \ ctags-recursive distclean distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distdir dvi dvi-am \ - dvi-recursive info info-am info-recursive install install-am \ - install-data install-data-am install-data-recursive \ - install-exec install-exec-am install-exec-recursive \ - install-info install-info-am install-info-recursive install-man \ - install-recursive install-strip installcheck installcheck-am \ - installdirs installdirs-am installdirs-recursive \ - maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ - pdf-recursive ps ps-am ps-recursive tags tags-recursive \ - uninstall uninstall-am uninstall-info-am \ - uninstall-info-recursive uninstall-recursive + distclean-recursive distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive \ + mostlyclean mostlyclean-generic mostlyclean-libtool \ + mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/plugins/clock/Makefile.in b/plugins/clock/Makefile.in index 5b2207f9..98d50a77 100644 --- a/plugins/clock/Makefile.in +++ b/plugins/clock/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.5 from Makefile.am. +# Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,6 +14,8 @@ @SET_MAKE@ +SOURCES = $(libclock_la_SOURCES) + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -21,7 +23,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -36,6 +37,40 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ +subdir = plugins/clock +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/X11.m4 \ + $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/depends.m4 \ + $(top_srcdir)/m4/i18n.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +am__installdirs = $(DESTDIR)$(plugindir) +pluginLTLIBRARIES_INSTALL = $(INSTALL) +LTLIBRARIES = $(plugin_LTLIBRARIES) +libclock_la_DEPENDENCIES = +am_libclock_la_OBJECTS = libclock_la-clock.lo +libclock_la_OBJECTS = $(am_libclock_la_OBJECTS) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libclock_la-clock.Plo +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(libclock_la_SOURCES) +DIST_SOURCES = $(libclock_la_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ @@ -166,6 +201,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -174,66 +210,58 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ plugindir = $(libdir)/xfce4/panel-plugins - plugin_LTLIBRARIES = libclock.la - libclock_la_LDFLAGS = \ -avoid-version \ -module - libclock_la_SOURCES = \ clock.c - libclock_la_CFLAGS = \ -I$(top_srcdir) \ @LIBXFCEGUI4_CFLAGS@ \ @LIBXML_CFLAGS@ - libclock_la_LIBADD = \ @LIBS@ -subdir = plugins/clock -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -LTLIBRARIES = $(plugin_LTLIBRARIES) - -libclock_la_DEPENDENCIES = -am_libclock_la_OBJECTS = libclock_la-clock.lo -libclock_la_OBJECTS = $(am_libclock_la_OBJECTS) - -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libclock_la-clock.Plo -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(libclock_la_SOURCES) -DIST_COMMON = Makefile.am Makefile.in -SOURCES = $(libclock_la_SOURCES) - all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/clock/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --foreign plugins/clock/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -pluginLTLIBRARIES_INSTALL = $(INSTALL) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(plugindir) + $(mkdir_p) $(DESTDIR)$(plugindir) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f="`echo $$p | sed -e 's|^.*/||'`"; \ @@ -262,77 +290,56 @@ libclock.la: $(libclock_la_OBJECTS) $(libclock_la_DEPENDENCIES) $(LINK) -rpath $(plugindir) $(libclock_la_LDFLAGS) $(libclock_la_OBJECTS) $(libclock_la_LIBADD) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core + -rm -f *.$(OBJEXT) distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclock_la-clock.Plo@am__quote@ -distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< libclock_la-clock.o: clock.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_la_CFLAGS) $(CFLAGS) -MT libclock_la-clock.o -MD -MP -MF "$(DEPDIR)/libclock_la-clock.Tpo" \ -@am__fastdepCC_TRUE@ -c -o libclock_la-clock.o `test -f 'clock.c' || echo '$(srcdir)/'`clock.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libclock_la-clock.Tpo" "$(DEPDIR)/libclock_la-clock.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libclock_la-clock.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_la_CFLAGS) $(CFLAGS) -MT libclock_la-clock.o -MD -MP -MF "$(DEPDIR)/libclock_la-clock.Tpo" -c -o libclock_la-clock.o `test -f 'clock.c' || echo '$(srcdir)/'`clock.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libclock_la-clock.Tpo" "$(DEPDIR)/libclock_la-clock.Po"; else rm -f "$(DEPDIR)/libclock_la-clock.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock.c' object='libclock_la-clock.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libclock_la-clock.Po' tmpdepfile='$(DEPDIR)/libclock_la-clock.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_la_CFLAGS) $(CFLAGS) -c -o libclock_la-clock.o `test -f 'clock.c' || echo '$(srcdir)/'`clock.c libclock_la-clock.obj: clock.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_la_CFLAGS) $(CFLAGS) -MT libclock_la-clock.obj -MD -MP -MF "$(DEPDIR)/libclock_la-clock.Tpo" \ -@am__fastdepCC_TRUE@ -c -o libclock_la-clock.obj `if test -f 'clock.c'; then $(CYGPATH_W) 'clock.c'; else $(CYGPATH_W) '$(srcdir)/clock.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libclock_la-clock.Tpo" "$(DEPDIR)/libclock_la-clock.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libclock_la-clock.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_la_CFLAGS) $(CFLAGS) -MT libclock_la-clock.obj -MD -MP -MF "$(DEPDIR)/libclock_la-clock.Tpo" -c -o libclock_la-clock.obj `if test -f 'clock.c'; then $(CYGPATH_W) 'clock.c'; else $(CYGPATH_W) '$(srcdir)/clock.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libclock_la-clock.Tpo" "$(DEPDIR)/libclock_la-clock.Po"; else rm -f "$(DEPDIR)/libclock_la-clock.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock.c' object='libclock_la-clock.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libclock_la-clock.Po' tmpdepfile='$(DEPDIR)/libclock_la-clock.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_la_CFLAGS) $(CFLAGS) -c -o libclock_la-clock.obj `if test -f 'clock.c'; then $(CYGPATH_W) 'clock.c'; else $(CYGPATH_W) '$(srcdir)/clock.c'; fi` libclock_la-clock.lo: clock.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_la_CFLAGS) $(CFLAGS) -MT libclock_la-clock.lo -MD -MP -MF "$(DEPDIR)/libclock_la-clock.Tpo" \ -@am__fastdepCC_TRUE@ -c -o libclock_la-clock.lo `test -f 'clock.c' || echo '$(srcdir)/'`clock.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libclock_la-clock.Tpo" "$(DEPDIR)/libclock_la-clock.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libclock_la-clock.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_la_CFLAGS) $(CFLAGS) -MT libclock_la-clock.lo -MD -MP -MF "$(DEPDIR)/libclock_la-clock.Tpo" -c -o libclock_la-clock.lo `test -f 'clock.c' || echo '$(srcdir)/'`clock.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libclock_la-clock.Tpo" "$(DEPDIR)/libclock_la-clock.Plo"; else rm -f "$(DEPDIR)/libclock_la-clock.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock.c' object='libclock_la-clock.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libclock_la-clock.Plo' tmpdepfile='$(DEPDIR)/libclock_la-clock.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @@ -348,14 +355,6 @@ distclean-libtool: -rm -f libtool uninstall-info-am: -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -364,6 +363,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -378,7 +378,6 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ test -z "$(ETAGS_ARGS)$$tags$$unique" \ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique - ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -401,10 +400,6 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = ../.. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -418,7 +413,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -436,9 +431,8 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) - installdirs: - $(mkinstalldirs) $(DESTDIR)$(plugindir) + $(mkdir_p) $(DESTDIR)$(plugindir) install: install-am install-exec: install-exec-am install-data: install-data-am @@ -450,7 +444,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -458,7 +452,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -469,14 +463,17 @@ clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \ mostlyclean-am distclean: distclean-am - -distclean-am: clean-am distclean-compile distclean-depend \ - distclean-generic distclean-libtool distclean-tags + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-tags dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -492,7 +489,8 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -rf ./$(DEPDIR) + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -512,12 +510,12 @@ uninstall-am: uninstall-info-am uninstall-pluginLTLIBRARIES .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool clean-pluginLTLIBRARIES ctags distclean \ - distclean-compile distclean-depend distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am info \ - info-am install install-am install-data install-data-am \ - install-exec install-exec-am install-info install-info-am \ - install-man install-pluginLTLIBRARIES install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-pluginLTLIBRARIES install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-info-am \ diff --git a/plugins/mailcheck/Makefile.in b/plugins/mailcheck/Makefile.in index 8c962247..1c9b4a21 100644 --- a/plugins/mailcheck/Makefile.in +++ b/plugins/mailcheck/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.5 from Makefile.am. +# Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,6 +14,8 @@ @SET_MAKE@ +SOURCES = $(libmailcheck_la_SOURCES) + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -21,7 +23,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -36,6 +37,40 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ +subdir = plugins/mailcheck +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/X11.m4 \ + $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/depends.m4 \ + $(top_srcdir)/m4/i18n.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +am__installdirs = $(DESTDIR)$(plugindir) +pluginLTLIBRARIES_INSTALL = $(INSTALL) +LTLIBRARIES = $(plugin_LTLIBRARIES) +libmailcheck_la_DEPENDENCIES = +am_libmailcheck_la_OBJECTS = libmailcheck_la-mailcheck.lo +libmailcheck_la_OBJECTS = $(am_libmailcheck_la_OBJECTS) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libmailcheck_la-mailcheck.Plo +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(libmailcheck_la_SOURCES) +DIST_SOURCES = $(libmailcheck_la_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ @@ -166,6 +201,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -174,67 +210,59 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ plugindir = $(libdir)/xfce4/panel-plugins - plugin_LTLIBRARIES = libmailcheck.la - libmailcheck_la_LDFLAGS = \ -avoid-version \ -module - libmailcheck_la_SOURCES = \ mailcheck.c - libmailcheck_la_CFLAGS = \ -I$(top_srcdir) \ @LIBSTARTUP_NOTIFICATION_CFLAGS@ \ @LIBXFCEGUI4_CFLAGS@ \ @LIBXML_CFLAGS@ - libmailcheck_la_LIBADD = \ @LIBS@ -subdir = plugins/mailcheck -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -LTLIBRARIES = $(plugin_LTLIBRARIES) - -libmailcheck_la_DEPENDENCIES = -am_libmailcheck_la_OBJECTS = libmailcheck_la-mailcheck.lo -libmailcheck_la_OBJECTS = $(am_libmailcheck_la_OBJECTS) - -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libmailcheck_la-mailcheck.Plo -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(libmailcheck_la_SOURCES) -DIST_COMMON = Makefile.am Makefile.in -SOURCES = $(libmailcheck_la_SOURCES) - all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/mailcheck/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --foreign plugins/mailcheck/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -pluginLTLIBRARIES_INSTALL = $(INSTALL) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(plugindir) + $(mkdir_p) $(DESTDIR)$(plugindir) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f="`echo $$p | sed -e 's|^.*/||'`"; \ @@ -263,77 +291,56 @@ libmailcheck.la: $(libmailcheck_la_OBJECTS) $(libmailcheck_la_DEPENDENCIES) $(LINK) -rpath $(plugindir) $(libmailcheck_la_LDFLAGS) $(libmailcheck_la_OBJECTS) $(libmailcheck_la_LIBADD) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core + -rm -f *.$(OBJEXT) distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmailcheck_la-mailcheck.Plo@am__quote@ -distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< libmailcheck_la-mailcheck.o: mailcheck.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmailcheck_la_CFLAGS) $(CFLAGS) -MT libmailcheck_la-mailcheck.o -MD -MP -MF "$(DEPDIR)/libmailcheck_la-mailcheck.Tpo" \ -@am__fastdepCC_TRUE@ -c -o libmailcheck_la-mailcheck.o `test -f 'mailcheck.c' || echo '$(srcdir)/'`mailcheck.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libmailcheck_la-mailcheck.Tpo" "$(DEPDIR)/libmailcheck_la-mailcheck.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libmailcheck_la-mailcheck.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmailcheck_la_CFLAGS) $(CFLAGS) -MT libmailcheck_la-mailcheck.o -MD -MP -MF "$(DEPDIR)/libmailcheck_la-mailcheck.Tpo" -c -o libmailcheck_la-mailcheck.o `test -f 'mailcheck.c' || echo '$(srcdir)/'`mailcheck.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libmailcheck_la-mailcheck.Tpo" "$(DEPDIR)/libmailcheck_la-mailcheck.Po"; else rm -f "$(DEPDIR)/libmailcheck_la-mailcheck.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mailcheck.c' object='libmailcheck_la-mailcheck.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libmailcheck_la-mailcheck.Po' tmpdepfile='$(DEPDIR)/libmailcheck_la-mailcheck.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmailcheck_la_CFLAGS) $(CFLAGS) -c -o libmailcheck_la-mailcheck.o `test -f 'mailcheck.c' || echo '$(srcdir)/'`mailcheck.c libmailcheck_la-mailcheck.obj: mailcheck.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmailcheck_la_CFLAGS) $(CFLAGS) -MT libmailcheck_la-mailcheck.obj -MD -MP -MF "$(DEPDIR)/libmailcheck_la-mailcheck.Tpo" \ -@am__fastdepCC_TRUE@ -c -o libmailcheck_la-mailcheck.obj `if test -f 'mailcheck.c'; then $(CYGPATH_W) 'mailcheck.c'; else $(CYGPATH_W) '$(srcdir)/mailcheck.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libmailcheck_la-mailcheck.Tpo" "$(DEPDIR)/libmailcheck_la-mailcheck.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libmailcheck_la-mailcheck.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmailcheck_la_CFLAGS) $(CFLAGS) -MT libmailcheck_la-mailcheck.obj -MD -MP -MF "$(DEPDIR)/libmailcheck_la-mailcheck.Tpo" -c -o libmailcheck_la-mailcheck.obj `if test -f 'mailcheck.c'; then $(CYGPATH_W) 'mailcheck.c'; else $(CYGPATH_W) '$(srcdir)/mailcheck.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libmailcheck_la-mailcheck.Tpo" "$(DEPDIR)/libmailcheck_la-mailcheck.Po"; else rm -f "$(DEPDIR)/libmailcheck_la-mailcheck.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mailcheck.c' object='libmailcheck_la-mailcheck.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libmailcheck_la-mailcheck.Po' tmpdepfile='$(DEPDIR)/libmailcheck_la-mailcheck.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmailcheck_la_CFLAGS) $(CFLAGS) -c -o libmailcheck_la-mailcheck.obj `if test -f 'mailcheck.c'; then $(CYGPATH_W) 'mailcheck.c'; else $(CYGPATH_W) '$(srcdir)/mailcheck.c'; fi` libmailcheck_la-mailcheck.lo: mailcheck.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmailcheck_la_CFLAGS) $(CFLAGS) -MT libmailcheck_la-mailcheck.lo -MD -MP -MF "$(DEPDIR)/libmailcheck_la-mailcheck.Tpo" \ -@am__fastdepCC_TRUE@ -c -o libmailcheck_la-mailcheck.lo `test -f 'mailcheck.c' || echo '$(srcdir)/'`mailcheck.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libmailcheck_la-mailcheck.Tpo" "$(DEPDIR)/libmailcheck_la-mailcheck.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libmailcheck_la-mailcheck.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmailcheck_la_CFLAGS) $(CFLAGS) -MT libmailcheck_la-mailcheck.lo -MD -MP -MF "$(DEPDIR)/libmailcheck_la-mailcheck.Tpo" -c -o libmailcheck_la-mailcheck.lo `test -f 'mailcheck.c' || echo '$(srcdir)/'`mailcheck.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libmailcheck_la-mailcheck.Tpo" "$(DEPDIR)/libmailcheck_la-mailcheck.Plo"; else rm -f "$(DEPDIR)/libmailcheck_la-mailcheck.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mailcheck.c' object='libmailcheck_la-mailcheck.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libmailcheck_la-mailcheck.Plo' tmpdepfile='$(DEPDIR)/libmailcheck_la-mailcheck.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @@ -349,14 +356,6 @@ distclean-libtool: -rm -f libtool uninstall-info-am: -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -365,6 +364,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -379,7 +379,6 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ test -z "$(ETAGS_ARGS)$$tags$$unique" \ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique - ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -402,10 +401,6 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = ../.. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -419,7 +414,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -437,9 +432,8 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) - installdirs: - $(mkinstalldirs) $(DESTDIR)$(plugindir) + $(mkdir_p) $(DESTDIR)$(plugindir) install: install-am install-exec: install-exec-am install-data: install-data-am @@ -451,7 +445,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -459,7 +453,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -470,14 +464,17 @@ clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \ mostlyclean-am distclean: distclean-am - -distclean-am: clean-am distclean-compile distclean-depend \ - distclean-generic distclean-libtool distclean-tags + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-tags dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -493,7 +490,8 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -rf ./$(DEPDIR) + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -513,12 +511,12 @@ uninstall-am: uninstall-info-am uninstall-pluginLTLIBRARIES .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool clean-pluginLTLIBRARIES ctags distclean \ - distclean-compile distclean-depend distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am info \ - info-am install install-am install-data install-data-am \ - install-exec install-exec-am install-info install-info-am \ - install-man install-pluginLTLIBRARIES install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-pluginLTLIBRARIES install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-info-am \ diff --git a/plugins/pager/Makefile.in b/plugins/pager/Makefile.in index 01903503..0b039e11 100644 --- a/plugins/pager/Makefile.in +++ b/plugins/pager/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.5 from Makefile.am. +# Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,6 +14,8 @@ @SET_MAKE@ +SOURCES = $(libpager_la_SOURCES) + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -21,7 +23,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -36,6 +37,40 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ +subdir = plugins/pager +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/X11.m4 \ + $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/depends.m4 \ + $(top_srcdir)/m4/i18n.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +am__installdirs = $(DESTDIR)$(plugindir) +pluginLTLIBRARIES_INSTALL = $(INSTALL) +LTLIBRARIES = $(plugin_LTLIBRARIES) +libpager_la_DEPENDENCIES = +am_libpager_la_OBJECTS = libpager_la-pager.lo +libpager_la_OBJECTS = $(am_libpager_la_OBJECTS) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libpager_la-pager.Plo +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(libpager_la_SOURCES) +DIST_SOURCES = $(libpager_la_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ @@ -166,6 +201,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -174,66 +210,58 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ plugindir = $(libdir)/xfce4/panel-plugins - plugin_LTLIBRARIES = libpager.la - libpager_la_LDFLAGS = \ -avoid-version \ -module - libpager_la_SOURCES = \ pager.c - libpager_la_CFLAGS = \ -I$(top_srcdir) \ @LIBXFCEGUI4_CFLAGS@ \ @LIBXML_CFLAGS@ - libpager_la_LIBADD = \ @LIBS@ -subdir = plugins/pager -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -LTLIBRARIES = $(plugin_LTLIBRARIES) - -libpager_la_DEPENDENCIES = -am_libpager_la_OBJECTS = libpager_la-pager.lo -libpager_la_OBJECTS = $(am_libpager_la_OBJECTS) - -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libpager_la-pager.Plo -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(libpager_la_SOURCES) -DIST_COMMON = Makefile.am Makefile.in -SOURCES = $(libpager_la_SOURCES) - all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/pager/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --foreign plugins/pager/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -pluginLTLIBRARIES_INSTALL = $(INSTALL) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(plugindir) + $(mkdir_p) $(DESTDIR)$(plugindir) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f="`echo $$p | sed -e 's|^.*/||'`"; \ @@ -262,77 +290,56 @@ libpager.la: $(libpager_la_OBJECTS) $(libpager_la_DEPENDENCIES) $(LINK) -rpath $(plugindir) $(libpager_la_LDFLAGS) $(libpager_la_OBJECTS) $(libpager_la_LIBADD) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core + -rm -f *.$(OBJEXT) distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpager_la-pager.Plo@am__quote@ -distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< libpager_la-pager.o: pager.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpager_la_CFLAGS) $(CFLAGS) -MT libpager_la-pager.o -MD -MP -MF "$(DEPDIR)/libpager_la-pager.Tpo" \ -@am__fastdepCC_TRUE@ -c -o libpager_la-pager.o `test -f 'pager.c' || echo '$(srcdir)/'`pager.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libpager_la-pager.Tpo" "$(DEPDIR)/libpager_la-pager.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libpager_la-pager.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpager_la_CFLAGS) $(CFLAGS) -MT libpager_la-pager.o -MD -MP -MF "$(DEPDIR)/libpager_la-pager.Tpo" -c -o libpager_la-pager.o `test -f 'pager.c' || echo '$(srcdir)/'`pager.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libpager_la-pager.Tpo" "$(DEPDIR)/libpager_la-pager.Po"; else rm -f "$(DEPDIR)/libpager_la-pager.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pager.c' object='libpager_la-pager.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libpager_la-pager.Po' tmpdepfile='$(DEPDIR)/libpager_la-pager.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpager_la_CFLAGS) $(CFLAGS) -c -o libpager_la-pager.o `test -f 'pager.c' || echo '$(srcdir)/'`pager.c libpager_la-pager.obj: pager.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpager_la_CFLAGS) $(CFLAGS) -MT libpager_la-pager.obj -MD -MP -MF "$(DEPDIR)/libpager_la-pager.Tpo" \ -@am__fastdepCC_TRUE@ -c -o libpager_la-pager.obj `if test -f 'pager.c'; then $(CYGPATH_W) 'pager.c'; else $(CYGPATH_W) '$(srcdir)/pager.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libpager_la-pager.Tpo" "$(DEPDIR)/libpager_la-pager.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libpager_la-pager.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpager_la_CFLAGS) $(CFLAGS) -MT libpager_la-pager.obj -MD -MP -MF "$(DEPDIR)/libpager_la-pager.Tpo" -c -o libpager_la-pager.obj `if test -f 'pager.c'; then $(CYGPATH_W) 'pager.c'; else $(CYGPATH_W) '$(srcdir)/pager.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libpager_la-pager.Tpo" "$(DEPDIR)/libpager_la-pager.Po"; else rm -f "$(DEPDIR)/libpager_la-pager.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pager.c' object='libpager_la-pager.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libpager_la-pager.Po' tmpdepfile='$(DEPDIR)/libpager_la-pager.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpager_la_CFLAGS) $(CFLAGS) -c -o libpager_la-pager.obj `if test -f 'pager.c'; then $(CYGPATH_W) 'pager.c'; else $(CYGPATH_W) '$(srcdir)/pager.c'; fi` libpager_la-pager.lo: pager.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpager_la_CFLAGS) $(CFLAGS) -MT libpager_la-pager.lo -MD -MP -MF "$(DEPDIR)/libpager_la-pager.Tpo" \ -@am__fastdepCC_TRUE@ -c -o libpager_la-pager.lo `test -f 'pager.c' || echo '$(srcdir)/'`pager.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libpager_la-pager.Tpo" "$(DEPDIR)/libpager_la-pager.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libpager_la-pager.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpager_la_CFLAGS) $(CFLAGS) -MT libpager_la-pager.lo -MD -MP -MF "$(DEPDIR)/libpager_la-pager.Tpo" -c -o libpager_la-pager.lo `test -f 'pager.c' || echo '$(srcdir)/'`pager.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libpager_la-pager.Tpo" "$(DEPDIR)/libpager_la-pager.Plo"; else rm -f "$(DEPDIR)/libpager_la-pager.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pager.c' object='libpager_la-pager.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libpager_la-pager.Plo' tmpdepfile='$(DEPDIR)/libpager_la-pager.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @@ -348,14 +355,6 @@ distclean-libtool: -rm -f libtool uninstall-info-am: -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -364,6 +363,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -378,7 +378,6 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ test -z "$(ETAGS_ARGS)$$tags$$unique" \ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique - ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -401,10 +400,6 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = ../.. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -418,7 +413,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -436,9 +431,8 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) - installdirs: - $(mkinstalldirs) $(DESTDIR)$(plugindir) + $(mkdir_p) $(DESTDIR)$(plugindir) install: install-am install-exec: install-exec-am install-data: install-data-am @@ -450,7 +444,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -458,7 +452,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -469,14 +463,17 @@ clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \ mostlyclean-am distclean: distclean-am - -distclean-am: clean-am distclean-compile distclean-depend \ - distclean-generic distclean-libtool distclean-tags + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-tags dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -492,7 +489,8 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -rf ./$(DEPDIR) + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -512,12 +510,12 @@ uninstall-am: uninstall-info-am uninstall-pluginLTLIBRARIES .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool clean-pluginLTLIBRARIES ctags distclean \ - distclean-compile distclean-depend distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am info \ - info-am install install-am install-data install-data-am \ - install-exec install-exec-am install-info install-info-am \ - install-man install-pluginLTLIBRARIES install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-pluginLTLIBRARIES install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-info-am \ diff --git a/plugins/pager/pager.c b/plugins/pager/pager.c index 207b88b1..2b1a49a8 100644 --- a/plugins/pager/pager.c +++ b/plugins/pager/pager.c @@ -25,6 +25,8 @@ #undef GDK_MULTIHEAD_SAFE #endif +#include <math.h> + #include <libxfce4util/i18n.h> #include <libxfcegui4/libxfcegui4.h> @@ -83,22 +85,14 @@ static void netk_pager_update_size (GtkWidget * pager, NetkScreen * screen) { int s = icon_size[settings.size] + border_width; - int count = netk_screen_get_workspace_count (screen); - int w; if (settings.orientation == HORIZONTAL) { - w = count * (int) ((double) (gdk_screen_width () * s) / - (double) (gdk_screen_height ())); - - gtk_widget_set_size_request (pager, w, s); + gtk_widget_set_size_request (pager, -1, s); } else { - w = count * (int) ((double) (gdk_screen_height () * s) / - (double) (gdk_screen_width ())); - - gtk_widget_set_size_request (pager, s, w); + gtk_widget_set_size_request (pager, s, -1); } } diff --git a/plugins/separator/Makefile.in b/plugins/separator/Makefile.in index 424d8f1d..d3c3d0db 100644 --- a/plugins/separator/Makefile.in +++ b/plugins/separator/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.5 from Makefile.am. +# Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,6 +14,8 @@ @SET_MAKE@ +SOURCES = $(libseparator_la_SOURCES) + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -21,7 +23,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -36,6 +37,40 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ +subdir = plugins/separator +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/X11.m4 \ + $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/depends.m4 \ + $(top_srcdir)/m4/i18n.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +am__installdirs = $(DESTDIR)$(plugindir) +pluginLTLIBRARIES_INSTALL = $(INSTALL) +LTLIBRARIES = $(plugin_LTLIBRARIES) +libseparator_la_DEPENDENCIES = +am_libseparator_la_OBJECTS = libseparator_la-separator.lo +libseparator_la_OBJECTS = $(am_libseparator_la_OBJECTS) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libseparator_la-separator.Plo +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(libseparator_la_SOURCES) +DIST_SOURCES = $(libseparator_la_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ @@ -166,6 +201,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -174,66 +210,58 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ plugindir = $(libdir)/xfce4/panel-plugins - plugin_LTLIBRARIES = libseparator.la - libseparator_la_LDFLAGS = \ -avoid-version \ -module - libseparator_la_SOURCES = \ separator.c - libseparator_la_CFLAGS = \ -I$(top_srcdir) \ @LIBXFCEGUI4_CFLAGS@ \ @LIBXML_CFLAGS@ - libseparator_la_LIBADD = \ @LIBS@ -subdir = plugins/separator -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -LTLIBRARIES = $(plugin_LTLIBRARIES) - -libseparator_la_DEPENDENCIES = -am_libseparator_la_OBJECTS = libseparator_la-separator.lo -libseparator_la_OBJECTS = $(am_libseparator_la_OBJECTS) - -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libseparator_la-separator.Plo -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(libseparator_la_SOURCES) -DIST_COMMON = Makefile.am Makefile.in -SOURCES = $(libseparator_la_SOURCES) - all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/separator/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --foreign plugins/separator/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -pluginLTLIBRARIES_INSTALL = $(INSTALL) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(plugindir) + $(mkdir_p) $(DESTDIR)$(plugindir) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f="`echo $$p | sed -e 's|^.*/||'`"; \ @@ -262,77 +290,56 @@ libseparator.la: $(libseparator_la_OBJECTS) $(libseparator_la_DEPENDENCIES) $(LINK) -rpath $(plugindir) $(libseparator_la_LDFLAGS) $(libseparator_la_OBJECTS) $(libseparator_la_LIBADD) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core + -rm -f *.$(OBJEXT) distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libseparator_la-separator.Plo@am__quote@ -distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< libseparator_la-separator.o: separator.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libseparator_la_CFLAGS) $(CFLAGS) -MT libseparator_la-separator.o -MD -MP -MF "$(DEPDIR)/libseparator_la-separator.Tpo" \ -@am__fastdepCC_TRUE@ -c -o libseparator_la-separator.o `test -f 'separator.c' || echo '$(srcdir)/'`separator.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libseparator_la-separator.Tpo" "$(DEPDIR)/libseparator_la-separator.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libseparator_la-separator.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libseparator_la_CFLAGS) $(CFLAGS) -MT libseparator_la-separator.o -MD -MP -MF "$(DEPDIR)/libseparator_la-separator.Tpo" -c -o libseparator_la-separator.o `test -f 'separator.c' || echo '$(srcdir)/'`separator.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libseparator_la-separator.Tpo" "$(DEPDIR)/libseparator_la-separator.Po"; else rm -f "$(DEPDIR)/libseparator_la-separator.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='separator.c' object='libseparator_la-separator.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libseparator_la-separator.Po' tmpdepfile='$(DEPDIR)/libseparator_la-separator.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libseparator_la_CFLAGS) $(CFLAGS) -c -o libseparator_la-separator.o `test -f 'separator.c' || echo '$(srcdir)/'`separator.c libseparator_la-separator.obj: separator.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libseparator_la_CFLAGS) $(CFLAGS) -MT libseparator_la-separator.obj -MD -MP -MF "$(DEPDIR)/libseparator_la-separator.Tpo" \ -@am__fastdepCC_TRUE@ -c -o libseparator_la-separator.obj `if test -f 'separator.c'; then $(CYGPATH_W) 'separator.c'; else $(CYGPATH_W) '$(srcdir)/separator.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libseparator_la-separator.Tpo" "$(DEPDIR)/libseparator_la-separator.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libseparator_la-separator.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libseparator_la_CFLAGS) $(CFLAGS) -MT libseparator_la-separator.obj -MD -MP -MF "$(DEPDIR)/libseparator_la-separator.Tpo" -c -o libseparator_la-separator.obj `if test -f 'separator.c'; then $(CYGPATH_W) 'separator.c'; else $(CYGPATH_W) '$(srcdir)/separator.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libseparator_la-separator.Tpo" "$(DEPDIR)/libseparator_la-separator.Po"; else rm -f "$(DEPDIR)/libseparator_la-separator.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='separator.c' object='libseparator_la-separator.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libseparator_la-separator.Po' tmpdepfile='$(DEPDIR)/libseparator_la-separator.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libseparator_la_CFLAGS) $(CFLAGS) -c -o libseparator_la-separator.obj `if test -f 'separator.c'; then $(CYGPATH_W) 'separator.c'; else $(CYGPATH_W) '$(srcdir)/separator.c'; fi` libseparator_la-separator.lo: separator.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libseparator_la_CFLAGS) $(CFLAGS) -MT libseparator_la-separator.lo -MD -MP -MF "$(DEPDIR)/libseparator_la-separator.Tpo" \ -@am__fastdepCC_TRUE@ -c -o libseparator_la-separator.lo `test -f 'separator.c' || echo '$(srcdir)/'`separator.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libseparator_la-separator.Tpo" "$(DEPDIR)/libseparator_la-separator.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libseparator_la-separator.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libseparator_la_CFLAGS) $(CFLAGS) -MT libseparator_la-separator.lo -MD -MP -MF "$(DEPDIR)/libseparator_la-separator.Tpo" -c -o libseparator_la-separator.lo `test -f 'separator.c' || echo '$(srcdir)/'`separator.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libseparator_la-separator.Tpo" "$(DEPDIR)/libseparator_la-separator.Plo"; else rm -f "$(DEPDIR)/libseparator_la-separator.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='separator.c' object='libseparator_la-separator.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libseparator_la-separator.Plo' tmpdepfile='$(DEPDIR)/libseparator_la-separator.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @@ -348,14 +355,6 @@ distclean-libtool: -rm -f libtool uninstall-info-am: -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -364,6 +363,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -378,7 +378,6 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ test -z "$(ETAGS_ARGS)$$tags$$unique" \ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique - ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -401,10 +400,6 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = ../.. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -418,7 +413,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -436,9 +431,8 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) - installdirs: - $(mkinstalldirs) $(DESTDIR)$(plugindir) + $(mkdir_p) $(DESTDIR)$(plugindir) install: install-am install-exec: install-exec-am install-data: install-data-am @@ -450,7 +444,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -458,7 +452,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -469,14 +463,17 @@ clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \ mostlyclean-am distclean: distclean-am - -distclean-am: clean-am distclean-compile distclean-depend \ - distclean-generic distclean-libtool distclean-tags + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-tags dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -492,7 +489,8 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -rf ./$(DEPDIR) + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -512,12 +510,12 @@ uninstall-am: uninstall-info-am uninstall-pluginLTLIBRARIES .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool clean-pluginLTLIBRARIES ctags distclean \ - distclean-compile distclean-depend distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am info \ - info-am install install-am install-data install-data-am \ - install-exec install-exec-am install-info install-info-am \ - install-man install-pluginLTLIBRARIES install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-pluginLTLIBRARIES install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-info-am \ diff --git a/plugins/switcher/Makefile.in b/plugins/switcher/Makefile.in index 8e98f4b4..a0fd4b59 100644 --- a/plugins/switcher/Makefile.in +++ b/plugins/switcher/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.5 from Makefile.am. +# Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,6 +14,8 @@ @SET_MAKE@ +SOURCES = $(libswitcher_la_SOURCES) + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -21,7 +23,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -36,6 +37,40 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ +subdir = plugins/switcher +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/X11.m4 \ + $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/depends.m4 \ + $(top_srcdir)/m4/i18n.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +am__installdirs = $(DESTDIR)$(plugindir) +pluginLTLIBRARIES_INSTALL = $(INSTALL) +LTLIBRARIES = $(plugin_LTLIBRARIES) +libswitcher_la_DEPENDENCIES = +am_libswitcher_la_OBJECTS = libswitcher_la-switcher.lo +libswitcher_la_OBJECTS = $(am_libswitcher_la_OBJECTS) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libswitcher_la-switcher.Plo +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(libswitcher_la_SOURCES) +DIST_SOURCES = $(libswitcher_la_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ @@ -166,6 +201,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -174,67 +210,59 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ plugindir = $(libdir)/xfce4/panel-plugins - plugin_LTLIBRARIES = libswitcher.la - libswitcher_la_LDFLAGS = \ -avoid-version \ -module - libswitcher_la_SOURCES = \ switcher.c - libswitcher_la_CFLAGS = \ -I$(top_srcdir) \ @LIBX11_CFLAGS@ \ @LIBXFCEGUI4_CFLAGS@ \ @LIBXML_CFLAGS@ - libswitcher_la_LIBADD = \ @LIBS@ -subdir = plugins/switcher -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -LTLIBRARIES = $(plugin_LTLIBRARIES) - -libswitcher_la_DEPENDENCIES = -am_libswitcher_la_OBJECTS = libswitcher_la-switcher.lo -libswitcher_la_OBJECTS = $(am_libswitcher_la_OBJECTS) - -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libswitcher_la-switcher.Plo -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(libswitcher_la_SOURCES) -DIST_COMMON = Makefile.am Makefile.in -SOURCES = $(libswitcher_la_SOURCES) - all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/switcher/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --foreign plugins/switcher/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -pluginLTLIBRARIES_INSTALL = $(INSTALL) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(plugindir) + $(mkdir_p) $(DESTDIR)$(plugindir) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f="`echo $$p | sed -e 's|^.*/||'`"; \ @@ -263,77 +291,56 @@ libswitcher.la: $(libswitcher_la_OBJECTS) $(libswitcher_la_DEPENDENCIES) $(LINK) -rpath $(plugindir) $(libswitcher_la_LDFLAGS) $(libswitcher_la_OBJECTS) $(libswitcher_la_LIBADD) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core + -rm -f *.$(OBJEXT) distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libswitcher_la-switcher.Plo@am__quote@ -distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< libswitcher_la-switcher.o: switcher.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libswitcher_la_CFLAGS) $(CFLAGS) -MT libswitcher_la-switcher.o -MD -MP -MF "$(DEPDIR)/libswitcher_la-switcher.Tpo" \ -@am__fastdepCC_TRUE@ -c -o libswitcher_la-switcher.o `test -f 'switcher.c' || echo '$(srcdir)/'`switcher.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libswitcher_la-switcher.Tpo" "$(DEPDIR)/libswitcher_la-switcher.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libswitcher_la-switcher.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libswitcher_la_CFLAGS) $(CFLAGS) -MT libswitcher_la-switcher.o -MD -MP -MF "$(DEPDIR)/libswitcher_la-switcher.Tpo" -c -o libswitcher_la-switcher.o `test -f 'switcher.c' || echo '$(srcdir)/'`switcher.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libswitcher_la-switcher.Tpo" "$(DEPDIR)/libswitcher_la-switcher.Po"; else rm -f "$(DEPDIR)/libswitcher_la-switcher.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='switcher.c' object='libswitcher_la-switcher.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libswitcher_la-switcher.Po' tmpdepfile='$(DEPDIR)/libswitcher_la-switcher.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libswitcher_la_CFLAGS) $(CFLAGS) -c -o libswitcher_la-switcher.o `test -f 'switcher.c' || echo '$(srcdir)/'`switcher.c libswitcher_la-switcher.obj: switcher.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libswitcher_la_CFLAGS) $(CFLAGS) -MT libswitcher_la-switcher.obj -MD -MP -MF "$(DEPDIR)/libswitcher_la-switcher.Tpo" \ -@am__fastdepCC_TRUE@ -c -o libswitcher_la-switcher.obj `if test -f 'switcher.c'; then $(CYGPATH_W) 'switcher.c'; else $(CYGPATH_W) '$(srcdir)/switcher.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libswitcher_la-switcher.Tpo" "$(DEPDIR)/libswitcher_la-switcher.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libswitcher_la-switcher.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libswitcher_la_CFLAGS) $(CFLAGS) -MT libswitcher_la-switcher.obj -MD -MP -MF "$(DEPDIR)/libswitcher_la-switcher.Tpo" -c -o libswitcher_la-switcher.obj `if test -f 'switcher.c'; then $(CYGPATH_W) 'switcher.c'; else $(CYGPATH_W) '$(srcdir)/switcher.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libswitcher_la-switcher.Tpo" "$(DEPDIR)/libswitcher_la-switcher.Po"; else rm -f "$(DEPDIR)/libswitcher_la-switcher.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='switcher.c' object='libswitcher_la-switcher.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libswitcher_la-switcher.Po' tmpdepfile='$(DEPDIR)/libswitcher_la-switcher.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libswitcher_la_CFLAGS) $(CFLAGS) -c -o libswitcher_la-switcher.obj `if test -f 'switcher.c'; then $(CYGPATH_W) 'switcher.c'; else $(CYGPATH_W) '$(srcdir)/switcher.c'; fi` libswitcher_la-switcher.lo: switcher.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libswitcher_la_CFLAGS) $(CFLAGS) -MT libswitcher_la-switcher.lo -MD -MP -MF "$(DEPDIR)/libswitcher_la-switcher.Tpo" \ -@am__fastdepCC_TRUE@ -c -o libswitcher_la-switcher.lo `test -f 'switcher.c' || echo '$(srcdir)/'`switcher.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libswitcher_la-switcher.Tpo" "$(DEPDIR)/libswitcher_la-switcher.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libswitcher_la-switcher.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libswitcher_la_CFLAGS) $(CFLAGS) -MT libswitcher_la-switcher.lo -MD -MP -MF "$(DEPDIR)/libswitcher_la-switcher.Tpo" -c -o libswitcher_la-switcher.lo `test -f 'switcher.c' || echo '$(srcdir)/'`switcher.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libswitcher_la-switcher.Tpo" "$(DEPDIR)/libswitcher_la-switcher.Plo"; else rm -f "$(DEPDIR)/libswitcher_la-switcher.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='switcher.c' object='libswitcher_la-switcher.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libswitcher_la-switcher.Plo' tmpdepfile='$(DEPDIR)/libswitcher_la-switcher.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @@ -349,14 +356,6 @@ distclean-libtool: -rm -f libtool uninstall-info-am: -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -365,6 +364,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -379,7 +379,6 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ test -z "$(ETAGS_ARGS)$$tags$$unique" \ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique - ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -402,10 +401,6 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = ../.. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -419,7 +414,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -437,9 +432,8 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) - installdirs: - $(mkinstalldirs) $(DESTDIR)$(plugindir) + $(mkdir_p) $(DESTDIR)$(plugindir) install: install-am install-exec: install-exec-am install-data: install-data-am @@ -451,7 +445,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -459,7 +453,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -470,14 +464,17 @@ clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \ mostlyclean-am distclean: distclean-am - -distclean-am: clean-am distclean-compile distclean-depend \ - distclean-generic distclean-libtool distclean-tags + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-tags dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -493,7 +490,8 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -rf ./$(DEPDIR) + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -513,12 +511,12 @@ uninstall-am: uninstall-info-am uninstall-pluginLTLIBRARIES .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool clean-pluginLTLIBRARIES ctags distclean \ - distclean-compile distclean-depend distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am info \ - info-am install install-am install-data install-data-am \ - install-exec install-exec-am install-info install-info-am \ - install-man install-pluginLTLIBRARIES install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-pluginLTLIBRARIES install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-info-am \ diff --git a/plugins/systembuttons/Makefile.in b/plugins/systembuttons/Makefile.in index 3e35e44c..b88c02e0 100644 --- a/plugins/systembuttons/Makefile.in +++ b/plugins/systembuttons/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.5 from Makefile.am. +# Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,6 +14,8 @@ @SET_MAKE@ +SOURCES = $(libsystembuttons_la_SOURCES) + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -21,7 +23,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -36,6 +37,41 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ +subdir = plugins/systembuttons +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/X11.m4 \ + $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/depends.m4 \ + $(top_srcdir)/m4/i18n.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +am__installdirs = $(DESTDIR)$(plugindir) +pluginLTLIBRARIES_INSTALL = $(INSTALL) +LTLIBRARIES = $(plugin_LTLIBRARIES) +libsystembuttons_la_DEPENDENCIES = +am_libsystembuttons_la_OBJECTS = libsystembuttons_la-systembuttons.lo +libsystembuttons_la_OBJECTS = $(am_libsystembuttons_la_OBJECTS) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +@AMDEP_TRUE@DEP_FILES = \ +@AMDEP_TRUE@ ./$(DEPDIR)/libsystembuttons_la-systembuttons.Plo +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(libsystembuttons_la_SOURCES) +DIST_SOURCES = $(libsystembuttons_la_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ @@ -166,6 +202,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -174,67 +211,58 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ plugindir = $(libdir)/xfce4/panel-plugins - plugin_LTLIBRARIES = libsystembuttons.la - libsystembuttons_la_LDFLAGS = \ -avoid-version \ -module - libsystembuttons_la_SOURCES = \ systembuttons.c - libsystembuttons_la_CFLAGS = \ -I$(top_srcdir) \ @LIBXFCEGUI4_CFLAGS@ \ @LIBXML_CFLAGS@ - libsystembuttons_la_LIBADD = \ @LIBS@ -subdir = plugins/systembuttons -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -LTLIBRARIES = $(plugin_LTLIBRARIES) - -libsystembuttons_la_DEPENDENCIES = -am_libsystembuttons_la_OBJECTS = libsystembuttons_la-systembuttons.lo -libsystembuttons_la_OBJECTS = $(am_libsystembuttons_la_OBJECTS) - -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = \ -@AMDEP_TRUE@ ./$(DEPDIR)/libsystembuttons_la-systembuttons.Plo -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(libsystembuttons_la_SOURCES) -DIST_COMMON = Makefile.am Makefile.in -SOURCES = $(libsystembuttons_la_SOURCES) - all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/systembuttons/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --foreign plugins/systembuttons/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -pluginLTLIBRARIES_INSTALL = $(INSTALL) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(plugindir) + $(mkdir_p) $(DESTDIR)$(plugindir) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f="`echo $$p | sed -e 's|^.*/||'`"; \ @@ -263,77 +291,56 @@ libsystembuttons.la: $(libsystembuttons_la_OBJECTS) $(libsystembuttons_la_DEPEND $(LINK) -rpath $(plugindir) $(libsystembuttons_la_LDFLAGS) $(libsystembuttons_la_OBJECTS) $(libsystembuttons_la_LIBADD) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core + -rm -f *.$(OBJEXT) distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsystembuttons_la-systembuttons.Plo@am__quote@ -distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< libsystembuttons_la-systembuttons.o: systembuttons.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystembuttons_la_CFLAGS) $(CFLAGS) -MT libsystembuttons_la-systembuttons.o -MD -MP -MF "$(DEPDIR)/libsystembuttons_la-systembuttons.Tpo" \ -@am__fastdepCC_TRUE@ -c -o libsystembuttons_la-systembuttons.o `test -f 'systembuttons.c' || echo '$(srcdir)/'`systembuttons.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libsystembuttons_la-systembuttons.Tpo" "$(DEPDIR)/libsystembuttons_la-systembuttons.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libsystembuttons_la-systembuttons.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystembuttons_la_CFLAGS) $(CFLAGS) -MT libsystembuttons_la-systembuttons.o -MD -MP -MF "$(DEPDIR)/libsystembuttons_la-systembuttons.Tpo" -c -o libsystembuttons_la-systembuttons.o `test -f 'systembuttons.c' || echo '$(srcdir)/'`systembuttons.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libsystembuttons_la-systembuttons.Tpo" "$(DEPDIR)/libsystembuttons_la-systembuttons.Po"; else rm -f "$(DEPDIR)/libsystembuttons_la-systembuttons.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='systembuttons.c' object='libsystembuttons_la-systembuttons.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libsystembuttons_la-systembuttons.Po' tmpdepfile='$(DEPDIR)/libsystembuttons_la-systembuttons.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystembuttons_la_CFLAGS) $(CFLAGS) -c -o libsystembuttons_la-systembuttons.o `test -f 'systembuttons.c' || echo '$(srcdir)/'`systembuttons.c libsystembuttons_la-systembuttons.obj: systembuttons.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystembuttons_la_CFLAGS) $(CFLAGS) -MT libsystembuttons_la-systembuttons.obj -MD -MP -MF "$(DEPDIR)/libsystembuttons_la-systembuttons.Tpo" \ -@am__fastdepCC_TRUE@ -c -o libsystembuttons_la-systembuttons.obj `if test -f 'systembuttons.c'; then $(CYGPATH_W) 'systembuttons.c'; else $(CYGPATH_W) '$(srcdir)/systembuttons.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libsystembuttons_la-systembuttons.Tpo" "$(DEPDIR)/libsystembuttons_la-systembuttons.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libsystembuttons_la-systembuttons.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystembuttons_la_CFLAGS) $(CFLAGS) -MT libsystembuttons_la-systembuttons.obj -MD -MP -MF "$(DEPDIR)/libsystembuttons_la-systembuttons.Tpo" -c -o libsystembuttons_la-systembuttons.obj `if test -f 'systembuttons.c'; then $(CYGPATH_W) 'systembuttons.c'; else $(CYGPATH_W) '$(srcdir)/systembuttons.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libsystembuttons_la-systembuttons.Tpo" "$(DEPDIR)/libsystembuttons_la-systembuttons.Po"; else rm -f "$(DEPDIR)/libsystembuttons_la-systembuttons.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='systembuttons.c' object='libsystembuttons_la-systembuttons.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libsystembuttons_la-systembuttons.Po' tmpdepfile='$(DEPDIR)/libsystembuttons_la-systembuttons.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystembuttons_la_CFLAGS) $(CFLAGS) -c -o libsystembuttons_la-systembuttons.obj `if test -f 'systembuttons.c'; then $(CYGPATH_W) 'systembuttons.c'; else $(CYGPATH_W) '$(srcdir)/systembuttons.c'; fi` libsystembuttons_la-systembuttons.lo: systembuttons.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystembuttons_la_CFLAGS) $(CFLAGS) -MT libsystembuttons_la-systembuttons.lo -MD -MP -MF "$(DEPDIR)/libsystembuttons_la-systembuttons.Tpo" \ -@am__fastdepCC_TRUE@ -c -o libsystembuttons_la-systembuttons.lo `test -f 'systembuttons.c' || echo '$(srcdir)/'`systembuttons.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libsystembuttons_la-systembuttons.Tpo" "$(DEPDIR)/libsystembuttons_la-systembuttons.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libsystembuttons_la-systembuttons.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystembuttons_la_CFLAGS) $(CFLAGS) -MT libsystembuttons_la-systembuttons.lo -MD -MP -MF "$(DEPDIR)/libsystembuttons_la-systembuttons.Tpo" -c -o libsystembuttons_la-systembuttons.lo `test -f 'systembuttons.c' || echo '$(srcdir)/'`systembuttons.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libsystembuttons_la-systembuttons.Tpo" "$(DEPDIR)/libsystembuttons_la-systembuttons.Plo"; else rm -f "$(DEPDIR)/libsystembuttons_la-systembuttons.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='systembuttons.c' object='libsystembuttons_la-systembuttons.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libsystembuttons_la-systembuttons.Plo' tmpdepfile='$(DEPDIR)/libsystembuttons_la-systembuttons.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @@ -349,14 +356,6 @@ distclean-libtool: -rm -f libtool uninstall-info-am: -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -365,6 +364,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -379,7 +379,6 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ test -z "$(ETAGS_ARGS)$$tags$$unique" \ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique - ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -402,10 +401,6 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = ../.. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -419,7 +414,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -437,9 +432,8 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) - installdirs: - $(mkinstalldirs) $(DESTDIR)$(plugindir) + $(mkdir_p) $(DESTDIR)$(plugindir) install: install-am install-exec: install-exec-am install-data: install-data-am @@ -451,7 +445,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -459,7 +453,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -470,14 +464,17 @@ clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \ mostlyclean-am distclean: distclean-am - -distclean-am: clean-am distclean-compile distclean-depend \ - distclean-generic distclean-libtool distclean-tags + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-tags dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -493,7 +490,8 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -rf ./$(DEPDIR) + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -513,12 +511,12 @@ uninstall-am: uninstall-info-am uninstall-pluginLTLIBRARIES .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool clean-pluginLTLIBRARIES ctags distclean \ - distclean-compile distclean-depend distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am info \ - info-am install install-am install-data install-data-am \ - install-exec install-exec-am install-info install-info-am \ - install-man install-pluginLTLIBRARIES install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-pluginLTLIBRARIES install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-info-am \ diff --git a/po/ChangeLog b/po/ChangeLog index 98e22b5f..a175cdde 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,2 +1,74 @@ -* 2003-02-17 - Add ChangeLog to keep make dist happy +2004-01-03 21:54 olivier + + * pl.gmo, pl.po: Fix Polish translation from Daniel Mróz + <beorn@alpha.pl> + +2003-12-29 16:20 olivier + + * no.gmo, no.po: Update version number, Update ChangeLog Fix + missing CHARSET in potfiles + +2003-12-29 13:16 jasper + + * no.gmo, no.po, tr.gmo, tr.po: Update Norwegian and Turkish + translations + +2003-12-28 21:28 olivier + + * xfce4-panel.pot: Fix removal of properties on unframed windows + +2003-12-27 22:52 jasper + + * pl.gmo, pl.po: Update Polish translations + +2003-12-15 22:35 jasper + + * az.gmo, az.po: Add Azerbaijani translations + +2003-11-16 09:44 jasper + + * cs.gmo, cs.po: Update Czech translations + +2003-11-12 08:02 jasper + + * ca.gmo, de.gmo, es.gmo, es_MX.gmo, fi.gmo, fr.gmo, hi.gmo, + hu.gmo, ja.gmo, ko.gmo, lt.gmo, ms.gmo, nl.gmo, pl.gmo, + pt_PT.gmo, ru.gmo, sv.gmo, ta.gmo, tr.gmo, uk.gmo, vi.gmo, + zh_CN.gmo, zh_TW.gmo: Forgot gmo files update + +2003-11-11 19:35 jasper + + * ca.po, cs.po, de.po, es.po, es_MX.po, fi.po, fr.po, hi.po, hu.po, + ja.po, ko.po, lt.po, ms.po, nl.po, pl.po, pt_PT.po, ru.po, sv.po, + ta.po, tr.po, uk.po, vi.po, zh_CN.po, zh_TW.po: Update po files, + just in case something changed ... + +2003-11-09 20:09 jasper + + * cs.gmo, cs.po: Add Check translations + +2003-11-07 22:09 jasper + + * xfce4-panel.pot: Add French documentation + +2003-11-03 19:06 jasper + + * uk.gmo, uk.po: Add Ukranian translations + +2003-10-25 00:31 jasper + + * vi.gmo, vi.po: + Add vietnamese translations by Lam Vinh Nien <nienvl@yahoo.ca>. + +2003-10-17 18:32 jasper + + * sv.gmo, sv.po: Add/update swedish translations + +2003-10-15 13:20 jasper + + * ko.gmo, ko.po: Update korean translations + +2003-09-27 13:20 huysmans + + * ta.gmo, ta.po: Update tamil translations + diff --git a/po/az.gmo b/po/az.gmo Binary files differnew file mode 100644 index 00000000..1bfbe980 --- /dev/null +++ b/po/az.gmo diff --git a/po/az.po b/po/az.po new file mode 100644 index 00000000..2d9624b6 --- /dev/null +++ b/po/az.po @@ -0,0 +1,483 @@ +# translation of az.po to Azerbaijani Turkish +# Azerbaijani Turkish translation of xfce4-panel. +# Copyright (C) 2003 THE xfce4-panel'S COPYRIGHT HOLDER +# This file is distributed under the same license as the xfce4-panel package. +# Mətin Əmirov <metin@karegen.com>, 2003. +# +msgid "" +msgstr "" +"Project-Id-Version: az\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-12-04 09:37+0100\n" +"PO-Revision-Date: 2003-12-15 17:25+0200\n" +"Last-Translator: Mətin Əmirov <metin@karegen.com>\n" +"Language-Team: Azerbaijani Turkish <gnome@azitt.com>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.0.2\n" + +#: panel/xfce_support.c:597 +msgid "Select file" +msgstr "Faylı seç" + +#: panel/controls_dialog.c:254 +msgid "Change item" +msgstr "Üzvü dəyişdir" + +#: panel/controls_dialog.c:286 panel/item_dialog.c:681 +msgid "Position:" +msgstr "Mövqe:" + +#: panel/controls_dialog.c:342 panel/controls.c:272 +msgid "" +"Removing an item will also remove its popup menu.\n" +"\n" +"Do you want to remove the item?" +msgstr "" +"Üzvün silinməsi eyni zamanda onun popup pəncərəsini də siləcəkdir.\n" +"\n" +"Üzvü silmək istəyirsiniz?" + +#: panel/item_dialog.c:321 +msgid "Other Icon" +msgstr "Başqa Timsal" + +#: panel/item_dialog.c:346 +msgid "Select icon" +msgstr "Timsal seç" + +#: panel/item_dialog.c:396 +msgid "Icon:" +msgstr "Timsal:" + +#: panel/item_dialog.c:467 +msgid "Select command" +msgstr "Əmr seç" + +#: panel/item_dialog.c:495 +msgid "Command:" +msgstr "Əmr:" + +#: panel/item_dialog.c:532 plugins/mailcheck/mailcheck.c:668 +msgid "Run in _terminal" +msgstr "_Terminalda işə sal" + +#: panel/item_dialog.c:537 plugins/mailcheck/mailcheck.c:676 +msgid "Use startup _notification" +msgstr "Başlama _bildirişini işlət" + +#: panel/item_dialog.c:564 +msgid "Caption:" +msgstr "Başlıq:" + +#: panel/item_dialog.c:597 +msgid "Tooltip:" +msgstr "İzahat:" + +#: panel/item_dialog.c:633 +msgid "Menu:" +msgstr "Menyu:" + +#: panel/item_dialog.c:640 +msgid "Attach menu to launcher" +msgstr "Menyuya başladıcı əlavə et" + +#: panel/item_dialog.c:773 +msgid "Icon Preview" +msgstr "Timsal Nömayişi" + +#: panel/item_dialog.c:777 +msgid "Drag file onto this frame to change the icon" +msgstr "Timsalı dəyişdirmək üçün yeni timsalı bu çərçivəyə daşıyın" + +#: panel/item_dialog.c:965 +msgid "Change menu item" +msgstr "Menyu üzvünü dəyişdir" + +#. add buttons +#: panel/item_dialog.c:968 +msgid "Remove" +msgstr "Sil" + +#: panel/item.c:441 +msgid "Click mouse button 3 to change item" +msgstr "Üzvü dəyişdirmək üçün siçanın 3-cü düyməsinə basın" + +#: panel/item.c:464 +msgid "Add launcher" +msgstr "Başladıcı əlavə et" + +#: panel/item.c:469 +msgid "Add new item" +msgstr "Yeni üzv əlavə et" + +#: panel/item.c:601 +msgid "Launcher" +msgstr "Başladıcı" + +#: panel/main.c:117 +msgid "Are you sure you want to exit?" +msgstr "Həqiqətən də çıxmaq istəyirsiniz?" + +#: panel/main.c:329 +#, c-format +msgid "" +"%s, version %s\n" +"Part of the XFce Desktop Environment\n" +"http://www.xfce.org\n" +msgstr "" +"%s, buraxılış %s\n" +"XFce Masa Üstü Mühitinin Hissəsidir\n" +"http://www.xfce.org\n" + +#: panel/main.c:361 +msgid "" +"Your window manager does not seem to support the new window manager hints as " +"defined on http://www.freedesktop.org. \n" +"Some XFce features may not work as intended." +msgstr "" +"Pəncərə idarəçiniz http://www.freedesktop.org ünvanında müəyyən edilmiş yeni pəncərə " +"idarəçisi yardım bildirişlərini dəstəkləmir. \n" +"Bəzi XFce xüsusiyyətləri gözləndiyi kimi işləməyə bilər." + +#: panel/controls.c:320 panel/panel.c:412 +msgid "/Add _new item" +msgstr "/Yeni ü_zv əlavə et" + +#: panel/controls.c:322 panel/panel.c:414 +msgid "/_Properties..." +msgstr "/_Xassələr..." + +#: panel/controls.c:323 +msgid "/_Remove" +msgstr "/_Sil" + +#: panel/controls.c:655 +msgid "This item has no configuration options" +msgstr "Bu üzvün heç bir qurğu seçimi yoxdur" + +#: panel/panel.c:410 +msgid "/XFce Panel" +msgstr "/XFce Paneli" + +#: panel/panel.c:415 +msgid "/_About XFce" +msgstr "/XFce _Haqqında" + +#: panel/panel.c:416 +msgid "/_Help" +msgstr "/_Yardım" + +#: panel/panel.c:419 +msgid "/_Settings manager" +msgstr "/_Qurğular idarəçisi" + +#: panel/panel.c:422 +msgid "/_Lock screen" +msgstr "/Ekranı _qıfılla" + +#: panel/panel.c:423 +msgid "/_Restart" +msgstr "/_Yenidən başlat" + +#: panel/panel.c:425 +msgid "/E_xit" +msgstr "/Çı_x" + +#: panel/panel.c:812 settings/xfce_settings_plugin.c:82 +#: settings/xfce_settings_dialog.c:649 +msgid "XFce Panel" +msgstr "XFce Paneli" + +#: panel/icons.c:73 +msgid "Default" +msgstr "Ön qurğulu" + +#: panel/icons.c:74 +msgid "Editor" +msgstr "Editor" + +#: panel/icons.c:75 +msgid "File management" +msgstr "Fayl idarəsi" + +#: panel/icons.c:76 +msgid "Utilities" +msgstr "Tə'minatlar" + +#: panel/icons.c:77 +msgid "Games" +msgstr "Oyunlar" + +#: panel/icons.c:78 +msgid "Help browser" +msgstr "Yardım səyyahı" + +#: panel/icons.c:79 +msgid "Multimedia" +msgstr "Multimediya" + +#: panel/icons.c:80 +msgid "Network" +msgstr "Şəbəkə" + +#: panel/icons.c:81 +msgid "Graphics" +msgstr "Qrafika" + +#: panel/icons.c:82 +msgid "Printer" +msgstr "Çapçı" + +#: panel/icons.c:83 +msgid "Productivity" +msgstr "İnkişaf" + +#: panel/icons.c:84 +msgid "Sound" +msgstr "Səs" + +#: panel/icons.c:85 +msgid "Terminal" +msgstr "Terminal" + +#: panel/mcs_client.c:208 +msgid "Settings manager not available" +msgstr "Qurğular idarəçisi mövcud deyil" + +#: panel/popup.c:261 +msgid "Menu" +msgstr "Menyu" + +#: settings/xfce_settings_dialog.c:119 +msgid "Tiny" +msgstr "Çox kiçik" + +#: settings/xfce_settings_dialog.c:123 +msgid "Small" +msgstr "Kiçik" + +#: settings/xfce_settings_dialog.c:127 +msgid "Medium" +msgstr "Orta" + +#: settings/xfce_settings_dialog.c:131 +msgid "Large" +msgstr "Geniş" + +#: settings/xfce_settings_dialog.c:190 +msgid "Horizontal" +msgstr "Üfüqi" + +#: settings/xfce_settings_dialog.c:194 +msgid "Vertical" +msgstr "Şaquli" + +#: settings/xfce_settings_dialog.c:226 settings/xfce_settings_dialog.c:456 +msgid "Left" +msgstr "Sol" + +#: settings/xfce_settings_dialog.c:230 settings/xfce_settings_dialog.c:457 +msgid "Right" +msgstr "Sağ" + +#: settings/xfce_settings_dialog.c:234 settings/xfce_settings_dialog.c:455 +#: settings/xfce_settings_dialog.c:511 +msgid "Top" +msgstr "Üst" + +#: settings/xfce_settings_dialog.c:238 settings/xfce_settings_dialog.c:454 +#: settings/xfce_settings_dialog.c:519 +msgid "Bottom" +msgstr "Alt" + +#: settings/xfce_settings_dialog.c:374 +msgid "Panel size:" +msgstr "Panel böyüklüyü:" + +#: settings/xfce_settings_dialog.c:390 +msgid "Panel orientation:" +msgstr "Panel istiqaməti:" + +#: settings/xfce_settings_dialog.c:407 +msgid "Popup position:" +msgstr "Popup mövqeyi:" + +#: settings/xfce_settings_dialog.c:424 +msgid "Icon theme:" +msgstr "Tİmsal örtüyü:" + +#: settings/xfce_settings_dialog.c:495 +msgid "Panel layer:" +msgstr "Panel layı:" + +#: settings/xfce_settings_dialog.c:515 +msgid "Normal" +msgstr "Normal" + +#: settings/xfce_settings_dialog.c:535 +msgid "Center the panel:" +msgstr "Paneli ortala:" + +#: settings/xfce_settings_dialog.c:559 +msgid "Set" +msgstr "Tədbiq et" + +#: settings/xfce_settings_dialog.c:595 +msgid "Autohide:" +msgstr "Avtomatik gizlətmə:" + +#: settings/xfce_settings_dialog.c:663 +msgid "XFce Panel Settings" +msgstr "XFce Paneli Qurğuları" + +#. Appearance +#: settings/xfce_settings_dialog.c:675 +msgid "Appearance" +msgstr "Görünüş" + +#. Position +#: settings/xfce_settings_dialog.c:696 +msgid "Position" +msgstr "Mövqe" + +#. autohide +#: settings/xfce_settings_dialog.c:712 +msgid "Behaviour" +msgstr "Davranış" + +#. Use format characters from strftime(3) +#. * to get the proper string for your locale. +#. * I used these: +#. * %A : full weekday name +#. * %-d : day of the month, without prefixed 0 +#. * %B : full month name +#. * %Y : four digit year +#. +#: plugins/clock/clock.c:119 +msgid "%A, %-d %B %Y" +msgstr "%A, %-d %B %Y" + +#: plugins/clock/clock.c:336 +msgid "Clock type:" +msgstr "Saat növü:" + +#: plugins/clock/clock.c:349 +msgid "Analog" +msgstr "Analoq" + +#: plugins/clock/clock.c:353 +msgid "Digital" +msgstr "Dijital" + +#: plugins/clock/clock.c:357 +msgid "LED" +msgstr "LED" + +#: plugins/clock/clock.c:419 +msgid "Hour mode:" +msgstr "Saat modu:" + +#: plugins/clock/clock.c:426 +msgid "24 hour" +msgstr "24 saat" + +#: plugins/clock/clock.c:432 +msgid "12 hour" +msgstr "12 saat" + +#: plugins/clock/clock.c:438 +msgid "AM/PM" +msgstr "GƏ/GS" + +#: plugins/clock/clock.c:476 +msgid "Show seconds:" +msgstr "Saniyələrin göstərilməsi:" + +#: plugins/clock/clock.c:585 +msgid "Xfce Clock" +msgstr "Xfce Saatı" + +#: plugins/pager/pager.c:271 +msgid "Graphical pager" +msgstr "Qrafiki peycer" + +#: plugins/switcher/switcher.c:696 +msgid "Desktop switcher" +msgstr "Masa üstü dəyişdiricisi" + +#: plugins/systembuttons/systembuttons.c:60 +msgid "" +"Access to the configuration system has been disabled.\n" +"\n" +"Ask your system administrator for more information" +msgstr "" +"Quraşdırma sisteminə yetişmə imkanı qeyri-fəallaşdırılıb.\n" +"\n" +"Ətraflı mə'lumat üçün sistem idarəçinizlə əlaqə qurun" + +#: plugins/systembuttons/systembuttons.c:148 +msgid "Lock the screen" +msgstr "Ekranı qıfılla" + +#: plugins/systembuttons/systembuttons.c:149 +#: plugins/systembuttons/systembuttons.c:518 +msgid "Exit" +msgstr "Çıx" + +#: plugins/systembuttons/systembuttons.c:150 +#: plugins/systembuttons/systembuttons.c:519 +msgid "Setup" +msgstr "Qurğular" + +#: plugins/systembuttons/systembuttons.c:151 +#: plugins/systembuttons/systembuttons.c:520 +msgid "Info" +msgstr "Mə'lmat" + +#: plugins/systembuttons/systembuttons.c:500 +msgid "Show two buttons:" +msgstr "İki düymə göstər:" + +#. set names to use in option menus +#: plugins/systembuttons/systembuttons.c:517 +msgid "Lock" +msgstr "Qıfılla" + +#: plugins/systembuttons/systembuttons.c:549 +msgid "Button 1:" +msgstr "Düymə 1:" + +#: plugins/systembuttons/systembuttons.c:565 +msgid "Button 2:" +msgstr "Düymə 2:" + +#: plugins/systembuttons/systembuttons.c:600 +msgid "System buttons" +msgstr "Sistem düymələri" + +#: plugins/separator/separator.c:153 +msgid "Separator" +msgstr "Ayırıcı" + +#: plugins/mailcheck/mailcheck.c:539 +msgid "Mail box:" +msgstr "Poçt qutusu:" + +#: plugins/mailcheck/mailcheck.c:623 +msgid "Mail command:" +msgstr "Poçt əmri:" + +#: plugins/mailcheck/mailcheck.c:637 +msgid "Command to run when the button on the panel is clicked" +msgstr "Paneldəki düyməyə basıldığında işə salınacaq əmr" + +#: plugins/mailcheck/mailcheck.c:706 +msgid "Interval (sec):" +msgstr "Aralıq (san):" + +#: plugins/mailcheck/mailcheck.c:778 +msgid "Mail check" +msgstr "Poçt yoxlaması" + Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2003-09-10 08:40+0200\n" +"POT-Creation-Date: 2003-11-05 17:25+0100\n" "PO-Revision-Date: 2003-07-05 16:17+0100\n" "Last-Translator: Carles Muñoz Gorriz <carlesmu@internautas.org>\n" "Language-Team: ca <LL@li.org>\n" @@ -26,7 +26,7 @@ msgstr "Canviar element" msgid "Position:" msgstr "Posició:" -#: panel/controls_dialog.c:331 panel/controls.c:272 +#: panel/controls_dialog.c:342 panel/controls.c:272 msgid "" "Removing an item will also remove its popup menu.\n" "\n" @@ -88,12 +88,12 @@ msgstr "Previsualització d'icona" msgid "Drag file onto this frame to change the icon" msgstr "Arrossega el fitxer dins d'aquest marc per canviar la icona" -#: panel/item_dialog.c:931 +#: panel/item_dialog.c:930 msgid "Change menu item" msgstr "Canvia l'element del menú" #. add buttons -#: panel/item_dialog.c:934 +#: panel/item_dialog.c:933 msgid "Remove" msgstr "Elimina" @@ -113,11 +113,11 @@ msgstr "Afegir un nou element" msgid "Launcher" msgstr "Llançador" -#: panel/main.c:132 +#: panel/main.c:115 msgid "Are you sure you want to exit?" msgstr "Esteu segur que voleu sortir?" -#: panel/main.c:268 +#: panel/main.c:243 #, c-format msgid "" "%s, version %s\n" @@ -128,7 +128,7 @@ msgstr "" "Part del Entorn d'Escriptori XFce\n" "http://www.xfce.org\n" -#: panel/main.c:284 +#: panel/main.c:259 msgid "" "Your window manager does not seem to support the new window manager hints as " "defined on http://www.freedesktop.org. \n" @@ -456,7 +456,7 @@ msgstr "Mostra els segons:" msgid "Xfce Clock" msgstr "Rellotge XFce" -#: plugins/pager/pager.c:277 +#: plugins/pager/pager.c:271 msgid "Graphical pager" msgstr "Paginador gràfic" diff --git a/po/cs.gmo b/po/cs.gmo Binary files differnew file mode 100644 index 00000000..7fa0fba4 --- /dev/null +++ b/po/cs.gmo diff --git a/po/cs.po b/po/cs.po new file mode 100644 index 00000000..8e7488a2 --- /dev/null +++ b/po/cs.po @@ -0,0 +1,540 @@ +# Czech translation for xfdesktop +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Lukáš Konarovský <daeltar@daeltar.org>, 2003. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2003-11-05 17:25+0100\n" +"PO-Revision-Date: 2003-15-11 HO:MI+ZONE\n" +"Last-Translator: Lukas Konarovsky <daeltar@daeltar.org>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: panel/xfce_support.c:597 +msgid "Select file" +msgstr "Vyber soubor" + +#: panel/controls_dialog.c:254 +msgid "Change item" +msgstr "Změn položku" + +#: panel/controls_dialog.c:286 panel/item_dialog.c:647 +msgid "Position:" +msgstr "Pozice:" + +#: panel/controls_dialog.c:342 panel/controls.c:272 +msgid "" +"Removing an item will also remove its popup menu.\n" +"\n" +"Do you want to remove the item?" +msgstr "" +"Odstranením položky odstraníte její popup menu.\n" +"\n" +"Chcete ji skutečně odstranit?" + +#: panel/item_dialog.c:320 +msgid "Other Icon" +msgstr "Jiná ikona" + +#: panel/item_dialog.c:345 +msgid "Select icon" +msgstr "Vyber ikonu" + +#: panel/item_dialog.c:384 +msgid "Icon:" +msgstr "Ikona:" + +#: panel/item_dialog.c:433 +msgid "Select command" +msgstr "Vyber příkaz" + +#: panel/item_dialog.c:461 +msgid "Command:" +msgstr "Příkaz:" + +#: panel/item_dialog.c:498 plugins/mailcheck/mailcheck.c:668 +msgid "Run in _terminal" +msgstr "Spusť v _terminálu" + +#: panel/item_dialog.c:503 plugins/mailcheck/mailcheck.c:676 +msgid "Use startup _notification" +msgstr "Použij startup _notification" + +#: panel/item_dialog.c:530 +msgid "Caption:" +msgstr "Nadpis:" + +#: panel/item_dialog.c:563 +msgid "Tooltip:" +msgstr "Popisek:" + +#: panel/item_dialog.c:599 +msgid "Menu:" +msgstr "Menu:" + +#: panel/item_dialog.c:606 +msgid "Attach menu to launcher" +msgstr "Pridej menu k spušteči" + +#: panel/item_dialog.c:738 +msgid "Icon Preview" +msgstr "Náhled ikony" + +#: panel/item_dialog.c:742 +msgid "Drag file onto this frame to change the icon" +msgstr "Táhni soubor na tento rám ke změně ikony" + +#: panel/item_dialog.c:930 +msgid "Change menu item" +msgstr "Změn položku menu" + +#. add buttons +#: panel/item_dialog.c:933 +msgid "Remove" +msgstr "Odstraň" + +#: panel/item.c:441 +msgid "Click mouse button 3 to change item" +msgstr "Klikni třetím tlačítkem ke změně položky" + +#: panel/item.c:464 +msgid "Add launcher" +msgstr "Přidej spoušteč" + +#: panel/item.c:469 +msgid "Add new item" +msgstr "Přidej novou položku" + +#: panel/item.c:601 +msgid "Launcher" +msgstr "Spoušteč" + +#: panel/main.c:115 +msgid "Are you sure you want to exit?" +msgstr "Jste si jisti, že chcete ukončit XFce?" + +#: panel/main.c:243 +#, c-format +msgid "" +"%s, version %s\n" +"Part of the XFce Desktop Environment\n" +"http://www.xfce.org\n" +msgstr "" +"%s, verze %s\n" +"Část XFce Desktop Environment\n" +"http://www.xfce.org\n" + +#: panel/main.c:259 +msgid "" +"Your window manager does not seem to support the new window manager hints as " +"defined on http://www.freedesktop.org. \n" +"Some XFce features may not work as intended." +msgstr "" +"Váš window manager jak se zdá nepodporuje window manager hints jak " +"je definováno na http://www.freedesktop.org. \n" +"Některé z vlastností XFce nemusí fungovat jek bylo zamýšleno." + +#: panel/controls.c:320 panel/panel.c:123 +msgid "/Add _new item" +msgstr "/Přidat _novou položku" + +#: panel/controls.c:322 panel/panel.c:125 +msgid "/_Properties..." +msgstr "/_Vlastnosti..." + +#: panel/controls.c:323 +msgid "/_Remove" +msgstr "/_Odstranit" + +#: panel/controls.c:655 +msgid "This item has no configuration options" +msgstr "Tato položka nemá žádná nasatvitelné vlastnosti" + +#: panel/panel.c:121 +msgid "/XFce Panel" +msgstr "/XFce Panel" + +#: panel/panel.c:126 +msgid "/_Settings manager" +msgstr "/_Settings manager" + +#: panel/panel.c:128 +msgid "/_About XFce" +msgstr "/_O desktopu XFce" + +#: panel/panel.c:129 +msgid "/_Help" +msgstr "/_Nápověda" + +#: panel/panel.c:131 +msgid "/_Lock screen" +msgstr "/_Zamknout obrazovku" + +#: panel/panel.c:132 +msgid "/E_xit" +msgstr "/_Konec" + +#: panel/panel.c:489 settings/xfce_settings_plugin.c:82 +#: settings/xfce_settings_dialog.c:649 +msgid "XFce Panel" +msgstr "XFce Panel" + +#: panel/icons.c:73 +msgid "Default" +msgstr "Výchozí" + +#: panel/icons.c:74 +msgid "Editor" +msgstr "Editor" + +#: panel/icons.c:75 +msgid "File management" +msgstr "Správa souborů" + +#: panel/icons.c:76 +msgid "Utilities" +msgstr "Nástroje" + +#: panel/icons.c:77 +msgid "Games" +msgstr "Hry" + +#: panel/icons.c:78 +msgid "Help browser" +msgstr "Prohlížeč nápovědy" + +#: panel/icons.c:79 +msgid "Multimedia" +msgstr "Multimedia" + +#: panel/icons.c:80 +msgid "Network" +msgstr "Síť" + +#: panel/icons.c:81 +msgid "Graphics" +msgstr "Grafika" + +#: panel/icons.c:82 +msgid "Printer" +msgstr "Tiskárna" + +#: panel/icons.c:83 +msgid "Productivity" +msgstr "Produktivita" + +#: panel/icons.c:84 +msgid "Sound" +msgstr "Zvuk" + +#: panel/icons.c:85 +msgid "Terminal" +msgstr "Terminál" + +#: panel/mcs_client.c:208 +msgid "Settings manager not available" +msgstr "Správce nastavení není dostupný" + +#: panel/popup.c:263 +msgid "Menu" +msgstr "Menu" + +#: settings/xfce_settings_dialog.c:119 +msgid "Tiny" +msgstr "Titěrný" + +#: settings/xfce_settings_dialog.c:123 +msgid "Small" +msgstr "Malý" + +#: settings/xfce_settings_dialog.c:127 +msgid "Medium" +msgstr "Střední" + +#: settings/xfce_settings_dialog.c:131 +msgid "Large" +msgstr "Velký" + +#: settings/xfce_settings_dialog.c:190 +msgid "Horizontal" +msgstr "Horizontální" + +#: settings/xfce_settings_dialog.c:194 +msgid "Vertical" +msgstr "Vertikální" + +#: settings/xfce_settings_dialog.c:226 settings/xfce_settings_dialog.c:456 +msgid "Left" +msgstr "Vlevo" + +#: settings/xfce_settings_dialog.c:230 settings/xfce_settings_dialog.c:457 +msgid "Right" +msgstr "Vpravo" + +#: settings/xfce_settings_dialog.c:234 settings/xfce_settings_dialog.c:455 +#: settings/xfce_settings_dialog.c:511 +msgid "Top" +msgstr "Nahoře" + +#: settings/xfce_settings_dialog.c:238 settings/xfce_settings_dialog.c:454 +#: settings/xfce_settings_dialog.c:519 +msgid "Bottom" +msgstr "Dole" + +#: settings/xfce_settings_dialog.c:374 +msgid "Panel size:" +msgstr "Velikost panelu" + +#: settings/xfce_settings_dialog.c:390 +msgid "Panel orientation:" +msgstr "Orientace panelu" + +#: settings/xfce_settings_dialog.c:407 +msgid "Popup position:" +msgstr "Pozice pro popup:" + +#: settings/xfce_settings_dialog.c:424 +msgid "Icon theme:" +msgstr "Ikonové téma:" + +#: settings/xfce_settings_dialog.c:495 +msgid "Panel layer:" +msgstr "Vrstva panelu:" + +#: settings/xfce_settings_dialog.c:515 +msgid "Normal" +msgstr "Normální" + +#: settings/xfce_settings_dialog.c:535 +msgid "Center the panel:" +msgstr "Centrovat panel:" + +#: settings/xfce_settings_dialog.c:559 +msgid "Set" +msgstr "Nasatvit" + +#: settings/xfce_settings_dialog.c:595 +msgid "Autohide:" +msgstr "Automaticky skrývat:" + +#: settings/xfce_settings_dialog.c:663 +msgid "XFce Panel Settings" +msgstr "XFce Nastavení Panelu" + +#. Appearance +#: settings/xfce_settings_dialog.c:675 +msgid "Appearance" +msgstr "Vzhled" + +#. Position +#: settings/xfce_settings_dialog.c:696 +msgid "Position" +msgstr "Pozice" + +#. autohide +#: settings/xfce_settings_dialog.c:712 +msgid "Behaviour" +msgstr "Chování" + +#: plugins/clock/clock.c:57 +msgid "Sunday" +msgstr "Neděle" + +#: plugins/clock/clock.c:58 +msgid "Monday" +msgstr "Pondělí" + +#: plugins/clock/clock.c:59 +msgid "Tuesday" +msgstr "Úterý" + +#: plugins/clock/clock.c:60 +msgid "Wednesday" +msgstr "Středa" + +#: plugins/clock/clock.c:61 +msgid "Thursday" +msgstr "Čtvrtek" + +#: plugins/clock/clock.c:62 +msgid "Friday" +msgstr "Pátek" + +#: plugins/clock/clock.c:63 +msgid "Saturday" +msgstr "Sobota" + +#: plugins/clock/clock.c:67 +msgid "January" +msgstr "Leden" + +#: plugins/clock/clock.c:68 +msgid "February" +msgstr "Únor" + +#: plugins/clock/clock.c:69 +msgid "March" +msgstr "Březen" + +#: plugins/clock/clock.c:70 +msgid "April" +msgstr "Duben" + +#: plugins/clock/clock.c:71 +msgid "May" +msgstr "Květen" + +#: plugins/clock/clock.c:72 +msgid "June" +msgstr "Červen" + +#: plugins/clock/clock.c:73 +msgid "July" +msgstr "Červenec" + +#: plugins/clock/clock.c:74 +msgid "August" +msgstr "Srpen" + +#: plugins/clock/clock.c:75 +msgid "September" +msgstr "Září" + +#: plugins/clock/clock.c:76 +msgid "October" +msgstr "Říjen" + +#: plugins/clock/clock.c:77 +msgid "November" +msgstr "Listopad" + +#: plugins/clock/clock.c:78 +msgid "December" +msgstr "Prosinec" + +#: plugins/clock/clock.c:350 +msgid "Clock type:" +msgstr "Typ hodin:" + +#: plugins/clock/clock.c:363 +msgid "Analog" +msgstr "Analogové" + +#: plugins/clock/clock.c:367 +msgid "Digital" +msgstr "Digitální" + +#: plugins/clock/clock.c:371 +msgid "LED" +msgstr "LED" + +#: plugins/clock/clock.c:433 +msgid "Hour mode:" +msgstr "Hodinový mód:" + +#: plugins/clock/clock.c:440 +msgid "24 hour" +msgstr "24 hodinový" + +#: plugins/clock/clock.c:446 +msgid "12 hour" +msgstr "12 hodinový" + +#: plugins/clock/clock.c:452 +msgid "AM/PM" +msgstr "AM/PM" + +#: plugins/clock/clock.c:490 +msgid "Show seconds:" +msgstr "Ukázat sekundy:" + +#: plugins/clock/clock.c:599 +msgid "Xfce Clock" +msgstr "Xfce Hodiny" + +#: plugins/pager/pager.c:271 +msgid "Graphical pager" +msgstr "Grafický přepínač ploch" + +#: plugins/switcher/switcher.c:696 +msgid "Desktop switcher" +msgstr "Tlačítkový přepínač ploch" + +#: plugins/systembuttons/systembuttons.c:60 +msgid "" +"Access to the configuration system has been disabled.\n" +"\n" +"Ask your system administrator for more information" +msgstr "" +"Přístup k systémové konfiguraci byl zakázán.\n" +"\n" +"Zeptejte se svého administrátora pro více informací" + +#: plugins/systembuttons/systembuttons.c:148 +msgid "Lock the screen" +msgstr "Zamknout obrazovku" + +#: plugins/systembuttons/systembuttons.c:149 +#: plugins/systembuttons/systembuttons.c:518 +msgid "Exit" +msgstr "Konec" + +#: plugins/systembuttons/systembuttons.c:150 +#: plugins/systembuttons/systembuttons.c:519 +msgid "Setup" +msgstr "Nastavení" + +#: plugins/systembuttons/systembuttons.c:151 +#: plugins/systembuttons/systembuttons.c:520 +msgid "Info" +msgstr "Info" + +#: plugins/systembuttons/systembuttons.c:500 +msgid "Show two buttons:" +msgstr "Ukázat dvě tlačítka:" + +#. set names to use in option menus +#: plugins/systembuttons/systembuttons.c:517 +msgid "Lock" +msgstr "Zamknout" + +#: plugins/systembuttons/systembuttons.c:549 +msgid "Button 1:" +msgstr "Tlačítko 1" + +#: plugins/systembuttons/systembuttons.c:565 +msgid "Button 2:" +msgstr "Tlačítko 2" + +#: plugins/systembuttons/systembuttons.c:600 +msgid "System buttons" +msgstr "Systémová tlačítka" + +#: plugins/separator/separator.c:153 +msgid "Separator" +msgstr "Oddělovač" + +#: plugins/mailcheck/mailcheck.c:539 +msgid "Mail box:" +msgstr "Emailová schránka" + +#: plugins/mailcheck/mailcheck.c:623 +msgid "Mail command:" +msgstr "Příkaz pro mail" + +#: plugins/mailcheck/mailcheck.c:637 +msgid "Command to run when the button on the panel is clicked" +msgstr "Příkaz, který se má vykonat, při kliku na tlačítkp" + +#: plugins/mailcheck/mailcheck.c:706 +msgid "Interval (sec):" +msgstr "Inerval (sec)" + +#: plugins/mailcheck/mailcheck.c:778 +msgid "Mail check" +msgstr "Konrola pošty" Binary files differ@@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-panel 1.0.0\n" -"POT-Creation-Date: 2003-09-10 08:40+0200\n" +"POT-Creation-Date: 2003-11-05 17:25+0100\n" "PO-Revision-Date: 2003-08-05 18:35+0200\n" "Last-Translator: Moritz Heiber <moritz-heiber@arcor.de>\n" "Language-Team: none <none@none>\n" @@ -26,7 +26,7 @@ msgstr "Objekt verändern" msgid "Position:" msgstr "Position:" -#: panel/controls_dialog.c:331 panel/controls.c:272 +#: panel/controls_dialog.c:342 panel/controls.c:272 msgid "" "Removing an item will also remove its popup menu.\n" "\n" @@ -88,12 +88,12 @@ msgstr "Icon Vorschau" msgid "Drag file onto this frame to change the icon" msgstr "Dateien auf diesen Rahmen ziehen, um das Icon zu verändern" -#: panel/item_dialog.c:931 +#: panel/item_dialog.c:930 msgid "Change menu item" msgstr "Menüobjekt verändern" #. add buttons -#: panel/item_dialog.c:934 +#: panel/item_dialog.c:933 msgid "Remove" msgstr "Entfernen" @@ -113,11 +113,11 @@ msgstr "Neues Objekt hinzufügen" msgid "Launcher" msgstr "Starter" -#: panel/main.c:132 +#: panel/main.c:115 msgid "Are you sure you want to exit?" msgstr "Sind Sie sicher, dass Sie XFce beenden wollen?" -#: panel/main.c:268 +#: panel/main.c:243 #, c-format msgid "" "%s, version %s\n" @@ -128,7 +128,7 @@ msgstr "" "Teil der XFce Desktop Umgebung\n" "http://www.xfce.org\n" -#: panel/main.c:284 +#: panel/main.c:259 msgid "" "Your window manager does not seem to support the new window manager hints as " "defined on http://www.freedesktop.org. \n" @@ -457,7 +457,7 @@ msgstr "Sekunden anzeigen:" msgid "Xfce Clock" msgstr "XFce Uhr" -#: plugins/pager/pager.c:277 +#: plugins/pager/pager.c:271 msgid "Graphical pager" msgstr "Grafischer Pager" @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2003-09-10 08:40+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Jaime Buffery <the_new_guiri@yahoo.es>\n" +"POT-Creation-Date: 2003-12-04 09:37+0100\n" +"PO-Revision-Date: 2004-01-13 00:00+0100\n" +"Last-Translator: Jaime Buffery <nestu@lunar-linux.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,11 +24,11 @@ msgstr "Seleccionar archivo" msgid "Change item" msgstr "Cambiar elemento" -#: panel/controls_dialog.c:286 panel/item_dialog.c:647 +#: panel/controls_dialog.c:286 panel/item_dialog.c:681 msgid "Position:" msgstr "Posición" -#: panel/controls_dialog.c:331 panel/controls.c:272 +#: panel/controls_dialog.c:342 panel/controls.c:272 msgid "" "Removing an item will also remove its popup menu.\n" "\n" @@ -38,66 +38,66 @@ msgstr "" "\n" "Desea quitar el elemento?" -#: panel/item_dialog.c:320 +#: panel/item_dialog.c:321 msgid "Other Icon" msgstr "Otro Icono" -#: panel/item_dialog.c:345 +#: panel/item_dialog.c:346 msgid "Select icon" msgstr "Seleccionar icono" -#: panel/item_dialog.c:384 +#: panel/item_dialog.c:396 msgid "Icon:" msgstr "Icono:" -#: panel/item_dialog.c:433 +#: panel/item_dialog.c:467 msgid "Select command" msgstr "Seleccionar comando" -#: panel/item_dialog.c:461 +#: panel/item_dialog.c:495 msgid "Command:" msgstr "Comando:" -#: panel/item_dialog.c:498 plugins/mailcheck/mailcheck.c:668 +#: panel/item_dialog.c:532 plugins/mailcheck/mailcheck.c:668 msgid "Run in _terminal" msgstr "Ejecutar en _terminal" -#: panel/item_dialog.c:503 plugins/mailcheck/mailcheck.c:676 +#: panel/item_dialog.c:537 plugins/mailcheck/mailcheck.c:676 msgid "Use startup _notification" -msgstr "Utilice notificaci" +msgstr "Usar notificación de arranque" -#: panel/item_dialog.c:530 +#: panel/item_dialog.c:564 msgid "Caption:" msgstr "Captura" -#: panel/item_dialog.c:563 +#: panel/item_dialog.c:597 msgid "Tooltip:" msgstr "Etiqueta explicativa" -#: panel/item_dialog.c:599 +#: panel/item_dialog.c:633 msgid "Menu:" msgstr "Menú:" -#: panel/item_dialog.c:606 +#: panel/item_dialog.c:640 msgid "Attach menu to launcher" -msgstr "Pegarle un menú al lanzador" +msgstr "Anexarle un menú al lanzador" -#: panel/item_dialog.c:738 +#: panel/item_dialog.c:773 msgid "Icon Preview" msgstr "Vista preliminar del icono" -#: panel/item_dialog.c:742 +#: panel/item_dialog.c:777 msgid "Drag file onto this frame to change the icon" msgstr "Arrastre el fichero a este marco para cambiar el icono" -#: panel/item_dialog.c:931 +#: panel/item_dialog.c:965 msgid "Change menu item" msgstr "Cambiar elemento del menú" #. add buttons -#: panel/item_dialog.c:934 +#: panel/item_dialog.c:968 msgid "Remove" -msgstr "Quitar" +msgstr "Borrar" #: panel/item.c:441 msgid "Click mouse button 3 to change item" @@ -115,22 +115,22 @@ msgstr "Añadir nuevo elemento" msgid "Launcher" msgstr "Lanzador" -#: panel/main.c:132 +#: panel/main.c:117 msgid "Are you sure you want to exit?" msgstr "¿Está seguro de querer salir?" -#: panel/main.c:268 +#: panel/main.c:329 #, c-format msgid "" "%s, version %s\n" "Part of the XFce Desktop Environment\n" "http://www.xfce.org\n" msgstr "" -"%s, versió %s\n" +"%s, versión %s\n" "Parte del Entorno de Escritorio XFce\n" "http://www.xfce.org\n" -#: panel/main.c:284 +#: panel/main.c:361 msgid "" "Your window manager does not seem to support the new window manager hints as " "defined on http://www.freedesktop.org. \n" @@ -140,47 +140,52 @@ msgstr "" "se definen en http://www.freedesktop.org. \n" "Algunas características puede que no funcionen adecuadamente." -#: panel/controls.c:320 panel/panel.c:123 +#: panel/controls.c:320 panel/panel.c:412 msgid "/Add _new item" msgstr "/Añadir nuevo elemento" -#: panel/controls.c:322 panel/panel.c:125 +#: panel/controls.c:322 panel/panel.c:414 msgid "/_Properties..." msgstr "/_Propiedades..." #: panel/controls.c:323 msgid "/_Remove" -msgstr "/_Quitar" +msgstr "/_Borrar" #: panel/controls.c:655 msgid "This item has no configuration options" msgstr "Este elemento no tiene opciones de configuración" -#: panel/panel.c:121 +#: panel/panel.c:410 msgid "/XFce Panel" msgstr "/Panel XFce" -#: panel/panel.c:126 -msgid "/_Settings manager" -msgstr "/Administrador de configuración" - -#: panel/panel.c:128 +#: panel/panel.c:415 msgid "/_About XFce" msgstr "/_Acerca de XFce" -#: panel/panel.c:129 +#: panel/panel.c:416 msgid "/_Help" msgstr "/Ayuda" -#: panel/panel.c:131 +#: panel/panel.c:419 +msgid "/_Settings manager" +msgstr "/Administrador de configuración" + +#: panel/panel.c:422 msgid "/_Lock screen" msgstr "/B_Loquear pantalla" -#: panel/panel.c:132 +#: panel/panel.c:423 +#, fuzzy +msgid "/_Restart" +msgstr "_Deshacer" + +#: panel/panel.c:425 msgid "/E_xit" msgstr "/Salir" -#: panel/panel.c:489 settings/xfce_settings_plugin.c:82 +#: panel/panel.c:812 settings/xfce_settings_plugin.c:82 #: settings/xfce_settings_dialog.c:649 msgid "XFce Panel" msgstr "Panel XFce" @@ -241,7 +246,7 @@ msgstr "Terminal" msgid "Settings manager not available" msgstr "Administrador de sesión no está disponible" -#: panel/popup.c:263 +#: panel/popup.c:261 msgid "Menu" msgstr "Menú" @@ -251,7 +256,7 @@ msgstr "Pequeñito" #: settings/xfce_settings_dialog.c:123 msgid "Small" -msgstr "Pequeño" +msgstr "Pequeño" #: settings/xfce_settings_dialog.c:127 msgid "Medium" @@ -342,124 +347,60 @@ msgstr "Posición" msgid "Behaviour" msgstr "Comportamiento" -#: plugins/clock/clock.c:57 -msgid "Sunday" -msgstr "Domingo" - -#: plugins/clock/clock.c:58 -msgid "Monday" -msgstr "Lunes" - -#: plugins/clock/clock.c:59 -msgid "Tuesday" -msgstr "Martes" - -#: plugins/clock/clock.c:60 -msgid "Wednesday" -msgstr "Miércoles" - -#: plugins/clock/clock.c:61 -msgid "Thursday" -msgstr "Jueves" - -#: plugins/clock/clock.c:62 -msgid "Friday" -msgstr "Viernes" - -#: plugins/clock/clock.c:63 -msgid "Saturday" -msgstr "Sábado" - -#: plugins/clock/clock.c:67 -msgid "January" -msgstr "Enero" - -#: plugins/clock/clock.c:68 -msgid "February" -msgstr "Febrero" - -#: plugins/clock/clock.c:69 -msgid "March" -msgstr "Marzo" - -#: plugins/clock/clock.c:70 -msgid "April" -msgstr "Abril" - -#: plugins/clock/clock.c:71 -msgid "May" -msgstr "Mayo" - -#: plugins/clock/clock.c:72 -msgid "June" -msgstr "Junio" - -#: plugins/clock/clock.c:73 -msgid "July" -msgstr "Julio" - -#: plugins/clock/clock.c:74 -msgid "August" -msgstr "Agosto" - -#: plugins/clock/clock.c:75 -msgid "September" -msgstr "Septiembre" - -#: plugins/clock/clock.c:76 -msgid "October" -msgstr "Octubre" - -#: plugins/clock/clock.c:77 -msgid "November" -msgstr "Noviembre" - -#: plugins/clock/clock.c:78 -msgid "December" -msgstr "Diciembre" +#. Use format characters from strftime(3) +#. * to get the proper string for your locale. +#. * I used these: +#. * %A : full weekday name +#. * %-d : day of the month, without prefixed 0 +#. * %B : full month name +#. * %Y : four digit year +#. +#: plugins/clock/clock.c:119 +msgid "%A, %-d %B %Y" +msgstr "" -#: plugins/clock/clock.c:350 +#: plugins/clock/clock.c:336 msgid "Clock type:" msgstr "Tipo de reloj:" -#: plugins/clock/clock.c:363 +#: plugins/clock/clock.c:349 msgid "Analog" msgstr "Analógico" -#: plugins/clock/clock.c:367 +#: plugins/clock/clock.c:353 msgid "Digital" msgstr "Digital" -#: plugins/clock/clock.c:371 +#: plugins/clock/clock.c:357 msgid "LED" msgstr "LED" -#: plugins/clock/clock.c:433 +#: plugins/clock/clock.c:419 msgid "Hour mode:" msgstr "Modo Horario" -#: plugins/clock/clock.c:440 +#: plugins/clock/clock.c:426 #, fuzzy msgid "24 hour" msgstr "24 horas" -#: plugins/clock/clock.c:446 +#: plugins/clock/clock.c:432 msgid "12 hour" msgstr "12 horas" -#: plugins/clock/clock.c:452 +#: plugins/clock/clock.c:438 msgid "AM/PM" msgstr "AM/PM" -#: plugins/clock/clock.c:490 +#: plugins/clock/clock.c:476 msgid "Show seconds:" msgstr "Mostrar segundos:" -#: plugins/clock/clock.c:599 +#: plugins/clock/clock.c:585 msgid "Xfce Clock" msgstr "Reloj de XFce" -#: plugins/pager/pager.c:277 +#: plugins/pager/pager.c:271 msgid "Graphical pager" msgstr "Paginador gráfico" @@ -475,7 +416,7 @@ msgid "" msgstr "" "El acceso al sistema de configuración está inhabilitado.\n" "\n" -"Para más información consulte con su administrador de sistema" +"Para más información consulte con su administrador de sistemas" #: plugins/systembuttons/systembuttons.c:148 msgid "Lock the screen" @@ -541,17 +482,71 @@ msgstr "Intervalo (seg):" msgid "Mail check" msgstr "Revisar correo" +#~ msgid "Sunday" +#~ msgstr "Domingo" + +#~ msgid "Monday" +#~ msgstr "Lunes" + +#~ msgid "Tuesday" +#~ msgstr "Martes" + +#~ msgid "Wednesday" +#~ msgstr "Miércoles" + +#~ msgid "Thursday" +#~ msgstr "Jueves" + +#~ msgid "Friday" +#~ msgstr "Viernes" + +#~ msgid "Saturday" +#~ msgstr "Sábado" + +#~ msgid "January" +#~ msgstr "Enero" + +#~ msgid "February" +#~ msgstr "Febrero" + +#~ msgid "March" +#~ msgstr "Marzo" + +#~ msgid "April" +#~ msgstr "Abril" + +#~ msgid "May" +#~ msgstr "Mayo" + +#~ msgid "June" +#~ msgstr "Junio" + +#~ msgid "July" +#~ msgstr "Julio" + +#~ msgid "August" +#~ msgstr "Agosto" + +#~ msgid "September" +#~ msgstr "Septiembre" + +#~ msgid "October" +#~ msgstr "Octubre" + +#~ msgid "November" +#~ msgstr "Noviembre" + +#~ msgid "December" +#~ msgstr "Diciembre" + #~ msgid "_Done" #~ msgstr "Termina_Do" -#~ msgid "_Revert" -#~ msgstr "_Deshacer" - #~ msgid "Type:" #~ msgstr "Tipo:" #~ msgid "Add item" -#~ msgstr "Añadir nuevo elemento" +#~ msgstr "Añladir nuevo elemento" #~ msgid "XFce Desktop Environment" #~ msgstr "Entorno de Escritorio XFce" diff --git a/po/es_MX.gmo b/po/es_MX.gmo Binary files differindex 869211b3..51489529 100644 --- a/po/es_MX.gmo +++ b/po/es_MX.gmo diff --git a/po/es_MX.po b/po/es_MX.po index 4323c6c0..f362e756 100644 --- a/po/es_MX.po +++ b/po/es_MX.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2003-09-10 08:40+0200\n" +"POT-Creation-Date: 2003-11-05 17:25+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -28,7 +28,7 @@ msgstr "Cambiar elemento" msgid "Position:" msgstr "Posición" -#: panel/controls_dialog.c:331 panel/controls.c:272 +#: panel/controls_dialog.c:342 panel/controls.c:272 msgid "" "Removing an item will also remove its popup menu.\n" "\n" @@ -90,12 +90,12 @@ msgstr "Prevista de ícono" msgid "Drag file onto this frame to change the icon" msgstr "Jala el archivo a este marco para cambiar el ícono" -#: panel/item_dialog.c:931 +#: panel/item_dialog.c:930 msgid "Change menu item" msgstr "Cambiar elemento de menú" #. add buttons -#: panel/item_dialog.c:934 +#: panel/item_dialog.c:933 msgid "Remove" msgstr "Remover" @@ -115,11 +115,11 @@ msgstr "Adicionar nuevo elemento" msgid "Launcher" msgstr "Lanzador" -#: panel/main.c:132 +#: panel/main.c:115 msgid "Are you sure you want to exit?" msgstr "¿Está seguro de querer salir?" -#: panel/main.c:268 +#: panel/main.c:243 #, c-format msgid "" "%s, version %s\n" @@ -130,7 +130,7 @@ msgstr "" "Parte del ambiente de escritorio XFce\n" "http://www.xfce.org\n" -#: panel/main.c:284 +#: panel/main.c:259 msgid "" "Your window manager does not seem to support the new window manager hints as " "defined on http://www.freedesktop.org. \n" @@ -458,7 +458,7 @@ msgstr "Mostrar segundos:" msgid "Xfce Clock" msgstr "Reloj XFce" -#: plugins/pager/pager.c:277 +#: plugins/pager/pager.c:271 msgid "Graphical pager" msgstr "Paginador gráfico" diff --git a/po/fa_IR.gmo b/po/fa_IR.gmo Binary files differnew file mode 100644 index 00000000..5ccc3112 --- /dev/null +++ b/po/fa_IR.gmo diff --git a/po/fa_IR.po b/po/fa_IR.po new file mode 100644 index 00000000..01478fe5 --- /dev/null +++ b/po/fa_IR.po @@ -0,0 +1,484 @@ +# translation of fa_IR.po to Persian +# translation of xfce4-panel.po to Persian +# Persian translation of PACKAGE. +# Copyright (C) 2003 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Abbas Izad <abbasizad@hotmail.com>, 2003, 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: fa_IR\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-12-04 09:37+0100\n" +"PO-Revision-Date: 2004-02-22 21:37+0330\n" +"Last-Translator: Abbas Izad <abbasizad@hotmail.com>\n" +"Language-Team: Persian <fa@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.0.2\n" + +#: panel/xfce_support.c:597 +msgid "Select file" +msgstr "انتخاب کردن پرونده" + +#: panel/controls_dialog.c:254 +msgid "Change item" +msgstr "تغییر دادن آیتم" + +#: panel/controls_dialog.c:286 panel/item_dialog.c:681 +msgid "Position:" +msgstr "موقعیت:" + +#: panel/controls_dialog.c:342 panel/controls.c:272 +msgid "" +"Removing an item will also remove its popup menu.\n" +"\n" +"Do you want to remove the item?" +msgstr "" +"برداشتن آیتمی فهرست واشوی آن را نیز برخواهد داشت.\n" +"\n" +"آیا میخواهید آیتم را بردارید؟" + +#: panel/item_dialog.c:321 +msgid "Other Icon" +msgstr "شمایل دیگر" + +#: panel/item_dialog.c:346 +msgid "Select icon" +msgstr "انتخاب کردن شمایل" + +#: panel/item_dialog.c:396 +msgid "Icon:" +msgstr "شمایل:" + +#: panel/item_dialog.c:467 +msgid "Select command" +msgstr "انتخاب کردن فرمان" + +#: panel/item_dialog.c:495 +msgid "Command:" +msgstr "فرمان:" + +#: panel/item_dialog.c:532 plugins/mailcheck/mailcheck.c:668 +msgid "Run in _terminal" +msgstr "اجرا کردن در _پایانه" + +#: panel/item_dialog.c:537 plugins/mailcheck/mailcheck.c:676 +msgid "Use startup _notification" +msgstr "استفاده کردن از یادآوری _آغازین" + +#: panel/item_dialog.c:564 +msgid "Caption:" +msgstr "عنوان:" + +#: panel/item_dialog.c:597 +msgid "Tooltip:" +msgstr "راهنمایابزار:" + +#: panel/item_dialog.c:633 +msgid "Menu:" +msgstr "فهرست:" + +#: panel/item_dialog.c:640 +msgid "Attach menu to launcher" +msgstr "پیوست فهرست به پرتابگر" + +#: panel/item_dialog.c:773 +msgid "Icon Preview" +msgstr "پیشنمای شمایل" + +#: panel/item_dialog.c:777 +msgid "Drag file onto this frame to change the icon" +msgstr "پرونده را برای تغییر شمایل بر روی این قاب بکشانید" + +#: panel/item_dialog.c:965 +msgid "Change menu item" +msgstr "تغییر دادن آیتم فهرست" + +#. add buttons +#: panel/item_dialog.c:968 +msgid "Remove" +msgstr "برداشتن" + +#: panel/item.c:441 +msgid "Click mouse button 3 to change item" +msgstr "دکمهی سوم موشی را برای تغییر دادن آیتم کلیک کنید" + +#: panel/item.c:464 +msgid "Add launcher" +msgstr "افزودن پرتابگر" + +#: panel/item.c:469 +msgid "Add new item" +msgstr "افزودن آیتم جدید" + +#: panel/item.c:601 +msgid "Launcher" +msgstr "پرتابگر" + +#: panel/main.c:117 +msgid "Are you sure you want to exit?" +msgstr "آیا مطمئن هستید که میخواهید خارج شوید؟" + +#: panel/main.c:329 +#, c-format +msgid "" +"%s, version %s\n" +"Part of the XFce Desktop Environment\n" +"http://www.xfce.org\n" +msgstr "" +"%s, نسخه %s\n" +"بخشی از محیط رومیزی Xfce\n" +"http://www.xfce.org\n" + +#: panel/main.c:361 +msgid "" +"Your window manager does not seem to support the new window manager hints as " +"defined on http://www.freedesktop.org. \n" +"Some XFce features may not work as intended." +msgstr "" +"مدیر پنجرهی شما بنظر نمیرسد که از سرنخهای مدیر پنجرهی جدید همانطور که " +"در http://www.freedesktop.org تعریف شده پشتیبانی کند. \n" +"بعضی از قابلیتهای XFce ممکن است آنطور که باید کار نکنند." + +#: panel/controls.c:320 panel/panel.c:412 +msgid "/Add _new item" +msgstr "/افزودن آیتم _جدید" + +#: panel/controls.c:322 panel/panel.c:414 +msgid "/_Properties..." +msgstr "/_مشخصات..." + +#: panel/controls.c:323 +msgid "/_Remove" +msgstr "/_برداشتن" + +#: panel/controls.c:655 +msgid "This item has no configuration options" +msgstr "این آیتم هیچ گزینههای تنظیمی ندارد" + +#: panel/panel.c:410 +msgid "/XFce Panel" +msgstr "/تابلوی XFce" + +#: panel/panel.c:415 +msgid "/_About XFce" +msgstr "/_دربارهی XFce" + +#: panel/panel.c:416 +msgid "/_Help" +msgstr "/_راهنما" + +#: panel/panel.c:419 +msgid "/_Settings manager" +msgstr "/_مدیر تنظیمات" + +#: panel/panel.c:422 +msgid "/_Lock screen" +msgstr "/_قفل کردن صفحه" + +#: panel/panel.c:423 +msgid "/_Restart" +msgstr "/_راهاندازی مجدد" + +#: panel/panel.c:425 +msgid "/E_xit" +msgstr "/_خروج" + +#: panel/panel.c:812 settings/xfce_settings_plugin.c:82 +#: settings/xfce_settings_dialog.c:649 +msgid "XFce Panel" +msgstr "تابلوی XFce" + +#: panel/icons.c:73 +msgid "Default" +msgstr "پیشفرض" + +#: panel/icons.c:74 +msgid "Editor" +msgstr "ویرایشگر" + +#: panel/icons.c:75 +msgid "File management" +msgstr "مدیریت پرونده" + +#: panel/icons.c:76 +msgid "Utilities" +msgstr "وسایل" + +#: panel/icons.c:77 +msgid "Games" +msgstr "بازیها" + +#: panel/icons.c:78 +msgid "Help browser" +msgstr "مرورگر راهنما" + +#: panel/icons.c:79 +msgid "Multimedia" +msgstr "چندرسانهای" + +#: panel/icons.c:80 +msgid "Network" +msgstr "شبکه" + +#: panel/icons.c:81 +msgid "Graphics" +msgstr "گرافیک" + +#: panel/icons.c:82 +msgid "Printer" +msgstr "چاپگر" + +#: panel/icons.c:83 +msgid "Productivity" +msgstr "سازندهگی" + +#: panel/icons.c:84 +msgid "Sound" +msgstr "صوت" + +#: panel/icons.c:85 +msgid "Terminal" +msgstr "پایانه" + +#: panel/mcs_client.c:208 +msgid "Settings manager not available" +msgstr "مدیر تنظیمات در دسترس نیست" + +#: panel/popup.c:261 +msgid "Menu" +msgstr "فهرست" + +#: settings/xfce_settings_dialog.c:119 +msgid "Tiny" +msgstr "کوچولو" + +#: settings/xfce_settings_dialog.c:123 +msgid "Small" +msgstr "کوچک" + +#: settings/xfce_settings_dialog.c:127 +msgid "Medium" +msgstr "متوسط" + +#: settings/xfce_settings_dialog.c:131 +msgid "Large" +msgstr "بزرگ" + +#: settings/xfce_settings_dialog.c:190 +msgid "Horizontal" +msgstr "افقی" + +#: settings/xfce_settings_dialog.c:194 +msgid "Vertical" +msgstr "عمودی" + +#: settings/xfce_settings_dialog.c:226 settings/xfce_settings_dialog.c:456 +msgid "Left" +msgstr "چپ" + +#: settings/xfce_settings_dialog.c:230 settings/xfce_settings_dialog.c:457 +msgid "Right" +msgstr "راست" + +#: settings/xfce_settings_dialog.c:234 settings/xfce_settings_dialog.c:455 +#: settings/xfce_settings_dialog.c:511 +msgid "Top" +msgstr "بالا" + +#: settings/xfce_settings_dialog.c:238 settings/xfce_settings_dialog.c:454 +#: settings/xfce_settings_dialog.c:519 +msgid "Bottom" +msgstr "پایین" + +#: settings/xfce_settings_dialog.c:374 +msgid "Panel size:" +msgstr "اندازهی تابلو:" + +#: settings/xfce_settings_dialog.c:390 +msgid "Panel orientation:" +msgstr "جهت تابلو:" + +#: settings/xfce_settings_dialog.c:407 +msgid "Popup position:" +msgstr "موقعیت واشو:" + +#: settings/xfce_settings_dialog.c:424 +msgid "Icon theme:" +msgstr "تم شمایل:" + +#: settings/xfce_settings_dialog.c:495 +msgid "Panel layer:" +msgstr "لایهی تابلو:" + +#: settings/xfce_settings_dialog.c:515 +msgid "Normal" +msgstr "عادی" + +#: settings/xfce_settings_dialog.c:535 +msgid "Center the panel:" +msgstr "مرکزی کردن تابلو:" + +#: settings/xfce_settings_dialog.c:559 +msgid "Set" +msgstr "تعیین کردن" + +#: settings/xfce_settings_dialog.c:595 +msgid "Autohide:" +msgstr "پنهانسازی خودکار:" + +#: settings/xfce_settings_dialog.c:663 +msgid "XFce Panel Settings" +msgstr "تنظیمات تابلوی XFce" + +#. Appearance +#: settings/xfce_settings_dialog.c:675 +msgid "Appearance" +msgstr "ظاهر" + +#. Position +#: settings/xfce_settings_dialog.c:696 +msgid "Position" +msgstr "موقعیت" + +#. autohide +#: settings/xfce_settings_dialog.c:712 +msgid "Behaviour" +msgstr "رفتار" + +#. Use format characters from strftime(3) +#. * to get the proper string for your locale. +#. * I used these: +#. * %A : full weekday name +#. * %-d : day of the month, without prefixed 0 +#. * %B : full month name +#. * %Y : four digit year +#. +#: plugins/clock/clock.c:119 +msgid "%A, %-d %B %Y" +msgstr "%A, %-d %B %Y" + +#: plugins/clock/clock.c:336 +msgid "Clock type:" +msgstr "نوع ساعت:" + +#: plugins/clock/clock.c:349 +msgid "Analog" +msgstr "آنالوگ" + +#: plugins/clock/clock.c:353 +msgid "Digital" +msgstr "ارقامی" + +#: plugins/clock/clock.c:357 +msgid "LED" +msgstr "LED" + +#: plugins/clock/clock.c:419 +msgid "Hour mode:" +msgstr "حالت ساعت:" + +#: plugins/clock/clock.c:426 +msgid "24 hour" +msgstr "۲۴ ساعتی" + +#: plugins/clock/clock.c:432 +msgid "12 hour" +msgstr "۱۲ ساعتی" + +#: plugins/clock/clock.c:438 +msgid "AM/PM" +msgstr "قظ/بظ" + +#: plugins/clock/clock.c:476 +msgid "Show seconds:" +msgstr "نشان دادن ثانیهها:" + +#: plugins/clock/clock.c:585 +msgid "Xfce Clock" +msgstr "ساعت XFce" + +#: plugins/pager/pager.c:271 +msgid "Graphical pager" +msgstr "صفحهنمای گرافیکی" + +#: plugins/switcher/switcher.c:696 +msgid "Desktop switcher" +msgstr "عوض کنندهی رومیزی" + +#: plugins/systembuttons/systembuttons.c:60 +msgid "" +"Access to the configuration system has been disabled.\n" +"\n" +"Ask your system administrator for more information" +msgstr "" +"دستیابی به سیستم تنظیم از کار انداخته شده است.\n" +"\n" +"برای اطلاعات بیشتر از مدیر سیستم خود سؤال کنید" + +#: plugins/systembuttons/systembuttons.c:148 +msgid "Lock the screen" +msgstr "قفل کردن صفحه" + +#: plugins/systembuttons/systembuttons.c:149 +#: plugins/systembuttons/systembuttons.c:518 +msgid "Exit" +msgstr "خروج" + +#: plugins/systembuttons/systembuttons.c:150 +#: plugins/systembuttons/systembuttons.c:519 +msgid "Setup" +msgstr "برپاسازی" + +#: plugins/systembuttons/systembuttons.c:151 +#: plugins/systembuttons/systembuttons.c:520 +msgid "Info" +msgstr "اطلاعات" + +#: plugins/systembuttons/systembuttons.c:500 +msgid "Show two buttons:" +msgstr "نشان دادن دو دکمه:" + +#. set names to use in option menus +#: plugins/systembuttons/systembuttons.c:517 +msgid "Lock" +msgstr "قفل کردن" + +#: plugins/systembuttons/systembuttons.c:549 +msgid "Button 1:" +msgstr "دکمهی ۱:" + +#: plugins/systembuttons/systembuttons.c:565 +msgid "Button 2:" +msgstr "دکمه ۲:" + +#: plugins/systembuttons/systembuttons.c:600 +msgid "System buttons" +msgstr "دکمههای سیستم" + +#: plugins/separator/separator.c:153 +msgid "Separator" +msgstr "جداساز" + +#: plugins/mailcheck/mailcheck.c:539 +msgid "Mail box:" +msgstr "جعبهی پست:" + +#: plugins/mailcheck/mailcheck.c:623 +msgid "Mail command:" +msgstr "فرمان پست:" + +#: plugins/mailcheck/mailcheck.c:637 +msgid "Command to run when the button on the panel is clicked" +msgstr "فرمان برای اجرا وقتی که دکمهی بر روی تابلو کلیک شده باشد" + +#: plugins/mailcheck/mailcheck.c:706 +msgid "Interval (sec):" +msgstr "بازه (ثانیه)" + +#: plugins/mailcheck/mailcheck.c:778 +msgid "Mail check" +msgstr "بررسی پست" + Binary files differ@@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: XFCE4\n" -"POT-Creation-Date: 2003-09-10 08:40+0200\n" +"POT-Creation-Date: 2003-11-05 17:25+0100\n" "PO-Revision-Date: 2003-06-01 23:04+0200\n" "Last-Translator: Ilkka Ollakka <ilkka.j.ollakka@students.oamk.fi>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -26,7 +26,7 @@ msgstr "Muuta osaa" msgid "Position:" msgstr "Paikka:" -#: panel/controls_dialog.c:331 panel/controls.c:272 +#: panel/controls_dialog.c:342 panel/controls.c:272 msgid "" "Removing an item will also remove its popup menu.\n" "\n" @@ -88,12 +88,12 @@ msgstr "Kuvakkeen esikatselu" msgid "Drag file onto this frame to change the icon" msgstr "Raahaa tiedosto tähän kehykseen vaihtaaksesi kuvaketta" -#: panel/item_dialog.c:931 +#: panel/item_dialog.c:930 msgid "Change menu item" msgstr "Vaihda valikon osaa" #. add buttons -#: panel/item_dialog.c:934 +#: panel/item_dialog.c:933 msgid "Remove" msgstr "Poista" @@ -113,11 +113,11 @@ msgstr "Lisää uusi osa" msgid "Launcher" msgstr "Käynnistin" -#: panel/main.c:132 +#: panel/main.c:115 msgid "Are you sure you want to exit?" msgstr "Haluatko lopettaa?" -#: panel/main.c:268 +#: panel/main.c:243 #, c-format msgid "" "%s, version %s\n" @@ -128,7 +128,7 @@ msgstr "" "Osa XFce-työpöytäympäristöä\n" "http://www.xfce.org\n" -#: panel/main.c:284 +#: panel/main.c:259 msgid "" "Your window manager does not seem to support the new window manager hints as " "defined on http://www.freedesktop.org. \n" @@ -456,7 +456,7 @@ msgstr "Näytä sekunnit:" msgid "Xfce Clock" msgstr "Xfce Kello" -#: plugins/pager/pager.c:277 +#: plugins/pager/pager.c:271 msgid "Graphical pager" msgstr "Graafinen työpöydän vaihtajaa" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: xfce4 1.0.0\n" -"POT-Creation-Date: 2003-09-10 08:40+0200\n" +"POT-Creation-Date: 2003-11-05 17:25+0100\n" "PO-Revision-Date: 2003-01-23 23:59+0100\n" "Last-Translator: Olivier Fourdan <fourdan@xfce.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -28,7 +28,7 @@ msgstr "Modifier l'entrée" msgid "Position:" msgstr "Position:" -#: panel/controls_dialog.c:331 panel/controls.c:272 +#: panel/controls_dialog.c:342 panel/controls.c:272 msgid "" "Removing an item will also remove its popup menu.\n" "\n" @@ -91,12 +91,12 @@ msgstr "Prévisualisation d'icône" msgid "Drag file onto this frame to change the icon" msgstr "Déposer un fichier dans cette zone pour changer l'icône" -#: panel/item_dialog.c:931 +#: panel/item_dialog.c:930 msgid "Change menu item" msgstr "Changer une entrée de menu" #. add buttons -#: panel/item_dialog.c:934 +#: panel/item_dialog.c:933 msgid "Remove" msgstr "Supprimer" @@ -116,11 +116,11 @@ msgstr "Ajouter une entrée" msgid "Launcher" msgstr "Lanceur" -#: panel/main.c:132 +#: panel/main.c:115 msgid "Are you sure you want to exit?" msgstr "Êtes-vous sûr de vouloir quitter ?" -#: panel/main.c:268 +#: panel/main.c:243 #, c-format msgid "" "%s, version %s\n" @@ -131,7 +131,7 @@ msgstr "" "Élément de l'environnement de bureau XFce\n" "http://www.xfce.org\n" -#: panel/main.c:284 +#: panel/main.c:259 msgid "" "Your window manager does not seem to support the new window manager hints as " "defined on http://www.freedesktop.org. \n" @@ -459,7 +459,7 @@ msgstr "Afficher les secondes:" msgid "Xfce Clock" msgstr "Horloge Xfce" -#: plugins/pager/pager.c:277 +#: plugins/pager/pager.c:271 msgid "Graphical pager" msgstr "Changeur de bureaux graphique" @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"POT-Creation-Date: 2003-09-10 08:40+0200\n" +"POT-Creation-Date: 2003-11-05 17:25+0100\n" "PO-Revision-Date: 2003-05-21 12:50+0530\n" "Last-Translator: G Karunakar <karunakar@freedomink.org>\n" "Language-Team: Hindi <indlinux-hindi-gnome@lists.sourceforge.net>\n" @@ -28,7 +28,7 @@ msgstr "बदलें" msgid "Position:" msgstr "स्थान:" -#: panel/controls_dialog.c:331 panel/controls.c:272 +#: panel/controls_dialog.c:342 panel/controls.c:272 msgid "" "Removing an item will also remove its popup menu.\n" "\n" @@ -88,12 +88,12 @@ msgstr "आईकाॅन" msgid "Drag file onto this frame to change the icon" msgstr "" -#: panel/item_dialog.c:931 +#: panel/item_dialog.c:930 msgid "Change menu item" msgstr "मेनू वस्तु बदलें" #. add buttons -#: panel/item_dialog.c:934 +#: panel/item_dialog.c:933 msgid "Remove" msgstr "हटाएं" @@ -113,11 +113,11 @@ msgstr "नया वस्तु जोडें" msgid "Launcher" msgstr "लाँचर" -#: panel/main.c:132 +#: panel/main.c:115 msgid "Are you sure you want to exit?" msgstr "कया आप सचमुच बाहर निकलना चाहते हैं" -#: panel/main.c:268 +#: panel/main.c:243 #, c-format msgid "" "%s, version %s\n" @@ -128,7 +128,7 @@ msgstr "" "XFce डेसकटॉप वातावरण का भाग\n" "http://www.xfce.org\n" -#: panel/main.c:284 +#: panel/main.c:259 msgid "" "Your window manager does not seem to support the new window manager hints as " "defined on http://www.freedesktop.org. \n" @@ -455,7 +455,7 @@ msgstr "क्षण दिखाएं" msgid "Xfce Clock" msgstr "Xfce घडी" -#: plugins/pager/pager.c:277 +#: plugins/pager/pager.c:271 msgid "Graphical pager" msgstr "ग्राफिकल पेजर" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: hu\n" -"POT-Creation-Date: 2003-09-10 08:40+0200\n" +"POT-Creation-Date: 2003-11-05 17:25+0100\n" "PO-Revision-Date: 2003-07-16 16:20+0200\n" "Last-Translator: Egmont Koblinger <egmont@uhulinux.hu>\n" "Language-Team: Hungarian <hu@li.org>\n" @@ -31,7 +31,7 @@ msgstr "Elem megváltoztatása" msgid "Position:" msgstr "Elhelyezés:" -#: panel/controls_dialog.c:331 panel/controls.c:272 +#: panel/controls_dialog.c:342 panel/controls.c:272 msgid "" "Removing an item will also remove its popup menu.\n" "\n" @@ -93,12 +93,12 @@ msgstr "Ikon előnézet" msgid "Drag file onto this frame to change the icon" msgstr "Az ikon megváltoztatásához húzza erre a keretre a fájlt" -#: panel/item_dialog.c:931 +#: panel/item_dialog.c:930 msgid "Change menu item" msgstr "Menüelem megváltoztatása" #. add buttons -#: panel/item_dialog.c:934 +#: panel/item_dialog.c:933 msgid "Remove" msgstr "Eltávolítás" @@ -118,11 +118,11 @@ msgstr "Panelra helyezés" msgid "Launcher" msgstr "Panel" -#: panel/main.c:132 +#: panel/main.c:115 msgid "Are you sure you want to exit?" msgstr "Biztosan ki akar lépni?" -#: panel/main.c:268 +#: panel/main.c:243 #, c-format msgid "" "%s, version %s\n" @@ -133,7 +133,7 @@ msgstr "" "Az XFce Munkakörnyezet része\n" "http://www.xfce.org\n" -#: panel/main.c:284 +#: panel/main.c:259 msgid "" "Your window manager does not seem to support the new window manager hints as " "defined on http://www.freedesktop.org. \n" @@ -461,7 +461,7 @@ msgstr "Másodpercek kijelzése:" msgid "Xfce Clock" msgstr "XFce Óra" -#: plugins/pager/pager.c:277 +#: plugins/pager/pager.c:271 msgid "Graphical pager" msgstr "Munkaterületváltó" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-panel 1.0.0\n" -"POT-Creation-Date: 2003-09-10 08:40+0200\n" +"POT-Creation-Date: 2003-11-05 17:25+0100\n" "PO-Revision-Date: 2003-05-27 12:30+0900\n" "Last-Translator: Zhao Ji <zhao-ji@awz.ne.jp>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -27,7 +27,7 @@ msgstr "項目変更" msgid "Position:" msgstr "位置:" -#: panel/controls_dialog.c:331 panel/controls.c:272 +#: panel/controls_dialog.c:342 panel/controls.c:272 msgid "" "Removing an item will also remove its popup menu.\n" "\n" @@ -90,12 +90,12 @@ msgstr "アイコン確認" msgid "Drag file onto this frame to change the icon" msgstr "項目変更のために、ここへファイルをドラッグしてください" -#: panel/item_dialog.c:931 +#: panel/item_dialog.c:930 msgid "Change menu item" msgstr "メニュー項目の変更" #. add buttons -#: panel/item_dialog.c:934 +#: panel/item_dialog.c:933 msgid "Remove" msgstr "削除" @@ -115,11 +115,11 @@ msgstr "項目追加" msgid "Launcher" msgstr "ランチャ" -#: panel/main.c:132 +#: panel/main.c:115 msgid "Are you sure you want to exit?" msgstr "本当に終了してもいいですか？" -#: panel/main.c:268 +#: panel/main.c:243 #, c-format msgid "" "%s, version %s\n" @@ -127,7 +127,7 @@ msgid "" "http://www.xfce.org\n" msgstr "" -#: panel/main.c:284 +#: panel/main.c:259 msgid "" "Your window manager does not seem to support the new window manager hints as " "defined on http://www.freedesktop.org. \n" @@ -455,7 +455,7 @@ msgstr "秒表示:" msgid "Xfce Clock" msgstr "XFce時計" -#: plugins/pager/pager.c:277 +#: plugins/pager/pager.c:271 msgid "Graphical pager" msgstr "グラフィカル・ページャ" @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-panel 1.0.0\n" -"POT-Creation-Date: 2003-09-10 08:40+0200\n" -"PO-Revision-Date: 2003-07-23 23:51+0900\n" +"POT-Creation-Date: 2003-11-05 17:25+0100\n" +"PO-Revision-Date: 2003-10-13 23:51+0900\n" "Last-Translator: ByungHyun Choi<byunghyunchoi@rtlinux.or.kr>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -26,7 +26,7 @@ msgstr "아이템 변경" msgid "Position:" msgstr "위치:" -#: panel/controls_dialog.c:331 panel/controls.c:272 +#: panel/controls_dialog.c:342 panel/controls.c:272 msgid "" "Removing an item will also remove its popup menu.\n" "\n" @@ -89,12 +89,12 @@ msgstr "아이콘 미리 보기" msgid "Drag file onto this frame to change the icon" msgstr "아이콘을 변경하려면 이 프레임에 화일을 끌어다 놓으세요." -#: panel/item_dialog.c:931 +#: panel/item_dialog.c:930 msgid "Change menu item" msgstr "메뉴 항목 변경" #. add buttons -#: panel/item_dialog.c:934 +#: panel/item_dialog.c:933 msgid "Remove" msgstr "삭제" @@ -114,11 +114,11 @@ msgstr "새 항목 추가" msgid "Launcher" msgstr "실행기" -#: panel/main.c:132 +#: panel/main.c:115 msgid "Are you sure you want to exit?" msgstr "종료하시겠습니까?" -#: panel/main.c:268 +#: panel/main.c:243 #, c-format msgid "" "%s, version %s\n" @@ -126,12 +126,15 @@ msgid "" "http://www.xfce.org\n" msgstr "" -#: panel/main.c:284 +#: panel/main.c:259 msgid "" "Your window manager does not seem to support the new window manager hints as " "defined on http://www.freedesktop.org. \n" "Some XFce features may not work as intended." msgstr "" +"사용하시는 창관리자는 http://www.freedesktop.org에서 규정한 새로운 창관리자 " +"힌트를 지원하지 않는 것 같습니다.\n" +"따라서 XFce의 일부 기능이 원하는 데로 동작하지 않을 수도 있습니다." #: panel/controls.c:320 panel/panel.c:123 msgid "/Add _new item" @@ -151,7 +154,7 @@ msgstr "이 아이템은 속성을 정의할 수 없습니다." #: panel/panel.c:121 msgid "/XFce Panel" -msgstr "" +msgstr "/XFce 패널" #: panel/panel.c:126 msgid "/_Settings manager" @@ -451,7 +454,7 @@ msgstr "초:" msgid "Xfce Clock" msgstr "XFce 시계" -#: plugins/pager/pager.c:277 +#: plugins/pager/pager.c:271 msgid "Graphical pager" msgstr "페이저" @@ -465,6 +468,8 @@ msgid "" "\n" "Ask your system administrator for more information" msgstr "" +"설정 시스템을 사용하지 못하도록 설정되어 있으니,\n" +"상세한 내용은 시스템 관리자에게 질문하십시오." #: plugins/systembuttons/systembuttons.c:148 msgid "Lock the screen" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-panel 3.99.2\n" -"POT-Creation-Date: 2003-09-10 08:40+0200\n" +"POT-Creation-Date: 2003-11-05 17:25+0100\n" "PO-Revision-Date: 2003-08-03 01:16+0300\n" "Last-Translator: Mantas <zaz@xxx.lt>\n" "Language-Team: Lithuania <zaz@xxx.lt>\n" @@ -26,7 +26,7 @@ msgstr "Pakeisti element" msgid "Position:" msgstr "Pozicija:" -#: panel/controls_dialog.c:331 panel/controls.c:272 +#: panel/controls_dialog.c:342 panel/controls.c:272 msgid "" "Removing an item will also remove its popup menu.\n" "\n" @@ -88,12 +88,12 @@ msgstr "Pikrogramos Perira" msgid "Drag file onto this frame to change the icon" msgstr "Nordami pakeisti piktogram, tempkite fail ant io rmo " -#: panel/item_dialog.c:931 +#: panel/item_dialog.c:930 msgid "Change menu item" msgstr "Pakeisti meniu element" #. add buttons -#: panel/item_dialog.c:934 +#: panel/item_dialog.c:933 msgid "Remove" msgstr "Paalinti" @@ -113,11 +113,11 @@ msgstr "dti nauj leistuk" msgid "Launcher" msgstr "Leistukas" -#: panel/main.c:132 +#: panel/main.c:115 msgid "Are you sure you want to exit?" msgstr "Ar tikrai norite ieiti?" -#: panel/main.c:268 +#: panel/main.c:243 #, c-format msgid "" "%s, version %s\n" @@ -128,7 +128,7 @@ msgstr "" "Dalis XFce Desktop Environment\n" "http://www.xfce.org\n" -#: panel/main.c:284 +#: panel/main.c:259 msgid "" "Your window manager does not seem to support the new window manager hints as " "defined on http://www.freedesktop.org. \n" @@ -456,7 +456,7 @@ msgstr "Rodyti sekundes:" msgid "Xfce Clock" msgstr "Xfce laikrodis" -#: plugins/pager/pager.c:277 +#: plugins/pager/pager.c:271 #, fuzzy msgid "Graphical pager" msgstr "Grafinis ?????" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-panel 3.99.3\n" -"POT-Creation-Date: 2003-09-10 08:40+0200\n" +"POT-Creation-Date: 2003-11-05 17:25+0100\n" "PO-Revision-Date: 2003-08-31 13:00+0800\n" "Last-Translator: Harun Musa <mharun@gmx.net>\n" "Language-Team: Malay <translation-team-ms@list.sourceforge.net>\n" @@ -27,7 +27,7 @@ msgstr "Tukar item" msgid "Position:" msgstr "Posisi:" -#: panel/controls_dialog.c:331 panel/controls.c:272 +#: panel/controls_dialog.c:342 panel/controls.c:272 msgid "" "Removing an item will also remove its popup menu.\n" "\n" @@ -89,12 +89,12 @@ msgstr "Pralihat Ikon" msgid "Drag file onto this frame to change the icon" msgstr "Jatuhkan fail kedalam frame ini untuk tukar ikon" -#: panel/item_dialog.c:931 +#: panel/item_dialog.c:930 msgid "Change menu item" msgstr "Tukar menu item" #. add buttons -#: panel/item_dialog.c:934 +#: panel/item_dialog.c:933 msgid "Remove" msgstr "Buang" @@ -114,11 +114,11 @@ msgstr "Tambah item baru" msgid "Launcher" msgstr "Pelancar" -#: panel/main.c:132 +#: panel/main.c:115 msgid "Are you sure you want to exit?" msgstr "Adakah anda pasti untuk keluar?" -#: panel/main.c:268 +#: panel/main.c:243 #, c-format msgid "" "%s, version %s\n" @@ -129,7 +129,7 @@ msgstr "" "Sebahagian Persekitaran Meja XFce\n" "http://www.xfce.org\n" -#: panel/main.c:284 +#: panel/main.c:259 msgid "" "Your window manager does not seem to support the new window manager hints as " "defined on http://www.freedesktop.org. \n" @@ -457,7 +457,7 @@ msgstr "Lihat saat:" msgid "Xfce Clock" msgstr "Jam Xfce" -#: plugins/pager/pager.c:277 +#: plugins/pager/pager.c:271 msgid "Graphical pager" msgstr "Pager grafik" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: xfce4 VERSION\n" -"POT-Creation-Date: 2003-09-10 08:40+0200\n" +"POT-Creation-Date: 2003-11-05 17:25+0100\n" "PO-Revision-Date: 24-01-03 12:43:34+0100\n" "Last-Translator: Jasper Huijsmans <huysmans@sourceforge.net>\n" "Language-Team: Nederlands <nl@li.org>\n" @@ -28,7 +28,7 @@ msgstr "Item aanpassen" msgid "Position:" msgstr "Positie:" -#: panel/controls_dialog.c:331 panel/controls.c:272 +#: panel/controls_dialog.c:342 panel/controls.c:272 msgid "" "Removing an item will also remove its popup menu.\n" "\n" @@ -90,12 +90,12 @@ msgstr "Voorbeeld" msgid "Drag file onto this frame to change the icon" msgstr "Sleep bestand naar dit frame om pictogram te wijzigen" -#: panel/item_dialog.c:931 +#: panel/item_dialog.c:930 msgid "Change menu item" msgstr "Menu item veranderen" #. add buttons -#: panel/item_dialog.c:934 +#: panel/item_dialog.c:933 msgid "Remove" msgstr "Verwijderen" @@ -115,11 +115,11 @@ msgstr "Nieuw item toevoegen" msgid "Launcher" msgstr "Starter" -#: panel/main.c:132 +#: panel/main.c:115 msgid "Are you sure you want to exit?" msgstr "Weet u zeker dat u wil afsluiten?" -#: panel/main.c:268 +#: panel/main.c:243 #, c-format msgid "" "%s, version %s\n" @@ -130,7 +130,7 @@ msgstr "" "Onderdeel van de XFce Desktop Environment\n" "http://www.xfce.org\n" -#: panel/main.c:284 +#: panel/main.c:259 msgid "" "Your window manager does not seem to support the new window manager hints as " "defined on http://www.freedesktop.org. \n" @@ -458,7 +458,7 @@ msgstr "Secondes tonen:" msgid "Xfce Clock" msgstr "Xfce Klok" -#: plugins/pager/pager.c:277 +#: plugins/pager/pager.c:271 msgid "Graphical pager" msgstr "Grafische pager" diff --git a/po/no.gmo b/po/no.gmo Binary files differnew file mode 100644 index 00000000..e6fb1a25 --- /dev/null +++ b/po/no.gmo diff --git a/po/no.po b/po/no.po new file mode 100644 index 00000000..a5c2d775 --- /dev/null +++ b/po/no.po @@ -0,0 +1,480 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2003-12-04 09:37+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: panel/xfce_support.c:597 +msgid "Select file" +msgstr "Velg fil" + +#: panel/controls_dialog.c:254 +msgid "Change item" +msgstr "Endre element" + +#: panel/controls_dialog.c:286 panel/item_dialog.c:681 +msgid "Position:" +msgstr "Posisjon:" + +#: panel/controls_dialog.c:342 panel/controls.c:272 +msgid "" +"Removing an item will also remove its popup menu.\n" +"\n" +"Do you want to remove the item?" +msgstr "" +"Fjerning av et element vil også fjerne dets popup meny.\n" +"\n" +"Vil du fjerne elementet?" + +#: panel/item_dialog.c:321 +msgid "Other Icon" +msgstr "Annet ikon" + +#: panel/item_dialog.c:346 +msgid "Select icon" +msgstr "Velg ikon" + +#: panel/item_dialog.c:396 +msgid "Icon:" +msgstr "Ikon:" + +#: panel/item_dialog.c:467 +msgid "Select command" +msgstr "Velg kommando" + +#: panel/item_dialog.c:495 +msgid "Command:" +msgstr "Kommando:" + +#: panel/item_dialog.c:532 plugins/mailcheck/mailcheck.c:668 +msgid "Run in _terminal" +msgstr "Kjør i _terminal" + +#: panel/item_dialog.c:537 plugins/mailcheck/mailcheck.c:676 +msgid "Use startup _notification" +msgstr "Bruk oppstarts _varsel" + +#: panel/item_dialog.c:564 +msgid "Caption:" +msgstr "Bildetekst:" + +#: panel/item_dialog.c:597 +msgid "Tooltip:" +msgstr "Verktøytips:" + +#: panel/item_dialog.c:633 +msgid "Menu:" +msgstr "Meny:" + +#: panel/item_dialog.c:640 +msgid "Attach menu to launcher" +msgstr "Fest meny til programstarter" + +#: panel/item_dialog.c:773 +msgid "Icon Preview" +msgstr "Ikon forhåndsvisning" + +#: panel/item_dialog.c:777 +msgid "Drag file onto this frame to change the icon" +msgstr "Dra filen på denne rammen for å forandre ikonet" + +#: panel/item_dialog.c:965 +msgid "Change menu item" +msgstr "Endre meny element" + +#. add buttons +#: panel/item_dialog.c:968 +msgid "Remove" +msgstr "Fjern" + +#: panel/item.c:441 +msgid "Click mouse button 3 to change item" +msgstr "Klikk tredje museknapp for å forandre element" + +#: panel/item.c:464 +msgid "Add launcher" +msgstr "Legg til programstarter" + +#: panel/item.c:469 +msgid "Add new item" +msgstr "Tilføy nytt element" + +#: panel/item.c:601 +msgid "Launcher" +msgstr "Programstarter" + +#: panel/main.c:117 +msgid "Are you sure you want to exit?" +msgstr "Er du sikker på at du vil avslutte?" + +#: panel/main.c:329 +#, c-format +msgid "" +"%s, version %s\n" +"Part of the XFce Desktop Environment\n" +"http://www.xfce.org\n" +msgstr "" +"%s, versjon %s\n" +"Del av XFce skrivebordsmiljøet\n" +"http://www.xfce.org\n" + +#: panel/main.c:361 +msgid "" +"Your window manager does not seem to support the new window manager hints as " +"defined on http://www.freedesktop.org. \n" +"Some XFce features may not work as intended." +msgstr "" +"Vinduhåndtereren din ser ikke ut til å støtte de vinduhånteringshintene som er " +"definert av http://www.freedesktop.org. \n" +"Noen XFce egenskaper virker kanskje ikke som påtenkt." + +#: panel/controls.c:320 panel/panel.c:412 +msgid "/Add _new item" +msgstr "/Legg til _nytt element" + +#: panel/controls.c:322 panel/panel.c:414 +msgid "/_Properties..." +msgstr "/_Egenskaper.." + +#: panel/controls.c:323 +msgid "/_Remove" +msgstr "/_Fjern" + +#: panel/controls.c:655 +msgid "This item has no configuration options" +msgstr "Dette elementet har konfigurasjons alternativer" + +#: panel/panel.c:410 +msgid "/XFce Panel" +msgstr "/XFce Panel" + +#: panel/panel.c:415 +msgid "/_About XFce" +msgstr "/_Om XFce" + +#: panel/panel.c:416 +msgid "/_Help" +msgstr "/_Hjelp" + +#: panel/panel.c:419 +msgid "/_Settings manager" +msgstr "/_Instillings håndterer" + +#: panel/panel.c:422 +msgid "/_Lock screen" +msgstr "/_Lås skjerm" + +#: panel/panel.c:423 +msgid "/_Restart" +msgstr "/_Omstart" + +#: panel/panel.c:425 +msgid "/E_xit" +msgstr "/A_vslutt" + +#: panel/panel.c:812 settings/xfce_settings_plugin.c:82 +#: settings/xfce_settings_dialog.c:649 +msgid "XFce Panel" +msgstr "XFce Panel" + +#: panel/icons.c:73 +msgid "Default" +msgstr "Standard" + +#: panel/icons.c:74 +msgid "Editor" +msgstr "Redigerer" + +#: panel/icons.c:75 +msgid "File management" +msgstr "Fil administrasjon" + +#: panel/icons.c:76 +msgid "Utilities" +msgstr "Verktøyer" + +#: panel/icons.c:77 +msgid "Games" +msgstr "Spill" + +#: panel/icons.c:78 +msgid "Help browser" +msgstr "Hjelpeveileder" + +#: panel/icons.c:79 +msgid "Multimedia" +msgstr "Multimedia" + +#: panel/icons.c:80 +msgid "Network" +msgstr "Nettverk" + +#: panel/icons.c:81 +msgid "Graphics" +msgstr "Grafikk" + +#: panel/icons.c:82 +msgid "Printer" +msgstr "Printer" + +#: panel/icons.c:83 +msgid "Productivity" +msgstr "Produktivitet" + +#: panel/icons.c:84 +msgid "Sound" +msgstr "Lyd" + +#: panel/icons.c:85 +msgid "Terminal" +msgstr "Terminal" + +#: panel/mcs_client.c:208 +msgid "Settings manager not available" +msgstr "Instilligns håndterer ikke tilgjengelig" + +#: panel/popup.c:261 +msgid "Menu" +msgstr "Meny" + +#: settings/xfce_settings_dialog.c:119 +msgid "Tiny" +msgstr "Knøttliten" + +#: settings/xfce_settings_dialog.c:123 +msgid "Small" +msgstr "Liten" + +#: settings/xfce_settings_dialog.c:127 +msgid "Medium" +msgstr "Medium" + +#: settings/xfce_settings_dialog.c:131 +msgid "Large" +msgstr "Stor" + +#: settings/xfce_settings_dialog.c:190 +msgid "Horizontal" +msgstr "Horisontal" + +#: settings/xfce_settings_dialog.c:194 +msgid "Vertical" +msgstr "Vertikal" + +#: settings/xfce_settings_dialog.c:226 settings/xfce_settings_dialog.c:456 +msgid "Left" +msgstr "Venstre" + +#: settings/xfce_settings_dialog.c:230 settings/xfce_settings_dialog.c:457 +msgid "Right" +msgstr "Høyre" + +#: settings/xfce_settings_dialog.c:234 settings/xfce_settings_dialog.c:455 +#: settings/xfce_settings_dialog.c:511 +msgid "Top" +msgstr "Topp" + +#: settings/xfce_settings_dialog.c:238 settings/xfce_settings_dialog.c:454 +#: settings/xfce_settings_dialog.c:519 +msgid "Bottom" +msgstr "Bunn" + +#: settings/xfce_settings_dialog.c:374 +msgid "Panel size:" +msgstr "Panel størrelse :" + +#: settings/xfce_settings_dialog.c:390 +msgid "Panel orientation:" +msgstr "Panel orientering:" + +#: settings/xfce_settings_dialog.c:407 +msgid "Popup position:" +msgstr "Sprettopp posisjon:" + +#: settings/xfce_settings_dialog.c:424 +msgid "Icon theme:" +msgstr "Ikon tema:" + +#: settings/xfce_settings_dialog.c:495 +msgid "Panel layer:" +msgstr "Panel lag:" + +#: settings/xfce_settings_dialog.c:515 +msgid "Normal" +msgstr "Normal" + +#: settings/xfce_settings_dialog.c:535 +msgid "Center the panel:" +msgstr "Sentrer panelet:" + +#: settings/xfce_settings_dialog.c:559 +msgid "Set" +msgstr "Sett" + +#: settings/xfce_settings_dialog.c:595 +msgid "Autohide:" +msgstr "Autogjem:" + +#: settings/xfce_settings_dialog.c:663 +msgid "XFce Panel Settings" +msgstr "XFce panel instillinger" + +#. Appearance +#: settings/xfce_settings_dialog.c:675 +msgid "Appearance" +msgstr "Utseende" + +#. Position +#: settings/xfce_settings_dialog.c:696 +msgid "Position" +msgstr "Posisjon" + +#. autohide +#: settings/xfce_settings_dialog.c:712 +msgid "Behaviour" +msgstr "Oppførsel" + +#. Use format characters from strftime(3) +#. * to get the proper string for your locale. +#. * I used these: +#. * %A : full weekday name +#. * %-d : day of the month, without prefixed 0 +#. * %B : full month name +#. * %Y : four digit year +#. +#: plugins/clock/clock.c:119 +msgid "%A, %-d %B %Y" +msgstr "%A, %-d %B %Y" + +#: plugins/clock/clock.c:336 +msgid "Clock type:" +msgstr "Klokke type:" + +#: plugins/clock/clock.c:349 +msgid "Analog" +msgstr "Analog" + +#: plugins/clock/clock.c:353 +msgid "Digital" +msgstr "Digital" + +#: plugins/clock/clock.c:357 +msgid "LED" +msgstr "LED" + +#: plugins/clock/clock.c:419 +msgid "Hour mode:" +msgstr "Time modus:" + +#: plugins/clock/clock.c:426 +msgid "24 hour" +msgstr "24 timer" + +#: plugins/clock/clock.c:432 +msgid "12 hour" +msgstr "12 timer" + +#: plugins/clock/clock.c:438 +msgid "AM/PM" +msgstr "AM/PM" + +#: plugins/clock/clock.c:476 +msgid "Show seconds:" +msgstr "Vis sekunder:" + +#: plugins/clock/clock.c:585 +msgid "Xfce Clock" +msgstr "Xfce klokke" + +#: plugins/pager/pager.c:271 +msgid "Graphical pager" +msgstr "Grafisk skrivebordsoversikt" + +#: plugins/switcher/switcher.c:696 +msgid "Desktop switcher" +msgstr "Skrivebordsbytter" + +#: plugins/systembuttons/systembuttons.c:60 +msgid "" +"Access to the configuration system has been disabled.\n" +"\n" +"Ask your system administrator for more information" +msgstr "" +"Adgang til konfigurasjons systemet har blitt deaktivert.\n" +"\n" +"Ta kontakt med din system administrator for mer informasjon" + +#: plugins/systembuttons/systembuttons.c:148 +msgid "Lock the screen" +msgstr "Lås skjermen" + +#: plugins/systembuttons/systembuttons.c:149 +#: plugins/systembuttons/systembuttons.c:518 +msgid "Exit" +msgstr "Avslutt" + +#: plugins/systembuttons/systembuttons.c:150 +#: plugins/systembuttons/systembuttons.c:519 +msgid "Setup" +msgstr "Oppsett" + +#: plugins/systembuttons/systembuttons.c:151 +#: plugins/systembuttons/systembuttons.c:520 +msgid "Info" +msgstr "Info" + +#: plugins/systembuttons/systembuttons.c:500 +msgid "Show two buttons:" +msgstr "Vis to knapper:" + +#. set names to use in option menus +#: plugins/systembuttons/systembuttons.c:517 +msgid "Lock" +msgstr "Lås" + +#: plugins/systembuttons/systembuttons.c:549 +msgid "Button 1:" +msgstr "Knapp 1:" + +#: plugins/systembuttons/systembuttons.c:565 +msgid "Button 2:" +msgstr "Knapp 2:" + +#: plugins/systembuttons/systembuttons.c:600 +msgid "System buttons" +msgstr "System knapper" + +#: plugins/separator/separator.c:153 +msgid "Separator" +msgstr "Skiller" + +#: plugins/mailcheck/mailcheck.c:539 +msgid "Mail box:" +msgstr "E-mail innboks:" + +#: plugins/mailcheck/mailcheck.c:623 +msgid "Mail command:" +msgstr "E-post kommando:" + +#: plugins/mailcheck/mailcheck.c:637 +msgid "Command to run when the button on the panel is clicked" +msgstr "Kommando som kjøres når knappen på panelet blir klikket" + +#: plugins/mailcheck/mailcheck.c:706 +msgid "Interval (sec):" +msgstr "Intervall (sek):" + +#: plugins/mailcheck/mailcheck.c:778 +msgid "Mail check" +msgstr "E-post sjekk" Binary files differ@@ -1,20 +1,29 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# Treanslation file for XFce4's panel. +# Copyright (C) Olivier Fourdain, 2003 +# This file is distributed under the same license as the XFce4. # FIRST AUTHOR <edscott@imp.mx>, 2003. # +# Paweł Pastuła <pastulap@poczta.onet.pl>, 2003 +#-- +# Daniel Mróz <beorn@alpha.pl>, 2003 +# +# Changes: +# - fixed missing semicolons +# - minor changes and fixes (ie "Środek" -> "Środa") +# - translated few missing strings +# #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2003-09-10 08:40+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Paweł Pastuła <pastulap@poczta.onet.pl>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"POT-Creation-Date: 2003-11-05 17:25+0100\n" +"PO-Revision-Date: 2003-12-25 18:20+0100\n" +"Last-Translator: Daniel Mróz <beorn@alpha.pl>\n" +"Language-Team: none <none@none>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" +"Report-Msgid-Bugs-To: beorn@alpha.pl\n" #: panel/xfce_support.c:597 msgid "Select file" @@ -26,9 +35,9 @@ msgstr "Zmień element" #: panel/controls_dialog.c:286 panel/item_dialog.c:647 msgid "Position:" -msgstr "Pozycja" +msgstr "Pozycja:" -#: panel/controls_dialog.c:331 panel/controls.c:272 +#: panel/controls_dialog.c:342 panel/controls.c:272 msgid "" "Removing an item will also remove its popup menu.\n" "\n" @@ -64,7 +73,7 @@ msgstr "Uruchom w _terminalu" #: panel/item_dialog.c:503 plugins/mailcheck/mailcheck.c:676 msgid "Use startup _notification" -msgstr "Powiadom o uruchomieniu" +msgstr "_Powiadom o uruchomieniu" #: panel/item_dialog.c:530 msgid "Caption:" @@ -72,7 +81,7 @@ msgstr "Opis:" #: panel/item_dialog.c:563 msgid "Tooltip:" -msgstr "Podpowiedź" +msgstr "Podpowiedź:" #: panel/item_dialog.c:599 msgid "Menu:" @@ -80,22 +89,22 @@ msgstr "" #: panel/item_dialog.c:606 msgid "Attach menu to launcher" -msgstr "" +msgstr "Dołącz menu do aktywatora" #: panel/item_dialog.c:738 msgid "Icon Preview" -msgstr "Podgląd iknony" +msgstr "Podgląd ikony" #: panel/item_dialog.c:742 msgid "Drag file onto this frame to change the icon" msgstr "Przeciągnij plik do tej ramki aby zmienić ikonę" -#: panel/item_dialog.c:931 +#: panel/item_dialog.c:930 msgid "Change menu item" msgstr "Zmień element menu" #. add buttons -#: panel/item_dialog.c:934 +#: panel/item_dialog.c:933 msgid "Remove" msgstr "_Usuń" @@ -105,7 +114,7 @@ msgstr "Naciśnij 3 klawisz myszy aby usunąć element" #: panel/item.c:464 msgid "Add launcher" -msgstr "Dodaj program" +msgstr "Dodaj aktywator" #: panel/item.c:469 msgid "Add new item" @@ -113,13 +122,13 @@ msgstr "Dodaj nowy element" #: panel/item.c:601 msgid "Launcher" -msgstr "Program" +msgstr "Aktywator" -#: panel/main.c:132 +#: panel/main.c:115 msgid "Are you sure you want to exit?" msgstr "Czy na pewno chcesz wyjść?" -#: panel/main.c:268 +#: panel/main.c:243 #, c-format msgid "" "%s, version %s\n" @@ -130,7 +139,7 @@ msgstr "" "Część środowiska XFCE\n" "http://www.xfce.org\n" -#: panel/main.c:284 +#: panel/main.c:259 msgid "" "Your window manager does not seem to support the new window manager hints as " "defined on http://www.freedesktop.org. \n" @@ -162,7 +171,7 @@ msgstr "/Panel XFce" #: panel/panel.c:126 msgid "/_Settings manager" -msgstr "/_Menadźer ustawień" +msgstr "/_Menadżer ustawień" #: panel/panel.c:128 msgid "/_About XFce" @@ -187,7 +196,7 @@ msgstr "Panel XFce" #: panel/icons.c:73 msgid "Default" -msgstr "Standardowy" +msgstr "Domyślny" #: panel/icons.c:74 msgid "Editor" @@ -227,7 +236,7 @@ msgstr "Drukarka" #: panel/icons.c:83 msgid "Productivity" -msgstr "Produkcja" +msgstr "Produktywność" #: panel/icons.c:84 msgid "Sound" @@ -289,11 +298,11 @@ msgstr "Dół" #: settings/xfce_settings_dialog.c:374 msgid "Panel size:" -msgstr "Rozmiar panela:" +msgstr "Rozmiar panelu:" #: settings/xfce_settings_dialog.c:390 msgid "Panel orientation:" -msgstr "Położenie panela:" +msgstr "Położenie panelu:" #: settings/xfce_settings_dialog.c:407 msgid "Popup position:" @@ -305,7 +314,7 @@ msgstr "Styl ikon:" #: settings/xfce_settings_dialog.c:495 msgid "Panel layer:" -msgstr "Warstwa panela:" +msgstr "Warstwa panelu:" #: settings/xfce_settings_dialog.c:515 msgid "Normal" @@ -321,11 +330,11 @@ msgstr "Ustaw" #: settings/xfce_settings_dialog.c:595 msgid "Autohide:" -msgstr "Automatyczne ukrywanie" +msgstr "Automatyczne ukrywanie:" #: settings/xfce_settings_dialog.c:663 msgid "XFce Panel Settings" -msgstr "Ustawienia panela XFce" +msgstr "Ustawienia panelu XFce" #. Appearance #: settings/xfce_settings_dialog.c:675 @@ -356,7 +365,7 @@ msgstr "Wtorek" #: plugins/clock/clock.c:60 msgid "Wednesday" -msgstr "Środek" +msgstr "Środa" #: plugins/clock/clock.c:61 msgid "Thursday" @@ -436,12 +445,12 @@ msgstr "" #: plugins/clock/clock.c:433 msgid "Hour mode:" -msgstr "Tryb godzin" +msgstr "Tryb godzin:" #: plugins/clock/clock.c:440 #, fuzzy msgid "24 hour" -msgstr "24 godzinny:" +msgstr "24 godzinny" #: plugins/clock/clock.c:446 msgid "12 hour" @@ -459,9 +468,9 @@ msgstr "Pokaż sekundy:" msgid "Xfce Clock" msgstr "Zegar XFce" -#: plugins/pager/pager.c:277 +#: plugins/pager/pager.c:271 msgid "Graphical pager" -msgstr "" +msgstr "Lista obszarów roboczych" #: plugins/switcher/switcher.c:696 msgid "Desktop switcher" @@ -498,7 +507,7 @@ msgstr "Informacja" #: plugins/systembuttons/systembuttons.c:500 msgid "Show two buttons:" -msgstr "Pokaż dwa przyciski" +msgstr "Pokaż dwa przyciski:" #. set names to use in option menus #: plugins/systembuttons/systembuttons.c:517 @@ -515,7 +524,7 @@ msgstr "Przycisk 2:" #: plugins/systembuttons/systembuttons.c:600 msgid "System buttons" -msgstr "Przysicki systemowe" +msgstr "Przyciski systemowe" #: plugins/separator/separator.c:153 msgid "Separator" @@ -531,7 +540,7 @@ msgstr "Polecenie poczty:" #: plugins/mailcheck/mailcheck.c:637 msgid "Command to run when the button on the panel is clicked" -msgstr "Polecenie do uruchomienia po naciśnieciu na przycisku panela" +msgstr "Polecenie do uruchomienia po naciśnieciu na przycisku panelu" #: plugins/mailcheck/mailcheck.c:706 msgid "Interval (sec):" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo Binary files differnew file mode 100644 index 00000000..4c3ed5fd --- /dev/null +++ b/po/pt_BR.gmo diff --git a/po/pt_BR.po b/po/pt_BR.po new file mode 100644 index 00000000..ce79c312 --- /dev/null +++ b/po/pt_BR.po @@ -0,0 +1,480 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: xfce4-panel\n" +"POT-Creation-Date: 2003-12-04 09:37+0100\n" +"PO-Revision-Date: 2004-01-18 12:26-0200\n" +"Last-Translator: Felix da Silva Costa <felix@online.eti.br>\n" +"Language-Team: pt_BR <felix@online.eti.br>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: panel/xfce_support.c:597 +msgid "Select file" +msgstr "Selecionar arquivo" + +#: panel/controls_dialog.c:254 +msgid "Change item" +msgstr "Mudar item" + +#: panel/controls_dialog.c:286 panel/item_dialog.c:681 +msgid "Position:" +msgstr "Posição:" + +#: panel/controls_dialog.c:342 panel/controls.c:272 +msgid "" +"Removing an item will also remove its popup menu.\n" +"\n" +"Do you want to remove the item?" +msgstr "" +"Remover um item também remove o menu popup.\n" +"\n" +"Você deseja remover este item?" + +#: panel/item_dialog.c:321 +msgid "Other Icon" +msgstr "Outro ícone" + +#: panel/item_dialog.c:346 +msgid "Select icon" +msgstr "Selecionar ícone" + +#: panel/item_dialog.c:396 +msgid "Icon:" +msgstr "Ícone:" + +#: panel/item_dialog.c:467 +msgid "Select command" +msgstr "Selecionar comando" + +#: panel/item_dialog.c:495 +msgid "Command:" +msgstr "Comando:" + +#: panel/item_dialog.c:532 plugins/mailcheck/mailcheck.c:668 +msgid "Run in _terminal" +msgstr "Executar em _terminal" + +#: panel/item_dialog.c:537 plugins/mailcheck/mailcheck.c:676 +msgid "Use startup _notification" +msgstr "Use _notificação na inicialização" + +#: panel/item_dialog.c:564 +msgid "Caption:" +msgstr "Etiqueta:" + +#: panel/item_dialog.c:597 +msgid "Tooltip:" +msgstr "Dicas:" + +#: panel/item_dialog.c:633 +msgid "Menu:" +msgstr "Menu:" + +#: panel/item_dialog.c:640 +msgid "Attach menu to launcher" +msgstr "" + +#: panel/item_dialog.c:773 +msgid "Icon Preview" +msgstr "Visualização do ícone" + +#: panel/item_dialog.c:777 +msgid "Drag file onto this frame to change the icon" +msgstr "Arraste o arquivo até este frame para alterar o ícone" + +#: panel/item_dialog.c:965 +msgid "Change menu item" +msgstr "Mudar item do menu" + +#. add buttons +#: panel/item_dialog.c:968 +msgid "Remove" +msgstr "Remover" + +#: panel/item.c:441 +msgid "Click mouse button 3 to change item" +msgstr "Clique o botão 3 para mudar o item" + +#: panel/item.c:464 +msgid "Add launcher" +msgstr "Adicionar lançador" + +#: panel/item.c:469 +msgid "Add new item" +msgstr "Adicionar novo item" + +#: panel/item.c:601 +msgid "Launcher" +msgstr "Lançador" + +#: panel/main.c:117 +msgid "Are you sure you want to exit?" +msgstr "Tem certeza que deseja sair?" + +#: panel/main.c:329 +#, c-format +msgid "" +"%s, version %s\n" +"Part of the XFce Desktop Environment\n" +"http://www.xfce.org\n" +msgstr "" +"%s, versão %s\n" +"Parte do Ambiente Desktop XFce\n" +"http://www.xfce.org\n" + +#: panel/main.c:361 +msgid "" +"Your window manager does not seem to support the new window manager hints as " +"defined on http://www.freedesktop.org. \n" +"Some XFce features may not work as intended." +msgstr "" +"Seu gerenciador de janelas parece não suportar as novas definições de dicas como\n" +"definidas em http://www.freedesktop.org.\n" +"Algumas características do XFce podem não funcionar com pretendido." + +#: panel/controls.c:320 panel/panel.c:412 +msgid "/Add _new item" +msgstr "/Adicionar _novo item" + +#: panel/controls.c:322 panel/panel.c:414 +msgid "/_Properties..." +msgstr "/_Propriedaddes..." + +#: panel/controls.c:323 +msgid "/_Remove" +msgstr "/_Remover" + +#: panel/controls.c:655 +msgid "This item has no configuration options" +msgstr "Este item não possui opções de configuração" + +#: panel/panel.c:410 +msgid "/XFce Panel" +msgstr "/Painel XFce" + +#: panel/panel.c:415 +msgid "/_About XFce" +msgstr "/_Sobre XFce" + +#: panel/panel.c:416 +msgid "/_Help" +msgstr "/_Ajuda" + +#: panel/panel.c:419 +msgid "/_Settings manager" +msgstr "/Gerenciador de _Configurações" + +#: panel/panel.c:422 +msgid "/_Lock screen" +msgstr "/_Travar tela" + +#: panel/panel.c:423 +msgid "/_Restart" +msgstr "/_Reiniciar" + +#: panel/panel.c:425 +msgid "/E_xit" +msgstr "/Sai_r" + +#: panel/panel.c:812 settings/xfce_settings_plugin.c:82 +#: settings/xfce_settings_dialog.c:649 +msgid "XFce Panel" +msgstr "Painel XFce" + +#: panel/icons.c:73 +msgid "Default" +msgstr "Padrão" + +#: panel/icons.c:74 +msgid "Editor" +msgstr "Editor" + +#: panel/icons.c:75 +msgid "File management" +msgstr "Gerenciamento de arquivos" + +#: panel/icons.c:76 +msgid "Utilities" +msgstr "Utilitários" + +#: panel/icons.c:77 +msgid "Games" +msgstr "Jogos" + +#: panel/icons.c:78 +msgid "Help browser" +msgstr "" + +#: panel/icons.c:79 +msgid "Multimedia" +msgstr "Multimidia" + +#: panel/icons.c:80 +msgid "Network" +msgstr "Rede" + +#: panel/icons.c:81 +msgid "Graphics" +msgstr "Gráficos" + +#: panel/icons.c:82 +msgid "Printer" +msgstr "Impressora" + +#: panel/icons.c:83 +msgid "Productivity" +msgstr "Produtividade" + +#: panel/icons.c:84 +msgid "Sound" +msgstr "Som" + +#: panel/icons.c:85 +msgid "Terminal" +msgstr "Terminal" + +#: panel/mcs_client.c:208 +msgid "Settings manager not available" +msgstr "Gerenciador de configurações não disponível" + +#: panel/popup.c:261 +msgid "Menu" +msgstr "Menu" + +#: settings/xfce_settings_dialog.c:119 +msgid "Tiny" +msgstr "Muito pequeno" + +#: settings/xfce_settings_dialog.c:123 +msgid "Small" +msgstr "Pequeno" + +#: settings/xfce_settings_dialog.c:127 +msgid "Medium" +msgstr "Médio" + +#: settings/xfce_settings_dialog.c:131 +msgid "Large" +msgstr "Grande" + +#: settings/xfce_settings_dialog.c:190 +msgid "Horizontal" +msgstr "Horizontal" + +#: settings/xfce_settings_dialog.c:194 +msgid "Vertical" +msgstr "Vertical" + +#: settings/xfce_settings_dialog.c:226 settings/xfce_settings_dialog.c:456 +msgid "Left" +msgstr "Esquerdo" + +#: settings/xfce_settings_dialog.c:230 settings/xfce_settings_dialog.c:457 +msgid "Right" +msgstr "Direito" + +#: settings/xfce_settings_dialog.c:234 settings/xfce_settings_dialog.c:455 +#: settings/xfce_settings_dialog.c:511 +msgid "Top" +msgstr "Topo" + +#: settings/xfce_settings_dialog.c:238 settings/xfce_settings_dialog.c:454 +#: settings/xfce_settings_dialog.c:519 +msgid "Bottom" +msgstr "Abaixo" + +#: settings/xfce_settings_dialog.c:374 +msgid "Panel size:" +msgstr "Tamanho do painel:" + +#: settings/xfce_settings_dialog.c:390 +msgid "Panel orientation:" +msgstr "Orientação do painel:" + +#: settings/xfce_settings_dialog.c:407 +msgid "Popup position:" +msgstr "Posição do Popup:" + +#: settings/xfce_settings_dialog.c:424 +msgid "Icon theme:" +msgstr "Tema dos ícones:" + +#: settings/xfce_settings_dialog.c:495 +msgid "Panel layer:" +msgstr "" + +#: settings/xfce_settings_dialog.c:515 +msgid "Normal" +msgstr "Normal" + +#: settings/xfce_settings_dialog.c:535 +msgid "Center the panel:" +msgstr "Centralizar painel:" + +#: settings/xfce_settings_dialog.c:559 +msgid "Set" +msgstr "Aplicar" + +#: settings/xfce_settings_dialog.c:595 +msgid "Autohide:" +msgstr "Auto-Ocultar:" + +#: settings/xfce_settings_dialog.c:663 +msgid "XFce Panel Settings" +msgstr "Configurações do painel do XFce" + +#. Appearance +#: settings/xfce_settings_dialog.c:675 +msgid "Appearance" +msgstr "Aparência" + +#. Position +#: settings/xfce_settings_dialog.c:696 +msgid "Position" +msgstr "Posição" + +#. autohide +#: settings/xfce_settings_dialog.c:712 +msgid "Behaviour" +msgstr "Comportamento" + +#. Use format characters from strftime(3) +#. * to get the proper string for your locale. +#. * I used these: +#. * %A : full weekday name +#. * %-d : day of the month, without prefixed 0 +#. * %B : full month name +#. * %Y : four digit year +#. +#: plugins/clock/clock.c:119 +msgid "%A, %-d %B %Y" +msgstr "%A, %-d %B %Y" + +#: plugins/clock/clock.c:336 +msgid "Clock type:" +msgstr "Tipo de relógio:" + +#: plugins/clock/clock.c:349 +msgid "Analog" +msgstr "Analógico" + +#: plugins/clock/clock.c:353 +msgid "Digital" +msgstr "Digital" + +#: plugins/clock/clock.c:357 +msgid "LED" +msgstr "LED" + +#: plugins/clock/clock.c:419 +msgid "Hour mode:" +msgstr "Modo de horas:" + +#: plugins/clock/clock.c:426 +msgid "24 hour" +msgstr "24 horas" + +#: plugins/clock/clock.c:432 +msgid "12 hour" +msgstr "12 horas" + +#: plugins/clock/clock.c:438 +msgid "AM/PM" +msgstr "AM/PM" + +#: plugins/clock/clock.c:476 +msgid "Show seconds:" +msgstr "Mostrar segundos:" + +#: plugins/clock/clock.c:585 +msgid "Xfce Clock" +msgstr "Relógio XFce" + +#: plugins/pager/pager.c:271 +msgid "Graphical pager" +msgstr "Paginador gráfico" + +#: plugins/switcher/switcher.c:696 +msgid "Desktop switcher" +msgstr "Alternador de desktop" + +#: plugins/systembuttons/systembuttons.c:60 +msgid "" +"Access to the configuration system has been disabled.\n" +"\n" +"Ask your system administrator for more information" +msgstr "" +"Acesso a configuração do sistema foi desabilitado.\n" +"\n" +"Pergunte ao administrador do sistema para mais informações" + +#: plugins/systembuttons/systembuttons.c:148 +msgid "Lock the screen" +msgstr "Travar a tela" + +#: plugins/systembuttons/systembuttons.c:149 +#: plugins/systembuttons/systembuttons.c:518 +msgid "Exit" +msgstr "Sair" + +#: plugins/systembuttons/systembuttons.c:150 +#: plugins/systembuttons/systembuttons.c:519 +msgid "Setup" +msgstr "Configurar" + +#: plugins/systembuttons/systembuttons.c:151 +#: plugins/systembuttons/systembuttons.c:520 +msgid "Info" +msgstr "Informações" + +#: plugins/systembuttons/systembuttons.c:500 +msgid "Show two buttons:" +msgstr "Mostrar dois botôes:" + +#. set names to use in option menus +#: plugins/systembuttons/systembuttons.c:517 +msgid "Lock" +msgstr "Travar" + +#: plugins/systembuttons/systembuttons.c:549 +msgid "Button 1:" +msgstr "Botão 1:" + +#: plugins/systembuttons/systembuttons.c:565 +msgid "Button 2:" +msgstr "Botão 2:" + +#: plugins/systembuttons/systembuttons.c:600 +msgid "System buttons" +msgstr "Botôes de sistema" + +#: plugins/separator/separator.c:153 +msgid "Separator" +msgstr "Separador" + +#: plugins/mailcheck/mailcheck.c:539 +msgid "Mail box:" +msgstr "Caixa de correio:" + +#: plugins/mailcheck/mailcheck.c:623 +msgid "Mail command:" +msgstr "Comando de e-mail:" + +#: plugins/mailcheck/mailcheck.c:637 +msgid "Command to run when the button on the panel is clicked" +msgstr "Comando a executar quando o botão no painel for clicado" + +#: plugins/mailcheck/mailcheck.c:706 +msgid "Interval (sec):" +msgstr "Intevalo (segundos):" + +#: plugins/mailcheck/mailcheck.c:778 +msgid "Mail check" +msgstr "Checar E-mail" diff --git a/po/pt_PT.gmo b/po/pt_PT.gmo Binary files differindex 3287e5c5..1f79a825 100644 --- a/po/pt_PT.gmo +++ b/po/pt_PT.gmo diff --git a/po/pt_PT.po b/po/pt_PT.po index 60528bb9..aadc8125 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -8,14 +8,14 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-08-26 08:23+0200\n" +"POT-Creation-Date: 2003-11-05 17:25+0100\n" "PO-Revision-Date: 2003-09-12 01:27+0100\n" "Last-Translator: Nuno Donato <nunodonato@sapo.pt>\n" "Language-Team: Portuguese <pt@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit" +"Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" #: panel/xfce_support.c:597 msgid "Select file" @@ -25,16 +25,17 @@ msgstr "Seleccione Ficheiro" msgid "Change item" msgstr "Editar Item" -#: panel/controls_dialog.c:286 panel/item_dialog.c:653 +#: panel/controls_dialog.c:286 panel/item_dialog.c:647 msgid "Position:" msgstr "Posição" -#: panel/controls_dialog.c:331 panel/controls.c:272 +#: panel/controls_dialog.c:342 panel/controls.c:272 msgid "" "Removing an item will also remove its popup menu.\n" "\n" "Do you want to remove the item?" -msgstr "Removendo um item também irá remover o seu menu de pop-up.\n" +msgstr "" +"Removendo um item também irá remover o seu menu de pop-up.\n" "\n" "Deseja remover este item?" @@ -82,20 +83,20 @@ msgstr "Menu:" msgid "Attach menu to launcher" msgstr "Anexar menu ao lançador" -#: panel/item_dialog.c:748 +#: panel/item_dialog.c:738 msgid "Icon Preview" msgstr "Previsão do Ícon" -#: panel/item_dialog.c:752 +#: panel/item_dialog.c:742 msgid "Drag file onto this frame to change the icon" msgstr "Arrastar ficheiro para esta frame para mudar o ícone" -#: panel/item_dialog.c:1034 +#: panel/item_dialog.c:930 msgid "Change menu item" msgstr "Mudar o item do menu" #. add buttons -#: panel/item_dialog.c:1037 +#: panel/item_dialog.c:933 msgid "Remove" msgstr "Remover" @@ -115,27 +116,29 @@ msgstr "Adicionar novo item" msgid "Launcher" msgstr "Lançador" -#: panel/main.c:132 +#: panel/main.c:115 msgid "Are you sure you want to exit?" msgstr "Tem a certeza que deseja sair?" -#: panel/main.c:268 +#: panel/main.c:243 #, c-format msgid "" "%s, version %s\n" "Part of the XFce Desktop Environment\n" "http://www.xfce.org\n" -msgstr "%s, versão %s\n" +msgstr "" +"%s, versão %s\n" "Parte do Ambiente de Trabalho XFCE\n" "http://www.xfce.org\n" -#: panel/main.c:284 +#: panel/main.c:259 msgid "" "Your window manager does not seem to support the new window manager hints as " "defined on http://www.freedesktop.org. \n" "Some XFce features may not work as intended." msgstr "" -"O seu gestor de janelas parece não suportar as novas dicas de janelas como está definido em http://www.freedesktop.org.\n" +"O seu gestor de janelas parece não suportar as novas dicas de janelas como " +"está definido em http://www.freedesktop.org.\n" "Algumas funcionalidades do XFce poderão não funcionar como esperado." #: panel/controls.c:320 panel/panel.c:123 @@ -239,7 +242,7 @@ msgstr "Consola" msgid "Settings manager not available" msgstr "Gestor de Definições não disponível" -#: panel/popup.c:272 +#: panel/popup.c:263 msgid "Menu" msgstr "Menú" @@ -456,7 +459,7 @@ msgstr "Mostrar segundos:" msgid "Xfce Clock" msgstr "Relógio XFce" -#: plugins/pager/pager.c:277 +#: plugins/pager/pager.c:271 msgid "Graphical pager" msgstr "Alternador Gráfico das Áreas de Trabalho" @@ -469,7 +472,8 @@ msgid "" "Access to the configuration system has been disabled.\n" "\n" "Ask your system administrator for more information" -msgstr "O acesso à configuraçao do sistema foi desactivado.\n" +msgstr "" +"O acesso à configuraçao do sistema foi desactivado.\n" "\n" "Peça ao seu administrador de sistema para mais informações." @@ -536,4 +540,3 @@ msgstr "Intervalo (segundos):" #: plugins/mailcheck/mailcheck.c:778 msgid "Mail check" msgstr "Verificar Correio" - Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ru\n" -"POT-Creation-Date: 2003-09-10 08:40+0200\n" +"POT-Creation-Date: 2003-11-05 17:25+0100\n" "PO-Revision-Date: 2003-09-03 21:35+0300\n" "Last-Translator: Dan Korostelev <daniel@ats.energo.ru>\n" "Language-Team: Russian <daniel@ats.energo.ru>\n" @@ -26,7 +26,7 @@ msgstr "Изменение объекта" msgid "Position:" msgstr "Позиция:" -#: panel/controls_dialog.c:331 panel/controls.c:272 +#: panel/controls_dialog.c:342 panel/controls.c:272 msgid "" "Removing an item will also remove its popup menu.\n" "\n" @@ -88,12 +88,12 @@ msgstr "Просмотр значка" msgid "Drag file onto this frame to change the icon" msgstr "Перетащите сюда файл, чтобы изменить значок" -#: panel/item_dialog.c:931 +#: panel/item_dialog.c:930 msgid "Change menu item" msgstr "Изменение элемента меню" #. add buttons -#: panel/item_dialog.c:934 +#: panel/item_dialog.c:933 msgid "Remove" msgstr "Удалить" @@ -113,11 +113,11 @@ msgstr "Добавить новый объект" msgid "Launcher" msgstr "Запуск" -#: panel/main.c:132 +#: panel/main.c:115 msgid "Are you sure you want to exit?" msgstr "Вы уверены, что хотите выйти?" -#: panel/main.c:268 +#: panel/main.c:243 #, c-format msgid "" "%s, version %s\n" @@ -128,7 +128,7 @@ msgstr "" "Часть рабочей среды XFce\n" "http://www.xfce.org\n" -#: panel/main.c:284 +#: panel/main.c:259 msgid "" "Your window manager does not seem to support the new window manager hints as " "defined on http://www.freedesktop.org. \n" @@ -456,7 +456,7 @@ msgstr "Показывать секунды:" msgid "Xfce Clock" msgstr "Часы XFce" -#: plugins/pager/pager.c:277 +#: plugins/pager/pager.c:271 msgid "Graphical pager" msgstr "Графический пейджер" diff --git a/po/sv.gmo b/po/sv.gmo Binary files differnew file mode 100644 index 00000000..729a6cad --- /dev/null +++ b/po/sv.gmo diff --git a/po/sv.po b/po/sv.po new file mode 100644 index 00000000..4245891a --- /dev/null +++ b/po/sv.po @@ -0,0 +1,540 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2003-11-05 17:25+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: panel/xfce_support.c:597 +msgid "Select file" +msgstr "Välj fil" + +#: panel/controls_dialog.c:254 +msgid "Change item" +msgstr "Ändra objekt" + +#: panel/controls_dialog.c:286 panel/item_dialog.c:647 +msgid "Position:" +msgstr "" + +#: panel/controls_dialog.c:342 panel/controls.c:272 +msgid "" +"Removing an item will also remove its popup menu.\n" +"\n" +"Do you want to remove the item?" +msgstr "" +"Att ta bort ett objekt kommer även att ta bort dess popup-meny.\n" +"\n" +"Vill du ta bort objektet?" + +#: panel/item_dialog.c:320 +msgid "Other Icon" +msgstr "Annan ikon" + +#: panel/item_dialog.c:345 +msgid "Select icon" +msgstr "Välj ikon" + +#: panel/item_dialog.c:384 +msgid "Icon:" +msgstr "Ikon:" + +#: panel/item_dialog.c:433 +msgid "Select command" +msgstr "Välj kommando" + +#: panel/item_dialog.c:461 +msgid "Command:" +msgstr "Kommando:" + +#: panel/item_dialog.c:498 plugins/mailcheck/mailcheck.c:668 +msgid "Run in _terminal" +msgstr "Kör i _terminal" + +#: panel/item_dialog.c:503 plugins/mailcheck/mailcheck.c:676 +msgid "Use startup _notification" +msgstr "Använd start_notifikation" + +#: panel/item_dialog.c:530 +msgid "Caption:" +msgstr "Titel:" + +#: panel/item_dialog.c:563 +msgid "Tooltip:" +msgstr "Hjälptext:" + +#: panel/item_dialog.c:599 +msgid "Menu:" +msgstr "Meny:" + +#: panel/item_dialog.c:606 +msgid "Attach menu to launcher" +msgstr "Anslut meny till programstartare" + +#: panel/item_dialog.c:738 +msgid "Icon Preview" +msgstr "Förhandsvisning av ikon" + +#: panel/item_dialog.c:742 +msgid "Drag file onto this frame to change the icon" +msgstr "Drag en fil till denna ram för att ändra ikon" + +#: panel/item_dialog.c:930 +msgid "Change menu item" +msgstr "Ändra menyobjekt" + +#. add buttons +#: panel/item_dialog.c:933 +msgid "Remove" +msgstr "Ta bort" + +#: panel/item.c:441 +msgid "Click mouse button 3 to change item" +msgstr "Musknapp 3 för att ändra objektet" + +#: panel/item.c:464 +msgid "Add launcher" +msgstr "Lägg till objekt" + +#: panel/item.c:469 +msgid "Add new item" +msgstr "Lägg till nytt objekt" + +#: panel/item.c:601 +msgid "Launcher" +msgstr "Programstartare" + +#: panel/main.c:115 +msgid "Are you sure you want to exit?" +msgstr "Är du säker på att du vill avsluta?" + +#: panel/main.c:243 +#, c-format +msgid "" +"%s, version %s\n" +"Part of the XFce Desktop Environment\n" +"http://www.xfce.org\n" +msgstr "" +"%s, version %s\n" +"Del av skrivbordsmiljön XFce\n" +"http://www.xfce.org\n" + +#: panel/main.c:259 +msgid "" +"Your window manager does not seem to support the new window manager hints as " +"defined on http://www.freedesktop.org. \n" +"Some XFce features may not work as intended." +msgstr "" +"din fönsterhanterare verkar inte stödja de nya fönsterhanterarledtrådarna " +"såsomdefinierade på http://www.freedesktop.org. \n" +"Detta kan begränsa XFce:s avsedda funktionalitet." + +#: panel/controls.c:320 panel/panel.c:123 +msgid "/Add _new item" +msgstr "/_Nytt objekt" + +#: panel/controls.c:322 panel/panel.c:125 +msgid "/_Properties..." +msgstr "/_Egenskaper..." + +#: panel/controls.c:323 +msgid "/_Remove" +msgstr "/_Ta bort" + +#: panel/controls.c:655 +msgid "This item has no configuration options" +msgstr "Detta objekt saknar konfigurationsalternativ" + +#: panel/panel.c:121 +msgid "/XFce Panel" +msgstr "/XFce-panelen" + +#: panel/panel.c:126 +msgid "/_Settings manager" +msgstr "/_Inställningshanterare" + +#: panel/panel.c:128 +msgid "/_About XFce" +msgstr "/_Om XFce" + +#: panel/panel.c:129 +msgid "/_Help" +msgstr "/_Hjälp" + +#: panel/panel.c:131 +msgid "/_Lock screen" +msgstr "/_Lås skärmen" + +#: panel/panel.c:132 +msgid "/E_xit" +msgstr "/_Avsluta" + +#: panel/panel.c:489 settings/xfce_settings_plugin.c:82 +#: settings/xfce_settings_dialog.c:649 +msgid "XFce Panel" +msgstr "XFce-panelen" + +#: panel/icons.c:73 +msgid "Default" +msgstr "Allmän" + +#: panel/icons.c:74 +msgid "Editor" +msgstr "Texteditor" + +#: panel/icons.c:75 +msgid "File management" +msgstr "Filhantering" + +#: panel/icons.c:76 +msgid "Utilities" +msgstr "Verktyg" + +#: panel/icons.c:77 +msgid "Games" +msgstr "Spel" + +#: panel/icons.c:78 +msgid "Help browser" +msgstr "Hjälpläsare" + +#: panel/icons.c:79 +msgid "Multimedia" +msgstr "" + +#: panel/icons.c:80 +msgid "Network" +msgstr "Nätverk" + +#: panel/icons.c:81 +msgid "Graphics" +msgstr "Grafik" + +#: panel/icons.c:82 +msgid "Printer" +msgstr "Skrivare" + +#: panel/icons.c:83 +msgid "Productivity" +msgstr "Produktivitet" + +#: panel/icons.c:84 +msgid "Sound" +msgstr "Ljud" + +#: panel/icons.c:85 +msgid "Terminal" +msgstr "" + +#: panel/mcs_client.c:208 +msgid "Settings manager not available" +msgstr "Inställningshanterare inte tillgänglig" + +#: panel/popup.c:263 +msgid "Menu" +msgstr "Meny" + +#: settings/xfce_settings_dialog.c:119 +msgid "Tiny" +msgstr "Minimal" + +#: settings/xfce_settings_dialog.c:123 +msgid "Small" +msgstr "Liten" + +#: settings/xfce_settings_dialog.c:127 +msgid "Medium" +msgstr "" + +#: settings/xfce_settings_dialog.c:131 +msgid "Large" +msgstr "Stor" + +#: settings/xfce_settings_dialog.c:190 +msgid "Horizontal" +msgstr "Horisontell" + +#: settings/xfce_settings_dialog.c:194 +msgid "Vertical" +msgstr "Vertikal" + +#: settings/xfce_settings_dialog.c:226 settings/xfce_settings_dialog.c:456 +msgid "Left" +msgstr "Vänster" + +#: settings/xfce_settings_dialog.c:230 settings/xfce_settings_dialog.c:457 +msgid "Right" +msgstr "Höger" + +#: settings/xfce_settings_dialog.c:234 settings/xfce_settings_dialog.c:455 +#: settings/xfce_settings_dialog.c:511 +msgid "Top" +msgstr "Överst" + +#: settings/xfce_settings_dialog.c:238 settings/xfce_settings_dialog.c:454 +#: settings/xfce_settings_dialog.c:519 +msgid "Bottom" +msgstr "Underst" + +#: settings/xfce_settings_dialog.c:374 +msgid "Panel size:" +msgstr "Panelstorlek:" + +#: settings/xfce_settings_dialog.c:390 +msgid "Panel orientation:" +msgstr "Panelorientering:" + +#: settings/xfce_settings_dialog.c:407 +msgid "Popup position:" +msgstr "Popupposition:" + +#: settings/xfce_settings_dialog.c:424 +msgid "Icon theme:" +msgstr "Ikontema:" + +#: settings/xfce_settings_dialog.c:495 +msgid "Panel layer:" +msgstr "Panellager:" + +#: settings/xfce_settings_dialog.c:515 +msgid "Normal" +msgstr "Normalt" + +#: settings/xfce_settings_dialog.c:535 +msgid "Center the panel:" +msgstr "Centrera panelen:" + +#: settings/xfce_settings_dialog.c:559 +msgid "Set" +msgstr "Sätt" + +#: settings/xfce_settings_dialog.c:595 +msgid "Autohide:" +msgstr "Autogöm:" + +#: settings/xfce_settings_dialog.c:663 +msgid "XFce Panel Settings" +msgstr "XFce panelinställningar" + +#. Appearance +#: settings/xfce_settings_dialog.c:675 +msgid "Appearance" +msgstr "Utseende" + +#. Position +#: settings/xfce_settings_dialog.c:696 +msgid "Position" +msgstr "" + +#. autohide +#: settings/xfce_settings_dialog.c:712 +msgid "Behaviour" +msgstr "Beteende" + +#: plugins/clock/clock.c:57 +msgid "Sunday" +msgstr "Söndag" + +#: plugins/clock/clock.c:58 +msgid "Monday" +msgstr "Måndag" + +#: plugins/clock/clock.c:59 +msgid "Tuesday" +msgstr "Tisdag" + +#: plugins/clock/clock.c:60 +msgid "Wednesday" +msgstr "Onsdag" + +#: plugins/clock/clock.c:61 +msgid "Thursday" +msgstr "Torsdag" + +#: plugins/clock/clock.c:62 +msgid "Friday" +msgstr "Fredag" + +#: plugins/clock/clock.c:63 +msgid "Saturday" +msgstr "Lördag" + +#: plugins/clock/clock.c:67 +msgid "January" +msgstr "Januari" + +#: plugins/clock/clock.c:68 +msgid "February" +msgstr "Februari" + +#: plugins/clock/clock.c:69 +msgid "March" +msgstr "Mars" + +#: plugins/clock/clock.c:70 +msgid "April" +msgstr "" + +#: plugins/clock/clock.c:71 +msgid "May" +msgstr "Maj" + +#: plugins/clock/clock.c:72 +msgid "June" +msgstr "Juni" + +#: plugins/clock/clock.c:73 +msgid "July" +msgstr "Juli" + +#: plugins/clock/clock.c:74 +msgid "August" +msgstr "Augusti" + +#: plugins/clock/clock.c:75 +msgid "September" +msgstr "" + +#: plugins/clock/clock.c:76 +msgid "October" +msgstr "Oktober" + +#: plugins/clock/clock.c:77 +msgid "November" +msgstr "" + +#: plugins/clock/clock.c:78 +msgid "December" +msgstr "" + +#: plugins/clock/clock.c:350 +msgid "Clock type:" +msgstr "Klocktyp:" + +#: plugins/clock/clock.c:363 +msgid "Analog" +msgstr "" + +#: plugins/clock/clock.c:367 +msgid "Digital" +msgstr "" + +#: plugins/clock/clock.c:371 +msgid "LED" +msgstr "" + +#: plugins/clock/clock.c:433 +msgid "Hour mode:" +msgstr "Timvisning:" + +#: plugins/clock/clock.c:440 +msgid "24 hour" +msgstr "24-timmars" + +#: plugins/clock/clock.c:446 +msgid "12 hour" +msgstr "12-timmars" + +#: plugins/clock/clock.c:452 +msgid "AM/PM" +msgstr "" + +#: plugins/clock/clock.c:490 +msgid "Show seconds:" +msgstr "Visa sekunder:" + +#: plugins/clock/clock.c:599 +msgid "Xfce Clock" +msgstr "XFce-klocka" + +#: plugins/pager/pager.c:271 +msgid "Graphical pager" +msgstr "Grafisk arbetsytehanterare" + +#: plugins/switcher/switcher.c:696 +msgid "Desktop switcher" +msgstr "Skrivbordsväxlare" + +#: plugins/systembuttons/systembuttons.c:60 +msgid "" +"Access to the configuration system has been disabled.\n" +"\n" +"Ask your system administrator for more information" +msgstr "" +"Tillgång till konfigurationssystemet har stängts av.\n" +"\n" +"Fråga din systemadministratör för mer information" + +#: plugins/systembuttons/systembuttons.c:148 +msgid "Lock the screen" +msgstr "Lås skärmen" + +#: plugins/systembuttons/systembuttons.c:149 +#: plugins/systembuttons/systembuttons.c:518 +msgid "Exit" +msgstr "Avsluta" + +#: plugins/systembuttons/systembuttons.c:150 +#: plugins/systembuttons/systembuttons.c:519 +msgid "Setup" +msgstr "Inställningar" + +#: plugins/systembuttons/systembuttons.c:151 +#: plugins/systembuttons/systembuttons.c:520 +msgid "Info" +msgstr "Information" + +#: plugins/systembuttons/systembuttons.c:500 +msgid "Show two buttons:" +msgstr "Visa två knappar" + +#. set names to use in option menus +#: plugins/systembuttons/systembuttons.c:517 +msgid "Lock" +msgstr "Lås" + +#: plugins/systembuttons/systembuttons.c:549 +msgid "Button 1:" +msgstr "Knapp 1:" + +#: plugins/systembuttons/systembuttons.c:565 +msgid "Button 2:" +msgstr "Knapp 2:" + +#: plugins/systembuttons/systembuttons.c:600 +msgid "System buttons" +msgstr "Systemknappar" + +#: plugins/separator/separator.c:153 +msgid "Separator" +msgstr "" + +#: plugins/mailcheck/mailcheck.c:539 +msgid "Mail box:" +msgstr "Postbox:" + +#: plugins/mailcheck/mailcheck.c:623 +msgid "Mail command:" +msgstr "Epostkommando:" + +#: plugins/mailcheck/mailcheck.c:637 +msgid "Command to run when the button on the panel is clicked" +msgstr "Kommando attutföra när knappen på panelen klickas" + +#: plugins/mailcheck/mailcheck.c:706 +msgid "Interval (sec):" +msgstr "Intervall (sek):" + +#: plugins/mailcheck/mailcheck.c:778 +msgid "Mail check" +msgstr "Epostkontroll" Binary files differ@@ -1,13 +1,14 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# Tamil translation of Tamil XFCE Panel. +# Copyright (C) 2003 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# +# Dinesh Nadarajah <n_dinesh@yahoo.com>, 2003. +# +# msgid "" msgstr "" "Project-Id-Version: Tamil XFCE Panel 4\n" -"POT-Creation-Date: 2003-09-10 08:40+0200\n" -"PO-Revision-Date: 2003-05-12 22:32+0600\n" +"POT-Creation-Date: 2003-11-05 17:25+0100\n" +"PO-Revision-Date: 2003-09-24 17:41-0500\n" "Last-Translator: Dinesh Nadarajah <n_dinesh@yahoo.com>\n" "Language-Team: Tamil <tamilinix@yahoogroups.com>\n" "MIME-Version: 1.0\n" @@ -17,454 +18,453 @@ msgstr "" #: panel/xfce_support.c:597 msgid "Select file" -msgstr "§¸¡ôÒ ¦¾Ã¢×¦ºö¸" +msgstr "கோப்பு தெரிவுசெய்க" #: panel/controls_dialog.c:254 msgid "Change item" -msgstr "¯ÕôÀÊ Á¡üÚ" +msgstr "உருப்படி மாற்று" #: panel/controls_dialog.c:286 panel/item_dialog.c:647 msgid "Position:" -msgstr "¼õ:" +msgstr "இடம்:" -#: panel/controls_dialog.c:331 panel/controls.c:272 +#: panel/controls_dialog.c:342 panel/controls.c:272 msgid "" "Removing an item will also remove its popup menu.\n" "\n" "Do you want to remove the item?" msgstr "" -"µ÷ ¯ÕôÀʨÂì ¸ÆðÊÉ¡ø «¾ý §ÁøÁ£ðÒ ÀðÊÔõ ¸Æð¼ôÀÎõ.\n" +"ஓர் உருப்படியைக் கழட்டினால் அதன் மேல்மீட்பு பட்டியும் கழட்டப்படும்.\n" "\n" -"¯ÕôÀʨÂì ¸Æð¼ Å¢ÕôÀÁ¡?" +"உருப்படியைக் கழட்ட விருப்பமா?" #: panel/item_dialog.c:320 msgid "Other Icon" -msgstr "§Å§Ã¡÷ ÌÚõÀ¼õ" +msgstr "வேரோர் குறும்படம்" #: panel/item_dialog.c:345 msgid "Select icon" -msgstr "ÌÚôÀ¼õ ¦¾Ã¢× ¦ºö" +msgstr "குறுப்படம் தெரிவு செய்" #: panel/item_dialog.c:384 msgid "Icon:" -msgstr "ÌÚõÀ¼õ:" +msgstr "குறும்படம்:" #: panel/item_dialog.c:433 msgid "Select command" -msgstr "¸ð¼¨Ç ¦¾Ã¢×¦ºö¸" +msgstr "கட்டளை தெரிவுசெய்க" #: panel/item_dialog.c:461 msgid "Command:" -msgstr "¸ð¼¨Ç:" +msgstr "கட்டளை:" #: panel/item_dialog.c:498 plugins/mailcheck/mailcheck.c:668 msgid "Run in _terminal" -msgstr "Ó¨ÉÂò¾¢ø þÂì¸" +msgstr "முனையத்தில் þயக்க" #: panel/item_dialog.c:503 plugins/mailcheck/mailcheck.c:676 msgid "Use startup _notification" -msgstr "¦¾¡¼ì¸ _«È¢ôÒ ÀÂýÀÎò¾×õ" +msgstr "தொடக்க _அறிப்பு பயன்படுத்தவும்" #: panel/item_dialog.c:530 msgid "Caption:" -msgstr "¾¨ÄôÒ Å¡ì¸¢Âõ" +msgstr "தலைப்பு வாக்கியம்" #: panel/item_dialog.c:563 msgid "Tooltip:" -msgstr "¯¾Å¢¸ÕÅ¢:" +msgstr "உதவிகருவி:" #: panel/item_dialog.c:599 -#, fuzzy msgid "Menu:" -msgstr "ÀðÊ" +msgstr "பட்டி" #: panel/item_dialog.c:606 msgid "Attach menu to launcher" -msgstr "" +msgstr "ஓர் பட்டியை தொடங்கருடன் சேர்க்கவும்" #: panel/item_dialog.c:738 msgid "Icon Preview" -msgstr "ÌÚõÀ¼õ Óý¸¡ðº¢" +msgstr "குறும்படம் முன்காட்சி" #: panel/item_dialog.c:742 msgid "Drag file onto this frame to change the icon" -msgstr "ÌÚõÀ¼ò¨¾ Á¡üÚžüÌ, þîºð¼õ §Áø §¸¡ôÒ þØòÐô §À¡¼×õ" +msgstr "குறும்படத்தை மாற்றுவதற்கு, þச்சட்டம் மேல் கோப்பு þழுத்துப் போடவும்" -#: panel/item_dialog.c:931 +#: panel/item_dialog.c:930 msgid "Change menu item" -msgstr "ÀðÊ ¯ÕôÀÊ Á¡üÈ×õ" +msgstr "பட்டி உருப்படி மாற்றவும்" #. add buttons -#: panel/item_dialog.c:934 +#: panel/item_dialog.c:933 msgid "Remove" -msgstr "¸Æðθ" +msgstr "கழட்டுக" #: panel/item.c:441 msgid "Click mouse button 3 to change item" -msgstr "¯ÕôÀÊ Á¡üÚžüÌ 3¬õ ÍðÊ ¦À¡ò¾¡¨É «Óò¾×õ" +msgstr "உருப்படி மாற்றுவதற்கு 3ஆம் சுட்டி பொத்தானை அமுத்தவும்" #: panel/item.c:464 msgid "Add launcher" -msgstr "¦¾¡¼í¸÷ §º÷ì¸×õ" +msgstr "தொடங்கர் சேர்க்கவும்" #: panel/item.c:469 msgid "Add new item" -msgstr "Ò¾¢Â ¯ÕôÀÊ §º÷ì¸×õ" +msgstr "புதிய உருப்படி சேர்க்கவும்" #: panel/item.c:601 msgid "Launcher" -msgstr "¦¾¡¼í¸÷" +msgstr "தொடங்கர்" -#: panel/main.c:132 +#: panel/main.c:115 msgid "Are you sure you want to exit?" -msgstr "¦ÅÇ¢¦ºøÄ ¯í¸ÙìÌ Å¢ÕôÀÁ¡?" +msgstr "வெளிசெல்ல உங்களுக்கு விருப்பமா?" -#: panel/main.c:268 +#: panel/main.c:243 #, c-format msgid "" "%s, version %s\n" "Part of the XFce Desktop Environment\n" "http://www.xfce.org\n" msgstr "" -"%s, À¾¢ôÒ %s\n" -"XFce ¸½¢§Á¨º ÝÆ¨Ä §º÷ó¾Ð\n" +"%s, பதிப்பு %s\n" +"XFce கணிமேசை சூழலை சேர்ந்தது\n" "http://www.xfce.org\n" -#: panel/main.c:284 +#: panel/main.c:259 msgid "" "Your window manager does not seem to support the new window manager hints as " "defined on http://www.freedesktop.org. \n" "Some XFce features may not work as intended." msgstr "" -"¯í¸û º¡ÇçÁÄ¡Ç÷ http://www.freedesktop.org «Ú¾¢Â¢ð¼ º¡ÇÃ-ÌÈ¢ôÀ¢Î¸ÙìÌ ¬¾ÃÅÇ¢" -"ôÒ ¸¢¨¼Â¡Ð. \n" -"º¢Ä XFce ¦ºÂøÀ¡Î¸û Å¢ÕõÀ¢ÂЧÀ¡ø §Å¨Ä¦ºö¡Ð." +"உங்கள் சாளரமேலாளர் http://www.freedesktop.org அறுதியிட்ட சாளர-குறிப்பிடுகளுக்கு " +"ஆதரவளிப்பு கிடையாது. \n" +"சில XFce செயல்பாடுகள் விரும்பியதுபோல் வேலைசெய்யாது." #: panel/controls.c:320 panel/panel.c:123 msgid "/Add _new item" -msgstr "/Ò¾¢Â _¯ÕôÀÊ §º÷ì¸×õ" +msgstr "/புதிய _உருப்படி சேர்க்கவும்" #: panel/controls.c:322 panel/panel.c:125 msgid "/_Properties..." -msgstr "/_ÀñÒ¸û..." +msgstr "/_பண்புகள்..." #: panel/controls.c:323 msgid "/_Remove" -msgstr "/_¸Æðθ" +msgstr "/_கழட்டுக" #: panel/controls.c:655 msgid "This item has no configuration options" -msgstr "þó¾ ¯ÕôÀÊìÌ «¨ÁôÒò §¾÷׸û ¸¢¨¼Â¡Ð" +msgstr "þந்த உருப்படிக்கு அமைப்புத் தேர்வுகள் கிடையாது" #: panel/panel.c:121 msgid "/XFce Panel" -msgstr "/XFCE ÀĨ¸" +msgstr "/XFCE பலகை" #: panel/panel.c:126 msgid "/_Settings manager" -msgstr "/_«¨ÁôÒ¸û §ÁÄ¡Ç÷" +msgstr "/_அமைப்புகள் மேலாளர்" #: panel/panel.c:128 msgid "/_About XFce" -msgstr "/_XFCE ÀüÈ¢" +msgstr "/_XFCE பற்றி" #: panel/panel.c:129 msgid "/_Help" -msgstr "/_¯¾Å¢" +msgstr "/_உதவி" #: panel/panel.c:131 msgid "/_Lock screen" -msgstr "/_¾¢¨Ã¨Âô âðθ" +msgstr "/_திரையைப் பூட்டுக" #: panel/panel.c:132 msgid "/E_xit" -msgstr "/¦ÅÇ¢_ø" +msgstr "/வெளி_ச்செல்" #: panel/panel.c:489 settings/xfce_settings_plugin.c:82 #: settings/xfce_settings_dialog.c:649 msgid "XFce Panel" -msgstr "XFCE ÀĨ¸" +msgstr "XFCE பலகை" #: panel/icons.c:73 msgid "Default" -msgstr "¦¸¡¼¡¿¢¨Ä" +msgstr "கொடாநிலை" #: panel/icons.c:74 msgid "Editor" -msgstr "À¾¢ôÀ¡ý" +msgstr "பதிப்பான்" #: panel/icons.c:75 msgid "File management" -msgstr "§¸¡ôÒ §ÁÄ¡ñ¨Á" +msgstr "கோப்பு மேலாண்மை" #: panel/icons.c:76 msgid "Utilities" -msgstr "ÀÂýÀ¡Î¸û" +msgstr "பயன்பாடுகள்" #: panel/icons.c:77 msgid "Games" -msgstr "Å¢¨Ç¡ðθû" +msgstr "விளையாட்டுகள்" #: panel/icons.c:78 msgid "Help browser" -msgstr "¯¾Å¢ §Á§Ä¡Ê" +msgstr "உதவி மேலோடி" #: panel/icons.c:79 msgid "Multimedia" -msgstr "Àø °¼¸õ" +msgstr "பல் ஊடகம்" #: panel/icons.c:80 msgid "Network" -msgstr "ŨĨÁôÒ" +msgstr "வலையமைப்பு" #: panel/icons.c:81 msgid "Graphics" -msgstr "ŨÃÅ¢Âø" +msgstr "வரைவியல்" #: panel/icons.c:82 msgid "Printer" -msgstr "«îÍô¦À¡È¢" +msgstr "அச்சுப்பொறி" #: panel/icons.c:83 msgid "Productivity" -msgstr "¯üÀò¾¢ò ¾¢Èý" +msgstr "உற்பத்தித் திறன்" #: panel/icons.c:84 msgid "Sound" -msgstr "´Ä¢" +msgstr "ஒலி" #: panel/icons.c:85 msgid "Terminal" -msgstr "Ó¨ÉÂõ" +msgstr "முனையம்" #: panel/mcs_client.c:208 msgid "Settings manager not available" -msgstr "«¨ÁôÒ¸û §ÁÄ¡Ç÷ ¸¢¨¼Â¡Ð" +msgstr "அமைப்புகள் மேலாளர் கிடையாது" #: panel/popup.c:263 msgid "Menu" -msgstr "ÀðÊ" +msgstr "பட்டி" #: settings/xfce_settings_dialog.c:119 msgid "Tiny" -msgstr "Á¢¸º¢È¢Â" +msgstr "மிகசிறிய" #: settings/xfce_settings_dialog.c:123 msgid "Small" -msgstr "º¢È¢Ð" +msgstr "சிறிது" #: settings/xfce_settings_dialog.c:127 msgid "Medium" -msgstr "¿Îò¾Ãõ" +msgstr "நடுத்தரம்" #: settings/xfce_settings_dialog.c:131 msgid "Large" -msgstr "¦ÀâÐ" +msgstr "பெரிது" #: settings/xfce_settings_dialog.c:190 msgid "Horizontal" -msgstr "¸¢¨¼Â¡É" +msgstr "கிடையான" #: settings/xfce_settings_dialog.c:194 msgid "Vertical" -msgstr "¦ºíÌò¾Á¡É" +msgstr "செங்குத்தமான" #: settings/xfce_settings_dialog.c:226 settings/xfce_settings_dialog.c:456 msgid "Left" -msgstr "¼Ð" +msgstr "இடது" #: settings/xfce_settings_dialog.c:230 settings/xfce_settings_dialog.c:457 msgid "Right" -msgstr "ÅÄÐ" +msgstr "வலது" #: settings/xfce_settings_dialog.c:234 settings/xfce_settings_dialog.c:455 #: settings/xfce_settings_dialog.c:511 msgid "Top" -msgstr "§Áø" +msgstr "மேல்" #: settings/xfce_settings_dialog.c:238 settings/xfce_settings_dialog.c:454 #: settings/xfce_settings_dialog.c:519 msgid "Bottom" -msgstr "¸£ú" +msgstr "கீழ்" #: settings/xfce_settings_dialog.c:374 msgid "Panel size:" -msgstr "ÀĨ¸ «Ç×:" +msgstr "பலகை அளவு:" #: settings/xfce_settings_dialog.c:390 msgid "Panel orientation:" -msgstr "ÀĨ¸ ¾¢¨º «¨Á×:" +msgstr "பலகை திசை அமைவு:" #: settings/xfce_settings_dialog.c:407 msgid "Popup position:" -msgstr "ÀĨ¸ ¼õ:" +msgstr "பலகை இடம்:" #: settings/xfce_settings_dialog.c:424 msgid "Icon theme:" -msgstr "ÌÚõÀ¼õ §¾¡üÈõ:" +msgstr "குறும்படம் தோற்றம்:" #: settings/xfce_settings_dialog.c:495 msgid "Panel layer:" -msgstr "ÀĨ¸ «Îì¸õ:" +msgstr "பலகை அடுக்கம்:" #: settings/xfce_settings_dialog.c:515 msgid "Normal" -msgstr "ÂøÀ¡ÉÐ" +msgstr "இயல்பானது" #: settings/xfce_settings_dialog.c:535 msgid "Center the panel:" -msgstr "ÀĨ¸¨Â ¿ÎôÀÎòÐ:" +msgstr "பலகையை நடுப்படுத்து:" #: settings/xfce_settings_dialog.c:559 msgid "Set" -msgstr "«¨Á" +msgstr "அமை" #: settings/xfce_settings_dialog.c:595 msgid "Autohide:" -msgstr "¾¡É¡¸§Å ´Ç¢/Á¨È:" +msgstr "தானாகவே ஒளி/மறை:" #: settings/xfce_settings_dialog.c:663 msgid "XFce Panel Settings" -msgstr "XFce ÀĨ¸ «¨ÁôÒ¸û" +msgstr "XFce பலகை அமைப்புகள்" #. Appearance #: settings/xfce_settings_dialog.c:675 msgid "Appearance" -msgstr "§¾¡üÈõ" +msgstr "தோற்றம்" #. Position #: settings/xfce_settings_dialog.c:696 msgid "Position" -msgstr "¼õ" +msgstr "இடம்" #. autohide #: settings/xfce_settings_dialog.c:712 msgid "Behaviour" -msgstr "´Øì¸õ" +msgstr "ஒழுக்கம்" #: plugins/clock/clock.c:57 msgid "Sunday" -msgstr "»¡Â¢Ú" +msgstr "ஞாயிறு" #: plugins/clock/clock.c:58 msgid "Monday" -msgstr "¾¢í¸û" +msgstr "திங்கள்" #: plugins/clock/clock.c:59 msgid "Tuesday" -msgstr "¦ÅùÅ¡ö" +msgstr "வெவ்வாய்" #: plugins/clock/clock.c:60 msgid "Wednesday" -msgstr "Ò¾ý" +msgstr "புதன்" #: plugins/clock/clock.c:61 msgid "Thursday" -msgstr "Ţ¡Æý" +msgstr "வியாழன்" #: plugins/clock/clock.c:62 msgid "Friday" -msgstr "¦ÅûÇ¢" +msgstr "வெள்ளி" #: plugins/clock/clock.c:63 msgid "Saturday" -msgstr "ºÉ¢" +msgstr "சனி" #: plugins/clock/clock.c:67 msgid "January" -msgstr "ÉÅâ" +msgstr "ஜனவரி" #: plugins/clock/clock.c:68 msgid "February" -msgstr "À¢ôÃÅâ" +msgstr "பிப்ரவரி" #: plugins/clock/clock.c:69 msgid "March" -msgstr "Á¡÷î" +msgstr "மார்ச்" #: plugins/clock/clock.c:70 msgid "April" -msgstr "²ôÃø" +msgstr "ஏப்ரல்" #: plugins/clock/clock.c:71 msgid "May" -msgstr "§Á" +msgstr "மே" #: plugins/clock/clock.c:72 msgid "June" -msgstr "¤ý" +msgstr "ஜுன்" #: plugins/clock/clock.c:73 msgid "July" -msgstr "¥¨Ä" +msgstr "ஜூலை" #: plugins/clock/clock.c:74 msgid "August" -msgstr "¬¸ð" +msgstr "ஆகஸ்ட்" #: plugins/clock/clock.c:75 msgid "September" -msgstr "¦ºô¼õÀ÷" +msgstr "செப்டம்பர்" #: plugins/clock/clock.c:76 msgid "October" -msgstr "«ì§¼¡À÷" +msgstr "அக்டோபர்" #: plugins/clock/clock.c:77 msgid "November" -msgstr "¿ÅõÀ÷" +msgstr "நவம்பர்" #: plugins/clock/clock.c:78 msgid "December" -msgstr "ʺõÀ÷" +msgstr "டிசம்பர்" #: plugins/clock/clock.c:350 msgid "Clock type:" -msgstr "¸Ê¸¡Ãõ Ũ¸:" +msgstr "கடிகாரம் வகை:" #: plugins/clock/clock.c:363 msgid "Analog" -msgstr "¦¾¡¼Ã¢¨º" +msgstr "தொடரிசை" #: plugins/clock/clock.c:367 msgid "Digital" -msgstr "Äì¸Ó¨È" +msgstr "இலக்கமுறை" #: plugins/clock/clock.c:371 msgid "LED" -msgstr "" +msgstr "LED" #: plugins/clock/clock.c:433 msgid "Hour mode:" -msgstr "Á½¢ Ũ¸:" +msgstr "மணி வகை:" #: plugins/clock/clock.c:440 msgid "24 hour" -msgstr "24 Á½¢" +msgstr "24 மணி" #: plugins/clock/clock.c:446 msgid "12 hour" -msgstr "12 Á½¢" +msgstr "12 மணி" #: plugins/clock/clock.c:452 msgid "AM/PM" -msgstr "¸¡/Á¡" +msgstr "கா/மா" #: plugins/clock/clock.c:490 msgid "Show seconds:" -msgstr "¦¿¡Ê¸û ¸¡ñÀ¢ì¸×õ:" +msgstr "நொடிகள் காண்பிக்கவும்:" #: plugins/clock/clock.c:599 msgid "Xfce Clock" -msgstr "XFCE ¸Ê¸¡Ãõ" +msgstr "XFCE கடிகாரம்" -#: plugins/pager/pager.c:277 +#: plugins/pager/pager.c:271 msgid "Graphical pager" -msgstr "ŨÃÅ¢Âø ÀÂɨÆÂõ" +msgstr "வரைவியல் பயனழையம்" #: plugins/switcher/switcher.c:696 msgid "Desktop switcher" -msgstr "§Å¨Ä¢¼ Á¡üÈ¢" +msgstr "வேலையிட மாற்றி" #: plugins/systembuttons/systembuttons.c:60 msgid "" @@ -472,79 +472,79 @@ msgid "" "\n" "Ask your system administrator for more information" msgstr "" -"«¨ÁôÒ ÅÊŨÁò¾ÖìÌ ¦ÀÚõÅÆ¢ ¸¢¨¼Â¡Ð.\n" +"அமைப்பு வடிவமைத்தலுக்கு பெறும்வழி கிடையாது.\n" "\n" -"¯í¸û ¸½¢ô¦À¡È¢ ¿¢÷Å¡¸¢Ô¼ý ¦¾¡¼÷Ò¦¸¡ûÇ×õ" +"உங்கள் கணிப்பொறி நிர்வாகியுடன் தொடர்புகொள்ளவும்" #: plugins/systembuttons/systembuttons.c:148 msgid "Lock the screen" -msgstr "¾¢¨Ã¨Âô âðθ" +msgstr "திரையைப் பூட்டுக" #: plugins/systembuttons/systembuttons.c:149 #: plugins/systembuttons/systembuttons.c:518 msgid "Exit" -msgstr "¦ºÇ¢î¦ºø" +msgstr "வெளியேறுக" #: plugins/systembuttons/systembuttons.c:150 #: plugins/systembuttons/systembuttons.c:519 msgid "Setup" -msgstr "«¨ÁôÒ" +msgstr "அமைப்பு" #: plugins/systembuttons/systembuttons.c:151 #: plugins/systembuttons/systembuttons.c:520 msgid "Info" -msgstr "¾¸Åø" +msgstr "தகவல்" #: plugins/systembuttons/systembuttons.c:500 msgid "Show two buttons:" -msgstr "þÃñÎ ¦À¡ò¾¡ý¸¨Ç ¸¡ðθ:" +msgstr "þரண்டு பொத்தான்களை காட்டுக:" #. set names to use in option menus #: plugins/systembuttons/systembuttons.c:517 msgid "Lock" -msgstr "âðÎ" +msgstr "பூட்டு" #: plugins/systembuttons/systembuttons.c:549 msgid "Button 1:" -msgstr "¦À¡ò¾¡ý 1:" +msgstr "பொத்தான் 1:" #: plugins/systembuttons/systembuttons.c:565 msgid "Button 2:" -msgstr "¦À¡ò¾¡ý 2:" +msgstr "பொத்தான் 2:" #: plugins/systembuttons/systembuttons.c:600 msgid "System buttons" -msgstr "«¨ÁôÒ ¦À¡ò¾¡ý¸û" +msgstr "அமைப்பு பொத்தான்கள்" #: plugins/separator/separator.c:153 msgid "Separator" -msgstr "" +msgstr "பிரிப்பு" #: plugins/mailcheck/mailcheck.c:539 msgid "Mail box:" -msgstr "«ïºø ¦ÀðÊ:" +msgstr "அஞ்சல் பெட்டி:" #: plugins/mailcheck/mailcheck.c:623 msgid "Mail command:" -msgstr "«ïºø ¸ð¼¨Ç:" +msgstr "அஞ்சல் கட்டளை:" #: plugins/mailcheck/mailcheck.c:637 msgid "Command to run when the button on the panel is clicked" -msgstr "ÀĨ¸ ¦À¡ò¾¡¨É «Óò¾¢É¡ø þÂ츧ÅñÊ ¸ð¼¨Ç" +msgstr "பலகை பொத்தானை அமுத்தினால் þயக்கவேண்டிய கட்டளை" #: plugins/mailcheck/mailcheck.c:706 msgid "Interval (sec):" -msgstr "¨¼¦ÅÇ¢ (¦¿¡Ê):" +msgstr "இடைவெளி (நொடி):" #: plugins/mailcheck/mailcheck.c:778 msgid "Mail check" -msgstr "«ïºø ºÃ¢À¡÷ôÒ" +msgstr "அஞ்சல் சரிபார்ப்பு" #~ msgid "_Done" -#~ msgstr "_ãÎ" +#~ msgstr "_மூடு" #~ msgid "_Revert" -#~ msgstr "_¿¢¨ÄÁ£ðÎ" +#~ msgstr "_நிலைமீட்டு" #~ msgid "Type:" -#~ msgstr "Ũ¸:" +#~ msgstr "வகை:" Binary files differ@@ -1,19 +1,19 @@ # translation of xfce4-panel.po to Turkish # This file is distributed under the same license as the PACKAGE package. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# Copyright (C) 2003 THE PACKAGE'S COPYRIGHT HOLDER # Erçin EKER <erc.caldera@gmx.net>, 2003 # msgid "" msgstr "" "Project-Id-Version: xfce4-panel\n" -"POT-Creation-Date: 2003-09-10 08:40+0200\n" -"PO-Revision-Date: 2003-07-16 20:51+0300\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-12-04 09:37+0100\n" +"PO-Revision-Date: 2003-12-13 20:08+0200\n" "Last-Translator: Erçin EKER <erc.caldera@gmx.net>\n" "Language-Team: Turkish <tr@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.2\n" +"Content-Transfer-Encoding: 8bit" #: panel/xfce_support.c:597 msgid "Select file" @@ -23,11 +23,11 @@ msgstr "Dosya seç" msgid "Change item" msgstr "Nesneyi değiştir" -#: panel/controls_dialog.c:286 panel/item_dialog.c:647 +#: panel/controls_dialog.c:286 panel/item_dialog.c:681 msgid "Position:" msgstr "Konum:" -#: panel/controls_dialog.c:331 panel/controls.c:272 +#: panel/controls_dialog.c:342 panel/controls.c:272 msgid "" "Removing an item will also remove its popup menu.\n" "\n" @@ -37,64 +37,64 @@ msgstr "" "\n" "Yinede bileşeni kaldırmak istiyor musunuz?" -#: panel/item_dialog.c:320 +#: panel/item_dialog.c:321 msgid "Other Icon" msgstr "Diğer Simge" -#: panel/item_dialog.c:345 +#: panel/item_dialog.c:346 msgid "Select icon" msgstr "Simge seçin" -#: panel/item_dialog.c:384 +#: panel/item_dialog.c:396 msgid "Icon:" msgstr "Simge:" -#: panel/item_dialog.c:433 +#: panel/item_dialog.c:467 msgid "Select command" msgstr "Komut seç" -#: panel/item_dialog.c:461 +#: panel/item_dialog.c:495 msgid "Command:" msgstr "Komut:" -#: panel/item_dialog.c:498 plugins/mailcheck/mailcheck.c:668 +#: panel/item_dialog.c:532 plugins/mailcheck/mailcheck.c:668 msgid "Run in _terminal" msgstr "_Terminalde çalıştır" -#: panel/item_dialog.c:503 plugins/mailcheck/mailcheck.c:676 +#: panel/item_dialog.c:537 plugins/mailcheck/mailcheck.c:676 msgid "Use startup _notification" msgstr "Başlangıç _uyarısı kullan" -#: panel/item_dialog.c:530 +#: panel/item_dialog.c:564 msgid "Caption:" msgstr "Başlık:" -#: panel/item_dialog.c:563 +#: panel/item_dialog.c:597 msgid "Tooltip:" msgstr "İpucu:" -#: panel/item_dialog.c:599 +#: panel/item_dialog.c:633 msgid "Menu:" msgstr "Menü:" -#: panel/item_dialog.c:606 +#: panel/item_dialog.c:640 msgid "Attach menu to launcher" msgstr "Başlatıcıya menü ekle" -#: panel/item_dialog.c:738 +#: panel/item_dialog.c:773 msgid "Icon Preview" msgstr "Simge Önizlemesi" -#: panel/item_dialog.c:742 +#: panel/item_dialog.c:777 msgid "Drag file onto this frame to change the icon" msgstr "Simgeyi değiştirmek için bu pencereye bir dosya sürükleyin" -#: panel/item_dialog.c:931 +#: panel/item_dialog.c:965 msgid "Change menu item" msgstr "Menü nesnesini değiştir" #. add buttons -#: panel/item_dialog.c:934 +#: panel/item_dialog.c:968 msgid "Remove" msgstr "Kaldır" @@ -114,11 +114,11 @@ msgstr "Yeni nesne ekle" msgid "Launcher" msgstr "Başlatıcı" -#: panel/main.c:132 +#: panel/main.c:117 msgid "Are you sure you want to exit?" msgstr "Çıkmak istediğinizden emin misiniz?" -#: panel/main.c:268 +#: panel/main.c:329 #, c-format msgid "" "%s, version %s\n" @@ -129,7 +129,7 @@ msgstr "" "XFce Masaüstü Ortamının bir bileşeni\n" "http://www.xfce.org\n" -#: panel/main.c:284 +#: panel/main.c:361 msgid "" "Your window manager does not seem to support the new window manager hints as " "defined on http://www.freedesktop.org. \n" @@ -139,11 +139,11 @@ msgstr "" "ipuçlarını desteklemiyor görünüyor. \n" "Bazı XFce özellikleri çalışmayabilir." -#: panel/controls.c:320 panel/panel.c:123 +#: panel/controls.c:320 panel/panel.c:412 msgid "/Add _new item" msgstr "/Yeni nesne _ekle" -#: panel/controls.c:322 panel/panel.c:125 +#: panel/controls.c:322 panel/panel.c:414 msgid "/_Properties..." msgstr "/_Özellikler..." @@ -155,31 +155,35 @@ msgstr "/_Kaldır" msgid "This item has no configuration options" msgstr "Bu nesne ayarlanabilir seçenek sunmuyor" -#: panel/panel.c:121 +#: panel/panel.c:410 msgid "/XFce Panel" msgstr "/XFce Paneli" -#: panel/panel.c:126 -msgid "/_Settings manager" -msgstr "/_Ayar yöneticisi" - -#: panel/panel.c:128 +#: panel/panel.c:415 msgid "/_About XFce" msgstr "/XFce _Hakkında" -#: panel/panel.c:129 +#: panel/panel.c:416 msgid "/_Help" msgstr "/_Yardım" -#: panel/panel.c:131 +#: panel/panel.c:419 +msgid "/_Settings manager" +msgstr "/_Ayar yöneticisi" + +#: panel/panel.c:422 msgid "/_Lock screen" msgstr "/Ekranı _kilitle" -#: panel/panel.c:132 +#: panel/panel.c:423 +msgid "/_Restart" +msgstr "/_Yeniden Başlat" + +#: panel/panel.c:425 msgid "/E_xit" msgstr "/_Çık" -#: panel/panel.c:489 settings/xfce_settings_plugin.c:82 +#: panel/panel.c:812 settings/xfce_settings_plugin.c:82 #: settings/xfce_settings_dialog.c:649 msgid "XFce Panel" msgstr "XFce Paneli" @@ -240,7 +244,7 @@ msgstr "Terminal" msgid "Settings manager not available" msgstr "Ayar yöneticisi kullanılamıyor" -#: panel/popup.c:263 +#: panel/popup.c:261 msgid "Menu" msgstr "Menü" @@ -341,123 +345,59 @@ msgstr "Konum" msgid "Behaviour" msgstr "Davranış" -#: plugins/clock/clock.c:57 -msgid "Sunday" -msgstr "Pazar" - -#: plugins/clock/clock.c:58 -msgid "Monday" -msgstr "Pazartesi" - -#: plugins/clock/clock.c:59 -msgid "Tuesday" -msgstr "Salı" - -#: plugins/clock/clock.c:60 -msgid "Wednesday" -msgstr "Çarşamba" - -#: plugins/clock/clock.c:61 -msgid "Thursday" -msgstr "Perşembe" - -#: plugins/clock/clock.c:62 -msgid "Friday" -msgstr "Cuma" - -#: plugins/clock/clock.c:63 -msgid "Saturday" -msgstr "Cumartesi" - -#: plugins/clock/clock.c:67 -msgid "January" -msgstr "Ocak" - -#: plugins/clock/clock.c:68 -msgid "February" -msgstr "Şubat" - -#: plugins/clock/clock.c:69 -msgid "March" -msgstr "Mart" - -#: plugins/clock/clock.c:70 -msgid "April" -msgstr "Nisan" - -#: plugins/clock/clock.c:71 -msgid "May" -msgstr "Mayıs" - -#: plugins/clock/clock.c:72 -msgid "June" -msgstr "Haziran" - -#: plugins/clock/clock.c:73 -msgid "July" -msgstr "Temmuz" - -#: plugins/clock/clock.c:74 -msgid "August" -msgstr "Ağustos" - -#: plugins/clock/clock.c:75 -msgid "September" -msgstr "Eylül" - -#: plugins/clock/clock.c:76 -msgid "October" -msgstr "Ekim" - -#: plugins/clock/clock.c:77 -msgid "November" -msgstr "Kasım" - -#: plugins/clock/clock.c:78 -msgid "December" -msgstr "Aralık" - -#: plugins/clock/clock.c:350 +#. Use format characters from strftime(3) +#. * to get the proper string for your locale. +#. * I used these: +#. * %A : full weekday name +#. * %-d : day of the month, without prefixed 0 +#. * %B : full month name +#. * %Y : four digit year +#. +#: plugins/clock/clock.c:119 +msgid "%A, %-d %B %Y" +msgstr "%A,·%-d·%B·%Y" + +#: plugins/clock/clock.c:336 msgid "Clock type:" msgstr "Saat türü:" -#: plugins/clock/clock.c:363 +#: plugins/clock/clock.c:349 msgid "Analog" msgstr "Analog" -#: plugins/clock/clock.c:367 +#: plugins/clock/clock.c:353 msgid "Digital" msgstr "Sayısal" -#: plugins/clock/clock.c:371 +#: plugins/clock/clock.c:357 msgid "LED" msgstr "LED" -#: plugins/clock/clock.c:433 +#: plugins/clock/clock.c:419 msgid "Hour mode:" msgstr "Saat biçimi:" -#: plugins/clock/clock.c:440 +#: plugins/clock/clock.c:426 msgid "24 hour" msgstr "24 saat" -#: plugins/clock/clock.c:446 +#: plugins/clock/clock.c:432 msgid "12 hour" msgstr "12 saat" -#: plugins/clock/clock.c:452 +#: plugins/clock/clock.c:438 msgid "AM/PM" msgstr "ÖÖ/ÖS" -#: plugins/clock/clock.c:490 +#: plugins/clock/clock.c:476 msgid "Show seconds:" msgstr "Saniyeyi göster:" -#: plugins/clock/clock.c:599 +#: plugins/clock/clock.c:585 msgid "Xfce Clock" msgstr "Xfce Saati" -#: plugins/pager/pager.c:277 +#: plugins/pager/pager.c:271 msgid "Graphical pager" msgstr "Grafik sayfalayıcı" @@ -538,3 +478,60 @@ msgstr "Gecikme (sn):" #: plugins/mailcheck/mailcheck.c:778 msgid "Mail check" msgstr "Posta denetimi" + +#~ msgid "Sunday" +#~ msgstr "Pazar" + +#~ msgid "Monday" +#~ msgstr "Pazartesi" + +#~ msgid "Tuesday" +#~ msgstr "Salı" + +#~ msgid "Wednesday" +#~ msgstr "Çarşamba" + +#~ msgid "Thursday" +#~ msgstr "Perşembe" + +#~ msgid "Friday" +#~ msgstr "Cuma" + +#~ msgid "Saturday" +#~ msgstr "Cumartesi" + +#~ msgid "January" +#~ msgstr "Ocak" + +#~ msgid "February" +#~ msgstr "Şubat" + +#~ msgid "March" +#~ msgstr "Mart" + +#~ msgid "April" +#~ msgstr "Nisan" + +#~ msgid "May" +#~ msgstr "Mayıs" + +#~ msgid "June" +#~ msgstr "Haziran" + +#~ msgid "July" +#~ msgstr "Temmuz" + +#~ msgid "August" +#~ msgstr "Ağustos" + +#~ msgid "September" +#~ msgstr "Eylül" + +#~ msgid "October" +#~ msgstr "Ekim" + +#~ msgid "November" +#~ msgstr "Kasım" + +#~ msgid "December" +#~ msgstr "Aralık" diff --git a/po/uk.gmo b/po/uk.gmo Binary files differnew file mode 100644 index 00000000..13991a26 --- /dev/null +++ b/po/uk.gmo diff --git a/po/uk.po b/po/uk.po new file mode 100644 index 00000000..15e6dc22 --- /dev/null +++ b/po/uk.po @@ -0,0 +1,540 @@ +# Ukrainian translation of xfce4-panel. +# Copyright (C) Free Software Foundation +# This file is distributed under the same license as the xfce4-panel package. +# Maxim Dziumanenko <mvd@mylinux.com.ua>, 2003. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: xfce4-panel\n" +"POT-Creation-Date: 2003-11-05 17:25+0100\n" +"PO-Revision-Date: 2003-10-22 12:31+0200\n" +"Last-Translator: axim Dziumanenko <mvd@mylinux.com.ua>\n" +"Language-Team: Ukrainian <uk@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: panel/xfce_support.c:597 +msgid "Select file" +msgstr "Вибір файлу" + +#: panel/controls_dialog.c:254 +msgid "Change item" +msgstr "Редагування об'єкта" + +#: panel/controls_dialog.c:286 panel/item_dialog.c:647 +msgid "Position:" +msgstr "Позиція:" + +#: panel/controls_dialog.c:342 panel/controls.c:272 +msgid "" +"Removing an item will also remove its popup menu.\n" +"\n" +"Do you want to remove the item?" +msgstr "" +"При видаленні об'єкта призведе до видалення його підменю.\n" +"\n" +"Ви впевнені, що бажаєте видалити об'єкт?" + +#: panel/item_dialog.c:320 +msgid "Other Icon" +msgstr "Інша піктограма" + +#: panel/item_dialog.c:345 +msgid "Select icon" +msgstr "Вибір піктограми" + +#: panel/item_dialog.c:384 +msgid "Icon:" +msgstr "Піктограма:" + +#: panel/item_dialog.c:433 +msgid "Select command" +msgstr "Вибір команди" + +#: panel/item_dialog.c:461 +msgid "Command:" +msgstr "Команда" + +#: panel/item_dialog.c:498 plugins/mailcheck/mailcheck.c:668 +msgid "Run in _terminal" +msgstr "Запустити у _терміналі" + +#: panel/item_dialog.c:503 plugins/mailcheck/mailcheck.c:676 +msgid "Use startup _notification" +msgstr "Використовувати _сповіщення про запуск" + +#: panel/item_dialog.c:530 +msgid "Caption:" +msgstr "Назва:" + +#: panel/item_dialog.c:563 +msgid "Tooltip:" +msgstr "Підказка:" + +#: panel/item_dialog.c:599 +msgid "Menu:" +msgstr "Меню:" + +#: panel/item_dialog.c:606 +msgid "Attach menu to launcher" +msgstr "Додати меню до об'єкта" + +#: panel/item_dialog.c:738 +msgid "Icon Preview" +msgstr "Перегляд піктограми" + +#: panel/item_dialog.c:742 +msgid "Drag file onto this frame to change the icon" +msgstr "Перетягніть сюди файл, щоб змінити піктограму" + +#: panel/item_dialog.c:930 +msgid "Change menu item" +msgstr "Зміна елементу меню" + +#. add buttons +#: panel/item_dialog.c:933 +msgid "Remove" +msgstr "Видалити" + +#: panel/item.c:441 +msgid "Click mouse button 3 to change item" +msgstr "Клацніть середньою кнопкою миші щоб змінити об'єкт" + +#: panel/item.c:464 +msgid "Add launcher" +msgstr "Додати запуск" + +#: panel/item.c:469 +msgid "Add new item" +msgstr "Додати новий об'єкт" + +#: panel/item.c:601 +msgid "Launcher" +msgstr "Запуск" + +#: panel/main.c:115 +msgid "Are you sure you want to exit?" +msgstr "Ви впевнені що хочете вийти?" + +#: panel/main.c:243 +#, c-format +msgid "" +"%s, version %s\n" +"Part of the XFce Desktop Environment\n" +"http://www.xfce.org\n" +msgstr "" +"%s, версія %s\n" +"Частина робочого середовища XFce\n" +"http://www.xfce.org\n" + +#: panel/main.c:259 +msgid "" +"Your window manager does not seem to support the new window manager hints as " +"defined on http://www.freedesktop.org. \n" +"Some XFce features may not work as intended." +msgstr "" +"Ваш віконний менеджер не підтримує нові можливості, які визначено на http://" +"www.freedesktop.org.\n" +"Деякі можливості XFce можуть не робити відповідним чином." + +#: panel/controls.c:320 panel/panel.c:123 +msgid "/Add _new item" +msgstr "/Додати _новий об'єкт" + +#: panel/controls.c:322 panel/panel.c:125 +msgid "/_Properties..." +msgstr "/В_ластивості" + +#: panel/controls.c:323 +msgid "/_Remove" +msgstr "/Ви_далити" + +#: panel/controls.c:655 +msgid "This item has no configuration options" +msgstr "Об'єкт не має параметрів налаштування" + +#: panel/panel.c:121 +msgid "/XFce Panel" +msgstr "/Панель XFce" + +#: panel/panel.c:126 +msgid "/_Settings manager" +msgstr "/Менеджер _параметрів" + +#: panel/panel.c:128 +msgid "/_About XFce" +msgstr "/_Про XFce" + +#: panel/panel.c:129 +msgid "/_Help" +msgstr "/_Довідка" + +#: panel/panel.c:131 +msgid "/_Lock screen" +msgstr "/_Блокувати екран" + +#: panel/panel.c:132 +msgid "/E_xit" +msgstr "/Ви_йти" + +#: panel/panel.c:489 settings/xfce_settings_plugin.c:82 +#: settings/xfce_settings_dialog.c:649 +msgid "XFce Panel" +msgstr "Панель XFce" + +#: panel/icons.c:73 +msgid "Default" +msgstr "Типова" + +#: panel/icons.c:74 +msgid "Editor" +msgstr "Редактор" + +#: panel/icons.c:75 +msgid "File management" +msgstr "Менеджер файлів" + +#: panel/icons.c:76 +msgid "Utilities" +msgstr "Утиліти" + +#: panel/icons.c:77 +msgid "Games" +msgstr "Ігри" + +#: panel/icons.c:78 +msgid "Help browser" +msgstr "Перегляд довідки" + +#: panel/icons.c:79 +msgid "Multimedia" +msgstr "Мультимедія" + +#: panel/icons.c:80 +msgid "Network" +msgstr "Мережа" + +#: panel/icons.c:81 +msgid "Graphics" +msgstr "Графіка" + +#: panel/icons.c:82 +msgid "Printer" +msgstr "Принтер" + +#: panel/icons.c:83 +msgid "Productivity" +msgstr "Продуктивність" + +#: panel/icons.c:84 +msgid "Sound" +msgstr "Звук" + +#: panel/icons.c:85 +msgid "Terminal" +msgstr "Термінал" + +#: panel/mcs_client.c:208 +msgid "Settings manager not available" +msgstr "Менеджер параметрів відсутній" + +#: panel/popup.c:263 +msgid "Menu" +msgstr "Меню" + +#: settings/xfce_settings_dialog.c:119 +msgid "Tiny" +msgstr "Малесенький" + +#: settings/xfce_settings_dialog.c:123 +msgid "Small" +msgstr "Маленький" + +#: settings/xfce_settings_dialog.c:127 +msgid "Medium" +msgstr "Середній" + +#: settings/xfce_settings_dialog.c:131 +msgid "Large" +msgstr "Великий" + +#: settings/xfce_settings_dialog.c:190 +msgid "Horizontal" +msgstr "Горизонтальне" + +#: settings/xfce_settings_dialog.c:194 +msgid "Vertical" +msgstr "Вертикальне" + +#: settings/xfce_settings_dialog.c:226 settings/xfce_settings_dialog.c:456 +msgid "Left" +msgstr "Зліва" + +#: settings/xfce_settings_dialog.c:230 settings/xfce_settings_dialog.c:457 +msgid "Right" +msgstr "Справа" + +#: settings/xfce_settings_dialog.c:234 settings/xfce_settings_dialog.c:455 +#: settings/xfce_settings_dialog.c:511 +msgid "Top" +msgstr "Згори" + +#: settings/xfce_settings_dialog.c:238 settings/xfce_settings_dialog.c:454 +#: settings/xfce_settings_dialog.c:519 +msgid "Bottom" +msgstr "Знизу" + +#: settings/xfce_settings_dialog.c:374 +msgid "Panel size:" +msgstr "Розмір панелі:" + +#: settings/xfce_settings_dialog.c:390 +msgid "Panel orientation:" +msgstr "Розташування панелі:" + +#: settings/xfce_settings_dialog.c:407 +msgid "Popup position:" +msgstr "Кнопка меню:" + +#: settings/xfce_settings_dialog.c:424 +msgid "Icon theme:" +msgstr "Тема піктограм:" + +#: settings/xfce_settings_dialog.c:495 +msgid "Panel layer:" +msgstr "Шар панелі:" + +#: settings/xfce_settings_dialog.c:515 +msgid "Normal" +msgstr "Звичайний" + +#: settings/xfce_settings_dialog.c:535 +msgid "Center the panel:" +msgstr "Центрування панелі:" + +#: settings/xfce_settings_dialog.c:559 +msgid "Set" +msgstr "Встановити" + +#: settings/xfce_settings_dialog.c:595 +msgid "Autohide:" +msgstr "Автоматично приховувати:" + +#: settings/xfce_settings_dialog.c:663 +msgid "XFce Panel Settings" +msgstr "Параметри панелі XFce" + +#. Appearance +#: settings/xfce_settings_dialog.c:675 +msgid "Appearance" +msgstr "Зовнішній вигляд" + +#. Position +#: settings/xfce_settings_dialog.c:696 +msgid "Position" +msgstr "Розташування" + +#. autohide +#: settings/xfce_settings_dialog.c:712 +msgid "Behaviour" +msgstr "Поведінка" + +#: plugins/clock/clock.c:57 +msgid "Sunday" +msgstr "Неділя" + +#: plugins/clock/clock.c:58 +msgid "Monday" +msgstr "Понеділок" + +#: plugins/clock/clock.c:59 +msgid "Tuesday" +msgstr "Вівторок" + +#: plugins/clock/clock.c:60 +msgid "Wednesday" +msgstr "Середа" + +#: plugins/clock/clock.c:61 +msgid "Thursday" +msgstr "Четвер" + +#: plugins/clock/clock.c:62 +msgid "Friday" +msgstr "П'ятниця" + +#: plugins/clock/clock.c:63 +msgid "Saturday" +msgstr "Субота" + +#: plugins/clock/clock.c:67 +msgid "January" +msgstr "січня" + +#: plugins/clock/clock.c:68 +msgid "February" +msgstr "лютого" + +#: plugins/clock/clock.c:69 +msgid "March" +msgstr "березня" + +#: plugins/clock/clock.c:70 +msgid "April" +msgstr "квітня" + +#: plugins/clock/clock.c:71 +msgid "May" +msgstr "травня" + +#: plugins/clock/clock.c:72 +msgid "June" +msgstr "червня" + +#: plugins/clock/clock.c:73 +msgid "July" +msgstr "липня" + +#: plugins/clock/clock.c:74 +msgid "August" +msgstr "серпня" + +#: plugins/clock/clock.c:75 +msgid "September" +msgstr "вересня" + +#: plugins/clock/clock.c:76 +msgid "October" +msgstr "жовтня" + +#: plugins/clock/clock.c:77 +msgid "November" +msgstr "листопада" + +#: plugins/clock/clock.c:78 +msgid "December" +msgstr "грудня" + +#: plugins/clock/clock.c:350 +msgid "Clock type:" +msgstr "Тип годинника:" + +#: plugins/clock/clock.c:363 +msgid "Analog" +msgstr "Аналоговий" + +#: plugins/clock/clock.c:367 +msgid "Digital" +msgstr "Цифровий" + +#: plugins/clock/clock.c:371 +msgid "LED" +msgstr "Рідинно-кристалічний" + +#: plugins/clock/clock.c:433 +msgid "Hour mode:" +msgstr "Режим годинника:" + +#: plugins/clock/clock.c:440 +msgid "24 hour" +msgstr "24 години" + +#: plugins/clock/clock.c:446 +msgid "12 hour" +msgstr "12 годин" + +#: plugins/clock/clock.c:452 +msgid "AM/PM" +msgstr "AM/PM" + +#: plugins/clock/clock.c:490 +msgid "Show seconds:" +msgstr "Показувати секунди:" + +#: plugins/clock/clock.c:599 +msgid "Xfce Clock" +msgstr "Годинник Xfce" + +#: plugins/pager/pager.c:271 +msgid "Graphical pager" +msgstr "Графічний пейджер" + +#: plugins/switcher/switcher.c:696 +msgid "Desktop switcher" +msgstr "Перемикач робочих стільниць" + +#: plugins/systembuttons/systembuttons.c:60 +msgid "" +"Access to the configuration system has been disabled.\n" +"\n" +"Ask your system administrator for more information" +msgstr "" +"Доступ до параметрів системи заборонено.\n" +"\n" +"Зверніться до системного адміністратора." + +#: plugins/systembuttons/systembuttons.c:148 +msgid "Lock the screen" +msgstr "Блокувати екран" + +#: plugins/systembuttons/systembuttons.c:149 +#: plugins/systembuttons/systembuttons.c:518 +msgid "Exit" +msgstr "Вийти" + +#: plugins/systembuttons/systembuttons.c:150 +#: plugins/systembuttons/systembuttons.c:519 +msgid "Setup" +msgstr "Налаштування" + +#: plugins/systembuttons/systembuttons.c:151 +#: plugins/systembuttons/systembuttons.c:520 +msgid "Info" +msgstr "Інформація" + +#: plugins/systembuttons/systembuttons.c:500 +msgid "Show two buttons:" +msgstr "Показувати дві кнопки:" + +#. set names to use in option menus +#: plugins/systembuttons/systembuttons.c:517 +msgid "Lock" +msgstr "Блокування" + +#: plugins/systembuttons/systembuttons.c:549 +msgid "Button 1:" +msgstr "Кнопка 1:" + +#: plugins/systembuttons/systembuttons.c:565 +msgid "Button 2:" +msgstr "Кнопка 2:" + +#: plugins/systembuttons/systembuttons.c:600 +msgid "System buttons" +msgstr "Системні кнопки" + +#: plugins/separator/separator.c:153 +msgid "Separator" +msgstr "Розділювач" + +#: plugins/mailcheck/mailcheck.c:539 +msgid "Mail box:" +msgstr "Поштова скринька:" + +#: plugins/mailcheck/mailcheck.c:623 +msgid "Mail command:" +msgstr "Команда:" + +#: plugins/mailcheck/mailcheck.c:637 +msgid "Command to run when the button on the panel is clicked" +msgstr "Виконати команду при натиску кнопки на панелі" + +#: plugins/mailcheck/mailcheck.c:706 +msgid "Interval (sec):" +msgstr "Інтервал (сек):" + +#: plugins/mailcheck/mailcheck.c:778 +msgid "Mail check" +msgstr "Перевірка почти" diff --git a/po/vi.gmo b/po/vi.gmo Binary files differnew file mode 100644 index 00000000..500fb005 --- /dev/null +++ b/po/vi.gmo diff --git a/po/vi.po b/po/vi.po new file mode 100644 index 00000000..a1436d83 --- /dev/null +++ b/po/vi.po @@ -0,0 +1,539 @@ +# xfce4-panel for XFCE +# Copyright (C) 2003 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the xfce4-panel package. +# Lâm Vĩnh Niên <nienvl@yahoo.ca>, 2003. +# +msgid "" +msgstr "" +"Project-Id-Version: xfwm4 1.0.0\n" +"POT-Creation-Date: 2003-11-05 17:25+0100\n" +"PO-Revision-Date: 2003-10-24 23:55+9\n" +"Last-Translator: Lâm Vĩnh Niên <nienvl@yahoo.ca>\n" +"Language-Team: none <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: panel/xfce_support.c:597 +msgid "Select file" +msgstr "Chọn tập tin" + +#: panel/controls_dialog.c:254 +msgid "Change item" +msgstr "Chuyển mục" + +#: panel/controls_dialog.c:286 panel/item_dialog.c:647 +msgid "Position:" +msgstr "Vị trí:" + +#: panel/controls_dialog.c:342 panel/controls.c:272 +msgid "" +"Removing an item will also remove its popup menu.\n" +"\n" +"Do you want to remove the item?" +msgstr "" +"Dỡ bỏ một mục cũng sẽ dỡ bỏ trình đơn tắt của nó.\n" +"\n" +"Bạn có muốn dỡ bỏ chúng?" + +#: panel/item_dialog.c:320 +msgid "Other Icon" +msgstr "Biểu tượng khác" + +#: panel/item_dialog.c:345 +msgid "Select icon" +msgstr "Chọn biểu tượng" + +#: panel/item_dialog.c:384 +msgid "Icon:" +msgstr "Biẻu tượng:" + +#: panel/item_dialog.c:433 +msgid "Select command" +msgstr "Chọn lệnh" + +#: panel/item_dialog.c:461 +msgid "Command:" +msgstr "Lệnh:" + +#: panel/item_dialog.c:498 plugins/mailcheck/mailcheck.c:668 +msgid "Run in _terminal" +msgstr "Chạy trong _trạm cuối" + +#: panel/item_dialog.c:503 plugins/mailcheck/mailcheck.c:676 +msgid "Use startup _notification" +msgstr "Hiển thị thông _báo lúc khởi động" + +#: panel/item_dialog.c:530 +msgid "Caption:" +msgstr "Tên:" + +#: panel/item_dialog.c:563 +msgid "Tooltip:" +msgstr "Chú thích:" + +#: panel/item_dialog.c:599 +msgid "Menu:" +msgstr "Trình đơn:" + +#: panel/item_dialog.c:606 +msgid "Attach menu to launcher" +msgstr "Gắn trình đơn vào trình gọi" + +#: panel/item_dialog.c:738 +msgid "Icon Preview" +msgstr "Xem trước biểu tượng" + +#: panel/item_dialog.c:742 +msgid "Drag file onto this frame to change the icon" +msgstr "Kéo tập tin vào khung này để thay đổi biểu tượng" + +#: panel/item_dialog.c:930 +msgid "Change menu item" +msgstr "Chuyển mục trình đơn" + +#. add buttons +#: panel/item_dialog.c:933 +msgid "Remove" +msgstr "Dỡ bỏ" + +#: panel/item.c:441 +msgid "Click mouse button 3 to change item" +msgstr "Bấm nút chuột thứ ba để đổi mục" + +#: panel/item.c:464 +msgid "Add launcher" +msgstr "Thêm trình gọi" + +#: panel/item.c:469 +msgid "Add new item" +msgstr "Thêm mục mới" + +#: panel/item.c:601 +msgid "Launcher" +msgstr "Trình gọi" + +#: panel/main.c:115 +msgid "Are you sure you want to exit?" +msgstr "Xác nhận thoát?" + +#: panel/main.c:243 +#, c-format +msgid "" +"%s, version %s\n" +"Part of the XFce Desktop Environment\n" +"http://www.xfce.org\n" +msgstr "" +"%s, phiên bản %s\n" +"Bộ phận của Môi trường desktop XFce\n" +"http://www.xfce.org\n" + +#: panel/main.c:259 +msgid "" +"Your window manager does not seem to support the new window manager hints as " +"defined on http://www.freedesktop.org. \n" +"Some XFce features may not work as intended." +msgstr "" +"Trình quản lí cửa sổ của bạn dường như không hỗ trợ các gợi ý cho trình quản " +"lí cửa sổ như đã được định nghĩa ở http://www.freedesktop.org. \n" +"Một số tính năng XFce có thể không làm việc." + +#: panel/controls.c:320 panel/panel.c:123 +msgid "/Add _new item" +msgstr "/Thêm mục _mới" + +#: panel/controls.c:322 panel/panel.c:125 +msgid "/_Properties..." +msgstr "/_Thuộc tính..." + +#: panel/controls.c:323 +msgid "/_Remove" +msgstr "/_Dỡ bỏ" + +#: panel/controls.c:655 +msgid "This item has no configuration options" +msgstr "Mục này không có tuỳ chọn cấu hình" + +#: panel/panel.c:121 +msgid "/XFce Panel" +msgstr "/Panel XFce" + +#: panel/panel.c:126 +msgid "/_Settings manager" +msgstr "/Trình _quản lí các thiết lập" + +#: panel/panel.c:128 +msgid "/_About XFce" +msgstr "/_Về XFce" + +#: panel/panel.c:129 +msgid "/_Help" +msgstr "/Trợ _giúp" + +#: panel/panel.c:131 +msgid "/_Lock screen" +msgstr "/_Khoá màn hình" + +#: panel/panel.c:132 +msgid "/E_xit" +msgstr "/Th_oát" + +#: panel/panel.c:489 settings/xfce_settings_plugin.c:82 +#: settings/xfce_settings_dialog.c:649 +msgid "XFce Panel" +msgstr "Panel XFce" + +#: panel/icons.c:73 +msgid "Default" +msgstr "Mặc định" + +#: panel/icons.c:74 +msgid "Editor" +msgstr "Biên tập" + +#: panel/icons.c:75 +msgid "File management" +msgstr "Quản lí tập tin" + +#: panel/icons.c:76 +msgid "Utilities" +msgstr "Tiện ích" + +#: panel/icons.c:77 +msgid "Games" +msgstr "Trò chơi" + +#: panel/icons.c:78 +msgid "Help browser" +msgstr "Duyệt trợ giúp" + +#: panel/icons.c:79 +msgid "Multimedia" +msgstr "Đa phương tiện" + +#: panel/icons.c:80 +msgid "Network" +msgstr "Mạng" + +#: panel/icons.c:81 +msgid "Graphics" +msgstr "Hình ảnh" + +#: panel/icons.c:82 +msgid "Printer" +msgstr "Máy in" + +#: panel/icons.c:83 +msgid "Productivity" +msgstr "Năng suất" + +#: panel/icons.c:84 +msgid "Sound" +msgstr "Âm thanh" + +#: panel/icons.c:85 +msgid "Terminal" +msgstr "Trạm cuối" + +#: panel/mcs_client.c:208 +msgid "Settings manager not available" +msgstr "Trình quản lí các thiết lập không có sẵn" + +#: panel/popup.c:263 +msgid "Menu" +msgstr "Trình đơn" + +#: settings/xfce_settings_dialog.c:119 +msgid "Tiny" +msgstr "Tí hon" + +#: settings/xfce_settings_dialog.c:123 +msgid "Small" +msgstr "Nhỏ" + +#: settings/xfce_settings_dialog.c:127 +msgid "Medium" +msgstr "Trung bình" + +#: settings/xfce_settings_dialog.c:131 +msgid "Large" +msgstr "To" + +#: settings/xfce_settings_dialog.c:190 +msgid "Horizontal" +msgstr "Ngang" + +#: settings/xfce_settings_dialog.c:194 +msgid "Vertical" +msgstr "Thẳng đứng" + +#: settings/xfce_settings_dialog.c:226 settings/xfce_settings_dialog.c:456 +msgid "Left" +msgstr "Trái" + +#: settings/xfce_settings_dialog.c:230 settings/xfce_settings_dialog.c:457 +msgid "Right" +msgstr "Phải" + +#: settings/xfce_settings_dialog.c:234 settings/xfce_settings_dialog.c:455 +#: settings/xfce_settings_dialog.c:511 +msgid "Top" +msgstr "Đỉnh" + +#: settings/xfce_settings_dialog.c:238 settings/xfce_settings_dialog.c:454 +#: settings/xfce_settings_dialog.c:519 +msgid "Bottom" +msgstr "Đáy" + +#: settings/xfce_settings_dialog.c:374 +msgid "Panel size:" +msgstr "Kích thước panel:" + +#: settings/xfce_settings_dialog.c:390 +msgid "Panel orientation:" +msgstr "Hướng panel:" + +#: settings/xfce_settings_dialog.c:407 +msgid "Popup position:" +msgstr "Vị trí trình đơn tắt:" + +#: settings/xfce_settings_dialog.c:424 +msgid "Icon theme:" +msgstr "Chủ đề biểu tượng:" + +#: settings/xfce_settings_dialog.c:495 +msgid "Panel layer:" +msgstr "Lớp panel:" + +#: settings/xfce_settings_dialog.c:515 +msgid "Normal" +msgstr "Bình thường" + +#: settings/xfce_settings_dialog.c:535 +msgid "Center the panel:" +msgstr "Đặt panel ở chính giữa:" + +#: settings/xfce_settings_dialog.c:559 +msgid "Set" +msgstr "Thiết lập" + +#: settings/xfce_settings_dialog.c:595 +msgid "Autohide:" +msgstr "Tự động ẩn:" + +#: settings/xfce_settings_dialog.c:663 +msgid "XFce Panel Settings" +msgstr "Các thiết lập panel XFce" + +#. Appearance +#: settings/xfce_settings_dialog.c:675 +msgid "Appearance" +msgstr "Dáng vẻ" + +#. Position +#: settings/xfce_settings_dialog.c:696 +msgid "Position" +msgstr "Vị trí" + +#. autohide +#: settings/xfce_settings_dialog.c:712 +msgid "Behaviour" +msgstr "Thái độ" + +#: plugins/clock/clock.c:57 +msgid "Sunday" +msgstr "Chủ Nhật" + +#: plugins/clock/clock.c:58 +msgid "Monday" +msgstr "Thứ Hai" + +#: plugins/clock/clock.c:59 +msgid "Tuesday" +msgstr "Thứ Ba" + +#: plugins/clock/clock.c:60 +msgid "Wednesday" +msgstr "Thứ Tư" + +#: plugins/clock/clock.c:61 +msgid "Thursday" +msgstr "Thứ Năm" + +#: plugins/clock/clock.c:62 +msgid "Friday" +msgstr "Thứ Sáu" + +#: plugins/clock/clock.c:63 +msgid "Saturday" +msgstr "Thứ Bảy" + +#: plugins/clock/clock.c:67 +msgid "January" +msgstr "Tháng Giêng" + +#: plugins/clock/clock.c:68 +msgid "February" +msgstr "Tháng Hai" + +#: plugins/clock/clock.c:69 +msgid "March" +msgstr "Tháng Ba" + +#: plugins/clock/clock.c:70 +msgid "April" +msgstr "Tháng Tư" + +#: plugins/clock/clock.c:71 +msgid "May" +msgstr "Tháng Năm" + +#: plugins/clock/clock.c:72 +msgid "June" +msgstr "Tháng Sáu" + +#: plugins/clock/clock.c:73 +msgid "July" +msgstr "Tháng Bảy" + +#: plugins/clock/clock.c:74 +msgid "August" +msgstr "Tháng Tám" + +#: plugins/clock/clock.c:75 +msgid "September" +msgstr "Tháng Chín" + +#: plugins/clock/clock.c:76 +msgid "October" +msgstr "Tháng Mười" + +#: plugins/clock/clock.c:77 +msgid "November" +msgstr "Tháng Mười Một" + +#: plugins/clock/clock.c:78 +msgid "December" +msgstr "Tháng Chạp" + +#: plugins/clock/clock.c:350 +msgid "Clock type:" +msgstr "Kiểu đồng hồ:" + +#: plugins/clock/clock.c:363 +msgid "Analog" +msgstr "Tương tự" + +#: plugins/clock/clock.c:367 +msgid "Digital" +msgstr "Số" + +#: plugins/clock/clock.c:371 +msgid "LED" +msgstr "LED" + +#: plugins/clock/clock.c:433 +msgid "Hour mode:" +msgstr "Chế độ giờ:" + +#: plugins/clock/clock.c:440 +msgid "24 hour" +msgstr "24 giờ" + +#: plugins/clock/clock.c:446 +msgid "12 hour" +msgstr "12 giờ" + +#: plugins/clock/clock.c:452 +msgid "AM/PM" +msgstr "AM/PM" + +#: plugins/clock/clock.c:490 +msgid "Show seconds:" +msgstr "Hiển thị giây:" + +#: plugins/clock/clock.c:599 +msgid "Xfce Clock" +msgstr "Đồng hồ Xfce" + +#: plugins/pager/pager.c:271 +msgid "Graphical pager" +msgstr "Trình chuyển trang đồ hoạ" + +#: plugins/switcher/switcher.c:696 +msgid "Desktop switcher" +msgstr "Trình chuyển desktop" + +#: plugins/systembuttons/systembuttons.c:60 +msgid "" +"Access to the configuration system has been disabled.\n" +"\n" +"Ask your system administrator for more information" +msgstr "" +"Truy nhập hệ thống cấu hình đã bị bất hoạt.\n" +"\n" +"Hỏi nhà quản trị hệ thống để có thêm thông tin" + +#: plugins/systembuttons/systembuttons.c:148 +msgid "Lock the screen" +msgstr "Khoá màn hình" + +#: plugins/systembuttons/systembuttons.c:149 +#: plugins/systembuttons/systembuttons.c:518 +msgid "Exit" +msgstr "Thoát" + +#: plugins/systembuttons/systembuttons.c:150 +#: plugins/systembuttons/systembuttons.c:519 +msgid "Setup" +msgstr "Thiết lập" + +#: plugins/systembuttons/systembuttons.c:151 +#: plugins/systembuttons/systembuttons.c:520 +msgid "Info" +msgstr "Thông tin" + +#: plugins/systembuttons/systembuttons.c:500 +msgid "Show two buttons:" +msgstr "Hiển thị hai nút:" + +#. set names to use in option menus +#: plugins/systembuttons/systembuttons.c:517 +msgid "Lock" +msgstr "Khoá" + +#: plugins/systembuttons/systembuttons.c:549 +msgid "Button 1:" +msgstr "Nút 1:" + +#: plugins/systembuttons/systembuttons.c:565 +msgid "Button 2:" +msgstr "Nút 2:" + +#: plugins/systembuttons/systembuttons.c:600 +msgid "System buttons" +msgstr "Các nút hệ thống" + +#: plugins/separator/separator.c:153 +msgid "Separator" +msgstr "Dấu cách" + +#: plugins/mailcheck/mailcheck.c:539 +msgid "Mail box:" +msgstr "Hộp thư:" + +#: plugins/mailcheck/mailcheck.c:623 +msgid "Mail command:" +msgstr "Lệnh kiểm thư:" + +#: plugins/mailcheck/mailcheck.c:637 +msgid "Command to run when the button on the panel is clicked" +msgstr "Lệnh thi hành khi bấm chuột vào nút trên panel:" + +#: plugins/mailcheck/mailcheck.c:706 +msgid "Interval (sec):" +msgstr "Thời khoảng (giây):" + +#: plugins/mailcheck/mailcheck.c:778 +msgid "Mail check" +msgstr "Kiểm thư" diff --git a/po/xfce4-panel.pot b/po/xfce4-panel.pot index 3b6631ad..1cf2e191 100644 --- a/po/xfce4-panel.pot +++ b/po/xfce4-panel.pot @@ -7,7 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2003-09-10 08:40+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-02-27 08:14+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -27,7 +28,7 @@ msgstr "" msgid "Position:" msgstr "" -#: panel/controls_dialog.c:331 panel/controls.c:272 +#: panel/controls_dialog.c:342 panel/controls.c:272 msgid "" "Removing an item will also remove its popup menu.\n" "\n" @@ -86,12 +87,12 @@ msgstr "" msgid "Drag file onto this frame to change the icon" msgstr "" -#: panel/item_dialog.c:931 +#: panel/item_dialog.c:930 msgid "Change menu item" msgstr "" #. add buttons -#: panel/item_dialog.c:934 +#: panel/item_dialog.c:933 msgid "Remove" msgstr "" @@ -111,11 +112,11 @@ msgstr "" msgid "Launcher" msgstr "" -#: panel/main.c:132 +#: panel/main.c:115 msgid "Are you sure you want to exit?" msgstr "" -#: panel/main.c:268 +#: panel/main.c:243 #, c-format msgid "" "%s, version %s\n" @@ -123,18 +124,18 @@ msgid "" "http://www.xfce.org\n" msgstr "" -#: panel/main.c:284 +#: panel/main.c:259 msgid "" "Your window manager does not seem to support the new window manager hints as " "defined on http://www.freedesktop.org. \n" "Some XFce features may not work as intended." msgstr "" -#: panel/controls.c:320 panel/panel.c:123 +#: panel/controls.c:320 panel/panel.c:399 msgid "/Add _new item" msgstr "" -#: panel/controls.c:322 panel/panel.c:125 +#: panel/controls.c:322 panel/panel.c:401 msgid "/_Properties..." msgstr "" @@ -146,31 +147,31 @@ msgstr "" msgid "This item has no configuration options" msgstr "" -#: panel/panel.c:121 +#: panel/panel.c:397 msgid "/XFce Panel" msgstr "" -#: panel/panel.c:126 +#: panel/panel.c:402 msgid "/_Settings manager" msgstr "" -#: panel/panel.c:128 +#: panel/panel.c:404 msgid "/_About XFce" msgstr "" -#: panel/panel.c:129 +#: panel/panel.c:405 msgid "/_Help" msgstr "" -#: panel/panel.c:131 +#: panel/panel.c:407 msgid "/_Lock screen" msgstr "" -#: panel/panel.c:132 +#: panel/panel.c:408 msgid "/E_xit" msgstr "" -#: panel/panel.c:489 settings/xfce_settings_plugin.c:82 +#: panel/panel.c:795 settings/xfce_settings_plugin.c:82 #: settings/xfce_settings_dialog.c:649 msgid "XFce Panel" msgstr "" @@ -231,7 +232,7 @@ msgstr "" msgid "Settings manager not available" msgstr "" -#: panel/popup.c:263 +#: panel/popup.c:269 msgid "Menu" msgstr "" @@ -448,7 +449,7 @@ msgstr "" msgid "Xfce Clock" msgstr "" -#: plugins/pager/pager.c:277 +#: plugins/pager/pager.c:271 msgid "Graphical pager" msgstr "" diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo Binary files differindex 93c55c53..911f7681 100644 --- a/po/zh_CN.gmo +++ b/po/zh_CN.gmo diff --git a/po/zh_CN.po b/po/zh_CN.po index ef546565..37a07e01 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2003-09-10 08:40+0200\n" -"PO-Revision-Date: 2003-07-08 20:52+0100\n" +"POT-Creation-Date: 2003-12-04 09:37+0100\n" +"PO-Revision-Date: 2004-01-19 20:52+0100\n" "Last-Translator: Yongtao Yang <yongtao.yang@telia.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -23,11 +23,11 @@ msgstr "选择文件" msgid "Change item" msgstr "改变条目" -#: panel/controls_dialog.c:286 panel/item_dialog.c:647 +#: panel/controls_dialog.c:286 panel/item_dialog.c:681 msgid "Position:" msgstr "位置" -#: panel/controls_dialog.c:331 panel/controls.c:272 +#: panel/controls_dialog.c:342 panel/controls.c:272 msgid "" "Removing an item will also remove its popup menu.\n" "\n" @@ -37,64 +37,64 @@ msgstr "" "\n" "你希望删除该条目吗?" -#: panel/item_dialog.c:320 +#: panel/item_dialog.c:321 msgid "Other Icon" msgstr "其它图标" -#: panel/item_dialog.c:345 +#: panel/item_dialog.c:346 msgid "Select icon" msgstr "选择图标" -#: panel/item_dialog.c:384 +#: panel/item_dialog.c:396 msgid "Icon:" msgstr "图标:" -#: panel/item_dialog.c:433 +#: panel/item_dialog.c:467 msgid "Select command" msgstr "选择命令" -#: panel/item_dialog.c:461 +#: panel/item_dialog.c:495 msgid "Command:" msgstr "命令:" -#: panel/item_dialog.c:498 plugins/mailcheck/mailcheck.c:668 +#: panel/item_dialog.c:532 plugins/mailcheck/mailcheck.c:668 msgid "Run in _terminal" msgstr "在终端中运行(_T)" -#: panel/item_dialog.c:503 plugins/mailcheck/mailcheck.c:676 +#: panel/item_dialog.c:537 plugins/mailcheck/mailcheck.c:676 msgid "Use startup _notification" msgstr "使用启动提示(_N)" -#: panel/item_dialog.c:530 +#: panel/item_dialog.c:564 msgid "Caption:" msgstr "标题:" -#: panel/item_dialog.c:563 +#: panel/item_dialog.c:597 msgid "Tooltip:" msgstr "工具提示:" -#: panel/item_dialog.c:599 +#: panel/item_dialog.c:633 msgid "Menu:" msgstr "菜单:" -#: panel/item_dialog.c:606 +#: panel/item_dialog.c:640 msgid "Attach menu to launcher" msgstr "将菜单附加到启动器" -#: panel/item_dialog.c:738 +#: panel/item_dialog.c:773 msgid "Icon Preview" msgstr "图标预览" -#: panel/item_dialog.c:742 +#: panel/item_dialog.c:777 msgid "Drag file onto this frame to change the icon" msgstr "拖拽文件到该框架中以改变图标" -#: panel/item_dialog.c:931 +#: panel/item_dialog.c:965 msgid "Change menu item" msgstr "改变菜单条目" #. add buttons -#: panel/item_dialog.c:934 +#: panel/item_dialog.c:968 msgid "Remove" msgstr "删除" @@ -114,11 +114,11 @@ msgstr "添加新条目" msgid "Launcher" msgstr "启动器" -#: panel/main.c:132 +#: panel/main.c:117 msgid "Are you sure you want to exit?" msgstr "你确定要退出吗?" -#: panel/main.c:268 +#: panel/main.c:329 #, c-format msgid "" "%s, version %s\n" @@ -129,7 +129,7 @@ msgstr "" "XFce桌面环境的组成部分\n" "http://www.xfce.org\n" -#: panel/main.c:284 +#: panel/main.c:361 msgid "" "Your window manager does not seem to support the new window manager hints as " "defined on http://www.freedesktop.org. \n" @@ -139,11 +139,11 @@ msgstr "" "示 \n" "某些XFce的功能可能无法正常运行。" -#: panel/controls.c:320 panel/panel.c:123 +#: panel/controls.c:320 panel/panel.c:412 msgid "/Add _new item" msgstr "/添加新条目(_N)" -#: panel/controls.c:322 panel/panel.c:125 +#: panel/controls.c:322 panel/panel.c:414 msgid "/_Properties..." msgstr "/属性(_P)..." @@ -155,31 +155,35 @@ msgstr "/删除(_R)" msgid "This item has no configuration options" msgstr "该条目没有配置选项" -#: panel/panel.c:121 +#: panel/panel.c:410 msgid "/XFce Panel" msgstr "/XFce启动面板" -#: panel/panel.c:126 -msgid "/_Settings manager" -msgstr "/配置管理器(_S)" - -#: panel/panel.c:128 +#: panel/panel.c:415 msgid "/_About XFce" msgstr "/关于XFce(_A)" -#: panel/panel.c:129 +#: panel/panel.c:416 msgid "/_Help" msgstr "/帮助(_H)" -#: panel/panel.c:131 +#: panel/panel.c:419 +msgid "/_Settings manager" +msgstr "/配置管理器(_S)" + +#: panel/panel.c:422 msgid "/_Lock screen" msgstr "/锁住屏幕(_L)" -#: panel/panel.c:132 +#: panel/panel.c:423 +msgid "/_Restart" +msgstr "恢复(_R)" + +#: panel/panel.c:425 msgid "/E_xit" msgstr "/退出(_X)" -#: panel/panel.c:489 settings/xfce_settings_plugin.c:82 +#: panel/panel.c:812 settings/xfce_settings_plugin.c:82 #: settings/xfce_settings_dialog.c:649 msgid "XFce Panel" msgstr "XFce面板" @@ -240,7 +244,7 @@ msgstr "终端" msgid "Settings manager not available" msgstr "配置管理器不可用" -#: panel/popup.c:263 +#: panel/popup.c:261 msgid "Menu" msgstr "菜单" @@ -341,123 +345,59 @@ msgstr "位置" msgid "Behaviour" msgstr "行为" -#: plugins/clock/clock.c:57 -msgid "Sunday" -msgstr "星期天" - -#: plugins/clock/clock.c:58 -msgid "Monday" -msgstr "星期一" - -#: plugins/clock/clock.c:59 -msgid "Tuesday" -msgstr "星期二" - -#: plugins/clock/clock.c:60 -msgid "Wednesday" -msgstr "星期三" - -#: plugins/clock/clock.c:61 -msgid "Thursday" -msgstr "星期四" - -#: plugins/clock/clock.c:62 -msgid "Friday" -msgstr "星期五" - -#: plugins/clock/clock.c:63 -msgid "Saturday" -msgstr "星期六" - -#: plugins/clock/clock.c:67 -msgid "January" -msgstr "一月" - -#: plugins/clock/clock.c:68 -msgid "February" -msgstr "二月" - -#: plugins/clock/clock.c:69 -msgid "March" -msgstr "三月" - -#: plugins/clock/clock.c:70 -msgid "April" -msgstr "四月" - -#: plugins/clock/clock.c:71 -msgid "May" -msgstr "五月" - -#: plugins/clock/clock.c:72 -msgid "June" -msgstr "六月" - -#: plugins/clock/clock.c:73 -msgid "July" -msgstr "七月" - -#: plugins/clock/clock.c:74 -msgid "August" -msgstr "八月" - -#: plugins/clock/clock.c:75 -msgid "September" -msgstr "Wrzesień" - -#: plugins/clock/clock.c:76 -msgid "October" -msgstr "十月" - -#: plugins/clock/clock.c:77 -msgid "November" -msgstr "十一月" - -#: plugins/clock/clock.c:78 -msgid "December" -msgstr "十二月" +#. Use format characters from strftime(3) +#. * to get the proper string for your locale. +#. * I used these: +#. * %A : full weekday name +#. * %-d : day of the month, without prefixed 0 +#. * %B : full month name +#. * %Y : four digit year +#. +#: plugins/clock/clock.c:119 +msgid "%A, %-d %B %Y" +msgstr "" -#: plugins/clock/clock.c:350 +#: plugins/clock/clock.c:336 msgid "Clock type:" msgstr "钟表类型:" -#: plugins/clock/clock.c:363 +#: plugins/clock/clock.c:349 msgid "Analog" msgstr "模拟式" -#: plugins/clock/clock.c:367 +#: plugins/clock/clock.c:353 msgid "Digital" msgstr "数字式" -#: plugins/clock/clock.c:371 +#: plugins/clock/clock.c:357 msgid "LED" msgstr "数字液晶显示" -#: plugins/clock/clock.c:433 +#: plugins/clock/clock.c:419 msgid "Hour mode:" msgstr "Tryb godzin" -#: plugins/clock/clock.c:440 +#: plugins/clock/clock.c:426 msgid "24 hour" msgstr "24小时" -#: plugins/clock/clock.c:446 +#: plugins/clock/clock.c:432 msgid "12 hour" msgstr "12小时" -#: plugins/clock/clock.c:452 +#: plugins/clock/clock.c:438 msgid "AM/PM" msgstr "AM/PM" -#: plugins/clock/clock.c:490 +#: plugins/clock/clock.c:476 msgid "Show seconds:" msgstr "显示秒:" -#: plugins/clock/clock.c:599 +#: plugins/clock/clock.c:585 msgid "Xfce Clock" msgstr "XFce时钟" -#: plugins/pager/pager.c:277 +#: plugins/pager/pager.c:271 #, fuzzy msgid "Graphical pager" msgstr "图形化的窗口切换器" @@ -540,8 +480,62 @@ msgstr "间隔(秒):" msgid "Mail check" msgstr "检查邮件" -#~ msgid "_Revert" -#~ msgstr "恢复(_R)" +#~ msgid "Sunday" +#~ msgstr "星期天" + +#~ msgid "Monday" +#~ msgstr "星期一" + +#~ msgid "Tuesday" +#~ msgstr "星期二" + +#~ msgid "Wednesday" +#~ msgstr "星期三" + +#~ msgid "Thursday" +#~ msgstr "星期四" + +#~ msgid "Friday" +#~ msgstr "星期五" + +#~ msgid "Saturday" +#~ msgstr "星期六" + +#~ msgid "January" +#~ msgstr "一月" + +#~ msgid "February" +#~ msgstr "二月" + +#~ msgid "March" +#~ msgstr "三月" + +#~ msgid "April" +#~ msgstr "四月" + +#~ msgid "May" +#~ msgstr "五月" + +#~ msgid "June" +#~ msgstr "六月" + +#~ msgid "July" +#~ msgstr "七月" + +#~ msgid "August" +#~ msgstr "八月" + +#~ msgid "September" +#~ msgstr "Wrzesień" + +#~ msgid "October" +#~ msgstr "十月" + +#~ msgid "November" +#~ msgstr "十一月" + +#~ msgid "December" +#~ msgstr "十二月" #~ msgid "_Done" #~ msgstr "完成(_D)" diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo Binary files differindex 1cf57543..552a066a 100644 --- a/po/zh_TW.gmo +++ b/po/zh_TW.gmo diff --git a/po/zh_TW.po b/po/zh_TW.po index ebfcf233..49b59934 100755 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-panel\n" -"POT-Creation-Date: 2003-09-10 08:40+0200\n" +"POT-Creation-Date: 2003-11-05 17:25+0100\n" "PO-Revision-Date: 2003-08-29 21:17+0800\n" "Last-Translator: umm <umm@pchome.com.tw>\n" "Language-Team: <>\n" @@ -25,7 +25,7 @@ msgstr "改變項目" msgid "Position:" msgstr "位置：" -#: panel/controls_dialog.c:331 panel/controls.c:272 +#: panel/controls_dialog.c:342 panel/controls.c:272 msgid "" "Removing an item will also remove its popup menu.\n" "\n" @@ -87,12 +87,12 @@ msgstr "圖示預覽" msgid "Drag file onto this frame to change the icon" msgstr "拖曳檔案到框架中以改變圖示" -#: panel/item_dialog.c:931 +#: panel/item_dialog.c:930 msgid "Change menu item" msgstr "改變選單項目" #. add buttons -#: panel/item_dialog.c:934 +#: panel/item_dialog.c:933 msgid "Remove" msgstr "移除" @@ -112,11 +112,11 @@ msgstr "增加新項目" msgid "Launcher" msgstr "啟動器" -#: panel/main.c:132 +#: panel/main.c:115 msgid "Are you sure you want to exit?" msgstr "你確定要退出？" -#: panel/main.c:268 +#: panel/main.c:243 #, c-format msgid "" "%s, version %s\n" @@ -127,7 +127,7 @@ msgstr "" "XFce 桌面環境的組成部分\n" "http://www.xfce.org\n" -#: panel/main.c:284 +#: panel/main.c:259 msgid "" "Your window manager does not seem to support the new window manager hints as " "defined on http://www.freedesktop.org. \n" @@ -455,7 +455,7 @@ msgstr "顯示秒：" msgid "Xfce Clock" msgstr "XFce 時鐘" -#: plugins/pager/pager.c:277 +#: plugins/pager/pager.c:271 msgid "Graphical pager" msgstr "圖形化視窗切換器" diff --git a/settings/Makefile.in b/settings/Makefile.in index d1c3be81..57c5dd36 100644 --- a/settings/Makefile.in +++ b/settings/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.5 from Makefile.am. +# Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,6 +14,8 @@ @SET_MAKE@ +SOURCES = $(libxfce4settings_la_SOURCES) + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -21,7 +23,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -36,6 +37,43 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ +subdir = settings +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/X11.m4 \ + $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/depends.m4 \ + $(top_srcdir)/m4/i18n.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +am__installdirs = $(DESTDIR)$(plugindir) +pluginLTLIBRARIES_INSTALL = $(INSTALL) +LTLIBRARIES = $(plugin_LTLIBRARIES) +libxfce4settings_la_DEPENDENCIES = +am_libxfce4settings_la_OBJECTS = \ + libxfce4settings_la-xfce_settings_dialog.lo \ + libxfce4settings_la-xfce_settings_plugin.lo +libxfce4settings_la_OBJECTS = $(am_libxfce4settings_la_OBJECTS) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libxfce4settings_la-xfce_settings_dialog.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/libxfce4settings_la-xfce_settings_plugin.Plo +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(libxfce4settings_la_SOURCES) +DIST_SOURCES = $(libxfce4settings_la_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ @@ -166,6 +204,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -174,14 +213,11 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ plugindir = @XFCE_MCS_MANAGER_PLUGINSDIR@ - plugin_LTLIBRARIES = libxfce4settings.la - libxfce4settings_la_LDFLAGS = \ -avoid-version \ -module - libxfce4settings_la_SOURCES = \ xfce_settings.h \ xfce_settings_dialog.c \ @@ -189,7 +225,6 @@ libxfce4settings_la_SOURCES = \ xfce_settings_plugin.c \ xfce_settings_plugin.h - libxfce4settings_la_CFLAGS = \ -I$(top_srcdir) \ @LIBXFCEGUI4_CFLAGS@ \ @@ -199,54 +234,46 @@ libxfce4settings_la_CFLAGS = \ -DDATADIR=\"$(datadir)/xfce4\" \ -DLOCALEDIR=\"$(localedir)\" - libxfce4settings_la_LIBADD = \ @LIBXML_LIBS@ \ @XFCE_MCS_MANAGER_LIBS@ -subdir = settings -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -LTLIBRARIES = $(plugin_LTLIBRARIES) - -libxfce4settings_la_DEPENDENCIES = -am_libxfce4settings_la_OBJECTS = \ - libxfce4settings_la-xfce_settings_dialog.lo \ - libxfce4settings_la-xfce_settings_plugin.lo -libxfce4settings_la_OBJECTS = $(am_libxfce4settings_la_OBJECTS) - -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = \ -@AMDEP_TRUE@ ./$(DEPDIR)/libxfce4settings_la-xfce_settings_dialog.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/libxfce4settings_la-xfce_settings_plugin.Plo -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(libxfce4settings_la_SOURCES) -DIST_COMMON = Makefile.am Makefile.in -SOURCES = $(libxfce4settings_la_SOURCES) - all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign settings/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --foreign settings/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -pluginLTLIBRARIES_INSTALL = $(INSTALL) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(plugindir) + $(mkdir_p) $(DESTDIR)$(plugindir) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f="`echo $$p | sed -e 's|^.*/||'`"; \ @@ -275,7 +302,7 @@ libxfce4settings.la: $(libxfce4settings_la_OBJECTS) $(libxfce4settings_la_DEPEND $(LINK) -rpath $(plugindir) $(libxfce4settings_la_LDFLAGS) $(libxfce4settings_la_OBJECTS) $(libxfce4settings_la_LIBADD) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core + -rm -f *.$(OBJEXT) distclean-compile: -rm -f *.tab.c @@ -283,103 +310,73 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4settings_la-xfce_settings_dialog.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4settings_la-xfce_settings_plugin.Plo@am__quote@ -distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< libxfce4settings_la-xfce_settings_dialog.o: xfce_settings_dialog.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4settings_la_CFLAGS) $(CFLAGS) -MT libxfce4settings_la-xfce_settings_dialog.o -MD -MP -MF "$(DEPDIR)/libxfce4settings_la-xfce_settings_dialog.Tpo" \ -@am__fastdepCC_TRUE@ -c -o libxfce4settings_la-xfce_settings_dialog.o `test -f 'xfce_settings_dialog.c' || echo '$(srcdir)/'`xfce_settings_dialog.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libxfce4settings_la-xfce_settings_dialog.Tpo" "$(DEPDIR)/libxfce4settings_la-xfce_settings_dialog.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libxfce4settings_la-xfce_settings_dialog.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4settings_la_CFLAGS) $(CFLAGS) -MT libxfce4settings_la-xfce_settings_dialog.o -MD -MP -MF "$(DEPDIR)/libxfce4settings_la-xfce_settings_dialog.Tpo" -c -o libxfce4settings_la-xfce_settings_dialog.o `test -f 'xfce_settings_dialog.c' || echo '$(srcdir)/'`xfce_settings_dialog.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libxfce4settings_la-xfce_settings_dialog.Tpo" "$(DEPDIR)/libxfce4settings_la-xfce_settings_dialog.Po"; else rm -f "$(DEPDIR)/libxfce4settings_la-xfce_settings_dialog.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce_settings_dialog.c' object='libxfce4settings_la-xfce_settings_dialog.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libxfce4settings_la-xfce_settings_dialog.Po' tmpdepfile='$(DEPDIR)/libxfce4settings_la-xfce_settings_dialog.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4settings_la_CFLAGS) $(CFLAGS) -c -o libxfce4settings_la-xfce_settings_dialog.o `test -f 'xfce_settings_dialog.c' || echo '$(srcdir)/'`xfce_settings_dialog.c libxfce4settings_la-xfce_settings_dialog.obj: xfce_settings_dialog.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4settings_la_CFLAGS) $(CFLAGS) -MT libxfce4settings_la-xfce_settings_dialog.obj -MD -MP -MF "$(DEPDIR)/libxfce4settings_la-xfce_settings_dialog.Tpo" \ -@am__fastdepCC_TRUE@ -c -o libxfce4settings_la-xfce_settings_dialog.obj `if test -f 'xfce_settings_dialog.c'; then $(CYGPATH_W) 'xfce_settings_dialog.c'; else $(CYGPATH_W) '$(srcdir)/xfce_settings_dialog.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libxfce4settings_la-xfce_settings_dialog.Tpo" "$(DEPDIR)/libxfce4settings_la-xfce_settings_dialog.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libxfce4settings_la-xfce_settings_dialog.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4settings_la_CFLAGS) $(CFLAGS) -MT libxfce4settings_la-xfce_settings_dialog.obj -MD -MP -MF "$(DEPDIR)/libxfce4settings_la-xfce_settings_dialog.Tpo" -c -o libxfce4settings_la-xfce_settings_dialog.obj `if test -f 'xfce_settings_dialog.c'; then $(CYGPATH_W) 'xfce_settings_dialog.c'; else $(CYGPATH_W) '$(srcdir)/xfce_settings_dialog.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libxfce4settings_la-xfce_settings_dialog.Tpo" "$(DEPDIR)/libxfce4settings_la-xfce_settings_dialog.Po"; else rm -f "$(DEPDIR)/libxfce4settings_la-xfce_settings_dialog.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce_settings_dialog.c' object='libxfce4settings_la-xfce_settings_dialog.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libxfce4settings_la-xfce_settings_dialog.Po' tmpdepfile='$(DEPDIR)/libxfce4settings_la-xfce_settings_dialog.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4settings_la_CFLAGS) $(CFLAGS) -c -o libxfce4settings_la-xfce_settings_dialog.obj `if test -f 'xfce_settings_dialog.c'; then $(CYGPATH_W) 'xfce_settings_dialog.c'; else $(CYGPATH_W) '$(srcdir)/xfce_settings_dialog.c'; fi` libxfce4settings_la-xfce_settings_dialog.lo: xfce_settings_dialog.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4settings_la_CFLAGS) $(CFLAGS) -MT libxfce4settings_la-xfce_settings_dialog.lo -MD -MP -MF "$(DEPDIR)/libxfce4settings_la-xfce_settings_dialog.Tpo" \ -@am__fastdepCC_TRUE@ -c -o libxfce4settings_la-xfce_settings_dialog.lo `test -f 'xfce_settings_dialog.c' || echo '$(srcdir)/'`xfce_settings_dialog.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libxfce4settings_la-xfce_settings_dialog.Tpo" "$(DEPDIR)/libxfce4settings_la-xfce_settings_dialog.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libxfce4settings_la-xfce_settings_dialog.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4settings_la_CFLAGS) $(CFLAGS) -MT libxfce4settings_la-xfce_settings_dialog.lo -MD -MP -MF "$(DEPDIR)/libxfce4settings_la-xfce_settings_dialog.Tpo" -c -o libxfce4settings_la-xfce_settings_dialog.lo `test -f 'xfce_settings_dialog.c' || echo '$(srcdir)/'`xfce_settings_dialog.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libxfce4settings_la-xfce_settings_dialog.Tpo" "$(DEPDIR)/libxfce4settings_la-xfce_settings_dialog.Plo"; else rm -f "$(DEPDIR)/libxfce4settings_la-xfce_settings_dialog.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce_settings_dialog.c' object='libxfce4settings_la-xfce_settings_dialog.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libxfce4settings_la-xfce_settings_dialog.Plo' tmpdepfile='$(DEPDIR)/libxfce4settings_la-xfce_settings_dialog.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4settings_la_CFLAGS) $(CFLAGS) -c -o libxfce4settings_la-xfce_settings_dialog.lo `test -f 'xfce_settings_dialog.c' || echo '$(srcdir)/'`xfce_settings_dialog.c libxfce4settings_la-xfce_settings_plugin.o: xfce_settings_plugin.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4settings_la_CFLAGS) $(CFLAGS) -MT libxfce4settings_la-xfce_settings_plugin.o -MD -MP -MF "$(DEPDIR)/libxfce4settings_la-xfce_settings_plugin.Tpo" \ -@am__fastdepCC_TRUE@ -c -o libxfce4settings_la-xfce_settings_plugin.o `test -f 'xfce_settings_plugin.c' || echo '$(srcdir)/'`xfce_settings_plugin.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libxfce4settings_la-xfce_settings_plugin.Tpo" "$(DEPDIR)/libxfce4settings_la-xfce_settings_plugin.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libxfce4settings_la-xfce_settings_plugin.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4settings_la_CFLAGS) $(CFLAGS) -MT libxfce4settings_la-xfce_settings_plugin.o -MD -MP -MF "$(DEPDIR)/libxfce4settings_la-xfce_settings_plugin.Tpo" -c -o libxfce4settings_la-xfce_settings_plugin.o `test -f 'xfce_settings_plugin.c' || echo '$(srcdir)/'`xfce_settings_plugin.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libxfce4settings_la-xfce_settings_plugin.Tpo" "$(DEPDIR)/libxfce4settings_la-xfce_settings_plugin.Po"; else rm -f "$(DEPDIR)/libxfce4settings_la-xfce_settings_plugin.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce_settings_plugin.c' object='libxfce4settings_la-xfce_settings_plugin.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libxfce4settings_la-xfce_settings_plugin.Po' tmpdepfile='$(DEPDIR)/libxfce4settings_la-xfce_settings_plugin.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4settings_la_CFLAGS) $(CFLAGS) -c -o libxfce4settings_la-xfce_settings_plugin.o `test -f 'xfce_settings_plugin.c' || echo '$(srcdir)/'`xfce_settings_plugin.c libxfce4settings_la-xfce_settings_plugin.obj: xfce_settings_plugin.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4settings_la_CFLAGS) $(CFLAGS) -MT libxfce4settings_la-xfce_settings_plugin.obj -MD -MP -MF "$(DEPDIR)/libxfce4settings_la-xfce_settings_plugin.Tpo" \ -@am__fastdepCC_TRUE@ -c -o libxfce4settings_la-xfce_settings_plugin.obj `if test -f 'xfce_settings_plugin.c'; then $(CYGPATH_W) 'xfce_settings_plugin.c'; else $(CYGPATH_W) '$(srcdir)/xfce_settings_plugin.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libxfce4settings_la-xfce_settings_plugin.Tpo" "$(DEPDIR)/libxfce4settings_la-xfce_settings_plugin.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libxfce4settings_la-xfce_settings_plugin.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4settings_la_CFLAGS) $(CFLAGS) -MT libxfce4settings_la-xfce_settings_plugin.obj -MD -MP -MF "$(DEPDIR)/libxfce4settings_la-xfce_settings_plugin.Tpo" -c -o libxfce4settings_la-xfce_settings_plugin.obj `if test -f 'xfce_settings_plugin.c'; then $(CYGPATH_W) 'xfce_settings_plugin.c'; else $(CYGPATH_W) '$(srcdir)/xfce_settings_plugin.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libxfce4settings_la-xfce_settings_plugin.Tpo" "$(DEPDIR)/libxfce4settings_la-xfce_settings_plugin.Po"; else rm -f "$(DEPDIR)/libxfce4settings_la-xfce_settings_plugin.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce_settings_plugin.c' object='libxfce4settings_la-xfce_settings_plugin.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libxfce4settings_la-xfce_settings_plugin.Po' tmpdepfile='$(DEPDIR)/libxfce4settings_la-xfce_settings_plugin.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4settings_la_CFLAGS) $(CFLAGS) -c -o libxfce4settings_la-xfce_settings_plugin.obj `if test -f 'xfce_settings_plugin.c'; then $(CYGPATH_W) 'xfce_settings_plugin.c'; else $(CYGPATH_W) '$(srcdir)/xfce_settings_plugin.c'; fi` libxfce4settings_la-xfce_settings_plugin.lo: xfce_settings_plugin.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4settings_la_CFLAGS) $(CFLAGS) -MT libxfce4settings_la-xfce_settings_plugin.lo -MD -MP -MF "$(DEPDIR)/libxfce4settings_la-xfce_settings_plugin.Tpo" \ -@am__fastdepCC_TRUE@ -c -o libxfce4settings_la-xfce_settings_plugin.lo `test -f 'xfce_settings_plugin.c' || echo '$(srcdir)/'`xfce_settings_plugin.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libxfce4settings_la-xfce_settings_plugin.Tpo" "$(DEPDIR)/libxfce4settings_la-xfce_settings_plugin.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libxfce4settings_la-xfce_settings_plugin.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4settings_la_CFLAGS) $(CFLAGS) -MT libxfce4settings_la-xfce_settings_plugin.lo -MD -MP -MF "$(DEPDIR)/libxfce4settings_la-xfce_settings_plugin.Tpo" -c -o libxfce4settings_la-xfce_settings_plugin.lo `test -f 'xfce_settings_plugin.c' || echo '$(srcdir)/'`xfce_settings_plugin.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libxfce4settings_la-xfce_settings_plugin.Tpo" "$(DEPDIR)/libxfce4settings_la-xfce_settings_plugin.Plo"; else rm -f "$(DEPDIR)/libxfce4settings_la-xfce_settings_plugin.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce_settings_plugin.c' object='libxfce4settings_la-xfce_settings_plugin.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libxfce4settings_la-xfce_settings_plugin.Plo' tmpdepfile='$(DEPDIR)/libxfce4settings_la-xfce_settings_plugin.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @@ -395,14 +392,6 @@ distclean-libtool: -rm -f libtool uninstall-info-am: -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -411,6 +400,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -425,7 +415,6 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ test -z "$(ETAGS_ARGS)$$tags$$unique" \ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique - ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -448,10 +437,6 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -465,7 +450,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -483,9 +468,8 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) - installdirs: - $(mkinstalldirs) $(DESTDIR)$(plugindir) + $(mkdir_p) $(DESTDIR)$(plugindir) install: install-am install-exec: install-exec-am install-data: install-data-am @@ -497,7 +481,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -505,7 +489,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -516,14 +500,17 @@ clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \ mostlyclean-am distclean: distclean-am - -distclean-am: clean-am distclean-compile distclean-depend \ - distclean-generic distclean-libtool distclean-tags + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-tags dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -539,7 +526,8 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -rf ./$(DEPDIR) + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -559,12 +547,12 @@ uninstall-am: uninstall-info-am uninstall-pluginLTLIBRARIES .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool clean-pluginLTLIBRARIES ctags distclean \ - distclean-compile distclean-depend distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am info \ - info-am install install-am install-data install-data-am \ - install-exec install-exec-am install-info install-info-am \ - install-man install-pluginLTLIBRARIES install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-pluginLTLIBRARIES install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-info-am \ diff --git a/themes/Crystal/Makefile.in b/themes/Crystal/Makefile.in index 0051dd70..5261ca31 100644 --- a/themes/Crystal/Makefile.in +++ b/themes/Crystal/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.5 from Makefile.am. +# Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,7 +21,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -36,6 +35,23 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ +subdir = themes/Crystal +DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/X11.m4 \ + $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/depends.m4 \ + $(top_srcdir)/m4/i18n.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +am__installdirs = $(DESTDIR)$(crystaldir) +crystalDATA_INSTALL = $(INSTALL_DATA) +DATA = $(crystal_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ @@ -166,6 +182,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -174,7 +191,6 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ crystaldir = $(datadir)/xfce4/themes/Crystal - crystal_DATA = \ edit.png \ file1.png \ @@ -200,25 +216,39 @@ trash_full.png \ unknown.png \ README - EXTRA_DIST = $(crystal_DATA) -subdir = themes/Crystal -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = -DATA = $(crystal_DATA) - -DIST_COMMON = README Makefile.am Makefile.in all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign themes/Crystal/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --foreign themes/Crystal/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: -rm -f *.lo @@ -229,10 +259,9 @@ clean-libtool: distclean-libtool: -rm -f libtool uninstall-info-am: -crystalDATA_INSTALL = $(INSTALL_DATA) install-crystalDATA: $(crystal_DATA) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(crystaldir) + $(mkdir_p) $(DESTDIR)$(crystaldir) @list='$(crystal_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ @@ -253,10 +282,6 @@ TAGS: ctags: CTAGS CTAGS: -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = ../.. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -270,7 +295,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -288,9 +313,8 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile $(DATA) - installdirs: - $(mkinstalldirs) $(DESTDIR)$(crystaldir) + $(mkdir_p) $(DESTDIR)$(crystaldir) install: install-am install-exec: install-exec-am install-data: install-data-am @@ -302,7 +326,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -310,7 +334,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -320,13 +344,15 @@ clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-libtool dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -342,7 +368,7 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -361,13 +387,13 @@ uninstall-am: uninstall-crystalDATA uninstall-info-am .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am info info-am install install-am install-crystalDATA \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-crystalDATA uninstall-info-am + dvi-am html html-am info info-am install install-am \ + install-crystalDATA install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am uninstall-crystalDATA uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/themes/Curve/Makefile.in b/themes/Curve/Makefile.in index 8b54ec93..c2245a69 100644 --- a/themes/Curve/Makefile.in +++ b/themes/Curve/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.5 from Makefile.am. +# Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,7 +21,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -36,6 +35,23 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ +subdir = themes/Curve +DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/X11.m4 \ + $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/depends.m4 \ + $(top_srcdir)/m4/i18n.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +am__installdirs = $(DESTDIR)$(curvedir) +curveDATA_INSTALL = $(INSTALL_DATA) +DATA = $(curve_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ @@ -166,6 +182,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -199,25 +216,39 @@ nomail.png \ oldmail.png \ README - EXTRA_DIST = $(curve_DATA) -subdir = themes/Curve -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = -DATA = $(curve_DATA) - -DIST_COMMON = README Makefile.am Makefile.in all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign themes/Curve/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --foreign themes/Curve/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: -rm -f *.lo @@ -228,10 +259,9 @@ clean-libtool: distclean-libtool: -rm -f libtool uninstall-info-am: -curveDATA_INSTALL = $(INSTALL_DATA) install-curveDATA: $(curve_DATA) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(curvedir) + $(mkdir_p) $(DESTDIR)$(curvedir) @list='$(curve_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ @@ -252,10 +282,6 @@ TAGS: ctags: CTAGS CTAGS: -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = ../.. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -269,7 +295,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -287,9 +313,8 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile $(DATA) - installdirs: - $(mkinstalldirs) $(DESTDIR)$(curvedir) + $(mkdir_p) $(DESTDIR)$(curvedir) install: install-am install-exec: install-exec-am install-data: install-data-am @@ -301,7 +326,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -309,7 +334,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -319,13 +344,15 @@ clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-libtool dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -341,7 +368,7 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -360,13 +387,13 @@ uninstall-am: uninstall-curveDATA uninstall-info-am .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am info info-am install install-am install-curveDATA \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-curveDATA uninstall-info-am + dvi-am html html-am info info-am install install-am \ + install-curveDATA install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am uninstall-curveDATA uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/themes/FreeIcons/Makefile.in b/themes/FreeIcons/Makefile.in index 43b2f0ed..7b096e01 100644 --- a/themes/FreeIcons/Makefile.in +++ b/themes/FreeIcons/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.5 from Makefile.am. +# Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,7 +21,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -36,6 +35,23 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ +subdir = themes/FreeIcons +DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/X11.m4 \ + $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/depends.m4 \ + $(top_srcdir)/m4/i18n.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +am__installdirs = $(DESTDIR)$(freeiconsdir) +freeiconsDATA_INSTALL = $(INSTALL_DATA) +DATA = $(freeicons_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ @@ -166,6 +182,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -197,25 +214,39 @@ freeicons_DATA = \ terminal.png \ unknown.png - EXTRA_DIST = $(freeicons_DATA) -subdir = themes/FreeIcons -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = -DATA = $(freeicons_DATA) - -DIST_COMMON = README Makefile.am Makefile.in all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign themes/FreeIcons/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --foreign themes/FreeIcons/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: -rm -f *.lo @@ -226,10 +257,9 @@ clean-libtool: distclean-libtool: -rm -f libtool uninstall-info-am: -freeiconsDATA_INSTALL = $(INSTALL_DATA) install-freeiconsDATA: $(freeicons_DATA) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(freeiconsdir) + $(mkdir_p) $(DESTDIR)$(freeiconsdir) @list='$(freeicons_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ @@ -250,10 +280,6 @@ TAGS: ctags: CTAGS CTAGS: -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = ../.. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -267,7 +293,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -285,9 +311,8 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile $(DATA) - installdirs: - $(mkinstalldirs) $(DESTDIR)$(freeiconsdir) + $(mkdir_p) $(DESTDIR)$(freeiconsdir) install: install-am install-exec: install-exec-am install-data: install-data-am @@ -299,7 +324,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -307,7 +332,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -317,13 +342,15 @@ clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-libtool dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -339,7 +366,7 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -358,8 +385,8 @@ uninstall-am: uninstall-freeiconsDATA uninstall-info-am .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-exec install-exec-am \ install-freeiconsDATA install-info install-info-am install-man \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ diff --git a/themes/Gnome/Makefile.in b/themes/Gnome/Makefile.in index 179caa27..0159982b 100644 --- a/themes/Gnome/Makefile.in +++ b/themes/Gnome/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.5 from Makefile.am. +# Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,7 +21,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -36,6 +35,23 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ +subdir = themes/Gnome +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/X11.m4 \ + $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/depends.m4 \ + $(top_srcdir)/m4/i18n.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +am__installdirs = $(DESTDIR)$(gnomedir) +gnomeDATA_INSTALL = $(INSTALL_DATA) +DATA = $(gnome_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ @@ -166,6 +182,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -195,25 +212,39 @@ trash_empty.png \ trash_full.png \ unknown.png - EXTRA_DIST = $(gnome_DATA) -subdir = themes/Gnome -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = -DATA = $(gnome_DATA) - -DIST_COMMON = Makefile.am Makefile.in all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign themes/Gnome/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --foreign themes/Gnome/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: -rm -f *.lo @@ -224,10 +255,9 @@ clean-libtool: distclean-libtool: -rm -f libtool uninstall-info-am: -gnomeDATA_INSTALL = $(INSTALL_DATA) install-gnomeDATA: $(gnome_DATA) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(gnomedir) + $(mkdir_p) $(DESTDIR)$(gnomedir) @list='$(gnome_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ @@ -248,10 +278,6 @@ TAGS: ctags: CTAGS CTAGS: -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = ../.. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -265,7 +291,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -283,9 +309,8 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile $(DATA) - installdirs: - $(mkinstalldirs) $(DESTDIR)$(gnomedir) + $(mkdir_p) $(DESTDIR)$(gnomedir) install: install-am install-exec: install-exec-am install-data: install-data-am @@ -297,7 +322,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -305,7 +330,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -315,13 +340,15 @@ clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-libtool dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -337,7 +364,7 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -356,13 +383,13 @@ uninstall-am: uninstall-gnomeDATA uninstall-info-am .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-gnomeDATA \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-gnomeDATA uninstall-info-am + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-exec install-exec-am \ + install-gnomeDATA install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am uninstall-gnomeDATA uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/themes/Makefile.in b/themes/Makefile.in index b7eeb4ed..6c1c602e 100644 --- a/themes/Makefile.in +++ b/themes/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.5 from Makefile.am. +# Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,7 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -21,7 +20,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -36,6 +34,29 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ +subdir = themes +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/X11.m4 \ + $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/depends.m4 \ + $(top_srcdir)/m4/i18n.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-exec-recursive install-info-recursive \ + install-recursive installcheck-recursive installdirs-recursive \ + pdf-recursive ps-recursive uninstall-info-recursive \ + uninstall-recursive +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ @@ -166,6 +187,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -181,28 +203,38 @@ SUBDIRS = \ Crystal \ FreeIcons -subdir = themes -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = - -RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ - ps-recursive install-info-recursive uninstall-info-recursive \ - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive -DIST_COMMON = Makefile.am Makefile.in -DIST_SUBDIRS = $(SUBDIRS) all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign themes/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --foreign themes/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: -rm -f *.lo @@ -273,14 +305,6 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -289,6 +313,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -314,7 +339,6 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ test -z "$(ETAGS_ARGS)$$tags$$unique" \ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique - ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -337,10 +361,6 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -354,7 +374,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -371,13 +391,13 @@ distdir: $(DISTFILES) done list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ + test -d "$(distdir)/$$subdir" \ + || mkdir "$(distdir)/$$subdir" \ || exit 1; \ (cd $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" \ - distdir=../$(distdir)/$$subdir \ + top_distdir="../$(top_distdir)" \ + distdir="../$(distdir)/$$subdir" \ distdir) \ || exit 1; \ fi; \ @@ -387,7 +407,6 @@ check: check-recursive all-am: Makefile installdirs: installdirs-recursive installdirs-am: - install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -399,7 +418,7 @@ install-am: all-am installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -407,7 +426,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -417,7 +436,7 @@ clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-recursive - + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-libtool \ distclean-tags @@ -425,6 +444,8 @@ dvi: dvi-recursive dvi-am: +html: html-recursive + info: info-recursive info-am: @@ -440,7 +461,7 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-recursive - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive @@ -459,22 +480,18 @@ uninstall-am: uninstall-info-am uninstall-info: uninstall-info-recursive -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ - clean-generic clean-libtool clean-recursive ctags \ +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ + clean clean-generic clean-libtool clean-recursive ctags \ ctags-recursive distclean distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distdir dvi dvi-am \ - dvi-recursive info info-am info-recursive install install-am \ - install-data install-data-am install-data-recursive \ - install-exec install-exec-am install-exec-recursive \ - install-info install-info-am install-info-recursive install-man \ - install-recursive install-strip installcheck installcheck-am \ - installdirs installdirs-am installdirs-recursive \ - maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ - pdf-recursive ps ps-am ps-recursive tags tags-recursive \ - uninstall uninstall-am uninstall-info-am \ - uninstall-info-recursive uninstall-recursive + distclean-recursive distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive \ + mostlyclean mostlyclean-generic mostlyclean-libtool \ + mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/themes/Noia/Makefile.in b/themes/Noia/Makefile.in index 84201383..ad911d38 100644 --- a/themes/Noia/Makefile.in +++ b/themes/Noia/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.5 from Makefile.am. +# Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,7 +21,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -36,6 +35,23 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ +subdir = themes/Noia +DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/X11.m4 \ + $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/depends.m4 \ + $(top_srcdir)/m4/i18n.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +am__installdirs = $(DESTDIR)$(noiadir) +noiaDATA_INSTALL = $(INSTALL_DATA) +DATA = $(noia_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ @@ -166,6 +182,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -174,7 +191,6 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ noiadir = $(datadir)/xfce4/themes/Noia - noia_DATA = \ edit.png \ file1.png \ @@ -200,25 +216,39 @@ trash_full.png \ unknown.png \ README - EXTRA_DIST = $(noia_DATA) -subdir = themes/Noia -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = -DATA = $(noia_DATA) - -DIST_COMMON = README Makefile.am Makefile.in all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign themes/Noia/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --foreign themes/Noia/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: -rm -f *.lo @@ -229,10 +259,9 @@ clean-libtool: distclean-libtool: -rm -f libtool uninstall-info-am: -noiaDATA_INSTALL = $(INSTALL_DATA) install-noiaDATA: $(noia_DATA) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(noiadir) + $(mkdir_p) $(DESTDIR)$(noiadir) @list='$(noia_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ @@ -253,10 +282,6 @@ TAGS: ctags: CTAGS CTAGS: -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = ../.. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -270,7 +295,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -288,9 +313,8 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile $(DATA) - installdirs: - $(mkinstalldirs) $(DESTDIR)$(noiadir) + $(mkdir_p) $(DESTDIR)$(noiadir) install: install-am install-exec: install-exec-am install-data: install-data-am @@ -302,7 +326,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -310,7 +334,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -320,13 +344,15 @@ clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-libtool dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -342,7 +368,7 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -361,13 +387,13 @@ uninstall-am: uninstall-info-am uninstall-noiaDATA .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-noiaDATA install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am uninstall-noiaDATA + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-exec install-exec-am \ + install-info install-info-am install-man install-noiaDATA \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am uninstall-info-am uninstall-noiaDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/themes/XFce/Makefile.in b/themes/XFce/Makefile.in index 34b54923..970d7237 100644 --- a/themes/XFce/Makefile.in +++ b/themes/XFce/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.5 from Makefile.am. +# Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,7 +21,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -36,6 +35,23 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ +subdir = themes/XFce +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/X11.m4 \ + $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/depends.m4 \ + $(top_srcdir)/m4/i18n.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +am__installdirs = $(DESTDIR)$(xfcedir) +xfceDATA_INSTALL = $(INSTALL_DATA) +DATA = $(xfce_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ @@ -166,6 +182,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -198,25 +215,39 @@ trash_empty.xpm \ trash_full.xpm \ unknown.xpm - EXTRA_DIST = $(xfce_DATA) -subdir = themes/XFce -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = -DATA = $(xfce_DATA) - -DIST_COMMON = Makefile.am Makefile.in all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign themes/XFce/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --foreign themes/XFce/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: -rm -f *.lo @@ -227,10 +258,9 @@ clean-libtool: distclean-libtool: -rm -f libtool uninstall-info-am: -xfceDATA_INSTALL = $(INSTALL_DATA) install-xfceDATA: $(xfce_DATA) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(xfcedir) + $(mkdir_p) $(DESTDIR)$(xfcedir) @list='$(xfce_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ @@ -251,10 +281,6 @@ TAGS: ctags: CTAGS CTAGS: -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = ../.. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -268,7 +294,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -286,9 +312,8 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile $(DATA) - installdirs: - $(mkinstalldirs) $(DESTDIR)$(xfcedir) + $(mkdir_p) $(DESTDIR)$(xfcedir) install: install-am install-exec: install-exec-am install-data: install-data-am @@ -300,7 +325,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -308,7 +333,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -318,13 +343,15 @@ clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-libtool dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -340,7 +367,7 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -359,13 +386,13 @@ uninstall-am: uninstall-info-am uninstall-xfceDATA .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip install-xfceDATA \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am uninstall-xfceDATA + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-exec install-exec-am \ + install-info install-info-am install-man install-strip \ + install-xfceDATA installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am uninstall-info-am uninstall-xfceDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. @@ -21,7 +21,7 @@ </Item> <Item> <Caption>Nautilus</Caption> - <Command term="0" sn="0">nautilus</Command> + <Command term="0" sn="0">nautilus --no-desktop</Command> <Tooltip>Nautlius File Manager</Tooltip> <Icon id="2"/> </Item> @@ -35,7 +35,7 @@ <Group> <Popup/> <Control id="-2" popup="0"> - <Command term="0" sn="0">mozilla</Command> + <Command term="0" sn="0">mozilla -splash</Command> <Tooltip>Mozilla Web Browser</Tooltip> <Icon id="7"/> </Control> @@ -44,7 +44,7 @@ <Popup/> <Control id="-1" filename="libmailcheck.so"> <Mailcheck interval="30"> - <Command term="0" sn="0">mozilla -mail</Command> + <Command term="0" sn="0">mozilla -mail -splash</Command> </Mailcheck> </Control> </Group> diff --git a/xfce4rc.az b/xfce4rc.az new file mode 100644 index 00000000..8ec5bf8b --- /dev/null +++ b/xfce4rc.az @@ -0,0 +1,128 @@ +<?xml version="1.0"?> +<Xfce> + <Panel orientation="0" layer="0" size="1" popupposition="1" icontheme="Curve" groups="15"> + </Panel> + <Groups> + <Group> + <Popup/> + <Control id="-2" popup="0"> + <Command term="0" sn="0">xfterm4</Command> + <Tooltip>Terminal</Tooltip> + <Icon id="12"/> + </Control> + </Group> + <Group> + <Popup> + <Item> + <Caption>Konqueror</Caption> + <Command term="0" sn="0">konqueror</Command> + <Tooltip>Konqueror Fay İdarəçisi</Tooltip> + <Icon id="2"/> + </Item> + <Item> + <Caption>Nautilus</Caption> + <Command term="0" sn="0">nautilus --no-desktop</Command> + <Tooltip>Nautlius Fay İdarəçisi</Tooltip> + <Icon id="2"/> + </Item> + </Popup> + <Control id="-2" popup="1"> + <Command term="0" sn="1">xffm</Command> + <Tooltip>Fay idarəçisi</Tooltip> + <Icon id="2"/> + </Control> + </Group> + <Group> + <Popup/> + <Control id="-2" popup="0"> + <Command term="0" sn="0">mozilla -splash</Command> + <Tooltip>Mozilla Veb Səyyahı</Tooltip> + <Icon id="7"/> + </Control> + </Group> + <Group> + <Popup/> + <Control id="-1" filename="libmailcheck.so"> + <Mailcheck interval="30"> + <Command term="0" sn="0">mozilla -mail -splash</Command> + </Mailcheck> + </Control> + </Group> + <Group> + <Popup/> + <Control id="-2" popup="0"> + <Command term="0" sn="0">xmms</Command> + <Tooltip>Musiqi çalğıcısı</Tooltip> + <Icon id="6"/> + </Control> + </Group> + <Group> + <Popup/> + <Control id="-1" filename="libseparator.so"/> + </Group> + <Group> + <Popup/> + <Control id="-1" filename="libpager.so"/> + </Group> + <Group> + <Popup/> + <Control id="-1" filename="libseparator.so"/> + </Group> + <Group> + <Popup> + <Item> + <Caption>Ekran qoruyucu</Caption> + <Command term="0" sn="0">xscreensaver-demo</Command> + <Tooltip>Ekran qoruyucu</Tooltip> + <Icon id="3"/> + </Item> + </Popup> + <Control id="-2" popup="1"> + <Command term="0" sn="0">xfce-setting-show</Command> + <Tooltip>Qurğular</Tooltip> + <Icon id="3"/> + </Control> + </Group> + <Group> + <Popup> + <Item> + <Caption>Çap İdarəsi</Caption> + <Command term="0" sn="0">xfprint-manager</Command> + <Tooltip>Çap İdarəsi</Tooltip> + <Icon id="9"/> + </Item> + </Popup> + <Control id="-2" popup="1"> + <Command term="0" sn="1">xfprint4</Command> + <Tooltip>Faylı çap etmək üçün burada daşıyın</Tooltip> + <Icon id="9"/> + </Control> + </Group> + <Group> + <Popup/> + <Control id="-2" popup="0"> + <Command term="0" sn="0">xfhelp4</Command> + <Tooltip>Əl kitabı</Tooltip> + <Icon id="5"/> + </Control> + </Group> + <Group> + <Popup/> + <Control id="-1" filename="libseparator.so"/> + </Group> + <Group> + <Popup/> + <Control id="-1" filename="libsystembuttons.so" button1="0" button2="1" showtwo="1"/> + </Group> + <Group> + <Popup/> + <Control id="-1" filename="libseparator.so"/> + </Group> + <Group> + <Popup/> + <Control id="-1" filename="libclock.so"> + <XfceClock Clock_type="2" Toggle_military="1" Toggle_am_pm="1" Toggle_secs="0"/> + </Control> + </Group> + </Groups> +</Xfce> @@ -4,14 +4,7 @@ </Panel> <Groups> <Group> - <Popup> - <Item> - <Caption>Terminal</Caption> - <Command term="0" sn="0">xfterm4</Command> - <Tooltip>Terminal</Tooltip> - <Icon id="12"/> - </Item> - </Popup> + <Popup/> <Control id="-2" popup="0"> <Command term="0" sn="0">xfterm4</Command> <Tooltip>Terminal</Tooltip> @@ -28,7 +21,7 @@ </Item> <Item> <Caption>Nautilus</Caption> - <Command term="0" sn="0">nautilus</Command> + <Command term="0" sn="0">nautilus --no-desktop</Command> <Tooltip>Gestor de fitxers nautlius</Tooltip> <Icon id="2"/> </Item> @@ -40,16 +33,9 @@ </Control> </Group> <Group> - <Popup> - <Item> - <Caption>Galeon</Caption> - <Command term="0" sn="0">galeon</Command> - <Tooltip>Navegador</Tooltip> - <Icon id="7"/> - </Item> - </Popup> + <Popup/> <Control id="-2" popup="0"> - <Command term="0" sn="0">mozilla</Command> + <Command term="0" sn="0">mozilla -splash</Command> <Tooltip>Navegador mozilla</Tooltip> <Icon id="7"/> </Control> @@ -58,7 +44,7 @@ <Popup/> <Control id="-1" filename="libmailcheck.so"> <Mailcheck interval="30"> - <Command term="0" sn="0">mozilla -mail</Command> + <Command term="0" sn="0">mozilla -mail -splash</Command> </Mailcheck> </Control> </Group> @@ -21,7 +21,7 @@ </Item> <Item> <Caption>Nautilus</Caption> - <Command term="0" sn="0">nautilus</Command> + <Command term="0" sn="0">nautilus --no-desktop</Command> <Tooltip>Nautlius fájlkezelő</Tooltip> <Icon id="2"/> </Item> @@ -35,7 +35,7 @@ <Group> <Popup/> <Control id="-2" popup="0"> - <Command term="0" sn="0">mozilla</Command> + <Command term="0" sn="0">mozilla -splash</Command> <Tooltip>Mozilla webböngésző</Tooltip> <Icon id="7"/> </Control> @@ -44,7 +44,7 @@ <Popup/> <Control id="-1" filename="libmailcheck.so"> <Mailcheck interval="30"> - <Command term="0" sn="0">mozilla -mail</Command> + <Command term="0" sn="0">mozilla -mail -splash</Command> </Mailcheck> </Control> </Group> @@ -21,7 +21,7 @@ </Item> <Item> <Caption>Nautilus</Caption> - <Command term="0" sn="0">nautilus</Command> + <Command term="0" sn="0">nautilus --no-desktop</Command> <Tooltip>Bestandsbeheer met Nautlius</Tooltip> <Icon id="2"/> </Item> @@ -35,7 +35,7 @@ <Group> <Popup/> <Control id="-2" popup="0"> - <Command term="0" sn="0">mozilla</Command> + <Command term="0" sn="0">mozilla -splash</Command> <Tooltip>Mozilla Web Browser</Tooltip> <Icon id="7"/> </Control> @@ -44,7 +44,7 @@ <Popup/> <Control id="-1" filename="libmailcheck.so"> <Mailcheck interval="30"> - <Command term="0" sn="0">mozilla -mail</Command> + <Command term="0" sn="0">mozilla -mail -splash</Command> </Mailcheck> </Control> </Group> diff --git a/xfce4rc.vi b/xfce4rc.vi new file mode 100644 index 00000000..8b129294 --- /dev/null +++ b/xfce4rc.vi @@ -0,0 +1,128 @@ +<?xml version="1.0"?> +<Xfce> + <Panel orientation="0" layer="0" size="1" popupposition="1" icontheme="Curve" groups="15"> + </Panel> + <Groups> + <Group> + <Popup/> + <Control id="-2" popup="0"> + <Command term="0" sn="0">xfterm4</Command> + <Tooltip>Trạm cuối</Tooltip> + <Icon id="12"/> + </Control> + </Group> + <Group> + <Popup> + <Item> + <Caption>Konqueror</Caption> + <Command term="0" sn="0">konqueror</Command> + <Tooltip>Trình quản lí tập tin Konqueror</Tooltip> + <Icon id="2"/> + </Item> + <Item> + <Caption>Nautilus</Caption> + <Command term="0" sn="0">nautilus --no-desktop</Command> + <Tooltip>Trình quản lí tập tin Nautlius</Tooltip> + <Icon id="2"/> + </Item> + </Popup> + <Control id="-2" popup="1"> + <Command term="0" sn="1">xffm</Command> + <Tooltip>Trình quản lí tập tin</Tooltip> + <Icon id="2"/> + </Control> + </Group> + <Group> + <Popup/> + <Control id="-2" popup="0"> + <Command term="0" sn="0">mozilla -splash</Command> + <Tooltip>Trình duyệt web Mozilla</Tooltip> + <Icon id="7"/> + </Control> + </Group> + <Group> + <Popup/> + <Control id="-1" filename="libmailcheck.so"> + <Mailcheck interval="30"> + <Command term="0" sn="0">mozilla -mail -splash</Command> + </Mailcheck> + </Control> + </Group> + <Group> + <Popup/> + <Control id="-2" popup="0"> + <Command term="0" sn="0">xmms</Command> + <Tooltip>Trình nghe nhạc</Tooltip> + <Icon id="6"/> + </Control> + </Group> + <Group> + <Popup/> + <Control id="-1" filename="libseparator.so"/> + </Group> + <Group> + <Popup/> + <Control id="-1" filename="libpager.so"/> + </Group> + <Group> + <Popup/> + <Control id="-1" filename="libseparator.so"/> + </Group> + <Group> + <Popup> + <Item> + <Caption>Trình bảo vệ màn hình</Caption> + <Command term="0" sn="0">xscreensaver-demo</Command> + <Tooltip>Trình bảo vệ màn hình</Tooltip> + <Icon id="3"/> + </Item> + </Popup> + <Control id="-2" popup="1"> + <Command term="0" sn="0">xfce-setting-show</Command> + <Tooltip>Các thiết lập</Tooltip> + <Icon id="3"/> + </Control> + </Group> + <Group> + <Popup> + <Item> + <Caption>Trình quản lí in</Caption> + <Command term="0" sn="0">xfprint-manager</Command> + <Tooltip>Trình quản lí in</Tooltip> + <Icon id="9"/> + </Item> + </Popup> + <Control id="-2" popup="1"> + <Command term="0" sn="1">xfprint4</Command> + <Tooltip>Kéo tập tin vào để in</Tooltip> + <Icon id="9"/> + </Control> + </Group> + <Group> + <Popup/> + <Control id="-2" popup="0"> + <Command term="0" sn="0">xfhelp4</Command> + <Tooltip>Cẩm nang sử dụng</Tooltip> + <Icon id="5"/> + </Control> + </Group> + <Group> + <Popup/> + <Control id="-1" filename="libseparator.so"/> + </Group> + <Group> + <Popup/> + <Control id="-1" filename="libsystembuttons.so" button1="0" button2="1" showtwo="1"/> + </Group> + <Group> + <Popup/> + <Control id="-1" filename="libseparator.so"/> + </Group> + <Group> + <Popup/> + <Control id="-1" filename="libclock.so"> + <XfceClock Clock_type="2" Toggle_military="1" Toggle_am_pm="1" Toggle_secs="0"/> + </Control> + </Group> + </Groups> +</Xfce> |
