diff options
-rw-r--r-- | .gitmodules | 3 | ||||
-rw-r--r-- | CMakeL10n.txt | 8 | ||||
-rw-r--r-- | CMakeLists.txt | 93 | ||||
-rw-r--r-- | ConfigureChecks.cmake | 103 | ||||
-rw-r--r-- | Makefile.am | 14 | ||||
-rw-r--r-- | NEWS | 0 | ||||
-rw-r--r-- | README | 18 | ||||
-rw-r--r-- | README.md | 32 | ||||
-rw-r--r-- | acinclude.m4 | 11919 | ||||
-rw-r--r-- | aclocal.m4 | 12935 | ||||
m--------- | admin | 0 | ||||
-rw-r--r-- | apps/Makefile.am | 1 | ||||
-rw-r--r-- | apps/ktcachecheck/Makefile.am | 12 | ||||
-rw-r--r-- | apps/ktorrent/Makefile.am | 65 | ||||
-rw-r--r-- | apps/ktorrent/groups/Makefile.am | 15 | ||||
-rw-r--r-- | apps/ktorrent/ktorrent.desktop | 85 | ||||
-rw-r--r-- | apps/ktorrent/ktorrentplugin.desktop | 33 | ||||
-rw-r--r-- | apps/ktorrent/newui/Makefile.am | 8 | ||||
-rw-r--r-- | apps/ktorrent/x-bittorrent.desktop | 39 | ||||
-rw-r--r-- | apps/kttorinfo/Makefile.am | 10 | ||||
-rw-r--r-- | apps/ktupnptest/Makefile.am | 10 | ||||
-rw-r--r-- | config.h.cmake | 53 | ||||
-rw-r--r-- | config.h.in | 300 | ||||
-rw-r--r-- | configure.files | 3 | ||||
-rw-r--r-- | configure.in | 476 | ||||
-rw-r--r-- | configure.in.bot | 21 | ||||
-rw-r--r-- | configure.in.in | 228 | ||||
-rw-r--r-- | doc/Makefile.am | 3 | ||||
-rw-r--r-- | doc/en/Makefile.am | 2 | ||||
-rw-r--r-- | doc/man/Makefile.am | 3 | ||||
-rw-r--r-- | ktorrent.tdevelop | 314 | ||||
-rw-r--r-- | libktorrent/Makefile.am | 22 | ||||
-rw-r--r-- | libktorrent/datachecker/Makefile.am | 8 | ||||
-rw-r--r-- | libktorrent/interfaces/Makefile.am | 15 | ||||
-rw-r--r-- | libktorrent/kademlia/Makefile.am | 12 | ||||
-rw-r--r-- | libktorrent/migrate/Makefile.am | 7 | ||||
-rw-r--r-- | libktorrent/mse/Makefile.am | 9 | ||||
-rw-r--r-- | libktorrent/net/Makefile.am | 10 | ||||
-rw-r--r-- | libktorrent/torrent/Makefile.am | 33 | ||||
-rw-r--r-- | libktorrent/util/Makefile.am | 18 | ||||
-rw-r--r-- | plugins/Makefile.am | 4 | ||||
-rw-r--r-- | plugins/infowidget/Makefile.am | 47 | ||||
-rw-r--r-- | plugins/infowidget/geoip/Makefile.am | 41 | ||||
-rw-r--r-- | plugins/infowidget/ktinfowidgetplugin.desktop | 29 | ||||
-rw-r--r-- | plugins/ipfilter/Makefile.am | 31 | ||||
-rw-r--r-- | plugins/ipfilter/ktipfilterplugin.desktop | 56 | ||||
-rw-r--r-- | plugins/logviewer/Makefile.am | 33 | ||||
-rw-r--r-- | plugins/logviewer/ktlogviewerplugin.desktop | 26 | ||||
-rw-r--r-- | plugins/partfileimport/Makefile.am | 27 | ||||
-rw-r--r-- | plugins/partfileimport/ktpartfileimportplugin.desktop | 25 | ||||
-rw-r--r-- | plugins/rssfeed/Makefile.am | 30 | ||||
-rw-r--r-- | plugins/rssfeed/ktrssfeedplugin.desktop | 22 | ||||
-rw-r--r-- | plugins/rssfeed/rss/Makefile.am | 20 | ||||
-rw-r--r-- | plugins/scanfolder/Makefile.am | 31 | ||||
-rw-r--r-- | plugins/scanfolder/ktscanfolderplugin.desktop | 26 | ||||
-rw-r--r-- | plugins/scheduler/Makefile.am | 36 | ||||
-rw-r--r-- | plugins/scheduler/bwsprefpage.cpp | 0 | ||||
-rw-r--r-- | plugins/scheduler/bwsprefpage.h | 0 | ||||
-rw-r--r-- | plugins/scheduler/ktschedulerplugin.desktop | 26 | ||||
-rw-r--r-- | plugins/search/Makefile.am | 28 | ||||
-rw-r--r-- | plugins/search/ktsearchplugin.desktop | 60 | ||||
-rw-r--r-- | plugins/stats/Makefile.am | 18 | ||||
-rw-r--r-- | plugins/stats/ktstatsplugin.desktop | 24 | ||||
-rw-r--r-- | plugins/upnp/Makefile.am | 38 | ||||
-rw-r--r-- | plugins/upnp/ktupnpplugin.desktop | 26 | ||||
-rw-r--r-- | plugins/webinterface/Makefile.am | 34 | ||||
-rw-r--r-- | plugins/webinterface/ktwebinterfaceplugin.desktop | 22 | ||||
-rw-r--r-- | plugins/webinterface/www/Makefile.am | 5 | ||||
-rw-r--r-- | plugins/webinterface/www/coldmilk/Makefile.am | 8 | ||||
-rw-r--r-- | plugins/webinterface/www/coldmilk/icons/16x16/Makefile.am | 6 | ||||
-rw-r--r-- | plugins/webinterface/www/coldmilk/icons/22x22/Makefile.am | 6 | ||||
-rw-r--r-- | plugins/webinterface/www/coldmilk/icons/32x32/Makefile.am | 6 | ||||
-rw-r--r-- | plugins/webinterface/www/coldmilk/icons/48x48/Makefile.am | 6 | ||||
-rw-r--r-- | plugins/webinterface/www/coldmilk/icons/64x64/Makefile.am | 6 | ||||
-rw-r--r-- | plugins/webinterface/www/coldmilk/icons/Makefile.am | 1 | ||||
-rw-r--r-- | plugins/webinterface/www/default/Makefile.am | 9 | ||||
-rw-r--r-- | plugins/webinterface/www/mobile/Makefile.am | 8 | ||||
-rw-r--r-- | plugins/zeroconf/Makefile.am | 22 | ||||
-rw-r--r-- | plugins/zeroconf/ktzeroconfplugin.desktop | 22 | ||||
-rw-r--r-- | scripts/Makefile.am | 1 | ||||
-rw-r--r-- | src/CMakeL10n.txt | 8 | ||||
-rw-r--r-- | src/CMakeLists.txt | 20 | ||||
-rw-r--r-- | src/apps/CMakeLists.txt | 7 | ||||
-rw-r--r-- | src/apps/ktcachecheck/CMakeLists.txt | 16 | ||||
-rw-r--r-- | src/apps/ktcachecheck/cachecheck.cpp (renamed from apps/ktcachecheck/cachecheck.cpp) | 0 | ||||
-rw-r--r-- | src/apps/ktcachecheck/cachechecker.cpp (renamed from apps/ktcachecheck/cachechecker.cpp) | 0 | ||||
-rw-r--r-- | src/apps/ktcachecheck/cachechecker.h (renamed from apps/ktcachecheck/cachechecker.h) | 0 | ||||
-rw-r--r-- | src/apps/ktcachecheck/multicachechecker.cpp (renamed from apps/ktcachecheck/multicachechecker.cpp) | 0 | ||||
-rw-r--r-- | src/apps/ktcachecheck/multicachechecker.h (renamed from apps/ktcachecheck/multicachechecker.h) | 0 | ||||
-rw-r--r-- | src/apps/ktcachecheck/singlecachechecker.cpp (renamed from apps/ktcachecheck/singlecachechecker.cpp) | 0 | ||||
-rw-r--r-- | src/apps/ktcachecheck/singlecachechecker.h (renamed from apps/ktcachecheck/singlecachechecker.h) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/CMakeLists.txt | 73 | ||||
-rw-r--r-- | src/apps/ktorrent/README (renamed from apps/ktorrent/README) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/addpeerwidget.cpp (renamed from apps/ktorrent/addpeerwidget.cpp) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/addpeerwidget.h (renamed from apps/ktorrent/addpeerwidget.h) | 4 | ||||
-rw-r--r-- | src/apps/ktorrent/addpeerwidgetbase.ui (renamed from apps/ktorrent/addpeerwidgetbase.ui) | 4 | ||||
-rw-r--r-- | src/apps/ktorrent/advancedpref.ui (renamed from apps/ktorrent/advancedpref.ui) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/custom_widgets.cw (renamed from apps/ktorrent/custom_widgets.cw) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/dcopinterface.h (renamed from apps/ktorrent/dcopinterface.h) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/downloadpref.ui (renamed from apps/ktorrent/downloadpref.ui) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/fileselectdlg.cpp (renamed from apps/ktorrent/fileselectdlg.cpp) | 12 | ||||
-rw-r--r-- | src/apps/ktorrent/fileselectdlg.h (renamed from apps/ktorrent/fileselectdlg.h) | 2 | ||||
-rw-r--r-- | src/apps/ktorrent/fileselectdlgbase.ui (renamed from apps/ktorrent/fileselectdlgbase.ui) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/filterbar.cpp (renamed from apps/ktorrent/filterbar.cpp) | 8 | ||||
-rw-r--r-- | src/apps/ktorrent/filterbar.h (renamed from apps/ktorrent/filterbar.h) | 2 | ||||
-rw-r--r-- | src/apps/ktorrent/generalpref.ui (renamed from apps/ktorrent/generalpref.ui) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/CMakeLists.txt | 16 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/activedownloadsgroup.cpp (renamed from apps/ktorrent/groups/activedownloadsgroup.cpp) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/activedownloadsgroup.h (renamed from apps/ktorrent/groups/activedownloadsgroup.h) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/activegroup.cpp (renamed from apps/ktorrent/groups/activegroup.cpp) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/activegroup.h (renamed from apps/ktorrent/groups/activegroup.h) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/activeuploadsgroup.cpp (renamed from apps/ktorrent/groups/activeuploadsgroup.cpp) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/activeuploadsgroup.h (renamed from apps/ktorrent/groups/activeuploadsgroup.h) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/allgroup.cpp (renamed from apps/ktorrent/groups/allgroup.cpp) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/allgroup.h (renamed from apps/ktorrent/groups/allgroup.h) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/downloadgroup.cpp (renamed from apps/ktorrent/groups/downloadgroup.cpp) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/downloadgroup.h (renamed from apps/ktorrent/groups/downloadgroup.h) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/group.cpp (renamed from apps/ktorrent/groups/group.cpp) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/group.h (renamed from apps/ktorrent/groups/group.h) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/groupmanager.cpp (renamed from apps/ktorrent/groups/groupmanager.cpp) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/groupmanager.h (renamed from apps/ktorrent/groups/groupmanager.h) | 3 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/groupview.cpp (renamed from apps/ktorrent/groups/groupview.cpp) | 20 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/groupview.h (renamed from apps/ktorrent/groups/groupview.h) | 2 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/inactivedownloadsgroup.cpp (renamed from apps/ktorrent/groups/inactivedownloadsgroup.cpp) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/inactivedownloadsgroup.h (renamed from apps/ktorrent/groups/inactivedownloadsgroup.h) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/inactivegroup.cpp (renamed from apps/ktorrent/groups/inactivegroup.cpp) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/inactivegroup.h (renamed from apps/ktorrent/groups/inactivegroup.h) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/inactiveuploadsgroup.cpp (renamed from apps/ktorrent/groups/inactiveuploadsgroup.cpp) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/inactiveuploadsgroup.h (renamed from apps/ktorrent/groups/inactiveuploadsgroup.h) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/queueddownloadsgroup.cpp (renamed from apps/ktorrent/groups/queueddownloadsgroup.cpp) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/queueddownloadsgroup.h (renamed from apps/ktorrent/groups/queueddownloadsgroup.h) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/queueduploadsgroup.cpp (renamed from apps/ktorrent/groups/queueduploadsgroup.cpp) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/queueduploadsgroup.h (renamed from apps/ktorrent/groups/queueduploadsgroup.h) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/torrentdrag.cpp (renamed from apps/ktorrent/groups/torrentdrag.cpp) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/torrentdrag.h (renamed from apps/ktorrent/groups/torrentdrag.h) | 2 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/torrentgroup.cpp (renamed from apps/ktorrent/groups/torrentgroup.cpp) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/torrentgroup.h (renamed from apps/ktorrent/groups/torrentgroup.h) | 3 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/uploadgroup.cpp (renamed from apps/ktorrent/groups/uploadgroup.cpp) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/uploadgroup.h (renamed from apps/ktorrent/groups/uploadgroup.h) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/userdownloadsgroup.cpp (renamed from apps/ktorrent/groups/userdownloadsgroup.cpp) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/userdownloadsgroup.h (renamed from apps/ktorrent/groups/userdownloadsgroup.h) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/useruploadsgroup.cpp (renamed from apps/ktorrent/groups/useruploadsgroup.cpp) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/groups/useruploadsgroup.h (renamed from apps/ktorrent/groups/useruploadsgroup.h) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/hi128-app-ktorrent.png (renamed from apps/ktorrent/hi128-app-ktorrent.png) | bin | 24064 -> 24064 bytes | |||
-rw-r--r-- | src/apps/ktorrent/hi128-mime-torrent.png (renamed from apps/ktorrent/hi128-mime-torrent.png) | bin | 18379 -> 18379 bytes | |||
-rw-r--r-- | src/apps/ktorrent/hi16-app-ktorrent.png (renamed from apps/ktorrent/hi16-app-ktorrent.png) | bin | 939 -> 939 bytes | |||
-rw-r--r-- | src/apps/ktorrent/hi16-mime-torrent.png (renamed from apps/ktorrent/hi16-mime-torrent.png) | bin | 864 -> 864 bytes | |||
-rw-r--r-- | src/apps/ktorrent/hi22-action-ktencrypted.png (renamed from apps/ktorrent/hi22-action-ktencrypted.png) | bin | 653 -> 653 bytes | |||
-rw-r--r-- | src/apps/ktorrent/hi22-action-ktremove.png (renamed from apps/ktorrent/hi22-action-ktremove.png) | bin | 1522 -> 1522 bytes | |||
-rw-r--r-- | src/apps/ktorrent/hi22-action-ktstart.png (renamed from apps/ktorrent/hi22-action-ktstart.png) | bin | 1221 -> 1221 bytes | |||
-rw-r--r-- | src/apps/ktorrent/hi22-action-ktstart_all.png (renamed from apps/ktorrent/hi22-action-ktstart_all.png) | bin | 1400 -> 1400 bytes | |||
-rw-r--r-- | src/apps/ktorrent/hi22-action-ktstop.png (renamed from apps/ktorrent/hi22-action-ktstop.png) | bin | 963 -> 963 bytes | |||
-rw-r--r-- | src/apps/ktorrent/hi22-action-ktstop_all.png (renamed from apps/ktorrent/hi22-action-ktstop_all.png) | bin | 1130 -> 1130 bytes | |||
-rw-r--r-- | src/apps/ktorrent/hi22-app-ktorrent.png (renamed from apps/ktorrent/hi22-app-ktorrent.png) | bin | 1502 -> 1502 bytes | |||
-rw-r--r-- | src/apps/ktorrent/hi22-mime-torrent.png (renamed from apps/ktorrent/hi22-mime-torrent.png) | bin | 1345 -> 1345 bytes | |||
-rw-r--r-- | src/apps/ktorrent/hi32-app-ktorrent.png (renamed from apps/ktorrent/hi32-app-ktorrent.png) | bin | 2689 -> 2689 bytes | |||
-rw-r--r-- | src/apps/ktorrent/hi32-mime-torrent.png (renamed from apps/ktorrent/hi32-mime-torrent.png) | bin | 2055 -> 2055 bytes | |||
-rw-r--r-- | src/apps/ktorrent/hi48-action-ktplugins.png (renamed from apps/ktorrent/hi48-action-ktplugins.png) | bin | 3077 -> 3077 bytes | |||
-rw-r--r-- | src/apps/ktorrent/hi48-app-ktorrent.png (renamed from apps/ktorrent/hi48-app-ktorrent.png) | bin | 5224 -> 5224 bytes | |||
-rw-r--r-- | src/apps/ktorrent/hi48-mime-torrent.png (renamed from apps/ktorrent/hi48-mime-torrent.png) | bin | 3737 -> 3737 bytes | |||
-rw-r--r-- | src/apps/ktorrent/hi64-action-ktinfowidget.png (renamed from apps/ktorrent/hi64-action-ktinfowidget.png) | bin | 1673 -> 1673 bytes | |||
-rw-r--r-- | src/apps/ktorrent/hi64-action-ktqueuemanager.png (renamed from apps/ktorrent/hi64-action-ktqueuemanager.png) | bin | 5149 -> 5149 bytes | |||
-rw-r--r-- | src/apps/ktorrent/hi64-action-ktupnp.png (renamed from apps/ktorrent/hi64-action-ktupnp.png) | bin | 4730 -> 4730 bytes | |||
-rw-r--r-- | src/apps/ktorrent/hi64-app-ktorrent.png (renamed from apps/ktorrent/hi64-app-ktorrent.png) | bin | 8186 -> 8186 bytes | |||
-rw-r--r-- | src/apps/ktorrent/hi64-filesys-ktprefdownloads.png (renamed from apps/ktorrent/hi64-filesys-ktprefdownloads.png) | bin | 5711 -> 5711 bytes | |||
-rw-r--r-- | src/apps/ktorrent/hi64-mime-torrent.png (renamed from apps/ktorrent/hi64-mime-torrent.png) | bin | 5882 -> 5882 bytes | |||
-rw-r--r-- | src/apps/ktorrent/hisc-app-ktorrent.svgz (renamed from apps/ktorrent/hisc-app-ktorrent.svgz) | bin | 6674 -> 6674 bytes | |||
-rw-r--r-- | src/apps/ktorrent/hisc-mime-torrent.svgz (renamed from apps/ktorrent/hisc-mime-torrent.svgz) | bin | 10113 -> 10113 bytes | |||
-rw-r--r-- | src/apps/ktorrent/ipfilterwidget.cpp (renamed from apps/ktorrent/ipfilterwidget.cpp) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/ipfilterwidget.h (renamed from apps/ktorrent/ipfilterwidget.h) | 2 | ||||
-rw-r--r-- | src/apps/ktorrent/ipfilterwidgetbase.ui (renamed from apps/ktorrent/ipfilterwidgetbase.ui) | 4 | ||||
-rw-r--r-- | src/apps/ktorrent/ktorrent.cpp (renamed from apps/ktorrent/ktorrent.cpp) | 126 | ||||
-rw-r--r-- | src/apps/ktorrent/ktorrent.desktop | 15 | ||||
-rw-r--r-- | src/apps/ktorrent/ktorrent.h (renamed from apps/ktorrent/ktorrent.h) | 2 | ||||
-rw-r--r-- | src/apps/ktorrent/ktorrentapp.cpp (renamed from apps/ktorrent/ktorrentapp.cpp) | 8 | ||||
-rw-r--r-- | src/apps/ktorrent/ktorrentapp.h (renamed from apps/ktorrent/ktorrentapp.h) | 6 | ||||
-rw-r--r-- | src/apps/ktorrent/ktorrentcore.cpp (renamed from apps/ktorrent/ktorrentcore.cpp) | 44 | ||||
-rw-r--r-- | src/apps/ktorrent/ktorrentcore.h (renamed from apps/ktorrent/ktorrentcore.h) | 2 | ||||
-rw-r--r-- | src/apps/ktorrent/ktorrentdcop.cpp (renamed from apps/ktorrent/ktorrentdcop.cpp) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/ktorrentdcop.h (renamed from apps/ktorrent/ktorrentdcop.h) | 2 | ||||
-rw-r--r-- | src/apps/ktorrent/ktorrentplugin.desktop | 5 | ||||
-rw-r--r-- | src/apps/ktorrent/ktorrentui.rc (renamed from apps/ktorrent/ktorrentui.rc) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/ktorrentview.cpp (renamed from apps/ktorrent/ktorrentview.cpp) | 24 | ||||
-rw-r--r-- | src/apps/ktorrent/ktorrentview.h (renamed from apps/ktorrent/ktorrentview.h) | 2 | ||||
-rw-r--r-- | src/apps/ktorrent/ktorrentviewitem.cpp (renamed from apps/ktorrent/ktorrentviewitem.cpp) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/ktorrentviewitem.h (renamed from apps/ktorrent/ktorrentviewitem.h) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/ktorrentviewmenu.cpp (renamed from apps/ktorrent/ktorrentviewmenu.cpp) | 34 | ||||
-rw-r--r-- | src/apps/ktorrent/ktorrentviewmenu.h (renamed from apps/ktorrent/ktorrentviewmenu.h) | 2 | ||||
-rw-r--r-- | src/apps/ktorrent/leaktrace.cpp (renamed from apps/ktorrent/leaktrace.cpp) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/main.cpp (renamed from apps/ktorrent/main.cpp) | 2 | ||||
-rw-r--r-- | src/apps/ktorrent/newui/CMakeLists.txt | 14 | ||||
-rw-r--r-- | src/apps/ktorrent/newui/button.cpp (renamed from apps/ktorrent/newui/button.cpp) | 12 | ||||
-rw-r--r-- | src/apps/ktorrent/newui/button.h (renamed from apps/ktorrent/newui/button.h) | 2 | ||||
-rw-r--r-- | src/apps/ktorrent/newui/buttonbar.cpp (renamed from apps/ktorrent/newui/buttonbar.cpp) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/newui/buttonbar.h (renamed from apps/ktorrent/newui/buttonbar.h) | 2 | ||||
-rw-r--r-- | src/apps/ktorrent/newui/comdefs.h (renamed from apps/ktorrent/newui/comdefs.h) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/newui/ddockwindow.cpp (renamed from apps/ktorrent/newui/ddockwindow.cpp) | 22 | ||||
-rw-r--r-- | src/apps/ktorrent/newui/ddockwindow.h (renamed from apps/ktorrent/newui/ddockwindow.h) | 2 | ||||
-rw-r--r-- | src/apps/ktorrent/newui/dmainwindow.cpp (renamed from apps/ktorrent/newui/dmainwindow.cpp) | 16 | ||||
-rw-r--r-- | src/apps/ktorrent/newui/dmainwindow.h (renamed from apps/ktorrent/newui/dmainwindow.h) | 2 | ||||
-rw-r--r-- | src/apps/ktorrent/newui/docksplitter.cpp (renamed from apps/ktorrent/newui/docksplitter.cpp) | 22 | ||||
-rw-r--r-- | src/apps/ktorrent/newui/docksplitter.h (renamed from apps/ktorrent/newui/docksplitter.h) | 6 | ||||
-rw-r--r-- | src/apps/ktorrent/newui/dtabwidget.cpp (renamed from apps/ktorrent/newui/dtabwidget.cpp) | 8 | ||||
-rw-r--r-- | src/apps/ktorrent/newui/dtabwidget.h (renamed from apps/ktorrent/newui/dtabwidget.h) | 2 | ||||
-rw-r--r-- | src/apps/ktorrent/pastedialog.cpp (renamed from apps/ktorrent/pastedialog.cpp) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/pastedialog.h (renamed from apps/ktorrent/pastedialog.h) | 2 | ||||
-rw-r--r-- | src/apps/ktorrent/pastedlgbase.ui (renamed from apps/ktorrent/pastedlgbase.ui) | 4 | ||||
-rw-r--r-- | src/apps/ktorrent/pref.cpp (renamed from apps/ktorrent/pref.cpp) | 30 | ||||
-rw-r--r-- | src/apps/ktorrent/pref.h (renamed from apps/ktorrent/pref.h) | 6 | ||||
-rw-r--r-- | src/apps/ktorrent/queuedialog.cpp (renamed from apps/ktorrent/queuedialog.cpp) | 4 | ||||
-rw-r--r-- | src/apps/ktorrent/queuedialog.h (renamed from apps/ktorrent/queuedialog.h) | 2 | ||||
-rw-r--r-- | src/apps/ktorrent/queuedlg.ui (renamed from apps/ktorrent/queuedlg.ui) | 4 | ||||
-rw-r--r-- | src/apps/ktorrent/scandialog.cpp (renamed from apps/ktorrent/scandialog.cpp) | 8 | ||||
-rw-r--r-- | src/apps/ktorrent/scandialog.h (renamed from apps/ktorrent/scandialog.h) | 2 | ||||
-rw-r--r-- | src/apps/ktorrent/scandlgbase.ui (renamed from apps/ktorrent/scandlgbase.ui) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/speedlimitsdlg.cpp (renamed from apps/ktorrent/speedlimitsdlg.cpp) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/speedlimitsdlg.h (renamed from apps/ktorrent/speedlimitsdlg.h) | 2 | ||||
-rw-r--r-- | src/apps/ktorrent/speedlimitsdlgbase.ui (renamed from apps/ktorrent/speedlimitsdlgbase.ui) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/torrentcreatordlg.cpp (renamed from apps/ktorrent/torrentcreatordlg.cpp) | 4 | ||||
-rw-r--r-- | src/apps/ktorrent/torrentcreatordlg.h (renamed from apps/ktorrent/torrentcreatordlg.h) | 2 | ||||
-rw-r--r-- | src/apps/ktorrent/torrentcreatordlgbase.ui (renamed from apps/ktorrent/torrentcreatordlgbase.ui) | 4 | ||||
-rw-r--r-- | src/apps/ktorrent/trayhoverpopup.cpp (renamed from apps/ktorrent/trayhoverpopup.cpp) | 4 | ||||
-rw-r--r-- | src/apps/ktorrent/trayhoverpopup.h (renamed from apps/ktorrent/trayhoverpopup.h) | 2 | ||||
-rw-r--r-- | src/apps/ktorrent/trayicon.cpp (renamed from apps/ktorrent/trayicon.cpp) | 40 | ||||
-rw-r--r-- | src/apps/ktorrent/trayicon.h (renamed from apps/ktorrent/trayicon.h) | 4 | ||||
-rw-r--r-- | src/apps/ktorrent/viewmanager.cpp (renamed from apps/ktorrent/viewmanager.cpp) | 0 | ||||
-rw-r--r-- | src/apps/ktorrent/viewmanager.h (renamed from apps/ktorrent/viewmanager.h) | 2 | ||||
-rw-r--r-- | src/apps/ktorrent/x-bittorrent.desktop | 9 | ||||
-rw-r--r-- | src/apps/kttorinfo/CMakeLists.txt | 13 | ||||
-rw-r--r-- | src/apps/kttorinfo/main.cpp (renamed from apps/kttorinfo/main.cpp) | 0 | ||||
-rw-r--r-- | src/apps/ktupnptest/CMakeLists.txt | 15 | ||||
-rw-r--r-- | src/apps/ktupnptest/main.cpp (renamed from apps/ktupnptest/main.cpp) | 0 | ||||
-rw-r--r-- | src/apps/ktupnptest/mainwidget.ui (renamed from apps/ktupnptest/mainwidget.ui) | 0 | ||||
-rw-r--r-- | src/apps/ktupnptest/upnptestapp.cpp (renamed from apps/ktupnptest/upnptestapp.cpp) | 8 | ||||
-rw-r--r-- | src/apps/ktupnptest/upnptestapp.h (renamed from apps/ktupnptest/upnptestapp.h) | 2 | ||||
-rw-r--r-- | src/estimation-scripts/EstimationResults.rb (renamed from estimation-scripts/EstimationResults.rb) | 0 | ||||
-rw-r--r-- | src/estimation-scripts/Estimators.rb (renamed from estimation-scripts/Estimators.rb) | 0 | ||||
-rw-r--r-- | src/estimation-scripts/README (renamed from estimation-scripts/README) | 0 | ||||
-rw-r--r-- | src/estimation-scripts/Sample.rb (renamed from estimation-scripts/Sample.rb) | 0 | ||||
-rw-r--r-- | src/estimation-scripts/demo.rb (renamed from estimation-scripts/demo.rb) | 0 | ||||
-rw-r--r-- | src/estimation-scripts/enable-logging.diff (renamed from estimation-scripts/enable-logging.diff) | 0 | ||||
-rw-r--r-- | src/estimation-scripts/processlog.rb (renamed from estimation-scripts/processlog.rb) | 0 | ||||
-rw-r--r-- | src/libktorrent/CMakeLists.txt | 54 | ||||
-rw-r--r-- | src/libktorrent/datachecker/CMakeLists.txt | 13 | ||||
-rw-r--r-- | src/libktorrent/datachecker/datachecker.cpp (renamed from libktorrent/datachecker/datachecker.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/datachecker/datachecker.h (renamed from libktorrent/datachecker/datachecker.h) | 3 | ||||
-rw-r--r-- | src/libktorrent/datachecker/datacheckerlistener.cpp (renamed from libktorrent/datachecker/datacheckerlistener.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/datachecker/datacheckerlistener.h (renamed from libktorrent/datachecker/datacheckerlistener.h) | 3 | ||||
-rw-r--r-- | src/libktorrent/datachecker/datacheckerthread.cpp (renamed from libktorrent/datachecker/datacheckerthread.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/datachecker/datacheckerthread.h (renamed from libktorrent/datachecker/datacheckerthread.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/datachecker/multidatachecker.cpp (renamed from libktorrent/datachecker/multidatachecker.cpp) | 2 | ||||
-rw-r--r-- | src/libktorrent/datachecker/multidatachecker.h (renamed from libktorrent/datachecker/multidatachecker.h) | 2 | ||||
-rw-r--r-- | src/libktorrent/datachecker/singledatachecker.cpp (renamed from libktorrent/datachecker/singledatachecker.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/datachecker/singledatachecker.h (renamed from libktorrent/datachecker/singledatachecker.h) | 2 | ||||
-rw-r--r-- | src/libktorrent/expandablewidget.cpp (renamed from libktorrent/expandablewidget.cpp) | 2 | ||||
-rw-r--r-- | src/libktorrent/expandablewidget.h (renamed from libktorrent/expandablewidget.h) | 2 | ||||
-rw-r--r-- | src/libktorrent/functions.cpp (renamed from libktorrent/functions.cpp) | 2 | ||||
-rw-r--r-- | src/libktorrent/functions.h (renamed from libktorrent/functions.h) | 3 | ||||
-rw-r--r-- | src/libktorrent/interfaces/CMakeLists.txt | 16 | ||||
-rw-r--r-- | src/libktorrent/interfaces/chunkdownloadinterface.cpp (renamed from libktorrent/interfaces/chunkdownloadinterface.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/interfaces/chunkdownloadinterface.h (renamed from libktorrent/interfaces/chunkdownloadinterface.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/interfaces/coreinterface.cpp (renamed from libktorrent/interfaces/coreinterface.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/interfaces/coreinterface.h (renamed from libktorrent/interfaces/coreinterface.h) | 5 | ||||
-rw-r--r-- | src/libktorrent/interfaces/exitoperation.cpp (renamed from libktorrent/interfaces/exitoperation.cpp) | 2 | ||||
-rw-r--r-- | src/libktorrent/interfaces/exitoperation.h (renamed from libktorrent/interfaces/exitoperation.h) | 7 | ||||
-rw-r--r-- | src/libktorrent/interfaces/filetreediritem.cpp (renamed from libktorrent/interfaces/filetreediritem.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/interfaces/filetreediritem.h (renamed from libktorrent/interfaces/filetreediritem.h) | 3 | ||||
-rw-r--r-- | src/libktorrent/interfaces/filetreeitem.cpp (renamed from libktorrent/interfaces/filetreeitem.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/interfaces/filetreeitem.h (renamed from libktorrent/interfaces/filetreeitem.h) | 3 | ||||
-rw-r--r-- | src/libktorrent/interfaces/functions.cpp (renamed from libktorrent/interfaces/functions.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/interfaces/functions.h (renamed from libktorrent/interfaces/functions.h) | 7 | ||||
-rw-r--r-- | src/libktorrent/interfaces/guiinterface.cpp (renamed from libktorrent/interfaces/guiinterface.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/interfaces/guiinterface.h (renamed from libktorrent/interfaces/guiinterface.h) | 3 | ||||
-rw-r--r-- | src/libktorrent/interfaces/ipblockinginterface.cpp (renamed from libktorrent/interfaces/ipblockinginterface.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/interfaces/ipblockinginterface.h (renamed from libktorrent/interfaces/ipblockinginterface.h) | 6 | ||||
-rw-r--r-- | src/libktorrent/interfaces/logmonitorinterface.cpp (renamed from libktorrent/interfaces/logmonitorinterface.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/interfaces/logmonitorinterface.h (renamed from libktorrent/interfaces/logmonitorinterface.h) | 4 | ||||
-rw-r--r-- | src/libktorrent/interfaces/monitorinterface.cpp (renamed from libktorrent/interfaces/monitorinterface.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/interfaces/monitorinterface.h (renamed from libktorrent/interfaces/monitorinterface.h) | 3 | ||||
-rw-r--r-- | src/libktorrent/interfaces/peerinterface.cpp (renamed from libktorrent/interfaces/peerinterface.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/interfaces/peerinterface.h (renamed from libktorrent/interfaces/peerinterface.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/interfaces/peersource.cpp (renamed from libktorrent/interfaces/peersource.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/interfaces/peersource.h (renamed from libktorrent/interfaces/peersource.h) | 5 | ||||
-rw-r--r-- | src/libktorrent/interfaces/plugin.cpp (renamed from libktorrent/interfaces/plugin.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/interfaces/plugin.h (renamed from libktorrent/interfaces/plugin.h) | 5 | ||||
-rw-r--r-- | src/libktorrent/interfaces/prefpageinterface.cpp (renamed from libktorrent/interfaces/prefpageinterface.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/interfaces/prefpageinterface.h (renamed from libktorrent/interfaces/prefpageinterface.h) | 3 | ||||
-rw-r--r-- | src/libktorrent/interfaces/torrentfileinterface.cpp (renamed from libktorrent/interfaces/torrentfileinterface.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/interfaces/torrentfileinterface.h (renamed from libktorrent/interfaces/torrentfileinterface.h) | 5 | ||||
-rw-r--r-- | src/libktorrent/interfaces/torrentinterface.cpp (renamed from libktorrent/interfaces/torrentinterface.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/interfaces/torrentinterface.h (renamed from libktorrent/interfaces/torrentinterface.h) | 10 | ||||
-rw-r--r-- | src/libktorrent/interfaces/trackerslist.cpp (renamed from libktorrent/interfaces/trackerslist.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/interfaces/trackerslist.h (renamed from libktorrent/interfaces/trackerslist.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/kademlia/CMakeLists.txt | 15 | ||||
-rw-r--r-- | src/libktorrent/kademlia/announcetask.cpp (renamed from libktorrent/kademlia/announcetask.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/kademlia/announcetask.h (renamed from libktorrent/kademlia/announcetask.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/kademlia/database.cpp (renamed from libktorrent/kademlia/database.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/kademlia/database.h (renamed from libktorrent/kademlia/database.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/kademlia/dht.cpp (renamed from libktorrent/kademlia/dht.cpp) | 2 | ||||
-rw-r--r-- | src/libktorrent/kademlia/dht.h (renamed from libktorrent/kademlia/dht.h) | 2 | ||||
-rw-r--r-- | src/libktorrent/kademlia/dhtbase.cpp (renamed from libktorrent/kademlia/dhtbase.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/kademlia/dhtbase.h (renamed from libktorrent/kademlia/dhtbase.h) | 2 | ||||
-rw-r--r-- | src/libktorrent/kademlia/dhttrackerbackend.cpp (renamed from libktorrent/kademlia/dhttrackerbackend.cpp) | 10 | ||||
-rw-r--r-- | src/libktorrent/kademlia/dhttrackerbackend.h (renamed from libktorrent/kademlia/dhttrackerbackend.h) | 2 | ||||
-rw-r--r-- | src/libktorrent/kademlia/kbucket.cpp (renamed from libktorrent/kademlia/kbucket.cpp) | 4 | ||||
-rw-r--r-- | src/libktorrent/kademlia/kbucket.h (renamed from libktorrent/kademlia/kbucket.h) | 2 | ||||
-rw-r--r-- | src/libktorrent/kademlia/kclosestnodessearch.cpp (renamed from libktorrent/kademlia/kclosestnodessearch.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/kademlia/kclosestnodessearch.h (renamed from libktorrent/kademlia/kclosestnodessearch.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/kademlia/key.cpp (renamed from libktorrent/kademlia/key.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/kademlia/key.h (renamed from libktorrent/kademlia/key.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/kademlia/node.cpp (renamed from libktorrent/kademlia/node.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/kademlia/node.h (renamed from libktorrent/kademlia/node.h) | 2 | ||||
-rw-r--r-- | src/libktorrent/kademlia/nodelookup.cpp (renamed from libktorrent/kademlia/nodelookup.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/kademlia/nodelookup.h (renamed from libktorrent/kademlia/nodelookup.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/kademlia/pack.cpp (renamed from libktorrent/kademlia/pack.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/kademlia/pack.h (renamed from libktorrent/kademlia/pack.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/kademlia/rpccall.cpp (renamed from libktorrent/kademlia/rpccall.cpp) | 6 | ||||
-rw-r--r-- | src/libktorrent/kademlia/rpccall.h (renamed from libktorrent/kademlia/rpccall.h) | 4 | ||||
-rw-r--r-- | src/libktorrent/kademlia/rpcmsg.cpp (renamed from libktorrent/kademlia/rpcmsg.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/kademlia/rpcmsg.h (renamed from libktorrent/kademlia/rpcmsg.h) | 3 | ||||
-rw-r--r-- | src/libktorrent/kademlia/rpcserver.cpp (renamed from libktorrent/kademlia/rpcserver.cpp) | 2 | ||||
-rw-r--r-- | src/libktorrent/kademlia/rpcserver.h (renamed from libktorrent/kademlia/rpcserver.h) | 2 | ||||
-rw-r--r-- | src/libktorrent/kademlia/task.cpp (renamed from libktorrent/kademlia/task.cpp) | 2 | ||||
-rw-r--r-- | src/libktorrent/kademlia/task.h (renamed from libktorrent/kademlia/task.h) | 2 | ||||
-rw-r--r-- | src/libktorrent/kademlia/taskmanager.cpp (renamed from libktorrent/kademlia/taskmanager.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/kademlia/taskmanager.h (renamed from libktorrent/kademlia/taskmanager.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/ktorrent.kcfg (renamed from libktorrent/ktorrent.kcfg) | 0 | ||||
-rw-r--r-- | src/libktorrent/ktversion.h (renamed from libktorrent/ktversion.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/labelview.cpp (renamed from libktorrent/labelview.cpp) | 10 | ||||
-rw-r--r-- | src/libktorrent/labelview.h (renamed from libktorrent/labelview.h) | 4 | ||||
-rw-r--r-- | src/libktorrent/labelviewitembase.ui (renamed from libktorrent/labelviewitembase.ui) | 0 | ||||
-rw-r--r-- | src/libktorrent/libktorrent_export.h | 12 | ||||
-rw-r--r-- | src/libktorrent/migrate/CMakeLists.txt | 11 | ||||
-rw-r--r-- | src/libktorrent/migrate/cachemigrate.cpp (renamed from libktorrent/migrate/cachemigrate.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/migrate/cachemigrate.h (renamed from libktorrent/migrate/cachemigrate.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/migrate/ccmigrate.cpp (renamed from libktorrent/migrate/ccmigrate.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/migrate/ccmigrate.h (renamed from libktorrent/migrate/ccmigrate.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/migrate/migrate.cpp (renamed from libktorrent/migrate/migrate.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/migrate/migrate.h (renamed from libktorrent/migrate/migrate.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/mse/CMakeLists.txt | 16 | ||||
-rw-r--r-- | src/libktorrent/mse/bigint.cpp (renamed from libktorrent/mse/bigint.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/mse/bigint.h (renamed from libktorrent/mse/bigint.h) | 3 | ||||
-rw-r--r-- | src/libktorrent/mse/encryptedauthenticate.cpp (renamed from libktorrent/mse/encryptedauthenticate.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/mse/encryptedauthenticate.h (renamed from libktorrent/mse/encryptedauthenticate.h) | 2 | ||||
-rw-r--r-- | src/libktorrent/mse/encryptedserverauthenticate.cpp (renamed from libktorrent/mse/encryptedserverauthenticate.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/mse/encryptedserverauthenticate.h (renamed from libktorrent/mse/encryptedserverauthenticate.h) | 2 | ||||
-rw-r--r-- | src/libktorrent/mse/functions.cpp (renamed from libktorrent/mse/functions.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/mse/functions.h (renamed from libktorrent/mse/functions.h) | 10 | ||||
-rw-r--r-- | src/libktorrent/mse/rc4encryptor.cpp (renamed from libktorrent/mse/rc4encryptor.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/mse/rc4encryptor.h (renamed from libktorrent/mse/rc4encryptor.h) | 5 | ||||
-rw-r--r-- | src/libktorrent/mse/streamsocket.cpp (renamed from libktorrent/mse/streamsocket.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/mse/streamsocket.h (renamed from libktorrent/mse/streamsocket.h) | 5 | ||||
-rw-r--r-- | src/libktorrent/net/CMakeLists.txt | 13 | ||||
-rw-r--r-- | src/libktorrent/net/address.cpp (renamed from libktorrent/net/address.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/net/address.h (renamed from libktorrent/net/address.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/net/bufferedsocket.cpp (renamed from libktorrent/net/bufferedsocket.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/net/bufferedsocket.h (renamed from libktorrent/net/bufferedsocket.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/net/circularbuffer.cpp (renamed from libktorrent/net/circularbuffer.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/net/circularbuffer.h (renamed from libktorrent/net/circularbuffer.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/net/downloadthread.cpp (renamed from libktorrent/net/downloadthread.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/net/downloadthread.h (renamed from libktorrent/net/downloadthread.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/net/networkthread.cpp (renamed from libktorrent/net/networkthread.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/net/networkthread.h (renamed from libktorrent/net/networkthread.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/net/portlist.cpp (renamed from libktorrent/net/portlist.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/net/portlist.h (renamed from libktorrent/net/portlist.h) | 5 | ||||
-rw-r--r-- | src/libktorrent/net/socket.cpp (renamed from libktorrent/net/socket.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/net/socket.h (renamed from libktorrent/net/socket.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/net/socketgroup.cpp (renamed from libktorrent/net/socketgroup.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/net/socketgroup.h (renamed from libktorrent/net/socketgroup.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/net/socketmonitor.cpp (renamed from libktorrent/net/socketmonitor.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/net/socketmonitor.h (renamed from libktorrent/net/socketmonitor.h) | 4 | ||||
-rw-r--r-- | src/libktorrent/net/speed.cpp (renamed from libktorrent/net/speed.cpp) | 2 | ||||
-rw-r--r-- | src/libktorrent/net/speed.h (renamed from libktorrent/net/speed.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/net/uploadthread.cpp (renamed from libktorrent/net/uploadthread.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/net/uploadthread.h (renamed from libktorrent/net/uploadthread.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/pluginmanager.cpp (renamed from libktorrent/pluginmanager.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/pluginmanager.h (renamed from libktorrent/pluginmanager.h) | 3 | ||||
-rw-r--r-- | src/libktorrent/pluginmanagerprefpage.cpp (renamed from libktorrent/pluginmanagerprefpage.cpp) | 12 | ||||
-rw-r--r-- | src/libktorrent/pluginmanagerprefpage.h (renamed from libktorrent/pluginmanagerprefpage.h) | 2 | ||||
-rw-r--r-- | src/libktorrent/pluginmanagerwidget.ui (renamed from libktorrent/pluginmanagerwidget.ui) | 0 | ||||
-rw-r--r-- | src/libktorrent/settings.kcfgc (renamed from libktorrent/settings.kcfgc) | 2 | ||||
-rw-r--r-- | src/libktorrent/torrent/CMakeLists.txt | 29 | ||||
-rw-r--r-- | src/libktorrent/torrent/advancedchokealgorithm.cpp (renamed from libktorrent/torrent/advancedchokealgorithm.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/advancedchokealgorithm.h (renamed from libktorrent/torrent/advancedchokealgorithm.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/announcelist.cpp (renamed from libktorrent/torrent/announcelist.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/announcelist.h (renamed from libktorrent/torrent/announcelist.h) | 2 | ||||
-rw-r--r-- | src/libktorrent/torrent/authenticate.cpp (renamed from libktorrent/torrent/authenticate.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/authenticate.h (renamed from libktorrent/torrent/authenticate.h) | 2 | ||||
-rw-r--r-- | src/libktorrent/torrent/authenticatebase.cpp (renamed from libktorrent/torrent/authenticatebase.cpp) | 2 | ||||
-rw-r--r-- | src/libktorrent/torrent/authenticatebase.h (renamed from libktorrent/torrent/authenticatebase.h) | 2 | ||||
-rw-r--r-- | src/libktorrent/torrent/authenticationmonitor.cpp (renamed from libktorrent/torrent/authenticationmonitor.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/authenticationmonitor.h (renamed from libktorrent/torrent/authenticationmonitor.h) | 4 | ||||
-rw-r--r-- | src/libktorrent/torrent/bdecoder.cpp (renamed from libktorrent/torrent/bdecoder.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/bdecoder.h (renamed from libktorrent/torrent/bdecoder.h) | 3 | ||||
-rw-r--r-- | src/libktorrent/torrent/bencoder.cpp (renamed from libktorrent/torrent/bencoder.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/bencoder.h (renamed from libktorrent/torrent/bencoder.h) | 3 | ||||
-rw-r--r-- | src/libktorrent/torrent/bnode.cpp (renamed from libktorrent/torrent/bnode.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/bnode.h (renamed from libktorrent/torrent/bnode.h) | 9 | ||||
-rw-r--r-- | src/libktorrent/torrent/cache.cpp (renamed from libktorrent/torrent/cache.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/cache.h (renamed from libktorrent/torrent/cache.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/cachefile.cpp (renamed from libktorrent/torrent/cachefile.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/cachefile.h (renamed from libktorrent/torrent/cachefile.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/cap.cpp (renamed from libktorrent/torrent/cap.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/cap.h (renamed from libktorrent/torrent/cap.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/choker.cpp (renamed from libktorrent/torrent/choker.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/choker.h (renamed from libktorrent/torrent/choker.h) | 3 | ||||
-rw-r--r-- | src/libktorrent/torrent/chunk.cpp (renamed from libktorrent/torrent/chunk.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/chunk.h (renamed from libktorrent/torrent/chunk.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/chunkcounter.cpp (renamed from libktorrent/torrent/chunkcounter.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/chunkcounter.h (renamed from libktorrent/torrent/chunkcounter.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/chunkdownload.cpp (renamed from libktorrent/torrent/chunkdownload.cpp) | 12 | ||||
-rw-r--r-- | src/libktorrent/torrent/chunkdownload.h (renamed from libktorrent/torrent/chunkdownload.h) | 2 | ||||
-rw-r--r-- | src/libktorrent/torrent/chunkmanager.cpp (renamed from libktorrent/torrent/chunkmanager.cpp) | 8 | ||||
-rw-r--r-- | src/libktorrent/torrent/chunkmanager.h (renamed from libktorrent/torrent/chunkmanager.h) | 5 | ||||
-rw-r--r-- | src/libktorrent/torrent/chunkselector.cpp (renamed from libktorrent/torrent/chunkselector.cpp) | 5 | ||||
-rw-r--r-- | src/libktorrent/torrent/chunkselector.h (renamed from libktorrent/torrent/chunkselector.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/dndfile.cpp (renamed from libktorrent/torrent/dndfile.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/dndfile.h (renamed from libktorrent/torrent/dndfile.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/downloadcap.cpp (renamed from libktorrent/torrent/downloadcap.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/downloadcap.h (renamed from libktorrent/torrent/downloadcap.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/downloader.cpp (renamed from libktorrent/torrent/downloader.cpp) | 8 | ||||
-rw-r--r-- | src/libktorrent/torrent/downloader.h (renamed from libktorrent/torrent/downloader.h) | 4 | ||||
-rw-r--r-- | src/libktorrent/torrent/globals.cpp (renamed from libktorrent/torrent/globals.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/globals.h (renamed from libktorrent/torrent/globals.h) | 5 | ||||
-rw-r--r-- | src/libktorrent/torrent/httptracker.cpp (renamed from libktorrent/torrent/httptracker.cpp) | 6 | ||||
-rw-r--r-- | src/libktorrent/torrent/httptracker.h (renamed from libktorrent/torrent/httptracker.h) | 2 | ||||
-rw-r--r-- | src/libktorrent/torrent/ipblocklist.cpp (renamed from libktorrent/torrent/ipblocklist.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/ipblocklist.h (renamed from libktorrent/torrent/ipblocklist.h) | 9 | ||||
-rw-r--r-- | src/libktorrent/torrent/movedatafilesjob.cpp (renamed from libktorrent/torrent/movedatafilesjob.cpp) | 8 | ||||
-rw-r--r-- | src/libktorrent/torrent/movedatafilesjob.h (renamed from libktorrent/torrent/movedatafilesjob.h) | 2 | ||||
-rw-r--r-- | src/libktorrent/torrent/multifilecache.cpp (renamed from libktorrent/torrent/multifilecache.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/multifilecache.h (renamed from libktorrent/torrent/multifilecache.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/newchokealgorithm.cpp (renamed from libktorrent/torrent/newchokealgorithm.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/newchokealgorithm.h (renamed from libktorrent/torrent/newchokealgorithm.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/oldchokealgorithm.cpp (renamed from libktorrent/torrent/oldchokealgorithm.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/oldchokealgorithm.h (renamed from libktorrent/torrent/oldchokealgorithm.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/packet.cpp (renamed from libktorrent/torrent/packet.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/packet.h (renamed from libktorrent/torrent/packet.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/packetreader.cpp (renamed from libktorrent/torrent/packetreader.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/packetreader.h (renamed from libktorrent/torrent/packetreader.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/packetwriter.cpp (renamed from libktorrent/torrent/packetwriter.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/packetwriter.h (renamed from libktorrent/torrent/packetwriter.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/peer.cpp (renamed from libktorrent/torrent/peer.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/peer.h (renamed from libktorrent/torrent/peer.h) | 5 | ||||
-rw-r--r-- | src/libktorrent/torrent/peerdownloader.cpp (renamed from libktorrent/torrent/peerdownloader.cpp) | 4 | ||||
-rw-r--r-- | src/libktorrent/torrent/peerdownloader.h (renamed from libktorrent/torrent/peerdownloader.h) | 2 | ||||
-rw-r--r-- | src/libktorrent/torrent/peerid.cpp (renamed from libktorrent/torrent/peerid.cpp) | 6 | ||||
-rw-r--r-- | src/libktorrent/torrent/peerid.h (renamed from libktorrent/torrent/peerid.h) | 3 | ||||
-rw-r--r-- | src/libktorrent/torrent/peermanager.cpp (renamed from libktorrent/torrent/peermanager.cpp) | 14 | ||||
-rw-r--r-- | src/libktorrent/torrent/peermanager.h (renamed from libktorrent/torrent/peermanager.h) | 4 | ||||
-rw-r--r-- | src/libktorrent/torrent/peersourcemanager.cpp (renamed from libktorrent/torrent/peersourcemanager.cpp) | 34 | ||||
-rw-r--r-- | src/libktorrent/torrent/peersourcemanager.h (renamed from libktorrent/torrent/peersourcemanager.h) | 2 | ||||
-rw-r--r-- | src/libktorrent/torrent/peeruploader.cpp (renamed from libktorrent/torrent/peeruploader.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/peeruploader.h (renamed from libktorrent/torrent/peeruploader.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/piece.cpp (renamed from libktorrent/torrent/piece.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/piece.h (renamed from libktorrent/torrent/piece.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/preallocationthread.cpp (renamed from libktorrent/torrent/preallocationthread.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/preallocationthread.h (renamed from libktorrent/torrent/preallocationthread.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/queuemanager.cpp (renamed from libktorrent/torrent/queuemanager.cpp) | 4 | ||||
-rw-r--r-- | src/libktorrent/torrent/queuemanager.h (renamed from libktorrent/torrent/queuemanager.h) | 5 | ||||
-rw-r--r-- | src/libktorrent/torrent/request.cpp (renamed from libktorrent/torrent/request.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/request.h (renamed from libktorrent/torrent/request.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/server.cpp (renamed from libktorrent/torrent/server.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/server.h (renamed from libktorrent/torrent/server.h) | 5 | ||||
-rw-r--r-- | src/libktorrent/torrent/serverauthenticate.cpp (renamed from libktorrent/torrent/serverauthenticate.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/serverauthenticate.h (renamed from libktorrent/torrent/serverauthenticate.h) | 5 | ||||
-rw-r--r-- | src/libktorrent/torrent/singlefilecache.cpp (renamed from libktorrent/torrent/singlefilecache.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/singlefilecache.h (renamed from libktorrent/torrent/singlefilecache.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/speedestimater.cpp (renamed from libktorrent/torrent/speedestimater.cpp) | 2 | ||||
-rw-r--r-- | src/libktorrent/torrent/speedestimater.h (renamed from libktorrent/torrent/speedestimater.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/statsfile.cpp (renamed from libktorrent/torrent/statsfile.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/statsfile.h (renamed from libktorrent/torrent/statsfile.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/timeestimator.cpp (renamed from libktorrent/torrent/timeestimator.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/timeestimator.h (renamed from libktorrent/torrent/timeestimator.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/torrent.cpp (renamed from libktorrent/torrent/torrent.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/torrent.h (renamed from libktorrent/torrent/torrent.h) | 3 | ||||
-rw-r--r-- | src/libktorrent/torrent/torrentcontrol.cpp (renamed from libktorrent/torrent/torrentcontrol.cpp) | 30 | ||||
-rw-r--r-- | src/libktorrent/torrent/torrentcontrol.h (renamed from libktorrent/torrent/torrentcontrol.h) | 5 | ||||
-rw-r--r-- | src/libktorrent/torrent/torrentcreator.cpp (renamed from libktorrent/torrent/torrentcreator.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/torrentcreator.h (renamed from libktorrent/torrent/torrentcreator.h) | 3 | ||||
-rw-r--r-- | src/libktorrent/torrent/torrentfile.cpp (renamed from libktorrent/torrent/torrentfile.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/torrentfile.h (renamed from libktorrent/torrent/torrentfile.h) | 2 | ||||
-rw-r--r-- | src/libktorrent/torrent/torrentmonitor.cpp (renamed from libktorrent/torrent/torrentmonitor.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/torrentmonitor.h (renamed from libktorrent/torrent/torrentmonitor.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/tracker.cpp (renamed from libktorrent/torrent/tracker.cpp) | 4 | ||||
-rw-r--r-- | src/libktorrent/torrent/tracker.h (renamed from libktorrent/torrent/tracker.h) | 4 | ||||
-rw-r--r-- | src/libktorrent/torrent/udptracker.cpp (renamed from libktorrent/torrent/udptracker.cpp) | 16 | ||||
-rw-r--r-- | src/libktorrent/torrent/udptracker.h (renamed from libktorrent/torrent/udptracker.h) | 2 | ||||
-rw-r--r-- | src/libktorrent/torrent/udptrackersocket.cpp (renamed from libktorrent/torrent/udptrackersocket.cpp) | 2 | ||||
-rw-r--r-- | src/libktorrent/torrent/udptrackersocket.h (renamed from libktorrent/torrent/udptrackersocket.h) | 5 | ||||
-rw-r--r-- | src/libktorrent/torrent/uploadcap.cpp (renamed from libktorrent/torrent/uploadcap.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/uploadcap.h (renamed from libktorrent/torrent/uploadcap.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/uploader.cpp (renamed from libktorrent/torrent/uploader.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/uploader.h (renamed from libktorrent/torrent/uploader.h) | 2 | ||||
-rw-r--r-- | src/libktorrent/torrent/upspeedestimater.cpp (renamed from libktorrent/torrent/upspeedestimater.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/upspeedestimater.h (renamed from libktorrent/torrent/upspeedestimater.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/utpex.cpp (renamed from libktorrent/torrent/utpex.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/utpex.h (renamed from libktorrent/torrent/utpex.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/value.cpp (renamed from libktorrent/torrent/value.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/torrent/value.h (renamed from libktorrent/torrent/value.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/util/CMakeLists.txt | 24 | ||||
-rw-r--r-- | src/libktorrent/util/array.cpp (renamed from libktorrent/util/array.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/util/array.h (renamed from libktorrent/util/array.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/util/autorotatelogjob.cpp (renamed from libktorrent/util/autorotatelogjob.cpp) | 6 | ||||
-rw-r--r-- | src/libktorrent/util/autorotatelogjob.h (renamed from libktorrent/util/autorotatelogjob.h) | 2 | ||||
-rw-r--r-- | src/libktorrent/util/bitset.cpp (renamed from libktorrent/util/bitset.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/util/bitset.h (renamed from libktorrent/util/bitset.h) | 3 | ||||
-rw-r--r-- | src/libktorrent/util/constants.h (renamed from libktorrent/util/constants.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/util/error.cpp (renamed from libktorrent/util/error.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/util/error.h (renamed from libktorrent/util/error.h) | 3 | ||||
-rw-r--r-- | src/libktorrent/util/file.cpp (renamed from libktorrent/util/file.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/util/file.h (renamed from libktorrent/util/file.h) | 3 | ||||
-rw-r--r-- | src/libktorrent/util/fileops.cpp (renamed from libktorrent/util/fileops.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/util/fileops.h (renamed from libktorrent/util/fileops.h) | 38 | ||||
-rw-r--r-- | src/libktorrent/util/functions.cpp (renamed from libktorrent/util/functions.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/util/functions.h (renamed from libktorrent/util/functions.h) | 42 | ||||
-rw-r--r-- | src/libktorrent/util/httprequest.cpp (renamed from libktorrent/util/httprequest.cpp) | 10 | ||||
-rw-r--r-- | src/libktorrent/util/httprequest.h (renamed from libktorrent/util/httprequest.h) | 4 | ||||
-rw-r--r-- | src/libktorrent/util/log.cpp (renamed from libktorrent/util/log.cpp) | 8 | ||||
-rw-r--r-- | src/libktorrent/util/log.h (renamed from libktorrent/util/log.h) | 7 | ||||
-rw-r--r-- | src/libktorrent/util/mmapfile.cpp (renamed from libktorrent/util/mmapfile.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/util/mmapfile.h (renamed from libktorrent/util/mmapfile.h) | 6 | ||||
-rw-r--r-- | src/libktorrent/util/profiler.cpp (renamed from libktorrent/util/profiler.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/util/profiler.h (renamed from libktorrent/util/profiler.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/util/ptrmap.cpp (renamed from libktorrent/util/ptrmap.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/util/ptrmap.h (renamed from libktorrent/util/ptrmap.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/util/sha1hash.cpp (renamed from libktorrent/util/sha1hash.cpp) | 2 | ||||
-rw-r--r-- | src/libktorrent/util/sha1hash.h (renamed from libktorrent/util/sha1hash.h) | 3 | ||||
-rw-r--r-- | src/libktorrent/util/sha1hashgen.cpp (renamed from libktorrent/util/sha1hashgen.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/util/sha1hashgen.h (renamed from libktorrent/util/sha1hashgen.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/util/timer.cpp (renamed from libktorrent/util/timer.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/util/timer.h (renamed from libktorrent/util/timer.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/util/urlencoder.cpp (renamed from libktorrent/util/urlencoder.cpp) | 0 | ||||
-rw-r--r-- | src/libktorrent/util/urlencoder.h (renamed from libktorrent/util/urlencoder.h) | 0 | ||||
-rw-r--r-- | src/libktorrent/util/waitjob.cpp (renamed from libktorrent/util/waitjob.cpp) | 6 | ||||
-rw-r--r-- | src/libktorrent/util/waitjob.h (renamed from libktorrent/util/waitjob.h) | 4 | ||||
-rw-r--r-- | src/plugins/CMakeLists.txt | 15 | ||||
-rw-r--r-- | src/plugins/infowidget/CMakeLists.txt | 54 | ||||
-rw-r--r-- | src/plugins/infowidget/GeoIP.c (renamed from plugins/infowidget/GeoIP.c) | 0 | ||||
-rw-r--r-- | src/plugins/infowidget/GeoIP.h (renamed from plugins/infowidget/GeoIP.h) | 0 | ||||
-rw-r--r-- | src/plugins/infowidget/availabilitychunkbar.cpp (renamed from plugins/infowidget/availabilitychunkbar.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/infowidget/availabilitychunkbar.h (renamed from plugins/infowidget/availabilitychunkbar.h) | 2 | ||||
-rw-r--r-- | src/plugins/infowidget/chunkbar.cpp (renamed from plugins/infowidget/chunkbar.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/infowidget/chunkbar.h (renamed from plugins/infowidget/chunkbar.h) | 5 | ||||
-rw-r--r-- | src/plugins/infowidget/chunkdownloadview.cpp (renamed from plugins/infowidget/chunkdownloadview.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/infowidget/chunkdownloadview.h (renamed from plugins/infowidget/chunkdownloadview.h) | 2 | ||||
-rw-r--r-- | src/plugins/infowidget/chunkdownloadviewbase.ui (renamed from plugins/infowidget/chunkdownloadviewbase.ui) | 0 | ||||
-rw-r--r-- | src/plugins/infowidget/downloadedchunkbar.cpp (renamed from plugins/infowidget/downloadedchunkbar.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/infowidget/downloadedchunkbar.h (renamed from plugins/infowidget/downloadedchunkbar.h) | 2 | ||||
-rw-r--r-- | src/plugins/infowidget/fileview.cpp (renamed from plugins/infowidget/fileview.cpp) | 20 | ||||
-rw-r--r-- | src/plugins/infowidget/fileview.h (renamed from plugins/infowidget/fileview.h) | 2 | ||||
-rw-r--r-- | src/plugins/infowidget/flagdb.cpp (renamed from plugins/infowidget/flagdb.cpp) | 4 | ||||
-rw-r--r-- | src/plugins/infowidget/flagdb.h (renamed from plugins/infowidget/flagdb.h) | 0 | ||||
-rw-r--r-- | src/plugins/infowidget/floatspinbox.cpp (renamed from plugins/infowidget/floatspinbox.cpp) | 12 | ||||
-rw-r--r-- | src/plugins/infowidget/floatspinbox.h (renamed from plugins/infowidget/floatspinbox.h) | 2 | ||||
-rw-r--r-- | src/plugins/infowidget/geoip/CMakeLists.txt | 17 | ||||
-rw-r--r-- | src/plugins/infowidget/geoip/FLAGS_LICENCE (renamed from plugins/infowidget/geoip/FLAGS_LICENCE) | 0 | ||||
-rw-r--r-- | src/plugins/infowidget/geoip/GeoIP-LICENSE.txt (renamed from plugins/infowidget/geoip/GeoIP-LICENSE.txt) | 0 | ||||
-rw-r--r-- | src/plugins/infowidget/geoip/ad.png (renamed from plugins/infowidget/geoip/ad.png) | bin | 551 -> 551 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ae.png (renamed from plugins/infowidget/geoip/ae.png) | bin | 404 -> 404 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/af.png (renamed from plugins/infowidget/geoip/af.png) | bin | 591 -> 591 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ag.png (renamed from plugins/infowidget/geoip/ag.png) | bin | 662 -> 662 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ai.png (renamed from plugins/infowidget/geoip/ai.png) | bin | 659 -> 659 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/al.png (renamed from plugins/infowidget/geoip/al.png) | bin | 568 -> 568 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/am.png (renamed from plugins/infowidget/geoip/am.png) | bin | 569 -> 569 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/an.png (renamed from plugins/infowidget/geoip/an.png) | bin | 576 -> 576 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ao.png (renamed from plugins/infowidget/geoip/ao.png) | bin | 585 -> 585 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/aq.png (renamed from plugins/infowidget/geoip/aq.png) | bin | 591 -> 591 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ar.png (renamed from plugins/infowidget/geoip/ar.png) | bin | 575 -> 575 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/as.png (renamed from plugins/infowidget/geoip/as.png) | bin | 641 -> 641 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/at.png (renamed from plugins/infowidget/geoip/at.png) | bin | 549 -> 549 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/au.png (renamed from plugins/infowidget/geoip/au.png) | bin | 631 -> 631 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/aw.png (renamed from plugins/infowidget/geoip/aw.png) | bin | 571 -> 571 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/az.png (renamed from plugins/infowidget/geoip/az.png) | bin | 600 -> 600 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ba.png (renamed from plugins/infowidget/geoip/ba.png) | bin | 618 -> 618 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/bb.png (renamed from plugins/infowidget/geoip/bb.png) | bin | 574 -> 574 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/bd.png (renamed from plugins/infowidget/geoip/bd.png) | bin | 572 -> 572 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/be.png (renamed from plugins/infowidget/geoip/be.png) | bin | 534 -> 534 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/bf.png (renamed from plugins/infowidget/geoip/bf.png) | bin | 566 -> 566 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/bg.png (renamed from plugins/infowidget/geoip/bg.png) | bin | 552 -> 552 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/bh.png (renamed from plugins/infowidget/geoip/bh.png) | bin | 514 -> 514 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/bi.png (renamed from plugins/infowidget/geoip/bi.png) | bin | 648 -> 648 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/bj.png (renamed from plugins/infowidget/geoip/bj.png) | bin | 544 -> 544 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/bm.png (renamed from plugins/infowidget/geoip/bm.png) | bin | 608 -> 608 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/bn.png (renamed from plugins/infowidget/geoip/bn.png) | bin | 631 -> 631 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/bo.png (renamed from plugins/infowidget/geoip/bo.png) | bin | 580 -> 580 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/br.png (renamed from plugins/infowidget/geoip/br.png) | bin | 640 -> 640 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/bs.png (renamed from plugins/infowidget/geoip/bs.png) | bin | 603 -> 603 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/bt.png (renamed from plugins/infowidget/geoip/bt.png) | bin | 614 -> 614 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/bv.png (renamed from plugins/infowidget/geoip/bv.png) | bin | 592 -> 592 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/bw.png (renamed from plugins/infowidget/geoip/bw.png) | bin | 564 -> 564 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/by.png (renamed from plugins/infowidget/geoip/by.png) | bin | 554 -> 554 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/bz.png (renamed from plugins/infowidget/geoip/bz.png) | bin | 615 -> 615 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ca.png (renamed from plugins/infowidget/geoip/ca.png) | bin | 602 -> 602 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/cc.png (renamed from plugins/infowidget/geoip/cc.png) | bin | 659 -> 659 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/cd.png (renamed from plugins/infowidget/geoip/cd.png) | bin | 588 -> 588 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/cf.png (renamed from plugins/infowidget/geoip/cf.png) | bin | 607 -> 607 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/cg.png (renamed from plugins/infowidget/geoip/cg.png) | bin | 558 -> 558 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ch.png (renamed from plugins/infowidget/geoip/ch.png) | bin | 581 -> 581 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ci.png (renamed from plugins/infowidget/geoip/ci.png) | bin | 531 -> 531 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ck.png (renamed from plugins/infowidget/geoip/ck.png) | bin | 600 -> 600 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/cl.png (renamed from plugins/infowidget/geoip/cl.png) | bin | 477 -> 477 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/cm.png (renamed from plugins/infowidget/geoip/cm.png) | bin | 548 -> 548 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/cn.png (renamed from plugins/infowidget/geoip/cn.png) | bin | 486 -> 486 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/co.png (renamed from plugins/infowidget/geoip/co.png) | bin | 570 -> 570 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/cr.png (renamed from plugins/infowidget/geoip/cr.png) | bin | 589 -> 589 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/cs.png (renamed from plugins/infowidget/geoip/cs.png) | bin | 440 -> 440 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/cu.png (renamed from plugins/infowidget/geoip/cu.png) | bin | 622 -> 622 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/cv.png (renamed from plugins/infowidget/geoip/cv.png) | bin | 600 -> 600 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/cx.png (renamed from plugins/infowidget/geoip/cx.png) | bin | 612 -> 612 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/cy.png (renamed from plugins/infowidget/geoip/cy.png) | bin | 562 -> 562 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/cz.png (renamed from plugins/infowidget/geoip/cz.png) | bin | 582 -> 582 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/de.png (renamed from plugins/infowidget/geoip/de.png) | bin | 540 -> 540 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/dj.png (renamed from plugins/infowidget/geoip/dj.png) | bin | 506 -> 506 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/dk.png (renamed from plugins/infowidget/geoip/dk.png) | bin | 559 -> 559 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/dm.png (renamed from plugins/infowidget/geoip/dm.png) | bin | 658 -> 658 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/do.png (renamed from plugins/infowidget/geoip/do.png) | bin | 592 -> 592 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/dz.png (renamed from plugins/infowidget/geoip/dz.png) | bin | 568 -> 568 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ec.png (renamed from plugins/infowidget/geoip/ec.png) | bin | 605 -> 605 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ee.png (renamed from plugins/infowidget/geoip/ee.png) | bin | 540 -> 540 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/eg.png (renamed from plugins/infowidget/geoip/eg.png) | bin | 557 -> 557 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/eh.png (renamed from plugins/infowidget/geoip/eh.png) | bin | 540 -> 540 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/er.png (renamed from plugins/infowidget/geoip/er.png) | bin | 603 -> 603 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/es.png (renamed from plugins/infowidget/geoip/es.png) | bin | 587 -> 587 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/et.png (renamed from plugins/infowidget/geoip/et.png) | bin | 604 -> 604 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/eu.png (renamed from plugins/infowidget/geoip/eu.png) | bin | 611 -> 611 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/fi.png (renamed from plugins/infowidget/geoip/fi.png) | bin | 566 -> 566 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/fj.png (renamed from plugins/infowidget/geoip/fj.png) | bin | 609 -> 609 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/fk.png (renamed from plugins/infowidget/geoip/fk.png) | bin | 661 -> 661 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/fm.png (renamed from plugins/infowidget/geoip/fm.png) | bin | 542 -> 542 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/fo.png (renamed from plugins/infowidget/geoip/fo.png) | bin | 583 -> 583 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/fr.png (renamed from plugins/infowidget/geoip/fr.png) | bin | 522 -> 522 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ga.png (renamed from plugins/infowidget/geoip/ga.png) | bin | 575 -> 575 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/gb.png (renamed from plugins/infowidget/geoip/gb.png) | bin | 656 -> 656 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/gd.png (renamed from plugins/infowidget/geoip/gd.png) | bin | 578 -> 578 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ge.png (renamed from plugins/infowidget/geoip/ge.png) | bin | 499 -> 499 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/geoip.dat (renamed from plugins/infowidget/geoip/geoip.dat) | bin | 1025470 -> 1025470 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/gf.png (renamed from plugins/infowidget/geoip/gf.png) | bin | 503 -> 503 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/gh.png (renamed from plugins/infowidget/geoip/gh.png) | bin | 451 -> 451 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/gi.png (renamed from plugins/infowidget/geoip/gi.png) | bin | 561 -> 561 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/gl.png (renamed from plugins/infowidget/geoip/gl.png) | bin | 574 -> 574 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/gm.png (renamed from plugins/infowidget/geoip/gm.png) | bin | 451 -> 451 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/gn.png (renamed from plugins/infowidget/geoip/gn.png) | bin | 518 -> 518 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/gp.png (renamed from plugins/infowidget/geoip/gp.png) | bin | 575 -> 575 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/gq.png (renamed from plugins/infowidget/geoip/gq.png) | bin | 574 -> 574 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/gr.png (renamed from plugins/infowidget/geoip/gr.png) | bin | 583 -> 583 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/gs.png (renamed from plugins/infowidget/geoip/gs.png) | bin | 650 -> 650 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/gt.png (renamed from plugins/infowidget/geoip/gt.png) | bin | 594 -> 594 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/gu.png (renamed from plugins/infowidget/geoip/gu.png) | bin | 577 -> 577 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/gw.png (renamed from plugins/infowidget/geoip/gw.png) | bin | 437 -> 437 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/gy.png (renamed from plugins/infowidget/geoip/gy.png) | bin | 535 -> 535 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/hk.png (renamed from plugins/infowidget/geoip/hk.png) | bin | 609 -> 609 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/hm.png (renamed from plugins/infowidget/geoip/hm.png) | bin | 640 -> 640 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/hn.png (renamed from plugins/infowidget/geoip/hn.png) | bin | 578 -> 578 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/hr.png (renamed from plugins/infowidget/geoip/hr.png) | bin | 601 -> 601 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ht.png (renamed from plugins/infowidget/geoip/ht.png) | bin | 587 -> 587 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/hu.png (renamed from plugins/infowidget/geoip/hu.png) | bin | 550 -> 550 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/id.png (renamed from plugins/infowidget/geoip/id.png) | bin | 535 -> 535 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ie.png (renamed from plugins/infowidget/geoip/ie.png) | bin | 516 -> 516 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/il.png (renamed from plugins/infowidget/geoip/il.png) | bin | 587 -> 587 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/in.png (renamed from plugins/infowidget/geoip/in.png) | bin | 574 -> 574 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/io.png (renamed from plugins/infowidget/geoip/io.png) | bin | 758 -> 758 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/iq.png (renamed from plugins/infowidget/geoip/iq.png) | bin | 581 -> 581 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ir.png (renamed from plugins/infowidget/geoip/ir.png) | bin | 573 -> 573 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/is.png (renamed from plugins/infowidget/geoip/is.png) | bin | 604 -> 604 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/it.png (renamed from plugins/infowidget/geoip/it.png) | bin | 504 -> 504 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/jm.png (renamed from plugins/infowidget/geoip/jm.png) | bin | 633 -> 633 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/jo.png (renamed from plugins/infowidget/geoip/jo.png) | bin | 593 -> 593 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/jp.png (renamed from plugins/infowidget/geoip/jp.png) | bin | 556 -> 556 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ke.png (renamed from plugins/infowidget/geoip/ke.png) | bin | 608 -> 608 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/kg.png (renamed from plugins/infowidget/geoip/kg.png) | bin | 563 -> 563 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/kh.png (renamed from plugins/infowidget/geoip/kh.png) | bin | 603 -> 603 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ki.png (renamed from plugins/infowidget/geoip/ki.png) | bin | 604 -> 604 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/km.png (renamed from plugins/infowidget/geoip/km.png) | bin | 541 -> 541 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/kn.png (renamed from plugins/infowidget/geoip/kn.png) | bin | 592 -> 592 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/kp.png (renamed from plugins/infowidget/geoip/kp.png) | bin | 619 -> 619 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/kr.png (renamed from plugins/infowidget/geoip/kr.png) | bin | 618 -> 618 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/kw.png (renamed from plugins/infowidget/geoip/kw.png) | bin | 447 -> 447 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ky.png (renamed from plugins/infowidget/geoip/ky.png) | bin | 601 -> 601 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/kz.png (renamed from plugins/infowidget/geoip/kz.png) | bin | 600 -> 600 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/la.png (renamed from plugins/infowidget/geoip/la.png) | bin | 515 -> 515 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/lb.png (renamed from plugins/infowidget/geoip/lb.png) | bin | 594 -> 594 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/lc.png (renamed from plugins/infowidget/geoip/lc.png) | bin | 610 -> 610 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/li.png (renamed from plugins/infowidget/geoip/li.png) | bin | 472 -> 472 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/lk.png (renamed from plugins/infowidget/geoip/lk.png) | bin | 593 -> 593 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/lr.png (renamed from plugins/infowidget/geoip/lr.png) | bin | 563 -> 563 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ls.png (renamed from plugins/infowidget/geoip/ls.png) | bin | 648 -> 648 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/lt.png (renamed from plugins/infowidget/geoip/lt.png) | bin | 531 -> 531 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/lu.png (renamed from plugins/infowidget/geoip/lu.png) | bin | 551 -> 551 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/lv.png (renamed from plugins/infowidget/geoip/lv.png) | bin | 561 -> 561 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ly.png (renamed from plugins/infowidget/geoip/ly.png) | bin | 454 -> 454 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ma.png (renamed from plugins/infowidget/geoip/ma.png) | bin | 501 -> 501 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/mc.png (renamed from plugins/infowidget/geoip/mc.png) | bin | 519 -> 519 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/md.png (renamed from plugins/infowidget/geoip/md.png) | bin | 575 -> 575 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/mg.png (renamed from plugins/infowidget/geoip/mg.png) | bin | 546 -> 546 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/mh.png (renamed from plugins/infowidget/geoip/mh.png) | bin | 661 -> 661 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/mk.png (renamed from plugins/infowidget/geoip/mk.png) | bin | 630 -> 630 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ml.png (renamed from plugins/infowidget/geoip/ml.png) | bin | 425 -> 425 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/mm.png (renamed from plugins/infowidget/geoip/mm.png) | bin | 510 -> 510 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/mn.png (renamed from plugins/infowidget/geoip/mn.png) | bin | 560 -> 560 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/mo.png (renamed from plugins/infowidget/geoip/mo.png) | bin | 590 -> 590 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/mp.png (renamed from plugins/infowidget/geoip/mp.png) | bin | 623 -> 623 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/mq.png (renamed from plugins/infowidget/geoip/mq.png) | bin | 503 -> 503 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/mr.png (renamed from plugins/infowidget/geoip/mr.png) | bin | 488 -> 488 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ms.png (renamed from plugins/infowidget/geoip/ms.png) | bin | 613 -> 613 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/mt.png (renamed from plugins/infowidget/geoip/mt.png) | bin | 497 -> 497 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/mu.png (renamed from plugins/infowidget/geoip/mu.png) | bin | 411 -> 411 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/mv.png (renamed from plugins/infowidget/geoip/mv.png) | bin | 574 -> 574 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/mw.png (renamed from plugins/infowidget/geoip/mw.png) | bin | 437 -> 437 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/mx.png (renamed from plugins/infowidget/geoip/mx.png) | bin | 604 -> 604 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/my.png (renamed from plugins/infowidget/geoip/my.png) | bin | 595 -> 595 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/mz.png (renamed from plugins/infowidget/geoip/mz.png) | bin | 599 -> 599 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/na.png (renamed from plugins/infowidget/geoip/na.png) | bin | 637 -> 637 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/nc.png (renamed from plugins/infowidget/geoip/nc.png) | bin | 620 -> 620 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ne.png (renamed from plugins/infowidget/geoip/ne.png) | bin | 514 -> 514 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/nf.png (renamed from plugins/infowidget/geoip/nf.png) | bin | 581 -> 581 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ng.png (renamed from plugins/infowidget/geoip/ng.png) | bin | 503 -> 503 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ni.png (renamed from plugins/infowidget/geoip/ni.png) | bin | 510 -> 510 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/nl.png (renamed from plugins/infowidget/geoip/nl.png) | bin | 551 -> 551 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/no.png (renamed from plugins/infowidget/geoip/no.png) | bin | 613 -> 613 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/np.png (renamed from plugins/infowidget/geoip/np.png) | bin | 486 -> 486 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/nr.png (renamed from plugins/infowidget/geoip/nr.png) | bin | 576 -> 576 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/nu.png (renamed from plugins/infowidget/geoip/nu.png) | bin | 531 -> 531 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/nz.png (renamed from plugins/infowidget/geoip/nz.png) | bin | 603 -> 603 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/om.png (renamed from plugins/infowidget/geoip/om.png) | bin | 549 -> 549 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/pa.png (renamed from plugins/infowidget/geoip/pa.png) | bin | 586 -> 586 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/pe.png (renamed from plugins/infowidget/geoip/pe.png) | bin | 583 -> 583 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/pf.png (renamed from plugins/infowidget/geoip/pf.png) | bin | 600 -> 600 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/pg.png (renamed from plugins/infowidget/geoip/pg.png) | bin | 532 -> 532 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ph.png (renamed from plugins/infowidget/geoip/ph.png) | bin | 606 -> 606 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/pk.png (renamed from plugins/infowidget/geoip/pk.png) | bin | 614 -> 614 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/pl.png (renamed from plugins/infowidget/geoip/pl.png) | bin | 514 -> 514 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/pm.png (renamed from plugins/infowidget/geoip/pm.png) | bin | 650 -> 650 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/pn.png (renamed from plugins/infowidget/geoip/pn.png) | bin | 686 -> 686 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/pr.png (renamed from plugins/infowidget/geoip/pr.png) | bin | 605 -> 605 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ps.png (renamed from plugins/infowidget/geoip/ps.png) | bin | 478 -> 478 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/pt.png (renamed from plugins/infowidget/geoip/pt.png) | bin | 573 -> 573 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/pw.png (renamed from plugins/infowidget/geoip/pw.png) | bin | 553 -> 553 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/py.png (renamed from plugins/infowidget/geoip/py.png) | bin | 577 -> 577 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/qa.png (renamed from plugins/infowidget/geoip/qa.png) | bin | 520 -> 520 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/re.png (renamed from plugins/infowidget/geoip/re.png) | bin | 503 -> 503 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ro.png (renamed from plugins/infowidget/geoip/ro.png) | bin | 539 -> 539 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ru.png (renamed from plugins/infowidget/geoip/ru.png) | bin | 550 -> 550 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/rw.png (renamed from plugins/infowidget/geoip/rw.png) | bin | 465 -> 465 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/sa.png (renamed from plugins/infowidget/geoip/sa.png) | bin | 558 -> 558 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/sb.png (renamed from plugins/infowidget/geoip/sb.png) | bin | 633 -> 633 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/sc.png (renamed from plugins/infowidget/geoip/sc.png) | bin | 626 -> 626 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/sd.png (renamed from plugins/infowidget/geoip/sd.png) | bin | 577 -> 577 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/se.png (renamed from plugins/infowidget/geoip/se.png) | bin | 603 -> 603 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/sg.png (renamed from plugins/infowidget/geoip/sg.png) | bin | 557 -> 557 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/sh.png (renamed from plugins/infowidget/geoip/sh.png) | bin | 622 -> 622 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/si.png (renamed from plugins/infowidget/geoip/si.png) | bin | 571 -> 571 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/sj.png (renamed from plugins/infowidget/geoip/sj.png) | bin | 592 -> 592 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/sk.png (renamed from plugins/infowidget/geoip/sk.png) | bin | 596 -> 596 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/sl.png (renamed from plugins/infowidget/geoip/sl.png) | bin | 557 -> 557 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/sm.png (renamed from plugins/infowidget/geoip/sm.png) | bin | 576 -> 576 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/sn.png (renamed from plugins/infowidget/geoip/sn.png) | bin | 474 -> 474 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/so.png (renamed from plugins/infowidget/geoip/so.png) | bin | 558 -> 558 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/sr.png (renamed from plugins/infowidget/geoip/sr.png) | bin | 503 -> 503 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/st.png (renamed from plugins/infowidget/geoip/st.png) | bin | 508 -> 508 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/sv.png (renamed from plugins/infowidget/geoip/sv.png) | bin | 530 -> 530 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/sy.png (renamed from plugins/infowidget/geoip/sy.png) | bin | 448 -> 448 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/sz.png (renamed from plugins/infowidget/geoip/sz.png) | bin | 713 -> 713 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/tc.png (renamed from plugins/infowidget/geoip/tc.png) | bin | 604 -> 604 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/td.png (renamed from plugins/infowidget/geoip/td.png) | bin | 529 -> 529 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/tf.png (renamed from plugins/infowidget/geoip/tf.png) | bin | 531 -> 531 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/tg.png (renamed from plugins/infowidget/geoip/tg.png) | bin | 592 -> 592 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/th.png (renamed from plugins/infowidget/geoip/th.png) | bin | 571 -> 571 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/tj.png (renamed from plugins/infowidget/geoip/tj.png) | bin | 523 -> 523 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/tk.png (renamed from plugins/infowidget/geoip/tk.png) | bin | 670 -> 670 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/tl.png (renamed from plugins/infowidget/geoip/tl.png) | bin | 518 -> 518 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/tm.png (renamed from plugins/infowidget/geoip/tm.png) | bin | 531 -> 531 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/tn.png (renamed from plugins/infowidget/geoip/tn.png) | bin | 601 -> 601 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/to.png (renamed from plugins/infowidget/geoip/to.png) | bin | 547 -> 547 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/tp.png (renamed from plugins/infowidget/geoip/tp.png) | bin | 579 -> 579 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/tr.png (renamed from plugins/infowidget/geoip/tr.png) | bin | 551 -> 551 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/tt.png (renamed from plugins/infowidget/geoip/tt.png) | bin | 637 -> 637 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/tv.png (renamed from plugins/infowidget/geoip/tv.png) | bin | 603 -> 603 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/tw.png (renamed from plugins/infowidget/geoip/tw.png) | bin | 525 -> 525 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/tz.png (renamed from plugins/infowidget/geoip/tz.png) | bin | 604 -> 604 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ua.png (renamed from plugins/infowidget/geoip/ua.png) | bin | 551 -> 551 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ug.png (renamed from plugins/infowidget/geoip/ug.png) | bin | 603 -> 603 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/um.png (renamed from plugins/infowidget/geoip/um.png) | bin | 580 -> 580 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/us.png (renamed from plugins/infowidget/geoip/us.png) | bin | 566 -> 566 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/uy.png (renamed from plugins/infowidget/geoip/uy.png) | bin | 558 -> 558 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/uz.png (renamed from plugins/infowidget/geoip/uz.png) | bin | 524 -> 524 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/va.png (renamed from plugins/infowidget/geoip/va.png) | bin | 574 -> 574 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/vc.png (renamed from plugins/infowidget/geoip/vc.png) | bin | 530 -> 530 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ve.png (renamed from plugins/infowidget/geoip/ve.png) | bin | 579 -> 579 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/vg.png (renamed from plugins/infowidget/geoip/vg.png) | bin | 609 -> 609 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/vi.png (renamed from plugins/infowidget/geoip/vi.png) | bin | 644 -> 644 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/vn.png (renamed from plugins/infowidget/geoip/vn.png) | bin | 563 -> 563 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/vu.png (renamed from plugins/infowidget/geoip/vu.png) | bin | 553 -> 553 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/wf.png (renamed from plugins/infowidget/geoip/wf.png) | bin | 503 -> 503 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ws.png (renamed from plugins/infowidget/geoip/ws.png) | bin | 534 -> 534 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/ye.png (renamed from plugins/infowidget/geoip/ye.png) | bin | 541 -> 541 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/yt.png (renamed from plugins/infowidget/geoip/yt.png) | bin | 503 -> 503 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/yu.png (renamed from plugins/infowidget/geoip/yu.png) | bin | 564 -> 564 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/za.png (renamed from plugins/infowidget/geoip/za.png) | bin | 637 -> 637 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/zm.png (renamed from plugins/infowidget/geoip/zm.png) | bin | 497 -> 497 bytes | |||
-rw-r--r-- | src/plugins/infowidget/geoip/zw.png (renamed from plugins/infowidget/geoip/zw.png) | bin | 614 -> 614 bytes | |||
-rw-r--r-- | src/plugins/infowidget/infowidgetplugin.cpp (renamed from plugins/infowidget/infowidgetplugin.cpp) | 4 | ||||
-rw-r--r-- | src/plugins/infowidget/infowidgetplugin.h (renamed from plugins/infowidget/infowidgetplugin.h) | 2 | ||||
-rw-r--r-- | src/plugins/infowidget/infowidgetpluginsettings.kcfgc (renamed from plugins/infowidget/infowidgetpluginsettings.kcfgc) | 0 | ||||
-rw-r--r-- | src/plugins/infowidget/infowidgetprefpage.cpp (renamed from plugins/infowidget/infowidgetprefpage.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/infowidget/infowidgetprefpage.h (renamed from plugins/infowidget/infowidgetprefpage.h) | 0 | ||||
-rw-r--r-- | src/plugins/infowidget/iwfiletreediritem.cpp (renamed from plugins/infowidget/iwfiletreediritem.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/infowidget/iwfiletreediritem.h (renamed from plugins/infowidget/iwfiletreediritem.h) | 0 | ||||
-rw-r--r-- | src/plugins/infowidget/iwfiletreeitem.cpp (renamed from plugins/infowidget/iwfiletreeitem.cpp) | 4 | ||||
-rw-r--r-- | src/plugins/infowidget/iwfiletreeitem.h (renamed from plugins/infowidget/iwfiletreeitem.h) | 2 | ||||
-rw-r--r-- | src/plugins/infowidget/iwpref.ui (renamed from plugins/infowidget/iwpref.ui) | 0 | ||||
-rw-r--r-- | src/plugins/infowidget/ktinfowidgetplugin.desktop | 6 | ||||
-rw-r--r-- | src/plugins/infowidget/ktinfowidgetplugin.kcfg (renamed from plugins/infowidget/ktinfowidgetplugin.kcfg) | 0 | ||||
-rw-r--r-- | src/plugins/infowidget/ktorrentmonitor.cpp (renamed from plugins/infowidget/ktorrentmonitor.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/infowidget/ktorrentmonitor.h (renamed from plugins/infowidget/ktorrentmonitor.h) | 0 | ||||
-rw-r--r-- | src/plugins/infowidget/localefloatvalidator.cpp (renamed from plugins/infowidget/localefloatvalidator.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/infowidget/localefloatvalidator.h (renamed from plugins/infowidget/localefloatvalidator.h) | 2 | ||||
-rw-r--r-- | src/plugins/infowidget/peerview.cpp (renamed from plugins/infowidget/peerview.cpp) | 8 | ||||
-rw-r--r-- | src/plugins/infowidget/peerview.h (renamed from plugins/infowidget/peerview.h) | 2 | ||||
-rw-r--r-- | src/plugins/infowidget/statustab.cpp (renamed from plugins/infowidget/statustab.cpp) | 8 | ||||
-rw-r--r-- | src/plugins/infowidget/statustab.h (renamed from plugins/infowidget/statustab.h) | 5 | ||||
-rw-r--r-- | src/plugins/infowidget/statustabbase.ui (renamed from plugins/infowidget/statustabbase.ui) | 0 | ||||
-rw-r--r-- | src/plugins/infowidget/trackerview.cpp (renamed from plugins/infowidget/trackerview.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/infowidget/trackerview.h (renamed from plugins/infowidget/trackerview.h) | 2 | ||||
-rw-r--r-- | src/plugins/infowidget/trackerviewbase.ui (renamed from plugins/infowidget/trackerviewbase.ui) | 4 | ||||
-rw-r--r-- | src/plugins/ipfilter/CMakeLists.txt | 30 | ||||
-rw-r--r-- | src/plugins/ipfilter/antip2p.cpp (renamed from plugins/ipfilter/antip2p.cpp) | 2 | ||||
-rw-r--r-- | src/plugins/ipfilter/antip2p.h (renamed from plugins/ipfilter/antip2p.h) | 4 | ||||
-rw-r--r-- | src/plugins/ipfilter/convert_dlg.ui (renamed from plugins/ipfilter/convert_dlg.ui) | 4 | ||||
-rw-r--r-- | src/plugins/ipfilter/convertdialog.cpp (renamed from plugins/ipfilter/convertdialog.cpp) | 8 | ||||
-rw-r--r-- | src/plugins/ipfilter/convertdialog.h (renamed from plugins/ipfilter/convertdialog.h) | 2 | ||||
-rw-r--r-- | src/plugins/ipfilter/ipblockingpref.ui (renamed from plugins/ipfilter/ipblockingpref.ui) | 4 | ||||
-rw-r--r-- | src/plugins/ipfilter/ipblockingprefpage.cpp (renamed from plugins/ipfilter/ipblockingprefpage.cpp) | 2 | ||||
-rw-r--r-- | src/plugins/ipfilter/ipblockingprefpage.h (renamed from plugins/ipfilter/ipblockingprefpage.h) | 0 | ||||
-rw-r--r-- | src/plugins/ipfilter/ipfilterplugin.cpp (renamed from plugins/ipfilter/ipfilterplugin.cpp) | 2 | ||||
-rw-r--r-- | src/plugins/ipfilter/ipfilterplugin.h (renamed from plugins/ipfilter/ipfilterplugin.h) | 4 | ||||
-rw-r--r-- | src/plugins/ipfilter/ipfilterpluginsettings.kcfgc (renamed from plugins/ipfilter/ipfilterpluginsettings.kcfgc) | 0 | ||||
-rw-r--r-- | src/plugins/ipfilter/ktipfilterplugin.desktop | 8 | ||||
-rw-r--r-- | src/plugins/ipfilter/ktipfilterplugin.kcfg (renamed from plugins/ipfilter/ktipfilterplugin.kcfg) | 2 | ||||
-rw-r--r-- | src/plugins/logviewer/CMakeLists.txt | 30 | ||||
-rw-r--r-- | src/plugins/logviewer/ktlogviewerplugin.desktop | 6 | ||||
-rw-r--r-- | src/plugins/logviewer/ktlogviewerplugin.kcfg (renamed from plugins/logviewer/ktlogviewerplugin.kcfg) | 0 | ||||
-rw-r--r-- | src/plugins/logviewer/logflags.cpp (renamed from plugins/logviewer/logflags.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/logviewer/logflags.h (renamed from plugins/logviewer/logflags.h) | 0 | ||||
-rw-r--r-- | src/plugins/logviewer/logprefpage.cpp (renamed from plugins/logviewer/logprefpage.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/logviewer/logprefpage.h (renamed from plugins/logviewer/logprefpage.h) | 0 | ||||
-rw-r--r-- | src/plugins/logviewer/logprefwidget.cpp (renamed from plugins/logviewer/logprefwidget.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/logviewer/logprefwidget.h (renamed from plugins/logviewer/logprefwidget.h) | 2 | ||||
-rw-r--r-- | src/plugins/logviewer/logprefwidgetbase.ui (renamed from plugins/logviewer/logprefwidgetbase.ui) | 0 | ||||
-rw-r--r-- | src/plugins/logviewer/logviewer.cpp (renamed from plugins/logviewer/logviewer.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/logviewer/logviewer.h (renamed from plugins/logviewer/logviewer.h) | 2 | ||||
-rw-r--r-- | src/plugins/logviewer/logviewerplugin.cpp (renamed from plugins/logviewer/logviewerplugin.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/logviewer/logviewerplugin.h (renamed from plugins/logviewer/logviewerplugin.h) | 2 | ||||
-rw-r--r-- | src/plugins/logviewer/logviewerpluginsettings.kcfgc (renamed from plugins/logviewer/logviewerpluginsettings.kcfgc) | 0 | ||||
-rw-r--r-- | src/plugins/partfileimport/CMakeLists.txt | 29 | ||||
-rw-r--r-- | src/plugins/partfileimport/importdialog.cpp (renamed from plugins/partfileimport/importdialog.cpp) | 8 | ||||
-rw-r--r-- | src/plugins/partfileimport/importdialog.h (renamed from plugins/partfileimport/importdialog.h) | 4 | ||||
-rw-r--r-- | src/plugins/partfileimport/importdlgbase.ui (renamed from plugins/partfileimport/importdlgbase.ui) | 0 | ||||
-rw-r--r-- | src/plugins/partfileimport/ktpartfileimportplugin.desktop | 6 | ||||
-rw-r--r-- | src/plugins/partfileimport/ktpartfileimportpluginui.rc (renamed from plugins/partfileimport/ktpartfileimportpluginui.rc) | 0 | ||||
-rw-r--r-- | src/plugins/partfileimport/partfileimportplugin.cpp (renamed from plugins/partfileimport/partfileimportplugin.cpp) | 2 | ||||
-rw-r--r-- | src/plugins/partfileimport/partfileimportplugin.h (renamed from plugins/partfileimport/partfileimportplugin.h) | 2 | ||||
-rw-r--r-- | src/plugins/rssfeed/CMakeLists.txt | 39 | ||||
-rw-r--r-- | src/plugins/rssfeed/ktrssfeedplugin.desktop | 6 | ||||
-rw-r--r-- | src/plugins/rssfeed/ktrssfeedplugin.kcfg (renamed from plugins/rssfeed/ktrssfeedplugin.kcfg) | 0 | ||||
-rw-r--r-- | src/plugins/rssfeed/rss/CMakeLists.txt | 24 | ||||
-rw-r--r-- | src/plugins/rssfeed/rss/COPYING (renamed from plugins/rssfeed/rss/COPYING) | 0 | ||||
-rw-r--r-- | src/plugins/rssfeed/rss/README (renamed from plugins/rssfeed/rss/README) | 0 | ||||
-rw-r--r-- | src/plugins/rssfeed/rss/article.cpp (renamed from plugins/rssfeed/rss/article.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/rssfeed/rss/article.h (renamed from plugins/rssfeed/rss/article.h) | 0 | ||||
-rw-r--r-- | src/plugins/rssfeed/rss/document.cpp (renamed from plugins/rssfeed/rss/document.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/rssfeed/rss/document.h (renamed from plugins/rssfeed/rss/document.h) | 0 | ||||
-rw-r--r-- | src/plugins/rssfeed/rss/global.h (renamed from plugins/rssfeed/rss/global.h) | 0 | ||||
-rw-r--r-- | src/plugins/rssfeed/rss/image.cpp (renamed from plugins/rssfeed/rss/image.cpp) | 6 | ||||
-rw-r--r-- | src/plugins/rssfeed/rss/image.h (renamed from plugins/rssfeed/rss/image.h) | 2 | ||||
-rw-r--r-- | src/plugins/rssfeed/rss/librss.doxyfile (renamed from plugins/rssfeed/rss/librss.doxyfile) | 0 | ||||
-rw-r--r-- | src/plugins/rssfeed/rss/librss.h (renamed from plugins/rssfeed/rss/librss.h) | 0 | ||||
-rw-r--r-- | src/plugins/rssfeed/rss/loader.cpp (renamed from plugins/rssfeed/rss/loader.cpp) | 28 | ||||
-rw-r--r-- | src/plugins/rssfeed/rss/loader.h (renamed from plugins/rssfeed/rss/loader.h) | 12 | ||||
-rw-r--r-- | src/plugins/rssfeed/rss/rss-faq.html (renamed from plugins/rssfeed/rss/rss-faq.html) | 0 | ||||
-rw-r--r-- | src/plugins/rssfeed/rss/testlibrss.cpp (renamed from plugins/rssfeed/rss/testlibrss.cpp) | 6 | ||||
-rw-r--r-- | src/plugins/rssfeed/rss/testlibrss.h (renamed from plugins/rssfeed/rss/testlibrss.h) | 2 | ||||
-rw-r--r-- | src/plugins/rssfeed/rss/textinput.cpp (renamed from plugins/rssfeed/rss/textinput.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/rssfeed/rss/textinput.h (renamed from plugins/rssfeed/rss/textinput.h) | 0 | ||||
-rw-r--r-- | src/plugins/rssfeed/rss/tools_p.cpp (renamed from plugins/rssfeed/rss/tools_p.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/rssfeed/rss/tools_p.h (renamed from plugins/rssfeed/rss/tools_p.h) | 0 | ||||
-rw-r--r-- | src/plugins/rssfeed/rssarticle.cpp (renamed from plugins/rssfeed/rssarticle.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/rssfeed/rssarticle.h (renamed from plugins/rssfeed/rssarticle.h) | 0 | ||||
-rw-r--r-- | src/plugins/rssfeed/rssfeed.cpp (renamed from plugins/rssfeed/rssfeed.cpp) | 16 | ||||
-rw-r--r-- | src/plugins/rssfeed/rssfeed.h (renamed from plugins/rssfeed/rssfeed.h) | 2 | ||||
-rw-r--r-- | src/plugins/rssfeed/rssfeedmanager.cpp (renamed from plugins/rssfeed/rssfeedmanager.cpp) | 334 | ||||
-rw-r--r-- | src/plugins/rssfeed/rssfeedmanager.h (renamed from plugins/rssfeed/rssfeedmanager.h) | 2 | ||||
-rw-r--r-- | src/plugins/rssfeed/rssfeedplugin.cpp (renamed from plugins/rssfeed/rssfeedplugin.cpp) | 2 | ||||
-rw-r--r-- | src/plugins/rssfeed/rssfeedplugin.h (renamed from plugins/rssfeed/rssfeedplugin.h) | 2 | ||||
-rw-r--r-- | src/plugins/rssfeed/rssfeedwidget.ui (renamed from plugins/rssfeed/rssfeedwidget.ui) | 0 | ||||
-rw-r--r-- | src/plugins/rssfeed/rssfilter.cpp (renamed from plugins/rssfeed/rssfilter.cpp) | 2 | ||||
-rw-r--r-- | src/plugins/rssfeed/rssfilter.h (renamed from plugins/rssfeed/rssfilter.h) | 2 | ||||
-rw-r--r-- | src/plugins/rssfeed/rsslinkdownloader.cpp (renamed from plugins/rssfeed/rsslinkdownloader.cpp) | 8 | ||||
-rw-r--r-- | src/plugins/rssfeed/rsslinkdownloader.h (renamed from plugins/rssfeed/rsslinkdownloader.h) | 2 | ||||
-rw-r--r-- | src/plugins/scanfolder/CMakeLists.txt | 30 | ||||
-rw-r--r-- | src/plugins/scanfolder/ktscanfolderplugin.desktop | 6 | ||||
-rw-r--r-- | src/plugins/scanfolder/ktscanfolderplugin.kcfg (renamed from plugins/scanfolder/ktscanfolderplugin.kcfg) | 12 | ||||
-rw-r--r-- | src/plugins/scanfolder/scanfolder.cpp (renamed from plugins/scanfolder/scanfolder.cpp) | 6 | ||||
-rw-r--r-- | src/plugins/scanfolder/scanfolder.h (renamed from plugins/scanfolder/scanfolder.h) | 2 | ||||
-rw-r--r-- | src/plugins/scanfolder/scanfolderplugin.cpp (renamed from plugins/scanfolder/scanfolderplugin.cpp) | 2 | ||||
-rw-r--r-- | src/plugins/scanfolder/scanfolderplugin.h (renamed from plugins/scanfolder/scanfolderplugin.h) | 2 | ||||
-rw-r--r-- | src/plugins/scanfolder/scanfolderpluginsettings.kcfgc (renamed from plugins/scanfolder/scanfolderpluginsettings.kcfgc) | 0 | ||||
-rw-r--r-- | src/plugins/scanfolder/scanfolderprefpage.cpp (renamed from plugins/scanfolder/scanfolderprefpage.cpp) | 2 | ||||
-rw-r--r-- | src/plugins/scanfolder/scanfolderprefpage.h (renamed from plugins/scanfolder/scanfolderprefpage.h) | 0 | ||||
-rw-r--r-- | src/plugins/scanfolder/scanfolderprefpagewidget.cpp (renamed from plugins/scanfolder/scanfolderprefpagewidget.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/scanfolder/scanfolderprefpagewidget.h (renamed from plugins/scanfolder/scanfolderprefpagewidget.h) | 2 | ||||
-rw-r--r-- | src/plugins/scanfolder/sfprefwidgetbase.ui (renamed from plugins/scanfolder/sfprefwidgetbase.ui) | 0 | ||||
-rw-r--r-- | src/plugins/scheduler/CMakeLists.txt | 42 | ||||
-rw-r--r-- | src/plugins/scheduler/bwscheduler.cpp (renamed from plugins/scheduler/bwscheduler.cpp) | 2 | ||||
-rw-r--r-- | src/plugins/scheduler/bwscheduler.h (renamed from plugins/scheduler/bwscheduler.h) | 0 | ||||
-rw-r--r-- | src/plugins/scheduler/bwspage.ui (renamed from plugins/scheduler/bwspage.ui) | 4 | ||||
-rw-r--r-- | src/plugins/scheduler/bwsprefpagewidget.cpp (renamed from plugins/scheduler/bwsprefpagewidget.cpp) | 22 | ||||
-rw-r--r-- | src/plugins/scheduler/bwsprefpagewidget.h (renamed from plugins/scheduler/bwsprefpagewidget.h) | 2 | ||||
-rw-r--r-- | src/plugins/scheduler/bwswidget.cpp (renamed from plugins/scheduler/bwswidget.cpp) | 10 | ||||
-rw-r--r-- | src/plugins/scheduler/bwswidget.h (renamed from plugins/scheduler/bwswidget.h) | 4 | ||||
-rw-r--r-- | src/plugins/scheduler/cell-a-0000.png (renamed from plugins/scheduler/cell-a-0000.png) | bin | 698 -> 698 bytes | |||
-rw-r--r-- | src/plugins/scheduler/cell-a-0001.png (renamed from plugins/scheduler/cell-a-0001.png) | bin | 985 -> 985 bytes | |||
-rw-r--r-- | src/plugins/scheduler/cell-a-0002.png (renamed from plugins/scheduler/cell-a-0002.png) | bin | 1069 -> 1069 bytes | |||
-rw-r--r-- | src/plugins/scheduler/cell-a-0003.png (renamed from plugins/scheduler/cell-a-0003.png) | bin | 1150 -> 1150 bytes | |||
-rw-r--r-- | src/plugins/scheduler/cell-a-0004.png (renamed from plugins/scheduler/cell-a-0004.png) | bin | 736 -> 736 bytes | |||
-rw-r--r-- | src/plugins/scheduler/cell-b-0000.png (renamed from plugins/scheduler/cell-b-0000.png) | bin | 673 -> 673 bytes | |||
-rw-r--r-- | src/plugins/scheduler/cell-b-0001.png (renamed from plugins/scheduler/cell-b-0001.png) | bin | 972 -> 972 bytes | |||
-rw-r--r-- | src/plugins/scheduler/cell-b-0002.png (renamed from plugins/scheduler/cell-b-0002.png) | bin | 1042 -> 1042 bytes | |||
-rw-r--r-- | src/plugins/scheduler/cell-b-0003.png (renamed from plugins/scheduler/cell-b-0003.png) | bin | 1110 -> 1110 bytes | |||
-rw-r--r-- | src/plugins/scheduler/cell-b-0004.png (renamed from plugins/scheduler/cell-b-0004.png) | bin | 718 -> 718 bytes | |||
-rw-r--r-- | src/plugins/scheduler/ktschedulerplugin.desktop | 6 | ||||
-rw-r--r-- | src/plugins/scheduler/ktschedulerplugin.kcfg (renamed from plugins/scheduler/ktschedulerplugin.kcfg) | 4 | ||||
-rw-r--r-- | src/plugins/scheduler/ktschedulerpluginui.rc (renamed from plugins/scheduler/ktschedulerpluginui.rc) | 0 | ||||
-rw-r--r-- | src/plugins/scheduler/schedulerpage.ui (renamed from plugins/scheduler/schedulerpage.ui) | 4 | ||||
-rw-r--r-- | src/plugins/scheduler/schedulerplugin.cpp (renamed from plugins/scheduler/schedulerplugin.cpp) | 8 | ||||
-rw-r--r-- | src/plugins/scheduler/schedulerplugin.h (renamed from plugins/scheduler/schedulerplugin.h) | 4 | ||||
-rw-r--r-- | src/plugins/scheduler/schedulerpluginsettings.kcfgc (renamed from plugins/scheduler/schedulerpluginsettings.kcfgc) | 0 | ||||
-rw-r--r-- | src/plugins/scheduler/schedulerprefpage.cpp (renamed from plugins/scheduler/schedulerprefpage.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/scheduler/schedulerprefpage.h (renamed from plugins/scheduler/schedulerprefpage.h) | 0 | ||||
-rw-r--r-- | src/plugins/scheduler/schedulerprefpagewidget.cpp (renamed from plugins/scheduler/schedulerprefpagewidget.cpp) | 5 | ||||
-rw-r--r-- | src/plugins/scheduler/schedulerprefpagewidget.h (renamed from plugins/scheduler/schedulerprefpagewidget.h) | 2 | ||||
-rw-r--r-- | src/plugins/search/CMakeLists.txt | 30 | ||||
-rw-r--r-- | src/plugins/search/htmlpart.cpp (renamed from plugins/search/htmlpart.cpp) | 14 | ||||
-rw-r--r-- | src/plugins/search/htmlpart.h (renamed from plugins/search/htmlpart.h) | 2 | ||||
-rw-r--r-- | src/plugins/search/ktsearchplugin.desktop | 8 | ||||
-rw-r--r-- | src/plugins/search/ktsearchplugin.kcfg (renamed from plugins/search/ktsearchplugin.kcfg) | 0 | ||||
-rw-r--r-- | src/plugins/search/searchbar.ui (renamed from plugins/search/searchbar.ui) | 0 | ||||
-rw-r--r-- | src/plugins/search/searchenginelist.cpp (renamed from plugins/search/searchenginelist.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/search/searchenginelist.h (renamed from plugins/search/searchenginelist.h) | 0 | ||||
-rw-r--r-- | src/plugins/search/searchplugin.cpp (renamed from plugins/search/searchplugin.cpp) | 10 | ||||
-rw-r--r-- | src/plugins/search/searchplugin.h (renamed from plugins/search/searchplugin.h) | 2 | ||||
-rw-r--r-- | src/plugins/search/searchpluginsettings.kcfgc (renamed from plugins/search/searchpluginsettings.kcfgc) | 0 | ||||
-rw-r--r-- | src/plugins/search/searchpref.ui (renamed from plugins/search/searchpref.ui) | 4 | ||||
-rw-r--r-- | src/plugins/search/searchprefpage.cpp (renamed from plugins/search/searchprefpage.cpp) | 12 | ||||
-rw-r--r-- | src/plugins/search/searchprefpage.h (renamed from plugins/search/searchprefpage.h) | 2 | ||||
-rw-r--r-- | src/plugins/search/searchtab.cpp (renamed from plugins/search/searchtab.cpp) | 8 | ||||
-rw-r--r-- | src/plugins/search/searchtab.h (renamed from plugins/search/searchtab.h) | 2 | ||||
-rw-r--r-- | src/plugins/search/searchwidget.cpp (renamed from plugins/search/searchwidget.cpp) | 46 | ||||
-rw-r--r-- | src/plugins/search/searchwidget.h (renamed from plugins/search/searchwidget.h) | 2 | ||||
-rw-r--r-- | src/plugins/stats/CMakeLists.txt | 31 | ||||
-rw-r--r-- | src/plugins/stats/ChartDrawer.cpp (renamed from plugins/stats/ChartDrawer.cpp) | 2 | ||||
-rw-r--r-- | src/plugins/stats/ChartDrawer.h (renamed from plugins/stats/ChartDrawer.h) | 2 | ||||
-rw-r--r-- | src/plugins/stats/ChartDrawerData.cpp (renamed from plugins/stats/ChartDrawerData.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/stats/ChartDrawerData.h (renamed from plugins/stats/ChartDrawerData.h) | 0 | ||||
-rw-r--r-- | src/plugins/stats/PeerMonitor.cpp (renamed from plugins/stats/PeerMonitor.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/stats/PeerMonitor.h (renamed from plugins/stats/PeerMonitor.h) | 0 | ||||
-rw-r--r-- | src/plugins/stats/StatsCon.cpp (renamed from plugins/stats/StatsCon.cpp) | 4 | ||||
-rw-r--r-- | src/plugins/stats/StatsCon.h (renamed from plugins/stats/StatsCon.h) | 2 | ||||
-rw-r--r-- | src/plugins/stats/StatsPluginPrefs.cpp (renamed from plugins/stats/StatsPluginPrefs.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/stats/StatsPluginPrefs.h (renamed from plugins/stats/StatsPluginPrefs.h) | 2 | ||||
-rw-r--r-- | src/plugins/stats/StatsPluginPrefsPage.cpp (renamed from plugins/stats/StatsPluginPrefsPage.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/stats/StatsPluginPrefsPage.h (renamed from plugins/stats/StatsPluginPrefsPage.h) | 0 | ||||
-rw-r--r-- | src/plugins/stats/StatsSpd.cpp (renamed from plugins/stats/StatsSpd.cpp) | 6 | ||||
-rw-r--r-- | src/plugins/stats/StatsSpd.h (renamed from plugins/stats/StatsSpd.h) | 2 | ||||
-rw-r--r-- | src/plugins/stats/ktstatsplugin.desktop | 6 | ||||
-rw-r--r-- | src/plugins/stats/ktstatsplugin.kcfg (renamed from plugins/stats/ktstatsplugin.kcfg) | 0 | ||||
-rw-r--r-- | src/plugins/stats/sprefwgt.ui (renamed from plugins/stats/sprefwgt.ui) | 0 | ||||
-rw-r--r-- | src/plugins/stats/statsconwgt.ui (renamed from plugins/stats/statsconwgt.ui) | 0 | ||||
-rw-r--r-- | src/plugins/stats/statsplugin.cpp (renamed from plugins/stats/statsplugin.cpp) | 28 | ||||
-rw-r--r-- | src/plugins/stats/statsplugin.h (renamed from plugins/stats/statsplugin.h) | 2 | ||||
-rw-r--r-- | src/plugins/stats/statspluginsettings.kcfgc (renamed from plugins/stats/statspluginsettings.kcfgc) | 0 | ||||
-rw-r--r-- | src/plugins/stats/statsspdwgt.ui (renamed from plugins/stats/statsspdwgt.ui) | 0 | ||||
-rw-r--r-- | src/plugins/upnp/CMakeLists.txt | 36 | ||||
-rw-r--r-- | src/plugins/upnp/ktupnpplugin.desktop | 6 | ||||
-rw-r--r-- | src/plugins/upnp/ktupnpplugin.kcfg (renamed from plugins/upnp/ktupnpplugin.kcfg) | 0 | ||||
-rw-r--r-- | src/plugins/upnp/soap.cpp (renamed from plugins/upnp/soap.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/upnp/soap.h (renamed from plugins/upnp/soap.h) | 0 | ||||
-rw-r--r-- | src/plugins/upnp/upnpdescriptionparser.cpp (renamed from plugins/upnp/upnpdescriptionparser.cpp) | 2 | ||||
-rw-r--r-- | src/plugins/upnp/upnpdescriptionparser.h (renamed from plugins/upnp/upnpdescriptionparser.h) | 0 | ||||
-rw-r--r-- | src/plugins/upnp/upnpmcastsocket.cpp (renamed from plugins/upnp/upnpmcastsocket.cpp) | 14 | ||||
-rw-r--r-- | src/plugins/upnp/upnpmcastsocket.h (renamed from plugins/upnp/upnpmcastsocket.h) | 2 | ||||
-rw-r--r-- | src/plugins/upnp/upnpplugin.cpp (renamed from plugins/upnp/upnpplugin.cpp) | 2 | ||||
-rw-r--r-- | src/plugins/upnp/upnpplugin.h (renamed from plugins/upnp/upnpplugin.h) | 2 | ||||
-rw-r--r-- | src/plugins/upnp/upnppluginsettings.kcfgc (renamed from plugins/upnp/upnppluginsettings.kcfgc) | 0 | ||||
-rw-r--r-- | src/plugins/upnp/upnpprefpage.cpp (renamed from plugins/upnp/upnpprefpage.cpp) | 4 | ||||
-rw-r--r-- | src/plugins/upnp/upnpprefpage.h (renamed from plugins/upnp/upnpprefpage.h) | 0 | ||||
-rw-r--r-- | src/plugins/upnp/upnpprefwidget.cpp (renamed from plugins/upnp/upnpprefwidget.cpp) | 8 | ||||
-rw-r--r-- | src/plugins/upnp/upnpprefwidget.h (renamed from plugins/upnp/upnpprefwidget.h) | 2 | ||||
-rw-r--r-- | src/plugins/upnp/upnprouter.cpp (renamed from plugins/upnp/upnprouter.cpp) | 16 | ||||
-rw-r--r-- | src/plugins/upnp/upnprouter.h (renamed from plugins/upnp/upnprouter.h) | 2 | ||||
-rw-r--r-- | src/plugins/upnp/upnpwidget.ui (renamed from plugins/upnp/upnpwidget.ui) | 0 | ||||
-rw-r--r-- | src/plugins/webinterface/CMakeLists.txt | 40 | ||||
-rw-r--r-- | src/plugins/webinterface/httpclienthandler.cpp (renamed from plugins/webinterface/httpclienthandler.cpp) | 2 | ||||
-rw-r--r-- | src/plugins/webinterface/httpclienthandler.h (renamed from plugins/webinterface/httpclienthandler.h) | 2 | ||||
-rw-r--r-- | src/plugins/webinterface/httpresponseheader.cpp (renamed from plugins/webinterface/httpresponseheader.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/webinterface/httpresponseheader.h (renamed from plugins/webinterface/httpresponseheader.h) | 0 | ||||
-rw-r--r-- | src/plugins/webinterface/httpserver.cpp (renamed from plugins/webinterface/httpserver.cpp) | 22 | ||||
-rw-r--r-- | src/plugins/webinterface/httpserver.h (renamed from plugins/webinterface/httpserver.h) | 2 | ||||
-rw-r--r-- | src/plugins/webinterface/ktwebinterfaceplugin.desktop | 6 | ||||
-rw-r--r-- | src/plugins/webinterface/ktwebinterfaceplugin.kcfg (renamed from plugins/webinterface/ktwebinterfaceplugin.kcfg) | 0 | ||||
-rw-r--r-- | src/plugins/webinterface/php_handler.cpp (renamed from plugins/webinterface/php_handler.cpp) | 6 | ||||
-rw-r--r-- | src/plugins/webinterface/php_handler.h (renamed from plugins/webinterface/php_handler.h) | 4 | ||||
-rw-r--r-- | src/plugins/webinterface/php_interface.cpp (renamed from plugins/webinterface/php_interface.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/webinterface/php_interface.h (renamed from plugins/webinterface/php_interface.h) | 0 | ||||
-rw-r--r-- | src/plugins/webinterface/webinterfaceplugin.cpp (renamed from plugins/webinterface/webinterfaceplugin.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/webinterface/webinterfaceplugin.h (renamed from plugins/webinterface/webinterfaceplugin.h) | 2 | ||||
-rw-r--r-- | src/plugins/webinterface/webinterfacepluginsettings.kcfgc (renamed from plugins/webinterface/webinterfacepluginsettings.kcfgc) | 0 | ||||
-rw-r--r-- | src/plugins/webinterface/webinterfacepref.ui (renamed from plugins/webinterface/webinterfacepref.ui) | 4 | ||||
-rw-r--r-- | src/plugins/webinterface/webinterfaceprefpage.cpp (renamed from plugins/webinterface/webinterfaceprefpage.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/webinterface/webinterfaceprefpage.h (renamed from plugins/webinterface/webinterfaceprefpage.h) | 0 | ||||
-rw-r--r-- | src/plugins/webinterface/webinterfaceprefwidget.cpp (renamed from plugins/webinterface/webinterfaceprefwidget.cpp) | 2 | ||||
-rw-r--r-- | src/plugins/webinterface/webinterfaceprefwidget.h (renamed from plugins/webinterface/webinterfaceprefwidget.h) | 2 | ||||
-rw-r--r-- | src/plugins/webinterface/www/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/CMakeLists.txt | 14 | ||||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/favicon.ico (renamed from plugins/webinterface/www/coldmilk/favicon.ico) | bin | 1406 -> 1406 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/icon.png (renamed from plugins/webinterface/www/coldmilk/icon.png) | bin | 24064 -> 24064 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/icons/16x16/CMakeLists.txt | 7 | ||||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/icons/16x16/edit_user.png (renamed from plugins/webinterface/www/coldmilk/icons/16x16/edit_user.png) | bin | 954 -> 954 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/icons/16x16/high_priority.png (renamed from plugins/webinterface/www/coldmilk/icons/16x16/high_priority.png) | bin | 217 -> 217 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/icons/16x16/low_priority.png (renamed from plugins/webinterface/www/coldmilk/icons/16x16/low_priority.png) | bin | 215 -> 215 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/icons/16x16/normal_priority.png (renamed from plugins/webinterface/www/coldmilk/icons/16x16/normal_priority.png) | bin | 195 -> 195 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/icons/16x16/only_seed.png (renamed from plugins/webinterface/www/coldmilk/icons/16x16/only_seed.png) | bin | 212 -> 212 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/icons/22x22/CMakeLists.txt | 7 | ||||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/icons/22x22/exit.png (renamed from plugins/webinterface/www/coldmilk/icons/22x22/exit.png) | bin | 1397 -> 1397 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/icons/22x22/ktstart_all.png (renamed from plugins/webinterface/www/coldmilk/icons/22x22/ktstart_all.png) | bin | 1400 -> 1400 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/icons/22x22/ktstop_all.png (renamed from plugins/webinterface/www/coldmilk/icons/22x22/ktstop_all.png) | bin | 1130 -> 1130 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/icons/22x22/remove.png (renamed from plugins/webinterface/www/coldmilk/icons/22x22/remove.png) | bin | 1522 -> 1522 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/icons/22x22/start.png (renamed from plugins/webinterface/www/coldmilk/icons/22x22/start.png) | bin | 1221 -> 1221 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/icons/22x22/stop.png (renamed from plugins/webinterface/www/coldmilk/icons/22x22/stop.png) | bin | 963 -> 963 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/icons/32x32/CMakeLists.txt | 7 | ||||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/icons/32x32/configure.png (renamed from plugins/webinterface/www/coldmilk/icons/32x32/configure.png) | bin | 1510 -> 1510 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/icons/32x32/extender_opened.png (renamed from plugins/webinterface/www/coldmilk/icons/32x32/extender_opened.png) | bin | 1310 -> 1310 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/icons/32x32/fileopen.png (renamed from plugins/webinterface/www/coldmilk/icons/32x32/fileopen.png) | bin | 1861 -> 1861 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/icons/32x32/folder1.png (renamed from plugins/webinterface/www/coldmilk/icons/32x32/folder1.png) | bin | 2275 -> 2275 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/icons/48x48/CMakeLists.txt | 7 | ||||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/icons/48x48/exit.png (renamed from plugins/webinterface/www/coldmilk/icons/48x48/exit.png) | bin | 2935 -> 2935 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/icons/48x48/switchuser.png (renamed from plugins/webinterface/www/coldmilk/icons/48x48/switchuser.png) | bin | 3109 -> 3109 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/icons/64x64/CMakeLists.txt | 7 | ||||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/icons/64x64/down.png (renamed from plugins/webinterface/www/coldmilk/icons/64x64/down.png) | bin | 5413 -> 5413 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/icons/64x64/folder1_man.png (renamed from plugins/webinterface/www/coldmilk/icons/64x64/folder1_man.png) | bin | 5452 -> 5452 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/icons/64x64/looknfeel.png (renamed from plugins/webinterface/www/coldmilk/icons/64x64/looknfeel.png) | bin | 5467 -> 5467 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/icons/CMakeLists.txt | 13 | ||||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/interface.js (renamed from plugins/webinterface/www/coldmilk/interface.js) | 0 | ||||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/interface.php (renamed from plugins/webinterface/www/coldmilk/interface.php) | 0 | ||||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/login.html (renamed from plugins/webinterface/www/coldmilk/login.html) | 0 | ||||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/page_update.js (renamed from plugins/webinterface/www/coldmilk/page_update.js) | 0 | ||||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/rest.php (renamed from plugins/webinterface/www/coldmilk/rest.php) | 0 | ||||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/shutdown.php (renamed from plugins/webinterface/www/coldmilk/shutdown.php) | 0 | ||||
-rw-r--r-- | src/plugins/webinterface/www/coldmilk/style.css (renamed from plugins/webinterface/www/coldmilk/style.css) | 0 | ||||
-rw-r--r-- | src/plugins/webinterface/www/default/CMakeLists.txt | 11 | ||||
-rw-r--r-- | src/plugins/webinterface/www/default/details.php (renamed from plugins/webinterface/www/default/details.php) | 0 | ||||
-rw-r--r-- | src/plugins/webinterface/www/default/favicon.ico (renamed from plugins/webinterface/www/default/favicon.ico) | bin | 1406 -> 1406 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/default/grad1.jpg (renamed from plugins/webinterface/www/default/grad1.jpg) | bin | 367 -> 367 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/default/grad2.jpg (renamed from plugins/webinterface/www/default/grad2.jpg) | bin | 362 -> 362 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/default/header_tile.png (renamed from plugins/webinterface/www/default/header_tile.png) | bin | 167 -> 167 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/default/high_priority.png (renamed from plugins/webinterface/www/default/high_priority.png) | bin | 217 -> 217 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/default/icon.png (renamed from plugins/webinterface/www/default/icon.png) | bin | 24064 -> 24064 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/default/interface.php (renamed from plugins/webinterface/www/default/interface.php) | 0 | ||||
-rw-r--r-- | src/plugins/webinterface/www/default/ktorrentwebinterfacelogo.png (renamed from plugins/webinterface/www/default/ktorrentwebinterfacelogo.png) | bin | 90590 -> 90590 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/default/login.html (renamed from plugins/webinterface/www/default/login.html) | 0 | ||||
-rw-r--r-- | src/plugins/webinterface/www/default/low_priority.png (renamed from plugins/webinterface/www/default/low_priority.png) | bin | 215 -> 215 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/default/menu_bg.png (renamed from plugins/webinterface/www/default/menu_bg.png) | bin | 249 -> 249 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/default/normal_priority.png (renamed from plugins/webinterface/www/default/normal_priority.png) | bin | 195 -> 195 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/default/only_seed.png (renamed from plugins/webinterface/www/default/only_seed.png) | bin | 212 -> 212 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/default/remove.png (renamed from plugins/webinterface/www/default/remove.png) | bin | 1040 -> 1040 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/default/shutdown.php (renamed from plugins/webinterface/www/default/shutdown.php) | 0 | ||||
-rw-r--r-- | src/plugins/webinterface/www/default/start.png (renamed from plugins/webinterface/www/default/start.png) | bin | 869 -> 869 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/default/stop.png (renamed from plugins/webinterface/www/default/stop.png) | bin | 710 -> 710 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/default/style.css (renamed from plugins/webinterface/www/default/style.css) | 0 | ||||
-rw-r--r-- | src/plugins/webinterface/www/default/stylen.css (renamed from plugins/webinterface/www/default/stylen.css) | 0 | ||||
-rw-r--r-- | src/plugins/webinterface/www/default/wz_tooltip.js (renamed from plugins/webinterface/www/default/wz_tooltip.js) | 0 | ||||
-rw-r--r-- | src/plugins/webinterface/www/mobile/CMakeLists.txt | 9 | ||||
-rw-r--r-- | src/plugins/webinterface/www/mobile/favicon.ico (renamed from plugins/webinterface/www/mobile/favicon.ico) | bin | 1406 -> 1406 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/mobile/interface.php (renamed from plugins/webinterface/www/mobile/interface.php) | 0 | ||||
-rw-r--r-- | src/plugins/webinterface/www/mobile/ktorrentwebinterfacelogo.png (renamed from plugins/webinterface/www/mobile/ktorrentwebinterfacelogo.png) | bin | 90590 -> 90590 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/mobile/login.html (renamed from plugins/webinterface/www/mobile/login.html) | 0 | ||||
-rw-r--r-- | src/plugins/webinterface/www/mobile/remove.png (renamed from plugins/webinterface/www/mobile/remove.png) | bin | 1040 -> 1040 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/mobile/settings.php (renamed from plugins/webinterface/www/mobile/settings.php) | 0 | ||||
-rw-r--r-- | src/plugins/webinterface/www/mobile/start.png (renamed from plugins/webinterface/www/mobile/start.png) | bin | 869 -> 869 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/mobile/stop.png (renamed from plugins/webinterface/www/mobile/stop.png) | bin | 710 -> 710 bytes | |||
-rw-r--r-- | src/plugins/webinterface/www/mobile/torrent.php (renamed from plugins/webinterface/www/mobile/torrent.php) | 0 | ||||
-rw-r--r-- | src/plugins/zeroconf/CMakeLists.txt | 25 | ||||
-rw-r--r-- | src/plugins/zeroconf/avahiservice.cpp (renamed from plugins/zeroconf/avahiservice.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/zeroconf/avahiservice.h (renamed from plugins/zeroconf/avahiservice.h) | 2 | ||||
-rw-r--r-- | src/plugins/zeroconf/ktzeroconfplugin.desktop | 6 | ||||
-rw-r--r-- | src/plugins/zeroconf/localbrowser.cpp (renamed from plugins/zeroconf/localbrowser.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/zeroconf/localbrowser.h (renamed from plugins/zeroconf/localbrowser.h) | 0 | ||||
-rw-r--r-- | src/plugins/zeroconf/zeroconfplugin.cpp (renamed from plugins/zeroconf/zeroconfplugin.cpp) | 20 | ||||
-rw-r--r-- | src/plugins/zeroconf/zeroconfplugin.h (renamed from plugins/zeroconf/zeroconfplugin.h) | 2 | ||||
-rw-r--r-- | src/scripts/CMakeLists.txt | 7 | ||||
-rwxr-xr-x | src/scripts/ktshell (renamed from scripts/ktshell) | 0 | ||||
-rw-r--r-- | src/utests/CMakeLists.txt | 18 | ||||
-rw-r--r-- | src/utests/biginttest.cpp (renamed from utests/biginttest.cpp) | 0 | ||||
-rw-r--r-- | src/utests/biginttest.h (renamed from utests/biginttest.h) | 0 | ||||
-rw-r--r-- | src/utests/dhtmsgparsetest.cpp (renamed from utests/dhtmsgparsetest.cpp) | 0 | ||||
-rw-r--r-- | src/utests/dhtmsgparsetest.h (renamed from utests/dhtmsgparsetest.h) | 0 | ||||
-rw-r--r-- | src/utests/difflehellmantest.cpp (renamed from utests/difflehellmantest.cpp) | 0 | ||||
-rw-r--r-- | src/utests/difflehellmantest.h (renamed from utests/difflehellmantest.h) | 0 | ||||
-rw-r--r-- | src/utests/main.cpp (renamed from utests/main.cpp) | 2 | ||||
-rw-r--r-- | src/utests/rc4test.cpp (renamed from utests/rc4test.cpp) | 0 | ||||
-rw-r--r-- | src/utests/rc4test.h (renamed from utests/rc4test.h) | 0 | ||||
-rw-r--r-- | src/utests/testrunner.cpp (renamed from utests/testrunner.cpp) | 0 | ||||
-rw-r--r-- | src/utests/testrunner.h (renamed from utests/testrunner.h) | 0 | ||||
-rw-r--r-- | src/utests/unittest.cpp (renamed from utests/unittest.cpp) | 0 | ||||
-rw-r--r-- | src/utests/unittest.h (renamed from utests/unittest.h) | 0 | ||||
-rw-r--r-- | src/utests/upnpparsedescriptiontest.cpp (renamed from utests/upnpparsedescriptiontest.cpp) | 0 | ||||
-rw-r--r-- | src/utests/upnpparsedescriptiontest.h (renamed from utests/upnpparsedescriptiontest.h) | 0 | ||||
-rw-r--r-- | src/utests/upnpparseresponsetest.cpp (renamed from utests/upnpparseresponsetest.cpp) | 2 | ||||
-rw-r--r-- | src/utests/upnpparseresponsetest.h (renamed from utests/upnpparseresponsetest.h) | 0 | ||||
-rw-r--r-- | stamp-h.in | 0 | ||||
-rw-r--r-- | subdirs | 6 | ||||
-rw-r--r-- | templates/cpp | 19 | ||||
-rw-r--r-- | templates/h | 19 | ||||
-rw-r--r-- | translations/Makefile.am | 1 | ||||
-rw-r--r-- | translations/ar/Makefile.am | 1 | ||||
-rw-r--r-- | translations/ar/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/bg/Makefile.am | 1 | ||||
-rw-r--r-- | translations/bg/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/br/Makefile.am | 1 | ||||
-rw-r--r-- | translations/br/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/ca/Makefile.am | 1 | ||||
-rw-r--r-- | translations/ca/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/cs/Makefile.am | 1 | ||||
-rw-r--r-- | translations/cs/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/cy/Makefile.am | 1 | ||||
-rw-r--r-- | translations/cy/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/da/Makefile.am | 1 | ||||
-rw-r--r-- | translations/da/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/de/Makefile.am | 1 | ||||
-rw-r--r-- | translations/de/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/desktop_files/ar.po | 113 | ||||
-rw-r--r-- | translations/desktop_files/bg.po | 114 | ||||
-rw-r--r-- | translations/desktop_files/br.po | 120 | ||||
-rw-r--r-- | translations/desktop_files/ca.po | 113 | ||||
-rw-r--r-- | translations/desktop_files/cs.po | 117 | ||||
-rw-r--r-- | translations/desktop_files/cy.po | 113 | ||||
-rw-r--r-- | translations/desktop_files/da.po | 119 | ||||
-rw-r--r-- | translations/desktop_files/de.po | 114 | ||||
-rw-r--r-- | translations/desktop_files/el.po | 116 | ||||
-rw-r--r-- | translations/desktop_files/es.po | 115 | ||||
-rw-r--r-- | translations/desktop_files/et.po | 114 | ||||
-rw-r--r-- | translations/desktop_files/fa.po | 118 | ||||
-rw-r--r-- | translations/desktop_files/fr.po | 114 | ||||
-rw-r--r-- | translations/desktop_files/gl.po | 113 | ||||
-rw-r--r-- | translations/desktop_files/it.po | 113 | ||||
-rw-r--r-- | translations/desktop_files/ja.po | 113 | ||||
-rw-r--r-- | translations/desktop_files/ka.po | 113 | ||||
-rw-r--r-- | translations/desktop_files/ktorrent-desktops.pot | 112 | ||||
-rw-r--r-- | translations/desktop_files/lt.po | 114 | ||||
-rw-r--r-- | translations/desktop_files/ms.po | 114 | ||||
-rw-r--r-- | translations/desktop_files/nb.po | 115 | ||||
-rw-r--r-- | translations/desktop_files/nds.po | 114 | ||||
-rw-r--r-- | translations/desktop_files/nl.po | 113 | ||||
-rw-r--r-- | translations/desktop_files/pa.po | 114 | ||||
-rw-r--r-- | translations/desktop_files/pl.po | 114 | ||||
-rw-r--r-- | translations/desktop_files/pt.po | 115 | ||||
-rw-r--r-- | translations/desktop_files/pt_BR.po | 114 | ||||
-rw-r--r-- | translations/desktop_files/ru.po | 114 | ||||
-rw-r--r-- | translations/desktop_files/sk.po | 116 | ||||
-rw-r--r-- | translations/desktop_files/sr.po | 114 | ||||
-rw-r--r-- | translations/desktop_files/sr@Latn.po | 114 | ||||
-rw-r--r-- | translations/desktop_files/sv.po | 113 | ||||
-rw-r--r-- | translations/desktop_files/tr.po | 114 | ||||
-rw-r--r-- | translations/desktop_files/uk.po | 115 | ||||
-rw-r--r-- | translations/desktop_files/zh_CN.po | 114 | ||||
-rw-r--r-- | translations/desktop_files/zh_TW.po | 116 | ||||
-rw-r--r-- | translations/el/Makefile.am | 1 | ||||
-rw-r--r-- | translations/el/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/en_GB/Makefile.am | 1 | ||||
-rw-r--r-- | translations/en_GB/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/es/Makefile.am | 1 | ||||
-rw-r--r-- | translations/es/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/et/Makefile.am | 1 | ||||
-rw-r--r-- | translations/et/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/fa/Makefile.am | 1 | ||||
-rw-r--r-- | translations/fa/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/fr/Makefile.am | 1 | ||||
-rw-r--r-- | translations/fr/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/gl/Makefile.am | 1 | ||||
-rw-r--r-- | translations/gl/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/hu/Makefile.am | 1 | ||||
-rw-r--r-- | translations/hu/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/it/Makefile.am | 1 | ||||
-rw-r--r-- | translations/it/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/ja/Makefile.am | 1 | ||||
-rw-r--r-- | translations/ja/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/ka/Makefile.am | 1 | ||||
-rw-r--r-- | translations/ka/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/lt/Makefile.am | 1 | ||||
-rw-r--r-- | translations/lt/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/messages/ar.po (renamed from translations/ar/messages/ktorrent.po) | 28 | ||||
-rw-r--r-- | translations/messages/bg.po (renamed from translations/bg/messages/ktorrent.po) | 28 | ||||
-rw-r--r-- | translations/messages/br.po (renamed from translations/br/messages/ktorrent.po) | 28 | ||||
-rw-r--r-- | translations/messages/ca.po (renamed from translations/ca/messages/ktorrent.po) | 28 | ||||
-rw-r--r-- | translations/messages/cs.po (renamed from translations/cs/messages/ktorrent.po) | 28 | ||||
-rw-r--r-- | translations/messages/cy.po (renamed from translations/cy/messages/ktorrent.po) | 29 | ||||
-rw-r--r-- | translations/messages/da.po (renamed from translations/da/messages/ktorrent.po) | 28 | ||||
-rw-r--r-- | translations/messages/de.po (renamed from translations/de/messages/ktorrent.po) | 28 | ||||
-rw-r--r-- | translations/messages/el.po (renamed from translations/el/messages/ktorrent.po) | 28 | ||||
-rw-r--r-- | translations/messages/en_GB.po (renamed from translations/en_GB/messages/ktorrent.po) | 28 | ||||
-rw-r--r-- | translations/messages/es.po (renamed from translations/es/messages/ktorrent.po) | 43 | ||||
-rw-r--r-- | translations/messages/et.po (renamed from translations/et/messages/ktorrent.po) | 28 | ||||
-rw-r--r-- | translations/messages/fa.po (renamed from translations/fa/messages/ktorrent.po) | 28 | ||||
-rw-r--r-- | translations/messages/fr.po (renamed from translations/fr/messages/ktorrent.po) | 28 | ||||
-rw-r--r-- | translations/messages/gl.po (renamed from translations/gl/messages/ktorrent.po) | 28 | ||||
-rw-r--r-- | translations/messages/hu.po (renamed from translations/hu/messages/ktorrent.po) | 28 | ||||
-rw-r--r-- | translations/messages/it.po (renamed from translations/it/messages/ktorrent.po) | 56 | ||||
-rw-r--r-- | translations/messages/ja.po (renamed from translations/ja/messages/ktorrent.po) | 28 | ||||
-rw-r--r-- | translations/messages/ka.po (renamed from translations/ka/messages/ktorrent.po) | 565 | ||||
-rw-r--r-- | translations/messages/ktorrent.pot (renamed from translations/ktorrent.pot) | 28 | ||||
-rw-r--r-- | translations/messages/lt.po (renamed from translations/lt/messages/ktorrent.po) | 28 | ||||
-rw-r--r-- | translations/messages/ms.po (renamed from translations/ms/messages/ktorrent.po) | 28 | ||||
-rw-r--r-- | translations/messages/nb.po (renamed from translations/nb/messages/ktorrent.po) | 28 | ||||
-rw-r--r-- | translations/messages/nds.po (renamed from translations/nds/messages/ktorrent.po) | 28 | ||||
-rw-r--r-- | translations/messages/nl.po (renamed from translations/nl/messages/ktorrent.po) | 46 | ||||
-rw-r--r-- | translations/messages/pa.po (renamed from translations/pa/messages/ktorrent.po) | 28 | ||||
-rw-r--r-- | translations/messages/pl.po (renamed from translations/pl/messages/ktorrent.po) | 28 | ||||
-rw-r--r-- | translations/messages/pt.po (renamed from translations/pt/messages/ktorrent.po) | 28 | ||||
-rw-r--r-- | translations/messages/pt_BR.po (renamed from translations/pt_BR/messages/ktorrent.po) | 28 | ||||
-rw-r--r-- | translations/messages/ru.po (renamed from translations/ru/messages/ktorrent.po) | 597 | ||||
-rw-r--r-- | translations/messages/rw.po (renamed from translations/rw/messages/ktorrent.po) | 28 | ||||
-rw-r--r-- | translations/messages/sk.po (renamed from translations/sk/messages/ktorrent.po) | 28 | ||||
-rw-r--r-- | translations/messages/sr.po (renamed from translations/sr/messages/ktorrent.po) | 28 | ||||
-rw-r--r-- | translations/messages/sr@Latn.po (renamed from translations/sr@Latn/messages/ktorrent.po) | 28 | ||||
-rw-r--r-- | translations/messages/sv.po (renamed from translations/sv/messages/ktorrent.po) | 28 | ||||
-rw-r--r-- | translations/messages/tr.po (renamed from translations/tr/messages/ktorrent.po) | 28 | ||||
-rw-r--r-- | translations/messages/uk.po (renamed from translations/uk/messages/ktorrent.po) | 28 | ||||
-rw-r--r-- | translations/messages/zh_CN.po (renamed from translations/zh_CN/messages/ktorrent.po) | 28 | ||||
-rw-r--r-- | translations/messages/zh_TW.po (renamed from translations/zh_TW/messages/ktorrent.po) | 28 | ||||
-rw-r--r-- | translations/ms/Makefile.am | 1 | ||||
-rw-r--r-- | translations/ms/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/nb/Makefile.am | 1 | ||||
-rw-r--r-- | translations/nb/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/nds/Makefile.am | 1 | ||||
-rw-r--r-- | translations/nds/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/nl/Makefile.am | 1 | ||||
-rw-r--r-- | translations/nl/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/pa/Makefile.am | 1 | ||||
-rw-r--r-- | translations/pa/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/pl/Makefile.am | 1 | ||||
-rw-r--r-- | translations/pl/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/pt/Makefile.am | 1 | ||||
-rw-r--r-- | translations/pt/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/pt_BR/Makefile.am | 1 | ||||
-rw-r--r-- | translations/pt_BR/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/ru/Makefile.am | 1 | ||||
-rw-r--r-- | translations/ru/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/rw/Makefile.am | 1 | ||||
-rw-r--r-- | translations/rw/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/sk/Makefile.am | 1 | ||||
-rw-r--r-- | translations/sk/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/sr/Makefile.am | 1 | ||||
-rw-r--r-- | translations/sr/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/sr@Latn/Makefile.am | 1 | ||||
-rw-r--r-- | translations/sr@Latn/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/sv/Makefile.am | 1 | ||||
-rw-r--r-- | translations/sv/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/tr/Makefile.am | 1 | ||||
-rw-r--r-- | translations/tr/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/uk/Makefile.am | 1 | ||||
-rw-r--r-- | translations/uk/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/zh_CN/Makefile.am | 1 | ||||
-rw-r--r-- | translations/zh_CN/messages/Makefile.am | 3 | ||||
-rw-r--r-- | translations/zh_TW/Makefile.am | 1 | ||||
-rw-r--r-- | translations/zh_TW/messages/Makefile.am | 3 | ||||
-rw-r--r-- | utests/Makefile.am | 12 |
1276 files changed, 7701 insertions, 29916 deletions
diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 934def7..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "admin"] - path = admin - url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin diff --git a/CMakeL10n.txt b/CMakeL10n.txt index 23220c6..a9c7e38 100644 --- a/CMakeL10n.txt +++ b/CMakeL10n.txt @@ -9,7 +9,11 @@ # ################################################# -cmake_minimum_required( VERSION 3.1 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) ##### include our cmake modules ################# @@ -19,4 +23,4 @@ include( TDEL10n ) ##### create translation templates ############## -tde_l10n_create_template( "ktorrent" ) +tde_l10n_auto_add_subdirectories( ) diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..97c15eb --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,93 @@ +############################################ +# # +# Improvements and feedbacks are welcome # +# # +# This file is released under GPL >= 3 # +# # +############################################ + + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) +tde_set_project_version( ) + + +#### general package setup + +project( ktorrent ) + + +#### include essential cmake modules + +include( FindPkgConfig ) +include( CheckFunctionExists ) +include( CheckSymbolExists ) +include( CheckIncludeFile ) +include( CheckLibraryExists ) +include( CheckCSourceCompiles ) +include( CheckCXXSourceCompiles ) +enable_testing() + + +#### include our cmake modules + +include( TDEMacros ) + + +##### setup install paths + +include( TDESetupPaths ) +tde_setup_paths( ) + + +##### optional stuff + +option( WITH_ALL_OPTIONS "Enable all optional support" OFF ) +option( WITH_ZEROCONF "Enable zeroconf support" ${WITH_ALL_OPTIONS} ) +option( WITH_SYSTEM_GEOIP "Enable system-wide geoip support" ${WITH_ALL_OPTIONS} ) +option( WITH_BUILTIN_GEOIP "Enable built-in geoip support" OFF ) +option( WITH_BUILTIN_FLAGS "Install built-in flags" ${WITH_BUILTIN_GEOIP} ) +option( WITH_TORRENT_MIMETYPE "Install torrent mime type" OFF ) +option( WITH_MEMLEAK_TRACING "Enable memory leak tracing" OFF ) +option( WITH_PROFILING_SUPPORT "Enable profiling support" OFF ) + +option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} ) + + +##### user requested modules + +option( BUILD_ALL "Build all" ON ) +option( BUILD_DOC "Build documentation" ${BUILD_ALL} ) +option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} ) + + +##### configure checks + +include( ConfigureChecks.cmake ) + + +###### global compiler settings + +add_definitions( -DHAVE_CONFIG_H ) + +set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" ) +set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" ) +set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" ) + + +##### directories + +add_subdirectory( src ) + + +##### other data ################################ + +tde_conditional_add_project_docs( BUILD_DOC ) +tde_conditional_add_project_translations( BUILD_TRANSLATIONS ) + + +##### write configure files + +configure_file( config.h.cmake config.h @ONLY ) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake new file mode 100644 index 0000000..d5976b3 --- /dev/null +++ b/ConfigureChecks.cmake @@ -0,0 +1,103 @@ +########################################### +# # +# Improvements and feedback are welcome # +# # +# This file is released under GPL >= 3 # +# # +########################################### + + +# required stuff +find_package( TQt ) +find_package( TDE ) + +tde_setup_architecture_flags( ) + +include(TestBigEndian) +test_big_endian(WORDS_BIGENDIAN) + +tde_setup_largefiles( ) + +set( ENV{PKG_CONFIG_PATH} "${PKG_CONFIG_PATH}:$ENV{PKG_CONFIG_PATH}:${LIB_INSTALL_DIR}/pkgconfig" ) + + +##### check for gcc visibility support + +if( WITH_GCC_VISIBILITY ) + tde_setup_gcc_visibility( ) +endif( WITH_GCC_VISIBILITY ) + + +##### check for libgmp + +pkg_search_module( GMP gmp ) +if( NOT GMP_FOUND ) + find_library( GMP_LIBRARIES gmp ) + if( NOT GMP_LIBRARIES ) + tde_message_fatal( "libgmp is required but not found on your system" ) + endif() +endif( ) + + +##### check for avahi + +if( WITH_ZEROCONF ) + pkg_search_module( AVAHI_TQT avahi-tqt ) + pkg_search_module( AVAHI_CLIENT avahi-client ) + if( NOT AVAHI_TQT_FOUND OR NOT AVAHI_CLIENT_FOUND OR AVAHI_CLIENT_VERSION VERSION_LESS "0.6.10") + tde_message_fatal( "avahi >= 0.6.10 support is requested, but not found on your system" ) + endif( ) +endif( ) + + +##### check for geoip + +if( WITH_SYSTEM_GEOIP ) + pkg_search_module( GEOIP geoip ) + if( NOT GEOIP_FOUND ) + tde_message_fatal( "GeoIP is required but was not found on your system" ) + endif( ) + set( USE_SYSTEM_GEOIP 1 ) + # The use of the system-wide geoip database disables the use of the builtin one + set( WITH_BUILTIN_GEOIP OFF ) +endif( ) + + +##### check for various fuctions, headers and types + +check_function_exists( posix_fallocate HAVE_POSIX_FALLOCATE ) +check_function_exists( posix_fallocate64 HAVE_POSIX_FALLOCATE64 ) +check_function_exists( fopen64 HAVE_FOPEN64 ) +check_function_exists( ftruncate64 HAVE_FTRUNCATE64 ) +check_function_exists( lseek64 HAVE_LSEEK64 ) +check_function_exists( mmap64 HAVE_MMAP64 ) +check_function_exists( munmap64 HAVE_MUNMAP64 ) +check_function_exists( statvfs HAVE_STATVFS ) +check_function_exists( statvfs64 HAVE_STATVFS64 ) + +check_function_exists( fseeko64 _HAVE_FSEEKO64 ) +check_function_exists( ftello64 _HAVE_FTELLO64 ) +if( _HAVE_FSEEKO64 AND _HAVE_FTELLO64 ) + set( HAVE_FSEEKO64 1 ) +endif( ) + +check_function_exists( stat64 _HAVE_STAT64 ) +check_function_exists( fstat64 _HAVE_FSTAT64 ) +if( _HAVE_FSTAT64 AND _HAVE_STAT64 ) + set( HAVE_STAT64 1 ) +endif( ) + +check_include_file( "xfs/xfs.h" HAVE_XFS_XFS_H ) + +tde_save_and_set( CMAKE_REQUIRED_INCLUDES ) +check_cxx_source_compiles( " + #include <xfs/xfs.h> + int main() { __s64 u; return 0; } " + HAVE___S64 +) +check_cxx_source_compiles( " + #include <xfs/xfs.h> + int main() { __u64 u; return 0; } " + HAVE___U64 +) +tde_restore( CMAKE_REQUIRED_INCLUDES ) diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index fd2862c..0000000 --- a/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -SUBDIRS = doc libktorrent plugins apps scripts translations - -# $(UTESTS_DIR) - -EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README TODO - -messages: rc.cpp - $(EXTRACTRC) `find . -name "*.rc" -o -name "*.ui" -o -name "*.kcfg"` > rc.cpp - LIST=`find . -name \*.h -o -name \*.cpp`; \ - if test -n "$$LIST"; then \ - $(XGETTEXT) $$LIST -o $(podir)/ktorrent.pot; \ - fi - rm -f rc.cpp - @@ -1,18 +0,0 @@ -KTorrent - A KDE BitTorrent client ------------------------------------ - -For installation follow the instructions from INSTALL file, but simple - -./configure --prefix=$TDEDIR -make -make install (as root) - -will install KTorrent hopefully without any problems. - - -For more info please visit - -http://www.ktorrent.org/ - - -KT Team
\ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..3846838 --- /dev/null +++ b/README.md @@ -0,0 +1,32 @@ +KTorrent +======== + +KTorrent is a BitTorrent client for TDE. + + +Features +-------- + +- File prioritization +- Speed capping +- Torrent queuing +- Support for DHT, PeerExchange, UDP Trackers, and Encryption +- A plugin system for extending KTorrent's builtin features + +Contributing +------------ + +There are multiple ways of contributing to KTorrent: + +- Development using [TDE Gitea Workspace (TGW)](https://mirror.git.trinitydesktop.org/gitea) +- Translations using [TDE Weblate Translation Workspace (TWTW)](https://mirror.git.trinitydesktop.org/weblate) + +General information on contributing to TDE can be found in the [Developers Category on the Trinity Wiki](https://wiki.trinitydesktop.org/Category:Developers). + +Translation Status +------------------ + +### Messages + +[](https://mirror.git.trinitydesktop.org/weblate/projects/applications/ktorrent/) diff --git a/acinclude.m4 b/acinclude.m4 deleted file mode 100644 index be94c35..0000000 --- a/acinclude.m4 +++ /dev/null @@ -1,11919 +0,0 @@ -## -*- autoconf -*- - -dnl This file is part of the KDE libraries/packages -dnl Copyright (C) 1997 Janos Farkas (chexum@shadow.banki.hu) -dnl (C) 1997,98,99 Stephan Kulow (coolo@kde.org) - -dnl This file is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Library General Public -dnl License as published by the Free Software Foundation; either -dnl version 2 of the License, or (at your option) any later version. - -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Library General Public License for more details. - -dnl You should have received a copy of the GNU Library General Public License -dnl along with this library; see the file COPYING.LIB. If not, write to -dnl the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -dnl Boston, MA 02110-1301, USA. - -dnl IMPORTANT NOTE: -dnl Please do not modify this file unless you expect your modifications to be -dnl carried into every other module in the repository. -dnl -dnl Single-module modifications are best placed in configure.in for tdelibs -dnl and tdebase or configure.in.in if present. - -# KDE_PATH_X_DIRECT -dnl Internal subroutine of AC_PATH_X. -dnl Set ac_x_includes and/or ac_x_libraries. -AC_DEFUN([KDE_PATH_X_DIRECT], -[ -AC_REQUIRE([KDE_CHECK_LIB64]) - -if test "$ac_x_includes" = NO; then - # Guess where to find include files, by looking for this one X11 .h file. - test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h - - # First, try using that file with no special directory specified. -AC_TRY_CPP([#include <$x_direct_test_include>], -[# We can compile using X headers with no special include directory. -ac_x_includes=], -[# Look for the header file in a standard set of common directories. -# Check X11 before X11Rn because it is often a symlink to the current release. - for ac_dir in \ - /usr/X11/include \ - /usr/X11R6/include \ - /usr/X11R5/include \ - /usr/X11R4/include \ - \ - /usr/include/X11 \ - /usr/include/X11R6 \ - /usr/include/X11R5 \ - /usr/include/X11R4 \ - \ - /usr/local/X11/include \ - /usr/local/X11R6/include \ - /usr/local/X11R5/include \ - /usr/local/X11R4/include \ - \ - /usr/local/include/X11 \ - /usr/local/include/X11R6 \ - /usr/local/include/X11R5 \ - /usr/local/include/X11R4 \ - \ - /usr/X386/include \ - /usr/x386/include \ - /usr/XFree86/include/X11 \ - \ - /usr/include \ - /usr/local/include \ - /usr/unsupported/include \ - /usr/athena/include \ - /usr/local/x11r5/include \ - /usr/lpp/Xamples/include \ - \ - /usr/openwin/include \ - /usr/openwin/share/include \ - ; \ - do - if test -r "$ac_dir/$x_direct_test_include"; then - ac_x_includes=$ac_dir - break - fi - done]) -fi # $ac_x_includes = NO - -if test "$ac_x_libraries" = NO; then - # Check for the libraries. - - test -z "$x_direct_test_library" && x_direct_test_library=Xt - test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc - - # See if we find them without any special options. - # Don't add to $LIBS permanently. - ac_save_LIBS="$LIBS" - LIBS="-l$x_direct_test_library $LIBS" -AC_TRY_LINK([#include <X11/Intrinsic.h>], [${x_direct_test_function}(1)], -[LIBS="$ac_save_LIBS" -# We can link X programs with no special library path. -ac_x_libraries=], -[LIBS="$ac_save_LIBS" -# First see if replacing the include by lib works. -# Check X11 before X11Rn because it is often a symlink to the current release. -for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \ - /usr/X11/lib${tdelibsuff} \ - /usr/X11R6/lib${tdelibsuff} \ - /usr/X11R5/lib${tdelibsuff} \ - /usr/X11R4/lib${tdelibsuff} \ - \ - /usr/lib${tdelibsuff}/X11 \ - /usr/lib${tdelibsuff}/X11R6 \ - /usr/lib${tdelibsuff}/X11R5 \ - /usr/lib${tdelibsuff}/X11R4 \ - \ - /usr/local/X11/lib${tdelibsuff} \ - /usr/local/X11R6/lib${tdelibsuff} \ - /usr/local/X11R5/lib${tdelibsuff} \ - /usr/local/X11R4/lib${tdelibsuff} \ - \ - /usr/local/lib${tdelibsuff}/X11 \ - /usr/local/lib${tdelibsuff}/X11R6 \ - /usr/local/lib${tdelibsuff}/X11R5 \ - /usr/local/lib${tdelibsuff}/X11R4 \ - \ - /usr/X386/lib${tdelibsuff} \ - /usr/x386/lib${tdelibsuff} \ - /usr/XFree86/lib${tdelibsuff}/X11 \ - \ - /usr/lib${tdelibsuff} \ - /usr/local/lib${tdelibsuff} \ - /usr/unsupported/lib${tdelibsuff} \ - /usr/athena/lib${tdelibsuff} \ - /usr/local/x11r5/lib${tdelibsuff} \ - /usr/lpp/Xamples/lib${tdelibsuff} \ - /lib/usr/lib${tdelibsuff}/X11 \ - \ - /usr/openwin/lib${tdelibsuff} \ - /usr/openwin/share/lib${tdelibsuff} \ - ; \ -do -dnl Don't even attempt the hair of trying to link an X program! - for ac_extension in a so sl; do - if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then - ac_x_libraries=$ac_dir - break 2 - fi - done -done]) -fi # $ac_x_libraries = NO -]) - - -dnl ------------------------------------------------------------------------ -dnl Find a file (or one of more files in a list of dirs) -dnl ------------------------------------------------------------------------ -dnl -AC_DEFUN([AC_FIND_FILE], -[ -$3=NO -for i in $2; -do - for j in $1; - do - echo "configure: __oline__: $i/$j" >&AC_FD_CC - if test -r "$i/$j"; then - echo "taking that" >&AC_FD_CC - $3=$i - break 2 - fi - done -done -]) - -dnl KDE_FIND_PATH(program-name, variable-name, list-of-dirs, -dnl if-not-found, test-parameter, prepend-path) -dnl -dnl Look for program-name in list-of-dirs+$PATH. -dnl If prepend-path is set, look in $PATH+list-of-dirs instead. -dnl If found, $variable-name is set. If not, if-not-found is evaluated. -dnl test-parameter: if set, the program is executed with this arg, -dnl and only a successful exit code is required. -AC_DEFUN([KDE_FIND_PATH], -[ - AC_MSG_CHECKING([for $1]) - if test -n "$$2"; then - kde_cv_path="$$2"; - else - kde_cache=`echo $1 | sed 'y%./+-%__p_%'` - - AC_CACHE_VAL(kde_cv_path_$kde_cache, - [ - kde_cv_path="NONE" - kde_save_IFS=$IFS - IFS=':' - dirs="" - for dir in $PATH; do - dirs="$dirs $dir" - done - if test -z "$6"; then dnl Append dirs in PATH (default) - dirs="$3 $dirs" - else dnl Prepend dirs in PATH (if 6th arg is set) - dirs="$dirs $3" - fi - IFS=$kde_save_IFS - - for dir in $dirs; do - if test -x "$dir/$1"; then - if test -n "$5" - then - evalstr="$dir/$1 $5 2>&1 " - if eval $evalstr; then - kde_cv_path="$dir/$1" - break - fi - else - kde_cv_path="$dir/$1" - break - fi - fi - done - - eval "kde_cv_path_$kde_cache=$kde_cv_path" - - ]) - - eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\"" - - fi - - if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - AC_MSG_RESULT(not found) - $4 - else - AC_MSG_RESULT($kde_cv_path) - $2=$kde_cv_path - - fi -]) - -AC_DEFUN([KDE_MOC_ERROR_MESSAGE], -[ - AC_MSG_ERROR([No Qt meta object compiler (moc) found! -Please check whether you installed Qt correctly. -You need to have a running moc binary. -configure tried to run $ac_cv_path_moc and the test didn't -succeed. If configure shouldn't have tried this one, set -the environment variable MOC to the right one before running -configure. -]) -]) - -AC_DEFUN([KDE_UIC_ERROR_MESSAGE], -[ - AC_MSG_WARN([No Qt ui compiler (uic) found! -Please check whether you installed Qt correctly. -You need to have a running uic binary. -configure tried to run $ac_cv_path_uic and the test didn't -succeed. If configure shouldn't have tried this one, set -the environment variable UIC to the right one before running -configure. -]) -]) - - -AC_DEFUN([KDE_CHECK_UIC_FLAG], -[ - AC_MSG_CHECKING([whether uic supports -$1 ]) - kde_cache=`echo $1 | sed 'y% .=/+-%____p_%'` - AC_CACHE_VAL(kde_cv_prog_uic_$kde_cache, - [ - cat >conftest.ui <<EOT - <!DOCTYPE UI><UI version="3" stdsetdef="1"></UI> -EOT - ac_uic_testrun="$UIC_PATH -$1 $2 conftest.ui >/dev/null" - if AC_TRY_EVAL(ac_uic_testrun); then - eval "kde_cv_prog_uic_$kde_cache=yes" - else - eval "kde_cv_prog_uic_$kde_cache=no" - fi - rm -f conftest* - ]) - - if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then - AC_MSG_RESULT([yes]) - : - $3 - else - AC_MSG_RESULT([no]) - : - $4 - fi -]) - - -dnl ------------------------------------------------------------------------ -dnl Find the meta object compiler and the ui compiler in the PATH, -dnl in $TQTDIR/bin, and some more usual places -dnl ------------------------------------------------------------------------ -dnl -AC_DEFUN([AC_PATH_TQT_MOC_UIC], -[ - AC_REQUIRE([KDE_CHECK_PERL]) - qt_bindirs="" - for dir in $kde_qt_dirs; do - qt_bindirs="$qt_bindirs $dir/bin $dir/src/moc" - done - qt_bindirs="$qt_bindirs /usr/bin /usr/X11R6/bin /usr/local/qt/bin" - if test ! "$ac_qt_bindir" = "NO"; then - qt_bindirs="$ac_qt_bindir $qt_bindirs" - fi - - KDE_FIND_PATH(moc, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE]) - if test -z "$UIC_NOT_NEEDED"; then - KDE_FIND_PATH(uic, UIC_PATH, [$qt_bindirs], [UIC_PATH=""]) - if test -z "$UIC_PATH" ; then - KDE_UIC_ERROR_MESSAGE - exit 1 - else - UIC=$UIC_PATH - - if test $kde_qtver = 3; then - KDE_CHECK_UIC_FLAG(L,[/nonexistent],ac_uic_supports_libpath=yes,ac_uic_supports_libpath=no) - KDE_CHECK_UIC_FLAG(nounload,,ac_uic_supports_nounload=yes,ac_uic_supports_nounload=no) - - if test x$ac_uic_supports_libpath = xyes; then - UIC="$UIC -L \$(kde_widgetdir)" - fi - if test x$ac_uic_supports_nounload = xyes; then - UIC="$UIC -nounload" - fi - fi - fi - else - UIC="echo uic not available: " - fi - - AC_SUBST(MOC) - AC_SUBST(UIC) - - UIC_TR="i18n" - if test $kde_qtver = 3; then - UIC_TR="tr2i18n" - fi - - AC_SUBST(UIC_TR) -]) - -AC_DEFUN([KDE_1_CHECK_PATHS], -[ - KDE_1_CHECK_PATH_HEADERS - - KDE_TEST_RPATH= - - if test -n "$USE_RPATH"; then - - if test -n "$kde_libraries"; then - KDE_TEST_RPATH="-R $kde_libraries" - fi - - if test -n "$qt_libraries"; then - KDE_TEST_RPATH="$KDE_TEST_RPATH -R $qt_libraries" - fi - - if test -n "$x_libraries"; then - KDE_TEST_RPATH="$KDE_TEST_RPATH -R $x_libraries" - fi - - KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH" - fi - -AC_MSG_CHECKING([for KDE libraries installed]) -ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBTQT $KDE_TEST_RPATH 1>&5' - -if AC_TRY_EVAL(ac_link) && test -s conftest; then - AC_MSG_RESULT(yes) -else - AC_MSG_ERROR([your system fails at linking a small KDE application! -Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and tdelibs as you did use now. -For more details about this problem, look at the end of config.log.]) -fi - -if eval `TDEDIR= ./conftest 2>&5`; then - kde_result=done -else - kde_result=problems -fi - -TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log -kde_have_all_paths=yes - -KDE_SET_PATHS($kde_result) - -]) - -AC_DEFUN([KDE_SET_PATHS], -[ - kde_cv_all_paths="kde_have_all_paths=\"yes\" \ - kde_htmldir=\"$kde_htmldir\" \ - kde_appsdir=\"$kde_appsdir\" \ - kde_icondir=\"$kde_icondir\" \ - kde_sounddir=\"$kde_sounddir\" \ - kde_datadir=\"$kde_datadir\" \ - kde_locale=\"$kde_locale\" \ - kde_cgidir=\"$kde_cgidir\" \ - kde_confdir=\"$kde_confdir\" \ - kde_kcfgdir=\"$kde_kcfgdir\" \ - kde_mimedir=\"$kde_mimedir\" \ - kde_toolbardir=\"$kde_toolbardir\" \ - kde_wallpaperdir=\"$kde_wallpaperdir\" \ - kde_templatesdir=\"$kde_templatesdir\" \ - kde_bindir=\"$kde_bindir\" \ - kde_servicesdir=\"$kde_servicesdir\" \ - kde_servicetypesdir=\"$kde_servicetypesdir\" \ - kde_moduledir=\"$kde_moduledir\" \ - kde_styledir=\"$kde_styledir\" \ - kde_widgetdir=\"$kde_widgetdir\" \ - xdg_appsdir=\"$xdg_appsdir\" \ - xdg_menudir=\"$xdg_menudir\" \ - xdg_directorydir=\"$xdg_directorydir\" \ - kde_result=$1" -]) - -AC_DEFUN([KDE_SET_DEFAULT_PATHS], -[ -if test "$1" = "default"; then - - if test -z "$kde_htmldir"; then - kde_htmldir='\${datadir}/doc/tde/HTML' - fi - if test -z "$kde_appsdir"; then - kde_appsdir='\${datadir}/applnk' - fi - if test -z "$kde_icondir"; then - kde_icondir='\${datadir}/icons' - fi - if test -z "$kde_sounddir"; then - kde_sounddir='\${datadir}/sounds' - fi - if test -z "$kde_datadir"; then - kde_datadir='\${datadir}/apps' - fi - if test -z "$kde_locale"; then - kde_locale='\${datadir}/locale' - fi - if test -z "$kde_cgidir"; then - kde_cgidir='\${exec_prefix}/cgi-bin' - fi - if test -z "$kde_confdir"; then - kde_confdir='\${datadir}/config' - fi - if test -z "$kde_kcfgdir"; then - kde_kcfgdir='\${datadir}/config.kcfg' - fi - if test -z "$kde_mimedir"; then - kde_mimedir='\${datadir}/mimelnk' - fi - if test -z "$kde_toolbardir"; then - kde_toolbardir='\${datadir}/toolbar' - fi - if test -z "$kde_wallpaperdir"; then - kde_wallpaperdir='\${datadir}/wallpapers' - fi - if test -z "$kde_templatesdir"; then - kde_templatesdir='\${datadir}/templates' - fi - if test -z "$kde_bindir"; then - kde_bindir='\${exec_prefix}/bin' - fi - if test -z "$kde_servicesdir"; then - kde_servicesdir='\${datadir}/services' - fi - if test -z "$kde_servicetypesdir"; then - kde_servicetypesdir='\${datadir}/servicetypes' - fi - if test -z "$kde_moduledir"; then - if test "$kde_qtver" = "2"; then - kde_moduledir='\${libdir}/kde2' - else - kde_moduledir='\${libdir}/trinity' - fi - fi - if test -z "$kde_styledir"; then - kde_styledir='\${libdir}/trinity/plugins/styles' - fi - if test -z "$kde_widgetdir"; then - kde_widgetdir='\${libdir}/trinity/plugins/designer' - fi - if test -z "$xdg_appsdir"; then - xdg_appsdir='\${datadir}/applications/tde' - fi - if test -z "$xdg_menudir"; then - xdg_menudir='\${sysconfdir}/xdg/menus' - fi - if test -z "$xdg_directorydir"; then - xdg_directorydir='\${datadir}/desktop-directories' - fi - - KDE_SET_PATHS(defaults) - -else - - if test $kde_qtver = 1; then - AC_MSG_RESULT([compiling]) - KDE_1_CHECK_PATHS - else - AC_MSG_ERROR([path checking not yet supported for KDE 2]) - fi - -fi -]) - -AC_DEFUN([KDE_CHECK_PATHS_FOR_COMPLETENESS], -[ if test -z "$kde_htmldir" || test -z "$kde_appsdir" || - test -z "$kde_icondir" || test -z "$kde_sounddir" || - test -z "$kde_datadir" || test -z "$kde_locale" || - test -z "$kde_cgidir" || test -z "$kde_confdir" || - test -z "$kde_kcfgdir" || - test -z "$kde_mimedir" || test -z "$kde_toolbardir" || - test -z "$kde_wallpaperdir" || test -z "$kde_templatesdir" || - test -z "$kde_bindir" || test -z "$kde_servicesdir" || - test -z "$kde_servicetypesdir" || test -z "$kde_moduledir" || - test -z "$kde_styledir" || test -z "kde_widgetdir" || - test -z "$xdg_appsdir" || test -z "$xdg_menudir" || test -z "$xdg_directorydir" || - test "x$kde_have_all_paths" != "xyes"; then - kde_have_all_paths=no - fi -]) - -AC_DEFUN([KDE_MISSING_PROG_ERROR], -[ - AC_MSG_ERROR([The important program $1 was not found! -Please check whether you installed KDE correctly. -]) -]) - -AC_DEFUN([KDE_MISSING_ARTS_ERROR], -[ - AC_MSG_ERROR([The important program $1 was not found! -Please check whether you installed aRts correctly or use ---without-arts to compile without aRts support (this will remove functionality). -]) -]) - -AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], -[ - kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin" - test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs" - if test -n "$TDEDIRS"; then - kde_save_IFS=$IFS - IFS=: - for dir in $TDEDIRS; do - kde_default_bindirs="$dir/bin $kde_default_bindirs " - done - IFS=$kde_save_IFS - fi -]) - -AC_DEFUN([KDE_SUBST_PROGRAMS], -[ - AC_ARG_WITH(arts, - AC_HELP_STRING([--without-arts],[build without aRts [default=no]]), - [build_arts=$withval], - [build_arts=yes] - ) - AM_CONDITIONAL(include_ARTS, test "$build_arts" '!=' "no") - if test "$build_arts" = "no"; then - AC_DEFINE(WITHOUT_ARTS, 1, [Defined if compiling without arts]) - fi - - KDE_SET_DEFAULT_BINDIRS - kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs" - KDE_FIND_PATH(dcopidl, DCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)]) - KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp)]) - if test "$build_arts" '!=' "no"; then - KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)]) - KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)]) - fi - KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs]) - - trinity2ornewer=1 - trinity3ornewer=1 - if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then - trinity2ornewer= - trinity3ornewer= - else - if test "$kde_qtver" = "3"; then - if test "$kde_qtsubver" -le 1; then - trinity2ornewer= - fi - if test "$kde_qtsubver" -le 2; then - trinity3ornewer= - fi - if test "$KDECONFIG" != "compiled"; then - if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then - trinity3ornewer= - fi - fi - fi - fi - - if test -n "$trinity2ornewer"; then - KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)]) - KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) - fi - if test -n "$trinity3ornewer"; then - KDE_FIND_PATH(maketdewidgets, MAKETDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)]) - AC_SUBST(MAKETDEWIDGETS) - fi - KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) - - if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then - kde_sharedirs="$prefix/share /opt/trinity/share /opt/trinity/share /opt/kde/share /usr/share/kde /usr/local/share /usr/share" - test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs" - AC_FIND_FILE(apps/ksgmltools2/customization/tde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) - if test "$KDE_XSL_STYLESHEET" = "NO"; then - KDE_XSL_STYLESHEET="" - else - KDE_XSL_STYLESHEET="$KDE_XSL_STYLESHEET/apps/ksgmltools2/customization/tde-chunk.xsl" - fi - fi - - DCOP_DEPENDENCIES='$(DCOPIDL)' - if test -n "$trinity2ornewer"; then - KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)' - DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)' - AC_SUBST(KCONFIG_COMPILER) - AC_SUBST(KCFG_DEPENDENCIES) - AC_SUBST(DCOPIDLNG) - fi - AC_SUBST(DCOPIDL) - AC_SUBST(DCOPIDL2CPP) - AC_SUBST(DCOP_DEPENDENCIES) - AC_SUBST(MCOPIDL) - AC_SUBST(ARTSCCONFIG) - AC_SUBST(MEINPROC) - AC_SUBST(KDE_XSL_STYLESHEET) - AC_SUBST(XMLLINT) -])dnl - -AC_DEFUN([AC_CREATE_KFSSTND], -[ -AC_REQUIRE([AC_CHECK_RPATH]) - -AC_MSG_CHECKING([for KDE paths]) -kde_result="" -kde_cached_paths=yes -AC_CACHE_VAL(kde_cv_all_paths, -[ - KDE_SET_DEFAULT_PATHS($1) - kde_cached_paths=no -]) -eval "$kde_cv_all_paths" -KDE_CHECK_PATHS_FOR_COMPLETENESS -if test "$kde_have_all_paths" = "no" && test "$kde_cached_paths" = "yes"; then - # wrong values were cached, may be, we can set better ones - kde_result= - kde_htmldir= kde_appsdir= kde_icondir= kde_sounddir= - kde_datadir= kde_locale= kde_cgidir= kde_confdir= kde_kcfgdir= - kde_mimedir= kde_toolbardir= kde_wallpaperdir= kde_templatesdir= - kde_bindir= kde_servicesdir= kde_servicetypesdir= kde_moduledir= - kde_have_all_paths= - kde_styledir= - kde_widgetdir= - xdg_appsdir = xdg_menudir= xdg_directorydir= - KDE_SET_DEFAULT_PATHS($1) - eval "$kde_cv_all_paths" - KDE_CHECK_PATHS_FOR_COMPLETENESS - kde_result="$kde_result (cache overridden)" -fi -if test "$kde_have_all_paths" = "no"; then - AC_MSG_ERROR([configure could not run a little KDE program to test the environment. -Since it had compiled and linked before, it must be a strange problem on your system. -Look at config.log for details. If you are not able to fix this, look at -http://www.kde.org/faq/installation.html or any www.kde.org mirror. -(If you're using an egcs version on Linux, you may update binutils!) -]) -else - rm -f conftest* - AC_MSG_RESULT($kde_result) -fi - -bindir=$kde_bindir - -KDE_SUBST_PROGRAMS - -]) - -AC_DEFUN([AC_SUBST_KFSSTND], -[ -AC_SUBST(kde_htmldir) -AC_SUBST(kde_appsdir) -AC_SUBST(kde_icondir) -AC_SUBST(kde_sounddir) -AC_SUBST(kde_datadir) -AC_SUBST(kde_locale) -AC_SUBST(kde_confdir) -AC_SUBST(kde_kcfgdir) -AC_SUBST(kde_mimedir) -AC_SUBST(kde_wallpaperdir) -AC_SUBST(kde_bindir) -dnl X Desktop Group standards -AC_SUBST(xdg_appsdir) -AC_SUBST(xdg_menudir) -AC_SUBST(xdg_directorydir) -dnl for KDE 2 -AC_SUBST(kde_templatesdir) -AC_SUBST(kde_servicesdir) -AC_SUBST(kde_servicetypesdir) -AC_SUBST(kde_moduledir) -AC_SUBST(tdeinitdir, '$(kde_moduledir)') -AC_SUBST(kde_styledir) -AC_SUBST(kde_widgetdir) -if test "$kde_qtver" = 1; then - kde_minidir="$kde_icondir/mini" -else -# for KDE 1 - this breaks KDE2 apps using minidir, but -# that's the plan ;-/ - kde_minidir="/dev/null" -fi -dnl AC_SUBST(kde_minidir) -dnl AC_SUBST(kde_cgidir) -dnl AC_SUBST(kde_toolbardir) -]) - -AC_DEFUN([KDE_MISC_TESTS], -[ - dnl Checks for libraries. - AC_CHECK_LIB(util, main, [LIBUTIL="-lutil"]) dnl for *BSD - AC_SUBST(LIBUTIL) - AC_CHECK_LIB(compat, main, [LIBCOMPAT="-lcompat"]) dnl for *BSD - AC_SUBST(LIBCOMPAT) - kde_have_crypt= - AC_CHECK_LIB(crypt, crypt, [LIBCRYPT="-lcrypt"; kde_have_crypt=yes], - AC_CHECK_LIB(c, crypt, [kde_have_crypt=yes], [ - AC_MSG_WARN([you have no crypt in either libcrypt or libc. -You should install libcrypt from another source or configure with PAM -support]) - kde_have_crypt=no - ])) - AC_SUBST(LIBCRYPT) - if test $kde_have_crypt = yes; then - AC_DEFINE_UNQUOTED(HAVE_CRYPT, 1, [Defines if your system has the crypt function]) - fi - AC_CHECK_SOCKLEN_T - AC_CHECK_LIB(dnet, dnet_ntoa, [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"]) - if test $ac_cv_lib_dnet_dnet_ntoa = no; then - AC_CHECK_LIB(dnet_stub, dnet_ntoa, - [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"]) - fi - AC_CHECK_FUNC(inet_ntoa) - if test $ac_cv_func_inet_ntoa = no; then - AC_CHECK_LIB(nsl, inet_ntoa, X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl") - fi - AC_CHECK_FUNC(connect) - if test $ac_cv_func_connect = no; then - AC_CHECK_LIB(socket, connect, X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS", , - $X_EXTRA_LIBS) - fi - - AC_CHECK_FUNC(remove) - if test $ac_cv_func_remove = no; then - AC_CHECK_LIB(posix, remove, X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix") - fi - - # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - AC_CHECK_FUNC(shmat, , - AC_CHECK_LIB(ipc, shmat, X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc")) - - # more headers that need to be explicitly included on darwin - AC_CHECK_HEADERS(sys/types.h stdint.h) - - # sys/bitypes.h is needed for uint32_t and friends on Tru64 - AC_CHECK_HEADERS(sys/bitypes.h) - - # darwin requires a poll emulation library - AC_CHECK_LIB(poll, poll, LIB_POLL="-lpoll") - - # for some image handling on Mac OS X - AC_CHECK_HEADERS(Carbon/Carbon.h) - - # CoreAudio framework - AC_CHECK_HEADER(CoreAudio/CoreAudio.h, [ - AC_DEFINE(HAVE_COREAUDIO, 1, [Define if you have the CoreAudio API]) - FRAMEWORK_COREAUDIO="-Wl,-framework,CoreAudio" - ]) - - AC_CHECK_RES_INIT - AC_SUBST(LIB_POLL) - AC_SUBST(FRAMEWORK_COREAUDIO) - LIBSOCKET="$X_EXTRA_LIBS" - AC_SUBST(LIBSOCKET) - AC_SUBST(X_EXTRA_LIBS) - AC_CHECK_LIB(ucb, killpg, [LIBUCB="-lucb"]) dnl for Solaris2.4 - AC_SUBST(LIBUCB) - - case $host in dnl this *is* LynxOS specific - *-*-lynxos* ) - AC_MSG_CHECKING([LynxOS header file wrappers]) - [CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"] - AC_MSG_RESULT(disabled) - AC_CHECK_LIB(bsd, gethostbyname, [LIBSOCKET="-lbsd"]) dnl for LynxOS - ;; - esac - - KDE_CHECK_TYPES - KDE_CHECK_LIBDL - KDE_CHECK_STRLCPY - KDE_CHECK_PIE_SUPPORT - -# darwin needs this to initialize the environment -AC_CHECK_HEADERS(crt_externs.h) -AC_CHECK_FUNC(_NSGetEnviron, [AC_DEFINE(HAVE_NSGETENVIRON, 1, [Define if your system needs _NSGetEnviron to set up the environment])]) - -AH_VERBATIM(_DARWIN_ENVIRON, -[ -#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H) -# include <sys/time.h> -# include <crt_externs.h> -# define environ (*_NSGetEnviron()) -#endif -]) - -AH_VERBATIM(_AIX_STRINGS_H_BZERO, -[ -/* - * AIX defines FD_SET in terms of bzero, but fails to include <strings.h> - * that defines bzero. - */ - -#if defined(_AIX) -#include <strings.h> -#endif -]) - -AC_CHECK_FUNCS([vsnprintf snprintf]) - -AH_VERBATIM(_TRU64,[ -/* - * On HP-UX, the declaration of vsnprintf() is needed every time ! - */ - -#if !defined(HAVE_VSNPRINTF) || defined(hpux) -#if __STDC__ -#include <stdarg.h> -#include <stdlib.h> -#else -#include <varargs.h> -#endif -#ifdef __cplusplus -extern "C" -#endif -int vsnprintf(char *str, size_t n, char const *fmt, va_list ap); -#ifdef __cplusplus -extern "C" -#endif -int snprintf(char *str, size_t n, char const *fmt, ...); -#endif -]) - -]) - -dnl ------------------------------------------------------------------------ -dnl Find the header files and libraries for X-Windows. Extended the -dnl macro AC_PATH_X -dnl ------------------------------------------------------------------------ -dnl -AC_DEFUN([K_PATH_X], -[ -AC_REQUIRE([KDE_MISC_TESTS])dnl -AC_REQUIRE([KDE_CHECK_LIB64]) - -AC_ARG_ENABLE( - embedded, - AC_HELP_STRING([--enable-embedded],[link to Qt-embedded, don't use X]), - kde_use_qt_emb=$enableval, - kde_use_qt_emb=no -) - -AC_ARG_ENABLE( - qtopia, - AC_HELP_STRING([--enable-qtopia],[link to Qt-embedded, link to the Qtopia Environment]), - kde_use_qt_emb_palm=$enableval, - kde_use_qt_emb_palm=no -) - -AC_ARG_ENABLE( - mac, - AC_HELP_STRING([--enable-mac],[link to Qt/Mac (don't use X)]), - kde_use_qt_mac=$enableval, - kde_use_qt_mac=no -) - -# used to disable x11-specific stuff on special platforms -AM_CONDITIONAL(include_x11, test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no") - -if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then - -AC_MSG_CHECKING(for X) - -AC_CACHE_VAL(kde_cv_have_x, -[# One or both of the vars are not set, and there is no cached value. -if test "{$x_includes+set}" = set || test "$x_includes" = NONE; then - kde_x_includes=NO -else - kde_x_includes=$x_includes -fi -if test "{$x_libraries+set}" = set || test "$x_libraries" = NONE; then - kde_x_libraries=NO -else - kde_x_libraries=$x_libraries -fi - -# below we use the standard autoconf calls -ac_x_libraries=$kde_x_libraries -ac_x_includes=$kde_x_includes - -KDE_PATH_X_DIRECT -dnl AC_PATH_X_XMKMF picks /usr/lib as the path for the X libraries. -dnl Unfortunately, if compiling with the N32 ABI, this is not the correct -dnl location. The correct location is /usr/lib32 or an undefined value -dnl (the linker is smart enough to pick the correct default library). -dnl Things work just fine if you use just AC_PATH_X_DIRECT. -dnl Solaris has a similar problem. AC_PATH_X_XMKMF forces x_includes to -dnl /usr/openwin/include, which doesn't work. /usr/include does work, so -dnl x_includes should be left alone. -case "$host" in -mips-sgi-irix6*) - ;; -*-*-solaris*) - ;; -*) - _AC_PATH_X_XMKMF - if test -z "$ac_x_includes"; then - ac_x_includes="." - fi - if test -z "$ac_x_libraries"; then - ac_x_libraries="/usr/lib${tdelibsuff}" - fi -esac -#from now on we use our own again - -# when the user already gave --x-includes, we ignore -# what the standard autoconf macros told us. -if test "$kde_x_includes" = NO; then - kde_x_includes=$ac_x_includes -fi - -# for --x-libraries too -if test "$kde_x_libraries" = NO; then - kde_x_libraries=$ac_x_libraries -fi - -if test "$kde_x_includes" = NO; then - AC_MSG_ERROR([Can't find X includes. Please check your installation and add the correct paths!]) -fi - -if test "$kde_x_libraries" = NO; then - AC_MSG_ERROR([Can't find X libraries. Please check your installation and add the correct paths!]) -fi - -# Record where we found X for the cache. -kde_cv_have_x="have_x=yes \ - kde_x_includes=$kde_x_includes kde_x_libraries=$kde_x_libraries" -])dnl - -eval "$kde_cv_have_x" - -if test "$have_x" != yes; then - AC_MSG_RESULT($have_x) - no_x=yes -else - AC_MSG_RESULT([libraries $kde_x_libraries, headers $kde_x_includes]) -fi - -if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then - X_INCLUDES="" - x_includes="."; dnl better than nothing :- - else - x_includes=$kde_x_includes - X_INCLUDES="-I$x_includes" -fi - -if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE || test "$kde_x_libraries" = "/usr/lib"; then - X_LDFLAGS="" - x_libraries="/usr/lib"; dnl better than nothing :- - else - x_libraries=$kde_x_libraries - X_LDFLAGS="-L$x_libraries" -fi -all_includes="$X_INCLUDES" -all_libraries="$X_LDFLAGS $LDFLAGS_AS_NEEDED $LDFLAGS_NEW_DTAGS" - -# Check for libraries that X11R6 Xt/Xaw programs need. -ac_save_LDFLAGS="$LDFLAGS" -LDFLAGS="$LDFLAGS $X_LDFLAGS" -# SM needs ICE to (dynamically) link under SunOS 4.x (so we have to -# check for ICE first), but we must link in the order -lSM -lICE or -# we get undefined symbols. So assume we have SM if we have ICE. -# These have to be linked with before -lX11, unlike the other -# libraries we check for below, so use a different variable. -# --interran@uluru.Stanford.EDU, kb@cs.umb.edu. -AC_CHECK_LIB(ICE, IceConnectionNumber, - [LIBSM="-lSM -lICE"], , $X_EXTRA_LIBS) -LDFLAGS="$ac_save_LDFLAGS" - -LIB_X11='-lX11 $(LIBSOCKET)' - -AC_MSG_CHECKING(for libXext) -AC_CACHE_VAL(kde_cv_have_libXext, -[ -kde_ldflags_safe="$LDFLAGS" -kde_libs_safe="$LIBS" - -LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS" -LIBS="-lXext -lX11 $LIBSOCKET" - -AC_TRY_LINK([ -#include <stdio.h> -#ifdef STDC_HEADERS -# include <stdlib.h> -#endif -], -[ -printf("hello Xext\n"); -], -kde_cv_have_libXext=yes, -kde_cv_have_libXext=no -) - -LDFLAGS=$kde_ldflags_safe -LIBS=$kde_libs_safe -]) - -AC_MSG_RESULT($kde_cv_have_libXext) - -if test "$kde_cv_have_libXext" = "no"; then - AC_MSG_ERROR([We need a working libXext to proceed. Since configure -can't find it itself, we stop here assuming that make wouldn't find -them either.]) -fi - -LIB_XEXT="-lXext" -QTE_NORTTI="" - -elif test "$kde_use_qt_emb" = "yes"; then - dnl We're using QT Embedded - CPPFLAGS=-DQWS - CXXFLAGS="$CXXFLAGS -fno-rtti" - QTE_NORTTI="-fno-rtti -DQWS" - X_PRE_LIBS="" - LIB_X11="" - LIB_XEXT="" - LIB_XRENDER="" - LIBSM="" - X_INCLUDES="" - X_LDFLAGS="" - x_includes="" - x_libraries="" -elif test "$kde_use_qt_mac" = "yes"; then - dnl We're using QT/Mac (I use QT_MAC so that qglobal.h doesn't *have* to - dnl be included to get the information) --Sam - CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp" - CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp" - X_PRE_LIBS="" - LIB_X11="" - LIB_XEXT="" - LIB_XRENDER="" - LIBSM="" - X_INCLUDES="" - X_LDFLAGS="" - x_includes="" - x_libraries="" -fi -AC_SUBST(X_PRE_LIBS) -AC_SUBST(LIB_X11) -AC_SUBST(LIB_XRENDER) -AC_SUBST(LIBSM) -AC_SUBST(X_INCLUDES) -AC_SUBST(X_LDFLAGS) -AC_SUBST(x_includes) -AC_SUBST(x_libraries) -AC_SUBST(QTE_NORTTI) -AC_SUBST(LIB_XEXT) - -]) - -AC_DEFUN([KDE_PRINT_QT_PROGRAM], -[ -AC_REQUIRE([KDE_USE_TQT]) -cat > conftest.$ac_ext <<EOF -#include "confdefs.h" -#include <qglobal.h> -#include <qapplication.h> -EOF -if test "$kde_qtver" = "2"; then -cat >> conftest.$ac_ext <<EOF -#include <qevent.h> -#include <qstring.h> -#include <qstyle.h> -EOF - -if test $kde_qtsubver -gt 0; then -cat >> conftest.$ac_ext <<EOF -#if TQT_VERSION < 210 -#error 1 -#endif -EOF -fi -fi - -if test "$kde_qtver" = "3"; then -cat >> conftest.$ac_ext <<EOF -#include <qcursor.h> -#include <qstylefactory.h> -#include <private/qucomextra_p.h> -EOF -fi - -echo "#if ! ($kde_qt_verstring)" >> conftest.$ac_ext -cat >> conftest.$ac_ext <<EOF -#error 1 -#endif - -int main() { -EOF -if test "$kde_qtver" = "2"; then -cat >> conftest.$ac_ext <<EOF - QStringList *t = new QStringList(); - Q_UNUSED(t); -EOF -if test $kde_qtsubver -gt 0; then -cat >> conftest.$ac_ext <<EOF - QString s; - s.setLatin1("Elvis is alive", 14); -EOF -fi -fi -if test "$kde_qtver" = "3"; then -cat >> conftest.$ac_ext <<EOF - (void)QStyleFactory::create(QString::null); - QCursor c(Qt::WhatsThisCursor); -EOF -fi -cat >> conftest.$ac_ext <<EOF - return 0; -} -EOF -]) - -AC_DEFUN([KDE_USE_TQT], -[ -if test -z "$1"; then - # Current default Qt version: 3.3 - kde_qtver=3 - kde_qtsubver=3 -else - kde_qtsubver=`echo "$1" | sed -e 's#[0-9][0-9]*\.\([0-9][0-9]*\).*#\1#'` - # following is the check if subversion isnt found in passed argument - if test "$kde_qtsubver" = "$1"; then - kde_qtsubver=1 - fi - kde_qtver=`echo "$1" | sed -e 's#^\([0-9][0-9]*\)\..*#\1#'` - if test "$kde_qtver" = "1"; then - kde_qtsubver=42 - fi -fi - -if test -z "$2"; then - if test "$kde_qtver" = "2"; then - if test $kde_qtsubver -gt 0; then - kde_qt_minversion=">= Qt 2.2.2" - else - kde_qt_minversion=">= Qt 2.0.2" - fi - fi - if test "$kde_qtver" = "3"; then - if test $kde_qtsubver -gt 0; then - if test $kde_qtsubver -gt 1; then - if test $kde_qtsubver -gt 2; then - kde_qt_minversion=">= Qt 3.3 and < 4.0" - else - kde_qt_minversion=">= Qt 3.2 and < 4.0" - fi - else - kde_qt_minversion=">= Qt 3.1 (20021021) and < 4.0" - fi - else - kde_qt_minversion=">= Qt 3.0 and < 4.0" - fi - fi - if test "$kde_qtver" = "1"; then - kde_qt_minversion=">= 1.42 and < 2.0" - fi -else - kde_qt_minversion="$2" -fi - -if test -z "$3"; then - if test $kde_qtver = 3; then - if test $kde_qtsubver -gt 0; then - kde_qt_verstring="TQT_VERSION >= 0x03@VER@00 && TQT_VERSION < 0x040000" - qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'` - kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"` - else - kde_qt_verstring="TQT_VERSION >= 300 && TQT_VERSION < 0x040000" - fi - fi - if test $kde_qtver = 2; then - if test $kde_qtsubver -gt 0; then - kde_qt_verstring="TQT_VERSION >= 222" - else - kde_qt_verstring="TQT_VERSION >= 200" - fi - fi - if test $kde_qtver = 1; then - kde_qt_verstring="TQT_VERSION >= 142 && TQT_VERSION < 200" - fi -else - kde_qt_verstring="$3" -fi - -if test $kde_qtver = 4; then - kde_qt_dirs="$TQTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4" -fi -if test $kde_qtver = 3; then - kde_qt_dirs="$TQTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${tdelibsuff}/qt-3.3" - if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - fi - if test "$PKG_CONFIG" != "no" ; then - if $PKG_CONFIG --exists qt-mt ; then - kde_qt_dirs="$kde_qt_dirs `$PKG_CONFIG --variable=prefix qt-mt`" - fi - fi -fi -if test $kde_qtver = 2; then - kde_qt_dirs="$TQTDIR /usr/lib/qt2 /usr/lib/qt" -fi -if test $kde_qtver = 1; then - kde_qt_dirs="$TQTDIR /usr/lib/qt" -fi -]) - -AC_DEFUN([KDE_CHECK_QT_DIRECT], -[ -AC_REQUIRE([KDE_USE_TQT]) -AC_MSG_CHECKING([if Qt compiles without flags]) -AC_CACHE_VAL(kde_cv_qt_direct, -[ -AC_LANG_SAVE -AC_LANG_CPLUSPLUS -ac_LD_LIBRARY_PATH_safe=$LD_LIBRARY_PATH -ac_LIBRARY_PATH="$LIBRARY_PATH" -ac_cxxflags_safe="$CXXFLAGS" -ac_ldflags_safe="$LDFLAGS" -ac_libs_safe="$LIBS" - -CXXFLAGS="$CXXFLAGS -I$tqt_includes" -LDFLAGS="$LDFLAGS $X_LDFLAGS" -if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then -LIBS="$LIBTQT -lXext -lX11 $LIBSOCKET" -else -LIBS="$LIBTQT $LIBSOCKET" -fi -LD_LIBRARY_PATH= -export LD_LIBRARY_PATH -LIBRARY_PATH= -export LIBRARY_PATH - -KDE_PRINT_QT_PROGRAM - -if AC_TRY_EVAL(ac_link) && test -s conftest; then - kde_cv_qt_direct="yes" -else - kde_cv_qt_direct="no" - echo "configure: failed program was:" >&AC_FD_CC - cat conftest.$ac_ext >&AC_FD_CC -fi - -rm -f conftest* -CXXFLAGS="$ac_cxxflags_safe" -LDFLAGS="$ac_ldflags_safe" -LIBS="$ac_libs_safe" - -LD_LIBRARY_PATH="$ac_LD_LIBRARY_PATH_safe" -export LD_LIBRARY_PATH -LIBRARY_PATH="$ac_LIBRARY_PATH" -export LIBRARY_PATH -AC_LANG_RESTORE -]) - -if test "$kde_cv_qt_direct" = "yes"; then - AC_MSG_RESULT(yes) - $1 -else - AC_MSG_RESULT(no) - $2 -fi -]) - -dnl ------------------------------------------------------------------------ -dnl Try to find the Qt headers and libraries. -dnl $(QT_LDFLAGS) will be -Ltqtliblocation (if needed) -dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed) -dnl ------------------------------------------------------------------------ -dnl -AC_DEFUN([AC_PATH_TQT_1_3], -[ -AC_REQUIRE([K_PATH_X]) -AC_REQUIRE([KDE_USE_TQT]) -AC_REQUIRE([KDE_CHECK_LIB64]) - -dnl ------------------------------------------------------------------------ -dnl Add configure flag to enable linking to MT version of Qt library. -dnl ------------------------------------------------------------------------ - -AC_ARG_ENABLE( - mt, - AC_HELP_STRING([--disable-mt],[link to non-threaded Qt (deprecated)]), - kde_use_qt_mt=$enableval, - [ - if test $kde_qtver = 3; then - kde_use_qt_mt=yes - else - kde_use_qt_mt=no - fi - ] -) - -USING_QT_MT="" - -dnl ------------------------------------------------------------------------ -dnl If we not get --disable-qt-mt then adjust some vars for the host. -dnl ------------------------------------------------------------------------ - -KDE_MT_LDFLAGS= -KDE_MT_LIBS= -if test "x$kde_use_qt_mt" = "xyes"; then - KDE_CHECK_THREADING - if test "x$kde_use_threading" = "xyes"; then - CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS" - KDE_MT_LDFLAGS="$USE_THREADS" - KDE_MT_LIBS="$LIBPTHREAD" - else - kde_use_qt_mt=no - fi -fi -AC_SUBST(KDE_MT_LDFLAGS) -AC_SUBST(KDE_MT_LIBS) - -kde_qt_was_given=yes - -dnl ------------------------------------------------------------------------ -dnl If we haven't been told how to link to Qt, we work it out for ourselves. -dnl ------------------------------------------------------------------------ -if test -z "$LIBTQT_GLOB"; then - if test "x$kde_use_qt_emb" = "xyes"; then - LIBTQT_GLOB="libtqte.*" - else - LIBTQT_GLOB="libtqt.*" - fi -fi - -dnl ------------------------------------------------------------ -dnl If we got --enable-embedded then adjust the Qt library name. -dnl ------------------------------------------------------------ -if test "x$kde_use_qt_emb" = "xyes"; then - tqtlib="qte" -else - tqtlib="qt" -fi - -kde_int_qt="-l$tqtlib" - -if test -z "$LIBQPE"; then -dnl ------------------------------------------------------------ -dnl If we got --enable-palmtop then add -lqpe to the link line -dnl ------------------------------------------------------------ - if test "x$kde_use_qt_emb" = "xyes"; then - if test "x$kde_use_qt_emb_palm" = "xyes"; then - LIB_QPE="-lqpe" - else - LIB_QPE="" - fi - else - LIB_QPE="" - fi -fi - -dnl ------------------------------------------------------------------------ -dnl If we got --enable-qt-mt then adjust the Qt library name for the host. -dnl ------------------------------------------------------------------------ - -if test "x$kde_use_qt_mt" = "xyes"; then - LIBTQT="-l$tqtlib-mt" - kde_int_qt="-l$tqtlib-mt" - LIBTQT_GLOB="lib$tqtlib-mt.*" - USING_QT_MT="using -mt" -else - LIBTQT="-l$tqtlib" -fi - -if test $kde_qtver != 1; then - - AC_REQUIRE([AC_FIND_PNG]) - AC_REQUIRE([AC_FIND_JPEG]) - LIBTQT="$LIBTQT $LIBPNG $LIBJPEG" -fi - -if test $kde_qtver = 3; then - AC_REQUIRE([KDE_CHECK_LIBDL]) - LIBTQT="$LIBTQT $LIBDL" -fi - -AC_MSG_CHECKING([for Qt]) - -if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then -LIBTQT="$LIBTQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET" -fi -ac_tqt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO -qt_libraries="" -tqt_includes="" -AC_ARG_WITH(qt-dir, - AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]), - [ ac_tqt_includes="$withval"/include - ac_qt_libraries="$withval"/lib${tdelibsuff} - ac_qt_bindir="$withval"/bin - ]) - -AC_ARG_WITH(qt-includes, - AC_HELP_STRING([--with-qt-includes=DIR],[where the Qt includes are. ]), - [ - ac_tqt_includes="$withval" - ]) - -kde_qt_libs_given=no - -AC_ARG_WITH(qt-libraries, - AC_HELP_STRING([--with-qt-libraries=DIR],[where the Qt library is installed.]), - [ ac_qt_libraries="$withval" - kde_qt_libs_given=yes - ]) - -AC_CACHE_VAL(ac_cv_have_qt, -[#try to guess Qt locations - -qt_incdirs="" -for dir in $kde_qt_dirs; do - qt_incdirs="$qt_incdirs $dir/include $dir" -done -if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -fi -if test "$PKG_CONFIG" != "no" ; then - if $PKG_CONFIG --exists qt-mt ; then - qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir qt-mt`" - fi -fi -qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes" -if test ! "$ac_tqt_includes" = "NO"; then - qt_incdirs="$ac_tqt_includes $qt_incdirs" -fi - -if test "$kde_qtver" != "1"; then - kde_qt_header=qstyle.h -else - kde_qt_header=qglobal.h -fi - -AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir) -ac_tqt_includes="$qt_incdir" - -qt_libdirs="" -for dir in $kde_qt_dirs; do - qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir/lib $dir" -done -if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -fi -if test "$PKG_CONFIG" != "no" ; then - if $PKG_CONFIG --exists qt-mt ; then - qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir qt-mt`" - fi -fi -qt_libdirs="$TQTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" -if test ! "$ac_qt_libraries" = "NO"; then - qt_libdir=$ac_qt_libraries -else - qt_libdirs="$ac_qt_libraries $qt_libdirs" - # if the Qt was given, the chance is too big that libtqt.* doesn't exist - qt_libdir=NONE - for dir in $qt_libdirs; do - try="ls -1 $dir/${LIBTQT_GLOB}" - if test -n "`$try 2> /dev/null`"; then qt_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi - done -fi -for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do - if test -e "$a"; then - LIBTQT="$LIBTQT ${kde_int_qt}_incremental" - break - fi -done - -ac_qt_libraries="$qt_libdir" - -AC_LANG_SAVE -AC_LANG_CPLUSPLUS - -ac_cxxflags_safe="$CXXFLAGS" -ac_ldflags_safe="$LDFLAGS" -ac_libs_safe="$LIBS" - -CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes" -LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" -LIBS="$LIBS $LIBTQT $KDE_MT_LIBS" - -KDE_PRINT_QT_PROGRAM - -if AC_TRY_EVAL(ac_link) && test -s conftest; then - rm -f conftest* -else - echo "configure: failed program was:" >&AC_FD_CC - cat conftest.$ac_ext >&AC_FD_CC - ac_qt_libraries="NO" -fi -rm -f conftest* -CXXFLAGS="$ac_cxxflags_safe" -LDFLAGS="$ac_ldflags_safe" -LIBS="$ac_libs_safe" - -AC_LANG_RESTORE -if test "$ac_tqt_includes" = NO || test "$ac_qt_libraries" = NO; then - ac_cv_have_qt="have_qt=no" - ac_qt_notfound="" - missing_qt_mt="" - if test "$ac_tqt_includes" = NO; then - if test "$ac_qt_libraries" = NO; then - ac_qt_notfound="(headers and libraries)"; - else - ac_qt_notfound="(headers)"; - fi - else - if test "x$kde_use_qt_mt" = "xyes"; then - missing_qt_mt=" -Make sure that you have compiled Qt with thread support!" - ac_qt_notfound="(library $tqtlib-mt)"; - else - ac_qt_notfound="(library $tqtlib)"; - fi - fi - - AC_MSG_ERROR([Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation! -For more details about this problem, look at the end of config.log.$missing_qt_mt]) -else - have_qt="yes" -fi -]) - -eval "$ac_cv_have_qt" - -if test "$have_qt" != yes; then - AC_MSG_RESULT([$have_qt]); -else - ac_cv_have_qt="have_qt=yes \ - ac_tqt_includes=$ac_tqt_includes ac_qt_libraries=$ac_qt_libraries" - AC_MSG_RESULT([libraries $ac_qt_libraries, headers $ac_tqt_includes $USING_QT_MT]) - - qt_libraries="$ac_qt_libraries" - tqt_includes="$ac_tqt_includes" -fi - -if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then - KDE_CHECK_QT_DIRECT(qt_libraries= ,[]) -fi - -AC_SUBST(qt_libraries) -AC_SUBST(tqt_includes) - -if test "$tqt_includes" = "$x_includes" || test -z "$tqt_includes"; then - TQT_INCLUDES="" -else - TQT_INCLUDES="-I$tqt_includes" - all_includes="$TQT_INCLUDES $all_includes" -fi - -if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then - QT_LDFLAGS="" -else - QT_LDFLAGS="-L$qt_libraries" - all_libraries="$QT_LDFLAGS $all_libraries" -fi -test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS" - -AC_SUBST(TQT_INCLUDES) -AC_SUBST(QT_LDFLAGS) -AC_PATH_TQT_MOC_UIC - -KDE_CHECK_QT_JPEG - -if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then -LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)' -else -LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)' -fi -test -z "$KDE_MT_LIBS" || LIB_TQT="$LIB_TQT $KDE_MT_LIBS" -for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do - if test -e "$a"; then - LIB_TQT="$LIB_TQT ${kde_int_qt}_incremental" - break - fi -done - -AC_SUBST(LIB_TQT) -AC_SUBST(LIB_QPE) - -AC_SUBST(kde_qtver) -]) - -AC_DEFUN([AC_PATH_TQT], -[ -AC_PATH_TQT_1_3 -]) - -AC_DEFUN([KDE_CHECK_UIC_PLUGINS], -[ -AC_REQUIRE([AC_PATH_TQT_MOC_UIC]) - -if test x$ac_uic_supports_libpath = xyes; then - -AC_MSG_CHECKING([if UIC has KDE plugins available]) -AC_CACHE_VAL(kde_cv_uic_plugins, -[ -cat > actest.ui << EOF -<!DOCTYPE UI><UI version="3.0" stdsetdef="1"> -<class>NewConnectionDialog</class> -<widget class="QDialog"> - <widget class="KLineEdit"> - <property name="name"> - <cstring>testInput</cstring> - </property> - </widget> -</widget> -</UI> -EOF - - - -kde_cv_uic_plugins=no -kde_line="$UIC_PATH -L $kde_widgetdir" -if test x$ac_uic_supports_nounload = xyes; then - kde_line="$kde_line -nounload" -fi -kde_line="$kde_line -impl actest.h actest.ui > actest.cpp" -if AC_TRY_EVAL(kde_line); then - # if you're trying to debug this check and think it's incorrect, - # better check your installation. The check _is_ correct - your - # installation is not. - if test -f actest.cpp && grep klineedit actest.cpp > /dev/null; then - kde_cv_uic_plugins=yes - fi -fi -rm -f actest.ui actest.cpp -]) - -AC_MSG_RESULT([$kde_cv_uic_plugins]) -if test "$kde_cv_uic_plugins" != yes; then - AC_MSG_ERROR([ -you need to install tdelibs first. - -If you did install tdelibs, then the Qt version that is picked up by -this configure is not the same version you used to compile tdelibs. -The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the -_same Qt version_, compiled with the _same compiler_ and the same Qt -configuration settings. -]) -fi -fi -]) - -AC_DEFUN([KDE_CHECK_FINAL], -[ - AC_ARG_ENABLE(final, - AC_HELP_STRING([--enable-final], - [build size optimized apps (experimental - needs lots of memory)]), - kde_use_final=$enableval, kde_use_final=no) - - if test "x$kde_use_final" = "xyes"; then - KDE_USE_FINAL_TRUE="" - KDE_USE_FINAL_FALSE="#" - else - KDE_USE_FINAL_TRUE="#" - KDE_USE_FINAL_FALSE="" - fi - AC_SUBST(KDE_USE_FINAL_TRUE) - AC_SUBST(KDE_USE_FINAL_FALSE) -]) - -AC_DEFUN([KDE_CHECK_CLOSURE], -[ - AC_ARG_ENABLE(closure, - AC_HELP_STRING([--enable-closure],[delay template instantiation]), - kde_use_closure=$enableval, kde_use_closure=no) - - KDE_NO_UNDEFINED="" - if test "x$kde_use_closure" = "xyes"; then - KDE_USE_CLOSURE_TRUE="" - KDE_USE_CLOSURE_FALSE="#" -# CXXFLAGS="$CXXFLAGS $REPO" - else - KDE_USE_CLOSURE_TRUE="#" - KDE_USE_CLOSURE_FALSE="" - KDE_NO_UNDEFINED="" - case $host in - *-*-linux-gnu) - KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined], - [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined], - [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"], - [KDE_NO_UNDEFINED=""])], - [KDE_NO_UNDEFINED=""]) - ;; - esac - fi - AC_SUBST(KDE_USE_CLOSURE_TRUE) - AC_SUBST(KDE_USE_CLOSURE_FALSE) - AC_SUBST(KDE_NO_UNDEFINED) -]) - -dnl Check if the linker supports --enable-new-dtags and --as-needed -AC_DEFUN([KDE_CHECK_NEW_LDFLAGS], -[ - AC_ARG_ENABLE(new_ldflags, - AC_HELP_STRING([--enable-new-ldflags], - [enable the new linker flags]), - kde_use_new_ldflags=$enableval, - kde_use_new_ldflags=no) - - LDFLAGS_AS_NEEDED="" - LDFLAGS_NEW_DTAGS="" - if test "x$kde_use_new_ldflags" = "xyes"; then - LDFLAGS_NEW_DTAGS="" - KDE_CHECK_COMPILER_FLAG([Wl,--enable-new-dtags], - [LDFLAGS_NEW_DTAGS="-Wl,--enable-new-dtags"],) - - KDE_CHECK_COMPILER_FLAG([Wl,--as-needed], - [LDFLAGS_AS_NEEDED="-Wl,--as-needed"],) - fi - AC_SUBST(LDFLAGS_AS_NEEDED) - AC_SUBST(LDFLAGS_NEW_DTAGS) -]) - -AC_DEFUN([KDE_CHECK_NMCHECK], -[ - AC_ARG_ENABLE(nmcheck,AC_HELP_STRING([--enable-nmcheck],[enable automatic namespace cleanness check]), - kde_use_nmcheck=$enableval, kde_use_nmcheck=no) - - if test "$kde_use_nmcheck" = "yes"; then - KDE_USE_NMCHECK_TRUE="" - KDE_USE_NMCHECK_FALSE="#" - else - KDE_USE_NMCHECK_TRUE="#" - KDE_USE_NMCHECK_FALSE="" - fi - AC_SUBST(KDE_USE_NMCHECK_TRUE) - AC_SUBST(KDE_USE_NMCHECK_FALSE) -]) - -AC_DEFUN([KDE_EXPAND_MAKEVAR], [ -savex=$exec_prefix -test "x$exec_prefix" = xNONE && exec_prefix=$prefix -tmp=$$2 -while $1=`eval echo "$tmp"`; test "x$$1" != "x$tmp"; do tmp=$$1; done -exec_prefix=$savex -]) - -dnl ------------------------------------------------------------------------ -dnl Now, the same with KDE -dnl $(KDE_LDFLAGS) will be the kdeliblocation (if needed) -dnl and $(kde_includes) will be the kdehdrlocation (if needed) -dnl ------------------------------------------------------------------------ -dnl -AC_DEFUN([AC_BASE_PATH_KDE], -[ -AC_REQUIRE([KDE_CHECK_STL]) -AC_REQUIRE([AC_PATH_TQT])dnl -AC_REQUIRE([KDE_CHECK_LIB64]) - -AC_CHECK_RPATH -AC_MSG_CHECKING([for KDE]) - -if test "${prefix}" != NONE; then - kde_includes=${includedir} - KDE_EXPAND_MAKEVAR(ac_kde_includes, includedir) - - kde_libraries=${libdir} - KDE_EXPAND_MAKEVAR(ac_kde_libraries, libdir) - -else - ac_kde_includes= - ac_kde_libraries= - kde_libraries="" - kde_includes="" -fi - -AC_CACHE_VAL(ac_cv_have_kde, -[#try to guess kde locations - -if test "$kde_qtver" = 1; then - kde_check_header="ksock.h" - kde_check_lib="libtdecore.la" -else - kde_check_header="ksharedptr.h" - kde_check_lib="libtdeio.la" -fi - -if test -z "$1"; then - -kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/trinity/include /opt/kde/include $x_includes $tqt_includes" -test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs" -kde_incdirs="$ac_kde_includes $kde_incdirs" -AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) -ac_kde_includes="$kde_incdir" - -if test -n "$ac_kde_includes" && test ! -r "$ac_kde_includes/$kde_check_header"; then - AC_MSG_ERROR([ -in the prefix, you've chosen, are no KDE headers installed. This will fail. -So, check this please and use another prefix!]) -fi - -kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/trinity /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/trinity/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}" -test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs" -kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" -AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) -ac_kde_libraries="$kde_libdir" - -kde_widgetdir=NO -dnl this might be somewhere else -AC_FIND_FILE("trinity/plugins/designer/tdewidgets.la", $kde_libdirs, kde_widgetdir) - -if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then -AC_MSG_ERROR([ -in the prefix, you've chosen, are no KDE libraries installed. This will fail. -So, check this please and use another prefix!]) -fi - -if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/tdewidgets.la"; then -AC_MSG_ERROR([ -I can't find the designer plugins. These are required and should have been installed -by tdelibs]) -fi - -if test -n "$kde_widgetdir"; then - kde_widgetdir="$kde_widgetdir/trinity/plugins/designer" -fi - - -if test "$ac_kde_includes" = NO || test "$ac_kde_libraries" = NO || test "$kde_widgetdir" = NO; then - ac_cv_have_kde="have_kde=no" -else - ac_cv_have_kde="have_kde=yes \ - ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" -fi - -else dnl test -z $1, e.g. from tdelibs - - ac_cv_have_kde="have_kde=no" - -fi -])dnl - -eval "$ac_cv_have_kde" - -if test "$have_kde" != "yes"; then - if test "${prefix}" = NONE; then - ac_kde_prefix="$ac_default_prefix" - else - ac_kde_prefix="$prefix" - fi - if test "$exec_prefix" = NONE; then - ac_kde_exec_prefix="$ac_kde_prefix" - AC_MSG_RESULT([will be installed in $ac_kde_prefix]) - else - ac_kde_exec_prefix="$exec_prefix" - AC_MSG_RESULT([will be installed in $ac_kde_prefix and $ac_kde_exec_prefix]) - fi - - kde_libraries="${libdir}" - kde_includes="${includedir}" - -else - ac_cv_have_kde="have_kde=yes \ - ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" - AC_MSG_RESULT([libraries $ac_kde_libraries, headers $ac_kde_includes]) - - kde_libraries="$ac_kde_libraries" - kde_includes="$ac_kde_includes" -fi -AC_SUBST(kde_libraries) -AC_SUBST(kde_includes) - -if test "$kde_includes" = "$x_includes" || test "$kde_includes" = "$tqt_includes" || test "$kde_includes" = "/usr/include"; then - KDE_INCLUDES="" -else - KDE_INCLUDES="-I$kde_includes" - all_includes="$KDE_INCLUDES $all_includes" -fi - -KDE_DEFAULT_CXXFLAGS="-DTQT_NO_ASCII_CAST -DTQT_NO_STL -DTQT_NO_COMPAT -DTQT_NO_TRANSLATION" - -KDE_LDFLAGS="-L$kde_libraries" -if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$qt_libraries" ; then - all_libraries="$KDE_LDFLAGS $all_libraries" -fi - -AC_SUBST(KDE_LDFLAGS) -AC_SUBST(KDE_INCLUDES) - -AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) - -all_libraries="$all_libraries $USER_LDFLAGS" -all_includes="$all_includes $USER_INCLUDES" -AC_SUBST(all_includes) -AC_SUBST(all_libraries) - -if test -z "$1"; then -KDE_CHECK_UIC_PLUGINS -fi - -ac_kde_libraries="$kde_libdir" - -AC_SUBST(AUTODIRS) - - -]) - -AC_DEFUN([KDE_CHECK_EXTRA_LIBS], -[ -AC_MSG_CHECKING(for extra includes) -AC_ARG_WITH(extra-includes,AC_HELP_STRING([--with-extra-includes=DIR],[adds non standard include paths]), - kde_use_extra_includes="$withval", - kde_use_extra_includes=NONE -) -kde_extra_includes= -if test -n "$kde_use_extra_includes" && \ - test "$kde_use_extra_includes" != "NONE"; then - - ac_save_ifs=$IFS - IFS=':' - for dir in $kde_use_extra_includes; do - kde_extra_includes="$kde_extra_includes $dir" - USER_INCLUDES="$USER_INCLUDES -I$dir" - done - IFS=$ac_save_ifs - kde_use_extra_includes="added" -else - kde_use_extra_includes="no" -fi -AC_SUBST(USER_INCLUDES) - -AC_MSG_RESULT($kde_use_extra_includes) - -kde_extra_libs= -AC_MSG_CHECKING(for extra libs) -AC_ARG_WITH(extra-libs,AC_HELP_STRING([--with-extra-libs=DIR],[adds non standard library paths]), - kde_use_extra_libs=$withval, - kde_use_extra_libs=NONE -) -if test -n "$kde_use_extra_libs" && \ - test "$kde_use_extra_libs" != "NONE"; then - - ac_save_ifs=$IFS - IFS=':' - for dir in $kde_use_extra_libs; do - kde_extra_libs="$kde_extra_libs $dir" - KDE_EXTRA_RPATH="$KDE_EXTRA_RPATH -R $dir" - USER_LDFLAGS="$USER_LDFLAGS -L$dir" - done - IFS=$ac_save_ifs - kde_use_extra_libs="added" -else - kde_use_extra_libs="no" -fi - -AC_SUBST(USER_LDFLAGS) - -AC_MSG_RESULT($kde_use_extra_libs) - -]) - -AC_DEFUN([KDE_1_CHECK_PATH_HEADERS], -[ - AC_MSG_CHECKING([for KDE headers installed]) - AC_LANG_SAVE - AC_LANG_CPLUSPLUS -cat > conftest.$ac_ext <<EOF -#ifdef STDC_HEADERS -# include <stdlib.h> -#endif -#include <stdio.h> -#include "confdefs.h" -#include <kapp.h> - -int main() { - printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data()); - printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data()); - printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data()); - printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data()); - printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data()); - printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data()); - printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data()); - printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data()); - printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data()); - printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data()); - printf("kde_wallpaperdir=\\"%s\\"\n", - TDEApplication::kde_wallpaperdir().data()); - printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data()); - printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data()); - printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); - printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); - printf("kde_moduledir=\\"/tmp/dummy\\"\n"); - printf("kde_styledir=\\"/tmp/dummy\\"\n"); - printf("kde_widgetdir=\\"/tmp/dummy\\"\n"); - printf("xdg_appsdir=\\"/tmp/dummy\\"\n"); - printf("xdg_menudir=\\"/tmp/dummy\\"\n"); - printf("xdg_directorydir=\\"/tmp/dummy\\"\n"); - printf("kde_kcfgdir=\\"/tmp/dummy\\"\n"); - return 0; - } -EOF - - ac_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$all_includes $CPPFLAGS" - if AC_TRY_EVAL(ac_compile); then - AC_MSG_RESULT(yes) - else - AC_MSG_ERROR([your system is not able to compile a small KDE application! -Check, if you installed the KDE header files correctly. -For more details about this problem, look at the end of config.log.]) - fi - CPPFLAGS=$ac_save_CPPFLAGS - - AC_LANG_RESTORE -]) - -AC_DEFUN([KDE_CHECK_KDEQTADDON], -[ -AC_MSG_CHECKING(for kde-qt-addon) -AC_CACHE_VAL(kde_cv_have_kdetqtaddon, -[ - kde_ldflags_safe="$LDFLAGS" - kde_libs_safe="$LIBS" - kde_cxxflags_safe="$CXXFLAGS" - - LIBS="-lkde-qt-addon $LIBTQT $LIBS" - CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes" - LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" - - AC_TRY_LINK([ - #include <qdom.h> - ], - [ - QDomDocument doc; - ], - kde_cv_have_kdetqtaddon=yes, - kde_cv_have_kdetqtaddon=no - ) - - LDFLAGS=$kde_ldflags_safe - LIBS=$kde_libs_safe - CXXFLAGS=$kde_cxxflags_safe -]) - -AC_MSG_RESULT($kde_cv_have_kdetqtaddon) - -if test "$kde_cv_have_kdetqtaddon" = "no"; then - AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first. -It is a separate package (and CVS module) named kde-qt-addon.]) -fi -]) - -AC_DEFUN([KDE_CREATE_LIBS_ALIASES], -[ - AC_REQUIRE([KDE_MISC_TESTS]) - AC_REQUIRE([KDE_CHECK_LIBDL]) - AC_REQUIRE([K_PATH_X]) - -if test $kde_qtver = 3; then - case $host in - *cygwin*) lib_kded="-ltdeinit_kded" ;; - *) lib_kded="" ;; - esac - AC_SUBST(LIB_KDED, $lib_kded) - AC_SUBST(LIB_TDECORE, "-ltdecore") - AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_TDEIO, "-ltdeio") - AC_SUBST(LIB_KJS, "-lkjs") - AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_TDEABC, "-ltdeabc") - AC_SUBST(LIB_TDEHTML, "-ltdehtml") - AC_SUBST(LIB_TDESPELL, "-ltdespell") - AC_SUBST(LIB_TDEPARTS, "-ltdeparts") - AC_SUBST(LIB_TDEPRINT, "-ltdeprint") - AC_SUBST(LIB_TDEUTILS, "-ltdeutils") - AC_SUBST(LIB_TDEPIM, "-ltdepim") - AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy") - AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") - AC_SUBST(LIB_TDEDNSSD, "-ltdednssd") - AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest") -# these are for backward compatibility - AC_SUBST(LIB_TDESYCOCA, "-ltdeio") - AC_SUBST(LIB_TDEFILE, "-ltdeio") -elif test $kde_qtver = 2; then - AC_SUBST(LIB_TDECORE, "-ltdecore") - AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_TDEIO, "-ltdeio") - AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca") - AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_TDEFILE, "-ltdefile") - AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_TDEHTML, "-ltdehtml") - AC_SUBST(LIB_TDESPELL, "-ltdespell") - AC_SUBST(LIB_TDEPARTS, "-ltdeparts") - AC_SUBST(LIB_TDEPRINT, "-ltdeprint") -else - AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_TQT)") - AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") - AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") - AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") - AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") -fi -]) - -AC_DEFUN([AC_PATH_KDE], -[ - AC_BASE_PATH_KDE - AC_ARG_ENABLE(path-check,AC_HELP_STRING([--disable-path-check],[don't try to find out, where to install]), - [ - if test "$enableval" = "no"; - then ac_use_path_checking="default" - else ac_use_path_checking="" - fi - ], - [ - if test "$kde_qtver" = 1; - then ac_use_path_checking="" - else ac_use_path_checking="default" - fi - ] - ) - - AC_CREATE_KFSSTND($ac_use_path_checking) - - AC_SUBST_KFSSTND - KDE_CREATE_LIBS_ALIASES -]) - -dnl KDE_CHECK_FUNC_EXT(<func>, [headers], [sample-use], [C prototype], [autoheader define], [call if found]) -AC_DEFUN([KDE_CHECK_FUNC_EXT], -[ -AC_MSG_CHECKING(for $1) -AC_CACHE_VAL(kde_cv_func_$1, -[ -AC_LANG_SAVE -AC_LANG_CPLUSPLUS -save_CXXFLAGS="$CXXFLAGS" -kde_safe_LIBS="$LIBS" -LIBS="$LIBS $X_EXTRA_LIBS" -if test "$GXX" = "yes"; then -CXXFLAGS="$CXXFLAGS -pedantic-errors" -fi -AC_TRY_COMPILE([ -$2 -], -[ -$3 -], -kde_cv_func_$1=yes, -kde_cv_func_$1=no) -CXXFLAGS="$save_CXXFLAGS" -LIBS="$kde_safe_LIBS" -AC_LANG_RESTORE -]) - -AC_MSG_RESULT($kde_cv_func_$1) - -AC_MSG_CHECKING([if $1 needs custom prototype]) -AC_CACHE_VAL(kde_cv_proto_$1, -[ -if test "x$kde_cv_func_$1" = xyes; then - kde_cv_proto_$1=no -else - case "$1" in - setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) - kde_cv_proto_$1="yes - in libtdefakes" - ;; - *) - kde_cv_proto_$1=unknown - ;; - esac -fi - -if test "x$kde_cv_proto_$1" = xunknown; then - -AC_LANG_SAVE -AC_LANG_CPLUSPLUS - kde_safe_libs=$LIBS - LIBS="$LIBS $X_EXTRA_LIBS" - AC_TRY_LINK([ -$2 - -extern "C" $4; -], -[ -$3 -], -[ kde_cv_func_$1=yes - kde_cv_proto_$1=yes ], - [kde_cv_proto_$1="$1 unavailable"] -) -LIBS=$kde_safe_libs -AC_LANG_RESTORE -fi -]) -AC_MSG_RESULT($kde_cv_proto_$1) - -if test "x$kde_cv_func_$1" = xyes; then - AC_DEFINE(HAVE_$5, 1, [Define if you have $1]) - $6 -fi -if test "x$kde_cv_proto_$1" = xno; then - AC_DEFINE(HAVE_$5_PROTO, 1, - [Define if you have the $1 prototype]) -fi - -AH_VERBATIM([_HAVE_$5_PROTO], -[ -#if !defined(HAVE_$5_PROTO) -#ifdef __cplusplus -extern "C" { -#endif -$4; -#ifdef __cplusplus -} -#endif -#endif -]) -]) - -AC_DEFUN([AC_CHECK_SETENV], -[ - KDE_CHECK_FUNC_EXT(setenv, [ -#include <stdlib.h> -], - [setenv("VAR", "VALUE", 1);], - [int setenv (const char *, const char *, int)], - [SETENV]) -]) - -AC_DEFUN([AC_CHECK_UNSETENV], -[ - KDE_CHECK_FUNC_EXT(unsetenv, [ -#include <stdlib.h> -], - [unsetenv("VAR");], - [void unsetenv (const char *)], - [UNSETENV]) -]) - -AC_DEFUN([AC_CHECK_GETDOMAINNAME], -[ - KDE_CHECK_FUNC_EXT(getdomainname, [ -#include <stdlib.h> -#include <unistd.h> -#include <netdb.h> -], - [ -char buffer[200]; -getdomainname(buffer, 200); -], - [#include <sys/types.h> - int getdomainname (char *, size_t)], - [GETDOMAINNAME]) -]) - -AC_DEFUN([AC_CHECK_GETHOSTNAME], -[ - KDE_CHECK_FUNC_EXT(gethostname, [ -#include <stdlib.h> -#include <unistd.h> -], - [ -char buffer[200]; -gethostname(buffer, 200); -], - [int gethostname (char *, unsigned int)], - [GETHOSTNAME]) -]) - -AC_DEFUN([AC_CHECK_USLEEP], -[ - KDE_CHECK_FUNC_EXT(usleep, [ -#include <unistd.h> -], - [ -usleep(200); -], - [int usleep (unsigned int)], - [USLEEP]) -]) - - -AC_DEFUN([AC_CHECK_RANDOM], -[ - KDE_CHECK_FUNC_EXT(random, [ -#include <stdlib.h> -], - [ -random(); -], - [long int random(void)], - [RANDOM]) - - KDE_CHECK_FUNC_EXT(srandom, [ -#include <stdlib.h> -], - [ -srandom(27); -], - [void srandom(unsigned int)], - [SRANDOM]) - -]) - -AC_DEFUN([AC_CHECK_INITGROUPS], -[ - KDE_CHECK_FUNC_EXT(initgroups, [ -#include <sys/types.h> -#include <unistd.h> -#include <grp.h> -], - [ -char buffer[200]; -initgroups(buffer, 27); -], - [int initgroups(const char *, gid_t)], - [INITGROUPS]) -]) - -AC_DEFUN([AC_CHECK_MKSTEMPS], -[ - KDE_CHECK_FUNC_EXT(mkstemps, [ -#include <stdlib.h> -#include <unistd.h> -], - [ -mkstemps("/tmp/aaaXXXXXX", 6); -], - [int mkstemps(char *, int)], - [MKSTEMPS]) -]) - -AC_DEFUN([AC_CHECK_MKSTEMP], -[ - KDE_CHECK_FUNC_EXT(mkstemp, [ -#include <stdlib.h> -#include <unistd.h> -], - [ -mkstemp("/tmp/aaaXXXXXX"); -], - [int mkstemp(char *)], - [MKSTEMP]) -]) - -AC_DEFUN([AC_CHECK_MKDTEMP], -[ - KDE_CHECK_FUNC_EXT(mkdtemp, [ -#include <stdlib.h> -#include <unistd.h> -], - [ -mkdtemp("/tmp/aaaXXXXXX"); -], - [char *mkdtemp(char *)], - [MKDTEMP]) -]) - - -AC_DEFUN([AC_CHECK_RES_INIT], -[ - AC_MSG_CHECKING([if res_init needs -lresolv]) - kde_libs_safe="$LIBS" - LIBS="$LIBS $X_EXTRA_LIBS -lresolv" - AC_TRY_LINK( - [ -#include <sys/types.h> -#include <netinet/in.h> -#include <arpa/nameser.h> -#include <resolv.h> - ], - [ - res_init(); - ], - [ - LIBRESOLV="-lresolv" - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_RES_INIT, 1, [Define if you have the res_init function]) - ], - [ AC_MSG_RESULT(no) ] - ) - LIBS=$kde_libs_safe - AC_SUBST(LIBRESOLV) - - KDE_CHECK_FUNC_EXT(res_init, - [ -#include <sys/types.h> -#include <netinet/in.h> -#include <arpa/nameser.h> -#include <resolv.h> - ], - [res_init()], - [int res_init(void)], - [RES_INIT]) -]) - -AC_DEFUN([AC_CHECK_STRLCPY], -[ - KDE_CHECK_FUNC_EXT(strlcpy, [ -#include <string.h> -], -[ char buf[20]; - strlcpy(buf, "KDE function test", sizeof(buf)); -], - [unsigned long strlcpy(char*, const char*, unsigned long)], - [STRLCPY]) -]) - -AC_DEFUN([AC_CHECK_STRLCAT], -[ - KDE_CHECK_FUNC_EXT(strlcat, [ -#include <string.h> -], -[ char buf[20]; - buf[0]='\0'; - strlcat(buf, "KDE function test", sizeof(buf)); -], - [unsigned long strlcat(char*, const char*, unsigned long)], - [STRLCAT]) -]) - -AC_DEFUN([AC_CHECK_RES_QUERY], -[ - KDE_CHECK_FUNC_EXT(res_query, [ -#include <sys/types.h> -#include <netinet/in.h> -#include <arpa/nameser.h> -#include <resolv.h> -#include <netdb.h> -], -[ -res_query(NULL, 0, 0, NULL, 0); -], - [int res_query(const char *, int, int, unsigned char *, int)], - [RES_QUERY]) -]) - -AC_DEFUN([AC_CHECK_DN_SKIPNAME], -[ - KDE_CHECK_FUNC_EXT(dn_skipname, [ -#include <sys/types.h> -#include <netinet/in.h> -#include <arpa/nameser.h> -#include <resolv.h> -], -[ -dn_skipname (NULL, NULL); -], - [int dn_skipname (unsigned char *, unsigned char *)], - [DN_SKIPNAME]) -]) - - -AC_DEFUN([AC_FIND_GIF], - [AC_MSG_CHECKING([for giflib]) -AC_CACHE_VAL(ac_cv_lib_gif, -[ac_save_LIBS="$LIBS" -if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then -LIBS="$all_libraries -lgif -lX11 $LIBSOCKET" -else -LIBS="$all_libraries -lgif" -fi -AC_TRY_LINK(dnl -[ -#ifdef __cplusplus -extern "C" { -#endif -int GifLastError(void); -#ifdef __cplusplus -} -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -], - [return GifLastError();], - eval "ac_cv_lib_gif=yes", - eval "ac_cv_lib_gif=no") -LIBS="$ac_save_LIBS" -])dnl -if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then - AC_MSG_RESULT(yes) - AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) -else - AC_MSG_ERROR(You need giflib30. Please install the tdesupport package) -fi -]) - -AC_DEFUN([KDE_FIND_JPEG_HELPER], -[ -AC_MSG_CHECKING([for libjpeg$2]) -AC_CACHE_VAL(ac_cv_lib_jpeg_$1, -[ -ac_save_LIBS="$LIBS" -LIBS="$all_libraries $USER_LDFLAGS -ljpeg$2 -lm" -ac_save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" -AC_TRY_LINK( -[ -#ifdef __cplusplus -extern "C" { -#endif -void jpeg_CreateDecompress(); -#ifdef __cplusplus -} -#endif -], -[jpeg_CreateDecompress();], - eval "ac_cv_lib_jpeg_$1=-ljpeg$2", - eval "ac_cv_lib_jpeg_$1=no") -LIBS="$ac_save_LIBS" -CFLAGS="$ac_save_CFLAGS" -]) - -if eval "test ! \"`echo $ac_cv_lib_jpeg_$1`\" = no"; then - LIBJPEG="$ac_cv_lib_jpeg_$1" - AC_MSG_RESULT($ac_cv_lib_jpeg_$1) -else - AC_MSG_RESULT(no) - $3 -fi - -]) - -AC_DEFUN([AC_FIND_JPEG], -[ -dnl first look for libraries -KDE_FIND_JPEG_HELPER(6b, 6b, - KDE_FIND_JPEG_HELPER(normal, [], - [ - LIBJPEG= - ] - ) -) - -dnl then search the headers (can't use simply AC_TRY_xxx, as jpeglib.h -dnl requires system dependent includes loaded before it) -jpeg_incdirs="$includedir /usr/include /usr/local/include $kde_extra_includes" -AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir) -test "x$jpeg_incdir" = xNO && jpeg_incdir= - -dnl if headers _and_ libraries are missing, this is no error, and we -dnl continue with a warning (the user will get no jpeg support in tdehtml) -dnl if only one is missing, it means a configuration error, but we still -dnl only warn -if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then - AC_DEFINE_UNQUOTED(HAVE_LIBJPEG, 1, [Define if you have libjpeg]) -else - if test -n "$jpeg_incdir" || test -n "$LIBJPEG" ; then - AC_MSG_WARN([ -There is an installation error in jpeg support. You seem to have only one -of either the headers _or_ the libraries installed. You may need to either -provide correct --with-extra-... options, or the development package of -libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/ -Disabling JPEG support. -]) - else - AC_MSG_WARN([libjpeg not found. disable JPEG support.]) - fi - jpeg_incdir= - LIBJPEG= -fi - -AC_SUBST(LIBJPEG) -AH_VERBATIM(_AC_CHECK_JPEG, -[/* - * jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system - * headers and I'm too lazy to write a configure test as long as only - * unixware is related - */ -#ifdef _UNIXWARE -#define HAVE_BOOLEAN -#endif -]) -]) - -AC_DEFUN([KDE_CHECK_QT_JPEG], -[ -if test -n "$LIBJPEG"; then -AC_MSG_CHECKING([if Qt needs $LIBJPEG]) -AC_CACHE_VAL(kde_cv_qt_jpeg, -[ -AC_LANG_SAVE -AC_LANG_CPLUSPLUS -ac_save_LIBS="$LIBS" -LIBS="$all_libraries $USER_LDFLAGS $LIBTQT" -LIBS=`echo $LIBS | sed "s/$LIBJPEG//"` -ac_save_CXXFLAGS="$CXXFLAGS" -CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES" -AC_TRY_LINK( -[#include <qapplication.h>], - [ - int argc; - char** argv; - QApplication app(argc, argv);], - eval "kde_cv_qt_jpeg=no", - eval "kde_cv_qt_jpeg=yes") -LIBS="$ac_save_LIBS" -CXXFLAGS="$ac_save_CXXFLAGS" -AC_LANG_RESTORE -fi -]) - -if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then - AC_MSG_RESULT(yes) - LIBJPEG_QT='$(LIBJPEG)' -else - AC_MSG_RESULT(no) - LIBJPEG_QT= -fi - -]) - -AC_DEFUN([AC_FIND_ZLIB], -[ -AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) -AC_MSG_CHECKING([for libz]) -AC_CACHE_VAL(ac_cv_lib_z, -[ -kde_save_LIBS="$LIBS" -LIBS="$all_libraries $USER_LDFLAGS -lz $LIBSOCKET" -kde_save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" -AC_TRY_LINK(dnl -[ -#include<zlib.h> -#include<string.h> -], -[ - char buf[42]; - gzFile f = (gzFile) 0; - /* this would segfault.. but we only link, don't run */ - (void) gzgets(f, buf, sizeof(buf)); - - return (strcmp(zlibVersion(), ZLIB_VERSION) == 0); -], - eval "ac_cv_lib_z='-lz'", - eval "ac_cv_lib_z=no") -LIBS="$kde_save_LIBS" -CFLAGS="$kde_save_CFLAGS" -])dnl -if test ! "$ac_cv_lib_z" = no; then - AC_DEFINE_UNQUOTED(HAVE_LIBZ, 1, [Define if you have libz]) - LIBZ="$ac_cv_lib_z" - AC_MSG_RESULT($ac_cv_lib_z) -else - AC_MSG_ERROR(not found. - Possibly configure picks up an outdated version - installed by XFree86. Remove it from your system. - - Check your installation and look into config.log) - LIBZ="" -fi -AC_SUBST(LIBZ) -]) - -AC_DEFUN([KDE_TRY_TIFFLIB], -[ -AC_MSG_CHECKING([for libtiff $1]) - -AC_CACHE_VAL(kde_cv_libtiff_$1, -[ -AC_LANG_SAVE -AC_LANG_CPLUSPLUS -kde_save_LIBS="$LIBS" -if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then -LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lX11 $LIBSOCKET -lm" -else -LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lm" -fi -kde_save_CXXFLAGS="$CXXFLAGS" -CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES" - -AC_TRY_LINK(dnl -[ -#include<tiffio.h> -], - [return (TIFFOpen( "", "r") == 0); ], -[ - kde_cv_libtiff_$1="-l$1 $LIBJPEG $LIBZ" -], [ - kde_cv_libtiff_$1=no -]) - -LIBS="$kde_save_LIBS" -CXXFLAGS="$kde_save_CXXFLAGS" -AC_LANG_RESTORE -]) - -if test "$kde_cv_libtiff_$1" = "no"; then - AC_MSG_RESULT(no) - LIBTIFF="" - $3 -else - LIBTIFF="$kde_cv_libtiff_$1" - AC_MSG_RESULT(yes) - AC_DEFINE_UNQUOTED(HAVE_LIBTIFF, 1, [Define if you have libtiff]) - $2 -fi - -]) - -AC_DEFUN([AC_FIND_TIFF], -[ -AC_REQUIRE([K_PATH_X]) -AC_REQUIRE([AC_FIND_ZLIB]) -AC_REQUIRE([AC_FIND_JPEG]) -AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) - -KDE_TRY_TIFFLIB(tiff, [], - KDE_TRY_TIFFLIB(tiff34)) - -AC_SUBST(LIBTIFF) -]) - -AC_DEFUN([KDE_FIND_LIBEXR], -[ -AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) -AC_REQUIRE([AC_FIND_ZLIB]) -AC_CACHE_VAL(ac_cv_libexr, -[ - if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - fi - - AC_MSG_CHECKING([for OpenEXR libraries]) - - if test "$PKG_CONFIG" = "no" ; then - AC_MSG_RESULT(no) - 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 - if ! $PKG_CONFIG --exists OpenEXR ; then - AC_MSG_RESULT(no) - EXRSTATUS=no - else - if ! $PKG_CONFIG --atleast-version="1.1.1" OpenEXR ; then - AC_MSG_RESULT(no) - EXRSTATUS=old - else - kde_save_LIBS="$LIBS" - LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ" - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - kde_save_CXXFLAGS="$CXXFLAGS" - EXR_FLAGS=`$PKG_CONFIG --cflags OpenEXR` - CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES $EXR_FLAGS" - - AC_TRY_LINK(dnl - [ - #include <ImfRgbaFile.h> - ], - [ - using namespace Imf; - RgbaInputFile file ("dummy"); - return 0; - ], - eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'", - eval "ac_cv_libexr=no" - ) - LIBS="$kde_save_LIBS" - CXXFLAGS="$kde_save_CXXFLAGS" - AC_LANG_RESTORE - ])dnl - if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then - AC_DEFINE_UNQUOTED(HAVE_EXR, 1, [Define if you have OpenEXR]) - LIB_EXR="$ac_cv_libexr" - AC_MSG_RESULT($ac_cv_libexr) - else - AC_MSG_RESULT(no) - LIB_EXR="" - fi - fi - fi - fi - AC_SUBST(LIB_EXR) - AC_SUBST(EXR_FLAGS) -]) - - - -AC_DEFUN([AC_FIND_PNG], -[ -AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) -AC_REQUIRE([AC_FIND_ZLIB]) -AC_MSG_CHECKING([for libpng]) -AC_CACHE_VAL(ac_cv_lib_png, -[ -kde_save_LIBS="$LIBS" -if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then -LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm -lX11 $LIBSOCKET" -else -LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm" -fi -kde_save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" - -AC_TRY_LINK(dnl - [ - #include<png.h> - ], - [ - png_structp png_ptr = png_create_read_struct( /* image ptr */ - PNG_LIBPNG_VER_STRING, 0, 0, 0 ); - return( png_ptr != 0 ); - ], - eval "ac_cv_lib_png='-lpng $LIBZ -lm'", - eval "ac_cv_lib_png=no" -) -LIBS="$kde_save_LIBS" -CFLAGS="$kde_save_CFLAGS" -])dnl -if eval "test ! \"`echo $ac_cv_lib_png`\" = no"; then - AC_DEFINE_UNQUOTED(HAVE_LIBPNG, 1, [Define if you have libpng]) - LIBPNG="$ac_cv_lib_png" - AC_SUBST(LIBPNG) - AC_MSG_RESULT($ac_cv_lib_png) -else - AC_MSG_RESULT(no) - LIBPNG="" - AC_SUBST(LIBPNG) -fi -]) - - -AC_DEFUN([AC_FIND_JASPER], -[ -AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) -AC_REQUIRE([AC_FIND_JPEG]) -AC_MSG_CHECKING([for jasper]) -AC_CACHE_VAL(ac_cv_jasper, -[ -kde_save_LIBS="$LIBS" -LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper $LIBJPEG -lm" -kde_save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" - -AC_TRY_LINK(dnl - [ - #include<jasper/jasper.h> - ], - [ - return( jas_init() ); - ], - eval "ac_cv_jasper='-ljasper $LIBJPEG -lm'", - eval "ac_cv_jasper=no" -) -LIBS="$kde_save_LIBS" -CFLAGS="$kde_save_CFLAGS" -])dnl -if eval "test ! \"`echo $ac_cv_jasper`\" = no"; then - AC_DEFINE_UNQUOTED(HAVE_JASPER, 1, [Define if you have jasper]) - LIB_JASPER="$ac_cv_jasper" - AC_MSG_RESULT($ac_cv_jasper) -else - AC_MSG_RESULT(no) - LIB_JASPER="" -fi -AC_SUBST(LIB_JASPER) -]) - -AC_DEFUN([AC_CHECK_BOOL], -[ - AC_DEFINE_UNQUOTED(HAVE_BOOL, 1, [You _must_ have bool]) -]) - -AC_DEFUN([KDE_CHECK_COMPILER_FLAG], -[ -AC_MSG_CHECKING([whether $CXX supports -$1]) -kde_cache=`echo $1 | sed 'y% .=/+-,%____p__%'` -AC_CACHE_VAL(kde_cv_prog_cxx_$kde_cache, -[ - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -$1" - AC_TRY_LINK([],[ return 0; ], [eval "kde_cv_prog_cxx_$kde_cache=yes"], []) - CXXFLAGS="$save_CXXFLAGS" - AC_LANG_RESTORE -]) -if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - AC_MSG_RESULT(yes) - : - $2 -else - AC_MSG_RESULT(no) - : - $3 -fi -]) - -AC_DEFUN([KDE_CHECK_C_COMPILER_FLAG], -[ -AC_MSG_CHECKING([whether $CC supports -$1]) -kde_cache=`echo $1 | sed 'y% .=/+-,%____p__%'` -AC_CACHE_VAL(kde_cv_prog_cc_$kde_cache, -[ - AC_LANG_SAVE - AC_LANG_C - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -$1" - AC_TRY_LINK([],[ return 0; ], [eval "kde_cv_prog_cc_$kde_cache=yes"], []) - CFLAGS="$save_CFLAGS" - AC_LANG_RESTORE -]) -if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then - AC_MSG_RESULT(yes) - : - $2 -else - AC_MSG_RESULT(no) - : - $3 -fi -]) - - -dnl AC_REMOVE_FORBIDDEN removes forbidden arguments from variables -dnl use: AC_REMOVE_FORBIDDEN(CC, [-forbid -bad-option whatever]) -dnl it's all white-space separated -AC_DEFUN([AC_REMOVE_FORBIDDEN], -[ __val=$$1 - __forbid=" $2 " - if test -n "$__val"; then - __new="" - ac_save_IFS=$IFS - IFS=" " - for i in $__val; do - case "$__forbid" in - *" $i "*) AC_MSG_WARN([found forbidden $i in $1, removing it]) ;; - *) # Careful to not add spaces, where there were none, because otherwise - # libtool gets confused, if we change e.g. CXX - if test -z "$__new" ; then __new=$i ; else __new="$__new $i" ; fi ;; - esac - done - IFS=$ac_save_IFS - $1=$__new - fi -]) - - -AC_DEFUN([KDE_CHECK_FOR_BAD_COMPILER], -[ - AC_MSG_CHECKING([whether $CC is blacklisted]) - - dnl In theory we have tu run this test against $CC and $CXX - dnl in C and in C++ mode, because its perfectly legal for - dnl the user to mix compiler versions, since C has a defined - dnl ABI. - dnl - dnl For now, we assume the user is not on crack. - - AC_TRY_COMPILE([ -#ifdef __GNUC__ -#if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0 -choke me -#endif -#endif -], , - kde_bad_compiler=no, - kde_bad_compiler=yes -) - - AC_MSG_RESULT($kde_bad_compiler) - -if test "$kde_bad_compiler" = "yes"; then - AC_MSG_ERROR([ - -This particular compiler version is blacklisted because it -is known to miscompile KDE. Please use a newer version, or -if that is not yet available, choose an older version. - -Please do not report a bug or bother us reporting this -configure error. We know about it, and we introduced -it by intention to avoid untraceable bugs or crashes in KDE. - -]) -fi - -]) - - -AC_DEFUN([KDE_CHECK_FOR_OPT_NOINLINE_MATCH], -[ - AC_CACHE_CHECK([whether system headers can cope with -O2 -fno-inline], - kde_cv_opt_noinline_match, - [ - kde_cv_opt_noinline_match=irrelevant - dnl if we don't use both -O2 and -fno-inline, this check is moot - if echo "$CFLAGS" | grep -e -O2 >/dev/null 2>/dev/null \ - && echo "$CFLAGS" | grep -e -fno-inline >/dev/null 2>/dev/null ; then - - ac_cflags_save="$CFLAGS" - CFLAGS="$CFLAGS -D_USE_GNU" - - AC_TRY_LINK([ - #include <string.h> -], [ const char *pt, *et; - et = __extension__ ({ char __a0, __a1, __a2; (__builtin_constant_p ( ";," ) && ((size_t)(const void *)(( ";," )+ 1) - (size_t)(const void *)( ";," ) == 1) ? ((__a0 =((__const char *) ( ";," ))[0], __a0 == '\0') ? ((void) ( pt ),((void *)0) ) : ((__a1 = ((__const char *) ( ";," ))[1], __a1== '\0') ? (__extension__ (__builtin_constant_p ( __a0 ) && ( __a0 ) == '\0' ? (char *) __rawmemchr ( pt , __a0) : strchr( pt , __a0 ))) : ((__a2 = ((__const char *) ( ";," ))[2], __a2 == '\0') ? __strpbrk_c2 ( pt , __a0, __a1) :(((__const char *) ( ";," ))[3] == '\0' ? __strpbrk_c3 ( pt ,__a0, __a1, __a2): strpbrk ( pt , ";," ))))) : strpbrk ( pt , ";," )); }) ; -], - kde_cv_opt_noinline_match=yes, - kde_cv_opt_noinline_match=no - ) - - CFLAGS="$ac_cflags_save" - fi - ]) -]) - - -dnl AC_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given -AC_DEFUN([AC_VALIDIFY_CXXFLAGS], -[dnl -if test "x$kde_use_qt_emb" != "xyes"; then - AC_REMOVE_FORBIDDEN(CXX, [-fno-rtti -rpath]) - AC_REMOVE_FORBIDDEN(CXXFLAGS, [-fno-rtti -rpath]) -else - AC_REMOVE_FORBIDDEN(CXX, [-rpath]) - AC_REMOVE_FORBIDDEN(CXXFLAGS, [-rpath]) -fi -]) - -AC_DEFUN([AC_CHECK_COMPILERS], -[ - AC_ARG_ENABLE(debug, - AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]), - [ - case $enableval in - yes) - kde_use_debug_code="yes" - kde_use_debug_define=no - ;; - full) - kde_use_debug_code="full" - kde_use_debug_define=no - ;; - *) - kde_use_debug_code="no" - kde_use_debug_define=yes - ;; - esac - ], - [kde_use_debug_code="no" - kde_use_debug_define=no - ]) - - dnl Just for configure --help - AC_ARG_ENABLE(dummyoption, - AC_HELP_STRING([--disable-debug], - [disables debug output and debug symbols [default=no]]), - [],[]) - - AC_ARG_ENABLE(strict, - AC_HELP_STRING([--enable-strict], - [compiles with strict compiler options (may not work!)]), - [ - if test $enableval = "no"; then - kde_use_strict_options="no" - else - kde_use_strict_options="yes" - fi - ], [kde_use_strict_options="no"]) - - AC_ARG_ENABLE(warnings,AC_HELP_STRING([--disable-warnings],[disables compilation with -Wall and similar]), - [ - if test $enableval = "no"; then - kde_use_warnings="no" - else - kde_use_warnings="yes" - fi - ], [kde_use_warnings="yes"]) - - dnl enable warnings for debug build - if test "$kde_use_debug_code" != "no"; then - kde_use_warnings=yes - fi - - AC_ARG_ENABLE(profile,AC_HELP_STRING([--enable-profile],[creates profiling infos [default=no]]), - [kde_use_profiling=$enableval], - [kde_use_profiling="no"] - ) - - dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS - CFLAGS=" $CFLAGS" - - AC_PROG_CC - - AC_PROG_CPP - - if test "$GCC" = "yes"; then - if test "$kde_use_debug_code" != "no"; then - if test $kde_use_debug_code = "full"; then - CFLAGS="-g3 -fno-inline $CFLAGS" - else - CFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CFLAGS" - fi - else - CFLAGS="-O2 $CFLAGS" - fi - fi - - if test "$kde_use_debug_define" = "yes"; then - CFLAGS="-DNDEBUG $CFLAGS" - fi - - - case "$host" in - *-*-sysv4.2uw*) CFLAGS="-D_UNIXWARE $CFLAGS";; - *-*-sysv5uw7*) CFLAGS="-D_UNIXWARE7 $CFLAGS";; - esac - - if test -z "$LDFLAGS" && test "$kde_use_debug_code" = "no" && test "$GCC" = "yes"; then - LDFLAGS="" - fi - - CXXFLAGS=" $CXXFLAGS" - - AC_PROG_CXX - - KDE_CHECK_FOR_BAD_COMPILER - - if test "$GXX" = "yes" || test "$CXX" = "KCC"; then - if test "$kde_use_debug_code" != "no"; then - if test "$CXX" = "KCC"; then - CXXFLAGS="+K0 -Wall -pedantic -W -Wpointer-arith -Wwrite-strings $CXXFLAGS" - else - if test "$kde_use_debug_code" = "full"; then - CXXFLAGS="-g3 -fno-inline $CXXFLAGS" - else - CXXFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CXXFLAGS" - fi - fi - KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"]) - - dnl convenience compiler flags - KDE_CHECK_COMPILER_FLAG(Woverloaded-virtual, [WOVERLOADED_VIRTUAL="-Woverloaded-virtual"], [WOVERLOADED_VRITUAL=""]) - AC_SUBST(WOVERLOADED_VIRTUAL) - else - if test "$CXX" = "KCC"; then - CXXFLAGS="+K3 $CXXFLAGS" - else - CXXFLAGS="-O2 $CXXFLAGS" - fi - fi - fi - - if test "$kde_use_debug_define" = "yes"; then - CXXFLAGS="-DNDEBUG -DNO_DEBUG $CXXFLAGS" - fi - - if test "$kde_use_profiling" = "yes"; then - KDE_CHECK_COMPILER_FLAG(pg, - [ - CFLAGS="-pg $CFLAGS" - CXXFLAGS="-pg $CXXFLAGS" - ]) - fi - - if test "$kde_use_warnings" = "yes"; then - if test "$GCC" = "yes"; then - CXXFLAGS="-Wall -W -Wpointer-arith $CXXFLAGS" - case $host in - *-*-linux-gnu) - CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE $CFLAGS" - CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE -Wcast-align -Wchar-subscripts $CXXFLAGS" - KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"]) - KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"]) - ;; - esac - KDE_CHECK_COMPILER_FLAG(Wundef,[CXXFLAGS="-Wundef $CXXFLAGS"]) - KDE_CHECK_COMPILER_FLAG(Wno-long-long,[CXXFLAGS="-Wno-long-long $CXXFLAGS"]) - dnl ### FIXME: revert for KDE 4 - KDE_CHECK_COMPILER_FLAG(Wno-non-virtual-dtor,[CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor"]) - fi - fi - - if test "$GXX" = "yes" && test "$kde_use_strict_options" = "yes"; then - CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS" - fi - - AC_ARG_ENABLE(pch, - AC_HELP_STRING([--enable-pch], - [enables precompiled header support (currently only KCC or gcc >=3.4+unsermake) [default=no]]), - [ kde_use_pch=$enableval ],[ kde_use_pch=no ]) - - HAVE_GCC_VISIBILITY=0 - AC_SUBST([HAVE_GCC_VISIBILITY]) - - if test "$GXX" = "yes"; then - gcc_no_reorder_blocks=NO - KDE_CHECK_COMPILER_FLAG(fno-reorder-blocks,[gcc_no_reorder_blocks=YES]) - if test $kde_use_debug_code != "no" && \ - test $kde_use_debug_code != "full" && \ - test "YES" = "$gcc_no_reorder_blocks" ; then - CXXFLAGS="$CXXFLAGS -fno-reorder-blocks" - CFLAGS="$CFLAGS -fno-reorder-blocks" - fi - KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"]) - KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"]) - KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"]) - KDE_CHECK_COMPILER_FLAG(fexceptions, [USE_EXCEPTIONS="-fexceptions"], USE_EXCEPTIONS= ) - ENABLE_PERMISSIVE_FLAG="-fpermissive" - - if test "$kde_use_pch" = "yes"; then - AC_MSG_CHECKING(whether gcc supports precompiling c header files) - echo >conftest.h - if $CC -x c-header conftest.h >/dev/null 2>/dev/null; then - kde_gcc_supports_pch=yes - AC_MSG_RESULT(yes) - else - kde_gcc_supports_pch=no - AC_MSG_RESULT(no) - fi - if test "$kde_gcc_supports_pch" = "yes"; then - AC_MSG_CHECKING(whether gcc supports precompiling c++ header files) - if $CXX -x c++-header conftest.h >/dev/null 2>/dev/null; then - kde_gcc_supports_pch=yes - AC_MSG_RESULT(yes) - else - kde_gcc_supports_pch=no - AC_MSG_RESULT(no) - fi - fi - rm -f conftest.h conftest.h.gch - fi - - KDE_CHECK_FOR_OPT_NOINLINE_MATCH - if test "x$kde_cv_opt_noinline_match" = "xno" ; then - CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`" - fi - fi - AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes") - if test "$CXX" = "KCC"; then - dnl unfortunately we currently cannot disable exception support in KCC - dnl because doing so is binary incompatible and Qt by default links with exceptions :-( - dnl KDE_CHECK_COMPILER_FLAG(-no_exceptions,[CXXFLAGS="$CXXFLAGS --no_exceptions"]) - dnl KDE_CHECK_COMPILER_FLAG(-exceptions, [USE_EXCEPTIONS="--exceptions"], USE_EXCEPTIONS= ) - - if test "$kde_use_pch" = "yes"; then - dnl TODO: support --pch-dir! - KDE_CHECK_COMPILER_FLAG(-pch,[CXXFLAGS="$CXXFLAGS --pch"]) - dnl the below works (but the dir must exist), but it's - dnl useless for a whole package. - dnl The are precompiled headers for each source file, so when compiling - dnl from scratch, it doesn't make a difference, and they take up - dnl around ~5Mb _per_ sourcefile. - dnl KDE_CHECK_COMPILER_FLAG(-pch_dir /tmp, - dnl [CXXFLAGS="$CXXFLAGS --pch_dir `pwd`/pcheaders"]) - fi - dnl this flag controls inlining. by default KCC inlines in optimisation mode - dnl all implementations that are defined inside the class {} declaration. - dnl because of templates-compatibility with broken gcc compilers, this - dnl can cause excessive inlining. This flag limits it to a sane level - KDE_CHECK_COMPILER_FLAG(-inline_keyword_space_time=6,[CXXFLAGS="$CXXFLAGS --inline_keyword_space_time=6"]) - KDE_CHECK_COMPILER_FLAG(-inline_auto_space_time=2,[CXXFLAGS="$CXXFLAGS --inline_auto_space_time=2"]) - KDE_CHECK_COMPILER_FLAG(-inline_implicit_space_time=2.0,[CXXFLAGS="$CXXFLAGS --inline_implicit_space_time=2.0"]) - KDE_CHECK_COMPILER_FLAG(-inline_generated_space_time=2.0,[CXXFLAGS="$CXXFLAGS --inline_generated_space_time=2.0"]) - dnl Some source files are shared between multiple executables - dnl (or libraries) and some of those need template instantiations. - dnl In that case KCC needs to compile those sources with - dnl --one_instantiation_per_object. To make it easy for us we compile - dnl _all_ objects with that flag (--one_per is a shorthand). - KDE_CHECK_COMPILER_FLAG(-one_per, [CXXFLAGS="$CXXFLAGS --one_per"]) - fi - AC_SUBST(USE_EXCEPTIONS) - dnl obsolete macro - provided to keep things going - USE_RTTI= - AC_SUBST(USE_RTTI) - - case "$host" in - *-*-irix*) test "$GXX" = yes && CXXFLAGS="-D_LANGUAGE_C_PLUS_PLUS -D__LANGUAGE_C_PLUS_PLUS $CXXFLAGS" ;; - *-*-sysv4.2uw*) CXXFLAGS="-D_UNIXWARE $CXXFLAGS";; - *-*-sysv5uw7*) CXXFLAGS="-D_UNIXWARE7 $CXXFLAGS";; - *-*-solaris*) - if test "$GXX" = yes; then - libstdcpp=`$CXX -print-file-name=libstdc++.so` - if test ! -f $libstdcpp; then - AC_MSG_ERROR([You've compiled gcc without --enable-shared. This doesn't work with KDE. Please recompile gcc with --enable-shared to receive a libstdc++.so]) - fi - fi - ;; - esac - - AC_VALIDIFY_CXXFLAGS - - AC_PROG_CXXCPP - - if test "$GCC" = yes; then - NOOPT_CFLAGS=-O0 - fi - KDE_CHECK_COMPILER_FLAG(O0,[NOOPT_CXXFLAGS=-O0]) - - AC_ARG_ENABLE(coverage, - AC_HELP_STRING([--enable-coverage],[use gcc coverage testing]), [ - if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then - ac_coverage_compiler="-fprofile-arcs -ftest-coverage" - ac_coverage_linker="-lgcc" - elif test "$am_cv_CC_dependencies_compiler_type" = "gcc"; then - ac_coverage_compiler="-fprofile-arcs -ftest-coverage" - ac_coverage_linker="" - else - AC_MSG_ERROR([coverage with your compiler is not supported]) - fi - CFLAGS="$CFLAGS $ac_coverage_compiler" - CXXFLAGS="$CXXFLAGS $ac_coverage_compiler" - LDFLAGS="$LDFLAGS $ac_coverage_linker" - ]) - - AC_SUBST(NOOPT_CXXFLAGS) - AC_SUBST(NOOPT_CFLAGS) - AC_SUBST(ENABLE_PERMISSIVE_FLAG) - - KDE_CHECK_NEW_LDFLAGS - KDE_CHECK_FINAL - KDE_CHECK_CLOSURE - KDE_CHECK_NMCHECK - - ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), []) -]) - -AC_DEFUN([KDE_CHECK_VISIBILITY_GCC_BUG], - [ - AC_CACHE_CHECK([for gcc -fvisibility-inlines-hidden bug], kde_cv_val_gcc_visibility_bug, - [ - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - - safe_CXXFLAGS=$CXXFLAGS - safe_LDFLAGS=$LDFLAGS - CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0" - LDFLAGS="$LDFLAGS -shared -fPIC" - - AC_TRY_LINK( - [ - /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */ - #include <string> - int some_function( void ) __attribute__ ((visibility("default"))); - int some_function( void ) - { - std::string s("blafasel"); - return 0; - } - ], [/* elvis is alive */], - kde_cv_val_gcc_visibility_bug=no, kde_cv_val_gcc_visibility_bug=yes) - - CXXFLAGS=$safe_CXXFLAGS - LDFLAGS=$safe_LDFLAGS - AC_LANG_RESTORE - ] - ) - - if test x$kde_cv_val_gcc_visibility_bug = xno; then - CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden" - fi - ] -) - -AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY], -[ - AC_BEFORE([AC_PATH_TQT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY]) - - AC_MSG_CHECKING([grepping for visibility push/pop in headers]) - - if test "x$GXX" = "xyes"; then - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_EGREP_CPP( - [GCC visibility push], - [ #include <exception> - ], - [ - AC_MSG_RESULT(yes) - kde_stdc_visibility_patched=yes ], - [ - AC_MSG_RESULT(no) - AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for - visibility support. Disabling -fvisibility=hidden]) - - kde_stdc_visibility_patched=no ]) - - AC_LANG_RESTORE - - kde_have_gcc_visibility=no - KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, - [ - kde_have_gcc_visibility=yes - dnl the whole toolchain is just a mess, gcc is just too buggy - dnl to handle STL with visibility enabled. Lets reconsider - dnl when gcc 4.2 is out or when things get fixed in the compiler. - dnl Contact mueller@kde.org for details. - AC_ARG_ENABLE(gcc-hidden-visibility, - AC_HELP_STRING([--enable-gcc-hidden-visibility],[toolchain hidden visibility [default=no]]), - [kde_have_gcc_visibility=$enableval], - [kde_have_gcc_visibility=no]) - - AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched, - [ - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - - safe_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CXXFLAGS $all_includes" - - AC_TRY_COMPILE( - [ -#include <qglobal.h> -#if Q_EXPORT - 0 != 0 -/* if this compiles, then Q_EXPORT is undefined */ -/* if Q_EXPORT is nonempty, this will break compilation */ -#endif - ], [/* elvis is alive */], - kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes) - - CXXFLAGS=$safe_CXXFLAGS - AC_LANG_RESTORE - ] - ) - - if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then - CXXFLAGS="$CXXFLAGS -fvisibility=hidden" - KDE_CHECK_VISIBILITY_GCC_BUG - HAVE_GCC_VISIBILITY=1 - AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported]) - fi - ]) - fi -]) - -AC_DEFUN([KDE_ADD_DEPENDENCIES], -[ - [A]M_DEPENDENCIES(CC) - [A]M_DEPENDENCIES(CXX) -]) - -dnl just a wrapper to clean up configure.in -AC_DEFUN([KDE_PROG_LIBTOOL], -[ -AC_REQUIRE([AC_CHECK_COMPILERS]) -AC_REQUIRE([AC_ENABLE_SHARED]) -AC_REQUIRE([AC_ENABLE_STATIC]) - -AC_REQUIRE([AC_LIBTOOL_DLOPEN]) -AC_REQUIRE([KDE_CHECK_LIB64]) - -AC_OBJEXT -AC_EXEEXT - -AM_PROG_LIBTOOL -AC_LIBTOOL_CXX - -LIBTOOL_SHELL="/bin/sh ./libtool" -# LIBTOOL="$LIBTOOL --silent" -KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" -AC_SUBST(KDE_PLUGIN) - -# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs. -KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" -AC_SUBST(KDE_CHECK_PLUGIN) - -# we patch configure quite some so we better keep that consistent for incremental runs -AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch configure') -]) - -AC_DEFUN([KDE_CHECK_LIB64], -[ - AC_ARG_ENABLE(libsuffix, - AC_HELP_STRING([--enable-libsuffix], - [/lib directory suffix (64,32,none,auto[=default])]), - tdelibsuff=$enableval, tdelibsuff="auto") - - if test "$tdelibsuff" = "auto"; then - -cat > conftest.c << EOF -#include <stdio.h> -int main() { - return 0; -} -EOF - tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ - s,.*/lib\([[^\/]]*\)/.*,\1, - p -}'` - rm -rf conftest.* - fi - - if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then - tdelibsuff= - fi - if test -z "$tdelibsuff"; then - AC_MSG_RESULT([not using lib directory suffix]) - AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) - else - if test "$libdir" = '${exec_prefix}/lib'; then - libdir="$libdir${tdelibsuff}" - AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms - fi - AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories) - AC_MSG_RESULT([using lib directory suffix $tdelibsuff]) - fi -]) - -AC_DEFUN([KDE_CHECK_TYPES], -[ AC_CHECK_SIZEOF(int, 4)dnl - AC_CHECK_SIZEOF(short)dnl - AC_CHECK_SIZEOF(long, 4)dnl - AC_CHECK_SIZEOF(char *, 4)dnl -])dnl - -dnl Not used - kept for compat only? -AC_DEFUN([KDE_DO_IT_ALL], -[ -AC_CANONICAL_SYSTEM -AC_ARG_PROGRAM -AM_INIT_AUTOMAKE($1, $2) -AM_DISABLE_LIBRARIES -AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) -AC_CHECK_COMPILERS -KDE_PROG_LIBTOOL -AM_KDE_WITH_NLS -AC_PATH_KDE -]) - -AC_DEFUN([AC_CHECK_RPATH], -[ -AC_MSG_CHECKING(for rpath) -AC_ARG_ENABLE(rpath, - AC_HELP_STRING([--disable-rpath],[do not use the rpath feature of ld]), - USE_RPATH=$enableval, USE_RPATH=yes) - -if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then - - KDE_RPATH="-R \$(libdir)" - - if test "$kde_libraries" != "$libdir"; then - KDE_RPATH="$KDE_RPATH -R \$(kde_libraries)" - fi - - if test -n "$qt_libraries"; then - KDE_RPATH="$KDE_RPATH -R \$(qt_libraries)" - fi - dnl $x_libraries is set to /usr/lib in case - if test -n "$X_LDFLAGS"; then - X_RPATH="-R \$(x_libraries)" - KDE_RPATH="$KDE_RPATH $X_RPATH" - fi - if test -n "$KDE_EXTRA_RPATH"; then - KDE_RPATH="$KDE_RPATH \$(KDE_EXTRA_RPATH)" - fi -fi -AC_SUBST(KDE_EXTRA_RPATH) -AC_SUBST(KDE_RPATH) -AC_SUBST(X_RPATH) -AC_MSG_RESULT($USE_RPATH) -]) - -dnl Check for the type of the third argument of getsockname -AC_DEFUN([AC_CHECK_SOCKLEN_T], -[ - AC_MSG_CHECKING(for socklen_t) - AC_CACHE_VAL(kde_cv_socklen_t, - [ - AC_LANG_PUSH(C++) - kde_cv_socklen_t=no - AC_TRY_COMPILE([ - #include <sys/types.h> - #include <sys/socket.h> - ], - [ - socklen_t len; - getpeername(0,0,&len); - ], - [ - kde_cv_socklen_t=yes - kde_cv_socklen_t_equiv=socklen_t - ]) - AC_LANG_POP(C++) - ]) - AC_MSG_RESULT($kde_cv_socklen_t) - if test $kde_cv_socklen_t = no; then - AC_MSG_CHECKING([for socklen_t equivalent for socket functions]) - AC_CACHE_VAL(kde_cv_socklen_t_equiv, - [ - kde_cv_socklen_t_equiv=int - AC_LANG_PUSH(C++) - for t in int size_t unsigned long "unsigned long"; do - AC_TRY_COMPILE([ - #include <sys/types.h> - #include <sys/socket.h> - ], - [ - $t len; - getpeername(0,0,&len); - ], - [ - kde_cv_socklen_t_equiv="$t" - break - ]) - done - AC_LANG_POP(C++) - ]) - AC_MSG_RESULT($kde_cv_socklen_t_equiv) - fi - AC_DEFINE_UNQUOTED(kde_socklen_t, $kde_cv_socklen_t_equiv, - [type to use in place of socklen_t if not defined]) - AC_DEFINE_UNQUOTED(ksize_t, $kde_cv_socklen_t_equiv, - [type to use in place of socklen_t if not defined (deprecated, use kde_socklen_t)]) -]) - -dnl This is a merge of some macros out of the gettext aclocal.m4 -dnl since we don't need anything, I took the things we need -dnl the copyright for them is: -dnl > -dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -dnl This Makefile.in is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without -dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A -dnl PARTICULAR PURPOSE. -dnl > -dnl for this file it is relicensed under LGPL - -AC_DEFUN([AM_KDE_WITH_NLS], - [ - dnl If we use NLS figure out what method - - AM_PATH_PROG_WITH_TEST_KDE(MSGFMT, msgfmt, - [test -n "`$ac_dir/$ac_word --version 2>&1 | grep 'GNU gettext'`"], msgfmt) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - - if test -z "`$GMSGFMT --version 2>&1 | grep 'GNU gettext'`"; then - AC_MSG_RESULT([found msgfmt program is not GNU msgfmt; ignore it]) - GMSGFMT=":" - fi - MSGFMT=$GMSGFMT - AC_SUBST(GMSGFMT) - AC_SUBST(MSGFMT) - - AM_PATH_PROG_WITH_TEST_KDE(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is no 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 programs is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi - fi - AC_SUBST(XGETTEXT) - - ]) - -# Search path for a program which passes the given test. -# Ulrich Drepper <drepper@cygnus.com>, 1996. - -# serial 1 -# Stephan Kulow: I appended a _KDE against name conflicts - -dnl AM_PATH_PROG_WITH_TEST_KDE(VARIABLE, PROG-TO-CHECK-FOR, -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -AC_DEFUN([AM_PATH_PROG_WITH_TEST_KDE], -[# 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 - 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 -n "[$]$1"; then - AC_MSG_RESULT([$]$1) -else - AC_MSG_RESULT(no) -fi -AC_SUBST($1)dnl -]) - - -# Check whether LC_MESSAGES is available in <locale.h>. -# Ulrich Drepper <drepper@cygnus.com>, 1995. - -# serial 1 - -AC_DEFUN([AM_LC_MESSAGES], - [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 contains LC_MESSAGES]) - fi - fi]) - -dnl From Jim Meyering. -dnl FIXME: migrate into libit. - -AC_DEFUN([AM_FUNC_OBSTACK], -[AC_CACHE_CHECK([for obstacks], am_cv_func_obstack, - [AC_TRY_LINK([#include "obstack.h"], - [struct obstack *mem;obstack_free(mem,(char *) 0)], - am_cv_func_obstack=yes, - am_cv_func_obstack=no)]) - if test $am_cv_func_obstack = yes; then - AC_DEFINE(HAVE_OBSTACK) - else - LIBOBJS="$LIBOBJS obstack.o" - fi -]) - -dnl From Jim Meyering. Use this if you use the GNU error.[ch]. -dnl FIXME: Migrate into libit - -AC_DEFUN([AM_FUNC_ERROR_AT_LINE], -[AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line, - [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");], - am_cv_lib_error_at_line=yes, - am_cv_lib_error_at_line=no)]) - if test $am_cv_lib_error_at_line = no; then - LIBOBJS="$LIBOBJS error.o" - fi - AC_SUBST(LIBOBJS)dnl -]) - -# Macro to add for using GNU gettext. -# Ulrich Drepper <drepper@cygnus.com>, 1995. - -# serial 1 -# Stephan Kulow: I put a KDE in it to avoid name conflicts - -AC_DEFUN([AM_KDE_GNU_GETTEXT], - [AC_REQUIRE([AC_PROG_MAKE_SET])dnl - AC_REQUIRE([AC_PROG_RANLIB])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl - AC_REQUIRE([AC_TYPE_OFF_T])dnl - AC_REQUIRE([AC_TYPE_SIZE_T])dnl - AC_REQUIRE([AC_FUNC_ALLOCA])dnl - AC_REQUIRE([AC_FUNC_MMAP])dnl - AC_REQUIRE([AM_KDE_WITH_NLS])dnl - AC_CHECK_HEADERS([limits.h locale.h nl_types.h string.h values.h alloca.h]) - AC_CHECK_FUNCS([getcwd munmap putenv setlocale strchr strcasecmp \ -__argz_count __argz_stringify __argz_next]) - - AC_MSG_CHECKING(for stpcpy) - AC_CACHE_VAL(kde_cv_func_stpcpy, - [ - kde_safe_cxxflags=$CXXFLAGS - CXXFLAGS="-Werror" - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([ - #include <string.h> - ], - [ - char buffer[200]; - stpcpy(buffer, buffer); - ], - kde_cv_func_stpcpy=yes, - kde_cv_func_stpcpy=no) - AC_LANG_RESTORE - CXXFLAGS=$kde_safe_cxxflags - ]) - AC_MSG_RESULT($kde_cv_func_stpcpy) - if eval "test \"`echo $kde_cv_func_stpcpy`\" = yes"; then - AC_DEFINE(HAVE_STPCPY, 1, [Define if you have stpcpy]) - fi - - AM_LC_MESSAGES - - if test "x$CATOBJEXT" != "x"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - AC_MSG_CHECKING(for catalogs to be installed) - NEW_LINGUAS= - for lang in ${LINGUAS=$ALL_LINGUAS}; do - case "$ALL_LINGUAS" in - *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; - esac - done - LINGUAS=$NEW_LINGUAS - AC_MSG_RESULT($LINGUAS) - fi - - 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 - - ]) - -AC_DEFUN([AC_HAVE_XPM], - [AC_REQUIRE_CPP()dnl - AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) - - test -z "$XPM_LDFLAGS" && XPM_LDFLAGS= - test -z "$XPM_INCLUDE" && XPM_INCLUDE= - - AC_ARG_WITH(xpm,AC_HELP_STRING([--without-xpm],[disable color pixmap XPM tests]), - xpm_test=$withval, xpm_test="yes") - if test "x$xpm_test" = xno; then - ac_cv_have_xpm=no - else - AC_MSG_CHECKING(for XPM) - AC_CACHE_VAL(ac_cv_have_xpm, - [ - ac_save_ldflags="$LDFLAGS" - ac_save_cflags="$CFLAGS" - if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then - LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm -lX11 -lXext $LIBZ $LIBSOCKET" - else - LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm $LIBZ $LIBSOCKET" - fi - CFLAGS="$CFLAGS $X_INCLUDES $USER_INCLUDES" - test -n "$XPM_INCLUDE" && CFLAGS="-I$XPM_INCLUDE $CFLAGS" - AC_TRY_LINK([#include <X11/xpm.h>],[], - ac_cv_have_xpm="yes",ac_cv_have_xpm="no") - LDFLAGS="$ac_save_ldflags" - CFLAGS="$ac_save_cflags" - ])dnl - - if test "$ac_cv_have_xpm" = no; then - AC_MSG_RESULT(no) - XPM_LDFLAGS="" - XPMINC="" - $2 - else - AC_DEFINE(HAVE_XPM, 1, [Define if you have XPM support]) - if test "$XPM_LDFLAGS" = ""; then - XPMLIB='-lXpm $(LIB_X11)' - else - XPMLIB="-L$XPM_LDFLAGS -lXpm "'$(LIB_X11)' - fi - if test "$XPM_INCLUDE" = ""; then - XPMINC="" - else - XPMINC="-I$XPM_INCLUDE" - fi - AC_MSG_RESULT(yes) - $1 - fi - fi - AC_SUBST(XPMINC) - AC_SUBST(XPMLIB) -]) - -AC_DEFUN([AC_HAVE_DPMS], - [AC_REQUIRE_CPP()dnl - AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) - - test -z "$DPMS_LDFLAGS" && DPMS_LDFLAGS= - test -z "$DPMS_INCLUDE" && DPMS_INCLUDE= - DPMS_LIB= - - AC_ARG_WITH(dpms,AC_HELP_STRING([--without-dpms],[disable DPMS power saving]), - dpms_test=$withval, dpms_test="yes") - if test "x$dpms_test" = xno; then - ac_cv_have_dpms=no - else - AC_MSG_CHECKING(for DPMS) - dnl Note: ac_cv_have_dpms can be no, yes, or -lXdpms. - dnl 'yes' means DPMS_LIB="", '-lXdpms' means DPMS_LIB="-lXdpms". - AC_CACHE_VAL(ac_cv_have_dpms, - [ - if test "x$kde_use_qt_emb" = "xyes" || test "x$kde_use_qt_mac" = "xyes"; then - AC_MSG_RESULT(no) - ac_cv_have_dpms="no" - else - ac_save_ldflags="$LDFLAGS" - ac_save_cflags="$CFLAGS" - ac_save_libs="$LIBS" - LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries" - LIBS="-lX11 -lXext $LIBSOCKET" - CFLAGS="$CFLAGS $X_INCLUDES" - test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS" - AC_TRY_LINK([ - #include <X11/Xproto.h> - #include <X11/X.h> - #include <X11/Xlib.h> - #include <X11/extensions/dpms.h> - int foo_test_dpms() - { return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[], - ac_cv_have_dpms="yes", [ - LIBS="-lXdpms $LIBS" - AC_TRY_LINK([ - #include <X11/Xproto.h> - #include <X11/X.h> - #include <X11/Xlib.h> - #include <X11/extensions/dpms.h> - int foo_test_dpms() - { return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[], - [ - ac_cv_have_dpms="-lXdpms" - ],ac_cv_have_dpms="no") - ]) - LDFLAGS="$ac_save_ldflags" - CFLAGS="$ac_save_cflags" - LIBS="$ac_save_libs" - fi - ])dnl - - if test "$ac_cv_have_dpms" = no; then - AC_MSG_RESULT(no) - DPMS_LDFLAGS="" - DPMSINC="" - $2 - else - AC_DEFINE(HAVE_DPMS, 1, [Define if you have DPMS support]) - if test "$ac_cv_have_dpms" = "-lXdpms"; then - DPMS_LIB="-lXdpms" - fi - if test "$DPMS_LDFLAGS" = ""; then - DPMSLIB="$DPMS_LIB "'$(LIB_X11)' - else - DPMSLIB="$DPMS_LDFLAGS $DPMS_LIB "'$(LIB_X11)' - fi - if test "$DPMS_INCLUDE" = ""; then - DPMSINC="" - else - DPMSINC="-I$DPMS_INCLUDE" - fi - AC_MSG_RESULT(yes) - $1 - fi - fi - ac_save_cflags="$CFLAGS" - CFLAGS="$CFLAGS $X_INCLUDES" - test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS" - AH_TEMPLATE(HAVE_DPMSCAPABLE_PROTO, - [Define if you have the DPMSCapable prototype in <X11/extensions/dpms.h>]) - AC_CHECK_DECL(DPMSCapable, - AC_DEFINE(HAVE_DPMSCAPABLE_PROTO),, - [#include <X11/Xlib.h> - #include <X11/extensions/dpms.h>]) - AH_TEMPLATE(HAVE_DPMSINFO_PROTO, - [Define if you have the DPMSInfo prototype in <X11/extensions/dpms.h>]) - AC_CHECK_DECL(DPMSInfo, - AC_DEFINE(HAVE_DPMSINFO_PROTO),, - [#include <X11/Xlib.h> - #include <X11/extensions/dpms.h>]) - CFLAGS="$ac_save_cflags" - AC_SUBST(DPMSINC) - AC_SUBST(DPMSLIB) -]) - -AC_DEFUN([AC_HAVE_GL], - [AC_REQUIRE_CPP()dnl - AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) - - test -z "$GL_LDFLAGS" && GL_LDFLAGS= - test -z "$GL_INCLUDE" && GL_INCLUDE= - - AC_ARG_WITH(gl,AC_HELP_STRING([--without-gl],[disable 3D GL modes]), - gl_test=$withval, gl_test="yes") - if test "x$kde_use_qt_emb" = "xyes"; then - # GL and Qt Embedded is a no-go for now. - ac_cv_have_gl=no - elif test "x$gl_test" = xno; then - ac_cv_have_gl=no - else - AC_MSG_CHECKING(for GL) - AC_CACHE_VAL(ac_cv_have_gl, - [ - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - ac_save_ldflags=$LDFLAGS - ac_save_cxxflags=$CXXFLAGS - ac_save_libs=$LIBS - LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries" - LIBS="$LIBS -lGL -lGLU" - test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LIBS="$LIBS -lX11" - LIBS="$LIBS $LIB_XEXT -lm $LIBSOCKET" - CXXFLAGS="$CFLAGS $X_INCLUDES" - test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS" - AC_TRY_LINK([#include <GL/gl.h> -#include <GL/glu.h> -], [], - ac_cv_have_gl="yes", ac_cv_have_gl="no") - AC_LANG_RESTORE - LDFLAGS=$ac_save_ldflags - CXXFLAGS=$ac_save_cxxflags - LIBS=$ac_save_libs - ])dnl - - if test "$ac_cv_have_gl" = "no"; then - AC_MSG_RESULT(no) - GL_LDFLAGS="" - GLINC="" - $2 - else - AC_DEFINE(HAVE_GL, 1, [Defines if you have GL (Mesa, OpenGL, ...)]) - if test "$GL_LDFLAGS" = ""; then - GLLIB='-lGLU -lGL $(LIB_X11)' - else - GLLIB="$GL_LDFLAGS -lGLU -lGL "'$(LIB_X11)' - fi - if test "$GL_INCLUDE" = ""; then - GLINC="" - else - GLINC="-I$GL_INCLUDE" - fi - AC_MSG_RESULT($ac_cv_have_gl) - $1 - fi - fi - AC_SUBST(GLINC) - AC_SUBST(GLLIB) -]) - - - dnl shadow password and PAM magic - maintained by ossi@kde.org - -AC_DEFUN([KDE_PAM], [ - AC_REQUIRE([KDE_CHECK_LIBDL]) - - want_pam= - AC_ARG_WITH(pam, - AC_HELP_STRING([--with-pam[=ARG]],[enable support for PAM: ARG=[yes|no|service name]]), - [ if test "x$withval" = "xyes"; then - want_pam=yes - pam_service=kde - elif test "x$withval" = "xno"; then - want_pam=no - else - want_pam=yes - pam_service=$withval - fi - ], [ pam_service=kde ]) - - use_pam= - PAMLIBS= - if test "x$want_pam" != xno; then - AC_CHECK_LIB(pam, pam_start, [ - AC_CHECK_HEADER(security/pam_appl.h, - [ pam_header=security/pam_appl.h ], - [ AC_CHECK_HEADER(pam/pam_appl.h, - [ pam_header=pam/pam_appl.h ], - [ - AC_MSG_WARN([PAM detected, but no headers found! -Make sure you have the necessary development packages installed.]) - ] - ) - ] - ) - ], , $LIBDL) - if test -z "$pam_header"; then - if test "x$want_pam" = xyes; then - AC_MSG_ERROR([--with-pam was specified, but cannot compile with PAM!]) - fi - else - AC_DEFINE(HAVE_PAM, 1, [Defines if you have PAM (Pluggable Authentication Modules)]) - PAMLIBS="$PAM_MISC_LIB -lpam $LIBDL" - use_pam=yes - - dnl darwin claims to be something special - if test "$pam_header" = "pam/pam_appl.h"; then - AC_DEFINE(HAVE_PAM_PAM_APPL_H, 1, [Define if your PAM headers are in pam/ instead of security/]) - fi - - dnl test whether struct pam_message is const (Linux) or not (Sun) - AC_MSG_CHECKING(for const pam_message) - AC_EGREP_HEADER([struct pam_message], $pam_header, - [ AC_EGREP_HEADER([const struct pam_message], $pam_header, - [AC_MSG_RESULT([const: Linux-type PAM])], - [AC_MSG_RESULT([nonconst: Sun-type PAM]) - AC_DEFINE(PAM_MESSAGE_NONCONST, 1, [Define if your PAM support takes non-const arguments (Solaris)])] - )], - [AC_MSG_RESULT([not found - assume const, Linux-type PAM])]) - fi - fi - - AC_SUBST(PAMLIBS) -]) - -dnl DEF_PAM_SERVICE(arg name, full name, define name) -AC_DEFUN([DEF_PAM_SERVICE], [ - AC_ARG_WITH($1-pam, - AC_HELP_STRING([--with-$1-pam=[val]],[override PAM service from --with-pam for $2]), - [ if test "x$use_pam" = xyes; then - $3_PAM_SERVICE=$withval - else - AC_MSG_ERROR([Cannot use use --with-$1-pam, as no PAM was detected. -You may want to enforce it by using --with-pam.]) - fi - ], - [ if test "x$use_pam" = xyes; then - $3_PAM_SERVICE="$pam_service" - fi - ]) - if test -n "$$3_PAM_SERVICE"; then - AC_MSG_RESULT([The PAM service used by $2 will be $$3_PAM_SERVICE]) - AC_DEFINE_UNQUOTED($3_PAM_SERVICE, "$$3_PAM_SERVICE", [The PAM service to be used by $2]) - fi - AC_SUBST($3_PAM_SERVICE) -]) - -AC_DEFUN([KDE_SHADOWPASSWD], [ - AC_REQUIRE([KDE_PAM]) - - AC_CHECK_LIB(shadow, getspent, - [ LIBSHADOW="-lshadow" - ac_use_shadow=yes - ], - [ dnl for UnixWare - AC_CHECK_LIB(gen, getspent, - [ LIBGEN="-lgen" - ac_use_shadow=yes - ], - [ AC_CHECK_FUNC(getspent, - [ ac_use_shadow=yes ], - [ ac_use_shadow=no ]) - ]) - ]) - AC_SUBST(LIBSHADOW) - AC_SUBST(LIBGEN) - - AC_MSG_CHECKING([for shadow passwords]) - - AC_ARG_WITH(shadow, - AC_HELP_STRING([--with-shadow],[If you want shadow password support]), - [ if test "x$withval" != "xno"; then - use_shadow=yes - else - use_shadow=no - fi - ], [ - use_shadow="$ac_use_shadow" - ]) - - if test "x$use_shadow" = xyes; then - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SHADOW, 1, [Define if you use shadow passwords]) - else - AC_MSG_RESULT(no) - LIBSHADOW= - LIBGEN= - fi - - dnl finally make the relevant binaries setuid root, if we have shadow passwds. - dnl this still applies, if we could use it indirectly through pam. - if test "x$use_shadow" = xyes || - ( test "x$use_pam" = xyes && test "x$ac_use_shadow" = xyes ); then - case $host in - *-*-freebsd* | *-*-netbsd* | *-*-openbsd*) - SETUIDFLAGS="-m 4755 -o root";; - *) - SETUIDFLAGS="-m 4755";; - esac - fi - AC_SUBST(SETUIDFLAGS) - -]) - -AC_DEFUN([KDE_PASSWDLIBS], [ - AC_REQUIRE([KDE_MISC_TESTS]) dnl for LIBCRYPT - AC_REQUIRE([KDE_PAM]) - AC_REQUIRE([KDE_SHADOWPASSWD]) - - if test "x$use_pam" = "xyes"; then - PASSWDLIBS="$PAMLIBS" - else - PASSWDLIBS="$LIBCRYPT $LIBSHADOW $LIBGEN" - fi - - dnl FreeBSD uses a shadow-like setup, where /etc/passwd holds the users, but - dnl /etc/master.passwd holds the actual passwords. /etc/master.passwd requires - dnl root to read, so kcheckpass needs to be root (even when using pam, since pam - dnl may need to read /etc/master.passwd). - case $host in - *-*-freebsd*) - SETUIDFLAGS="-m 4755 -o root" - ;; - *) - ;; - esac - - AC_SUBST(PASSWDLIBS) -]) - -AC_DEFUN([KDE_CHECK_LIBDL], -[ -AC_CHECK_LIB(dl, dlopen, [ -LIBDL="-ldl" -ac_cv_have_dlfcn=yes -]) - -AC_CHECK_LIB(dld, shl_unload, [ -LIBDL="-ldld" -ac_cv_have_shload=yes -]) - -AC_SUBST(LIBDL) -]) - -AC_DEFUN([KDE_CHECK_DLOPEN], -[ -KDE_CHECK_LIBDL -AC_CHECK_HEADERS(dlfcn.h dl.h) -if test "$ac_cv_header_dlfcn_h" = "no"; then - ac_cv_have_dlfcn=no -fi - -if test "$ac_cv_header_dl_h" = "no"; then - ac_cv_have_shload=no -fi - -dnl XXX why change enable_dlopen? its already set by autoconf's AC_ARG_ENABLE -dnl (MM) -AC_ARG_ENABLE(dlopen, -AC_HELP_STRING([--disable-dlopen],[link statically [default=no]]), -enable_dlopen=$enableval, -enable_dlopen=yes) - -# override the user's opinion, if we know it better ;) -if test "$ac_cv_have_dlfcn" = "no" && test "$ac_cv_have_shload" = "no"; then - enable_dlopen=no -fi - -if test "$ac_cv_have_dlfcn" = "yes"; then - AC_DEFINE_UNQUOTED(HAVE_DLFCN, 1, [Define if you have dlfcn]) -fi - -if test "$ac_cv_have_shload" = "yes"; then - AC_DEFINE_UNQUOTED(HAVE_SHLOAD, 1, [Define if you have shload]) -fi - -if test "$enable_dlopen" = no ; then - test -n "$1" && eval $1 -else - test -n "$2" && eval $2 -fi - -]) - -AC_DEFUN([KDE_CHECK_DYNAMIC_LOADING], -[ -KDE_CHECK_DLOPEN(libtool_enable_shared=yes, libtool_enable_static=no) -KDE_PROG_LIBTOOL -AC_MSG_CHECKING([dynamic loading]) -eval "`egrep '^build_libtool_libs=' libtool`" -if test "$build_libtool_libs" = "yes" && test "$enable_dlopen" = "yes"; then - dynamic_loading=yes - AC_DEFINE_UNQUOTED(HAVE_DYNAMIC_LOADING) -else - dynamic_loading=no -fi -AC_MSG_RESULT($dynamic_loading) -if test "$dynamic_loading" = "yes"; then - $1 -else - $2 -fi -]) - -AC_DEFUN([KDE_ADD_INCLUDES], -[ -if test -z "$1"; then - test_include="Pix.h" -else - test_include="$1" -fi - -AC_MSG_CHECKING([for libg++ ($test_include)]) - -AC_CACHE_VAL(kde_cv_libgpp_includes, -[ -kde_cv_libgpp_includes=no - - for ac_dir in \ - \ - /usr/include/g++ \ - /usr/include \ - /usr/unsupported/include \ - /opt/include \ - $extra_include \ - ; \ - do - if test -r "$ac_dir/$test_include"; then - kde_cv_libgpp_includes=$ac_dir - break - fi - done -]) - -AC_MSG_RESULT($kde_cv_libgpp_includes) -if test "$kde_cv_libgpp_includes" != "no"; then - all_includes="-I$kde_cv_libgpp_includes $all_includes $USER_INCLUDES" -fi -]) -]) - -AC_DEFUN([KDE_CHECK_LIBPTHREAD], -[ - dnl This code is here specifically to handle the - dnl various flavors of threading library on FreeBSD - dnl 4-, 5-, and 6-, and the (weird) rules around it. - dnl There may be an environment PTHREAD_LIBS that - dnl specifies what to use; otherwise, search for it. - dnl -pthread is special cased and unsets LIBPTHREAD - dnl below if found. - LIBPTHREAD="" - - if test -n "$PTHREAD_LIBS"; then - if test "x$PTHREAD_LIBS" = "x-pthread" ; then - LIBPTHREAD="PTHREAD" - else - PTHREAD_LIBS_save="$PTHREAD_LIBS" - PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'` - AC_MSG_CHECKING([for pthread_create in $PTHREAD_LIBS]) - KDE_CHECK_LIB($PTHREAD_LIBS, pthread_create, [ - LIBPTHREAD="$PTHREAD_LIBS_save"]) - PTHREAD_LIBS="$PTHREAD_LIBS_save" - fi - fi - - dnl Is this test really needed, in the face of the Tru64 test below? - if test -z "$LIBPTHREAD"; then - AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"]) - fi - - dnl This is a special Tru64 check, see BR 76171 issue #18. - if test -z "$LIBPTHREAD" ; then - AC_MSG_CHECKING([for pthread_create in -lpthread]) - kde_safe_libs=$LIBS - LIBS="$LIBS -lpthread" - AC_TRY_LINK([#include <pthread.h>],[(void)pthread_create(0,0,0,0);],[ - AC_MSG_RESULT(yes) - LIBPTHREAD="-lpthread"],[ - AC_MSG_RESULT(no)]) - LIBS=$kde_safe_libs - fi - - dnl Un-special-case for FreeBSD. - if test "x$LIBPTHREAD" = "xPTHREAD" ; then - LIBPTHREAD="" - fi - - AC_SUBST(LIBPTHREAD) -]) - -AC_DEFUN([KDE_CHECK_PTHREAD_OPTION], -[ - USE_THREADS="" - if test -z "$LIBPTHREAD"; then - KDE_CHECK_COMPILER_FLAG(pthread, [USE_THREADS="-D_THREAD_SAFE -pthread"]) - fi - - AH_VERBATIM(__svr_define, [ -#if defined(__SVR4) && !defined(__svr4__) -#define __svr4__ 1 -#endif -]) - case $host_os in - solaris*) - KDE_CHECK_COMPILER_FLAG(mt, [USE_THREADS="-mt"]) - CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_SOLARIS -DSVR4" - ;; - freebsd*) - CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE $PTHREAD_CFLAGS" - ;; - aix*) - CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" - LIBPTHREAD="$LIBPTHREAD -lc_r" - ;; - linux*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" - if test "$CXX" = "KCC"; then - CXXFLAGS="$CXXFLAGS --thread_safe" - NOOPT_CXXFLAGS="$NOOPT_CXXFLAGS --thread_safe" - fi - ;; - *) - ;; - esac - AC_SUBST(USE_THREADS) - AC_SUBST(LIBPTHREAD) -]) - -AC_DEFUN([KDE_CHECK_THREADING], -[ - AC_REQUIRE([KDE_CHECK_LIBPTHREAD]) - AC_REQUIRE([KDE_CHECK_PTHREAD_OPTION]) - dnl default is yes if libpthread is found and no if no libpthread is available - if test -z "$LIBPTHREAD"; then - if test -z "$USE_THREADS"; then - kde_check_threading_default=no - else - kde_check_threading_default=yes - fi - else - kde_check_threading_default=yes - fi - AC_ARG_ENABLE(threading,AC_HELP_STRING([--disable-threading],[disables threading even if libpthread found]), - kde_use_threading=$enableval, kde_use_threading=$kde_check_threading_default) - if test "x$kde_use_threading" = "xyes"; then - AC_DEFINE(HAVE_LIBPTHREAD, 1, [Define if you have a working libpthread (will enable threaded code)]) - fi -]) - -AC_DEFUN([KDE_TRY_LINK_PYTHON], -[ -if test "$kde_python_link_found" = no; then - -if test "$1" = normal; then - AC_MSG_CHECKING(if a Python application links) -else - AC_MSG_CHECKING(if Python depends on $2) -fi - -AC_CACHE_VAL(kde_cv_try_link_python_$1, -[ -kde_save_cflags="$CFLAGS" -CFLAGS="$CFLAGS $PYTHONINC" -kde_save_libs="$LIBS" -LIBS="$LIBS $LIBPYTHON $2 $LIBDL $LIBSOCKET" -kde_save_ldflags="$LDFLAGS" -LDFLAGS="$LDFLAGS $PYTHONLIB" - -AC_TRY_LINK( -[ -#include <Python.h> -],[ - PySys_SetArgv(1, 0); -], - [kde_cv_try_link_python_$1=yes], - [kde_cv_try_link_python_$1=no] -) -CFLAGS="$kde_save_cflags" -LIBS="$kde_save_libs" -LDFLAGS="$kde_save_ldflags" -]) - -if test "$kde_cv_try_link_python_$1" = "yes"; then - AC_MSG_RESULT(yes) - kde_python_link_found=yes - if test ! "$1" = normal; then - LIBPYTHON="$LIBPYTHON $2" - fi - $3 -else - AC_MSG_RESULT(no) - $4 -fi - -fi - -]) - -AC_DEFUN([KDE_CHECK_PYTHON_DIR], -[ -AC_MSG_CHECKING([for Python directory]) - -AC_CACHE_VAL(kde_cv_pythondir, -[ - if test -z "$PYTHONDIR"; then - kde_cv_pythondir=/usr/local - else - kde_cv_pythondir="$PYTHONDIR" - fi -]) - -AC_ARG_WITH(pythondir, -AC_HELP_STRING([--with-pythondir=pythondir],[use python installed in pythondir]), -[ - ac_python_dir=$withval -], ac_python_dir=$kde_cv_pythondir -) - -AC_MSG_RESULT($ac_python_dir) -]) - -AC_DEFUN([KDE_CHECK_PYTHON_INTERN], -[ -AC_REQUIRE([KDE_CHECK_LIBDL]) -AC_REQUIRE([KDE_CHECK_LIBPTHREAD]) -AC_REQUIRE([KDE_CHECK_PYTHON_DIR]) - -if test -z "$1"; then - version="1.5" -else - version="$1" -fi - -AC_MSG_CHECKING([for Python$version]) - -python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes" -AC_FIND_FILE(Python.h, $python_incdirs, python_incdir) -if test ! -r $python_incdir/Python.h; then - AC_FIND_FILE(python$version/Python.h, $python_incdirs, python_incdir) - python_incdir=$python_incdir/python$version - if test ! -r $python_incdir/Python.h; then - python_incdir=no - fi -fi - -PYTHONINC=-I$python_incdir - -python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs" -AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir) -if test ! -r $python_libdir/libpython$version.so; then - AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) - if test ! -r $python_libdir/libpython$version.a; then - AC_FIND_FILE(python$version/config/libpython$version.a, $python_libdirs, python_libdir) - python_libdir=$python_libdir/python$version/config - if test ! -r $python_libdir/libpython$version.a; then - python_libdir=no - fi - fi -fi - -PYTHONLIB=-L$python_libdir -kde_orig_LIBPYTHON=$LIBPYTHON -if test -z "$LIBPYTHON"; then - LIBPYTHON=-lpython$version -fi - -AC_FIND_FILE(python$version/copy.py, $python_libdirs, python_moddir) -python_moddir=$python_moddir/python$version -if test ! -r $python_moddir/copy.py; then - python_moddir=no -fi - -PYTHONMODDIR=$python_moddir - -AC_MSG_RESULT(header $python_incdir library $python_libdir modules $python_moddir) - -if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then - LIBPYTHON=$kde_orig_LIBPYTHON - test "x$PYTHONLIB" = "x-Lno" && PYTHONLIB="" - test "x$PYTHONINC" = "x-Ino" && PYTHONINC="" - $2 -else - dnl Note: this test is very weak - kde_python_link_found=no - KDE_TRY_LINK_PYTHON(normal) - KDE_TRY_LINK_PYTHON(m, -lm) - KDE_TRY_LINK_PYTHON(pthread, $LIBPTHREAD) - KDE_TRY_LINK_PYTHON(tcl, -ltcl) - KDE_TRY_LINK_PYTHON(db2, -ldb2) - KDE_TRY_LINK_PYTHON(m_and_thread, [$LIBPTHREAD -lm]) - KDE_TRY_LINK_PYTHON(m_and_thread_and_util, [$LIBPTHREAD -lm -lutil]) - KDE_TRY_LINK_PYTHON(m_and_thread_and_db3, [$LIBPTHREAD -lm -ldb-3 -lutil]) - KDE_TRY_LINK_PYTHON(pthread_and_db3, [$LIBPTHREAD -ldb-3]) - KDE_TRY_LINK_PYTHON(m_and_thread_and_db, [$LIBPTHREAD -lm -ldb -ltermcap -lutil]) - KDE_TRY_LINK_PYTHON(pthread_and_dl, [$LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm]) - KDE_TRY_LINK_PYTHON(pthread_and_panel_curses, [$LIBPTHREAD $LIBDL -lm -lpanel -lcurses]) - KDE_TRY_LINK_PYTHON(m_and_thread_and_db_special, [$LIBPTHREAD -lm -ldb -lutil], [], - [AC_MSG_WARN([it seems, Python depends on another library. - Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this - and contact the authors to let them know about this problem]) - ]) - - LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET" - AC_SUBST(PYTHONINC) - AC_SUBST(PYTHONLIB) - AC_SUBST(LIBPYTHON) - AC_SUBST(PYTHONMODDIR) - AC_DEFINE(HAVE_PYTHON, 1, [Define if you have the development files for python]) -fi - -]) - - -AC_DEFUN([KDE_CHECK_PYTHON], -[ - KDE_CHECK_PYTHON_INTERN("2.6", - [KDE_CHECK_PYTHON_INTERN("2.5", - [KDE_CHECK_PYTHON_INTERN("2.4", - [KDE_CHECK_PYTHON_INTERN("2.3", - [KDE_CHECK_PYTHON_INTERN("2.2", - [KDE_CHECK_PYTHON_INTERN("2.1", - [KDE_CHECK_PYTHON_INTERN("2.0", - [KDE_CHECK_PYTHON_INTERN($1, $2) ]) - ]) - ]) - ]) - ]) - ]) - ]) -]) - -AC_DEFUN([KDE_CHECK_STL], -[ - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`" - - AC_MSG_CHECKING([if C++ programs can be compiled]) - AC_CACHE_VAL(kde_cv_stl_works, - [ - AC_TRY_COMPILE([ -#include <string> -using namespace std; -],[ - string astring="Hallo Welt."; - astring.erase(0, 6); // now astring is "Welt" - return 0; -], kde_cv_stl_works=yes, - kde_cv_stl_works=no) -]) - - AC_MSG_RESULT($kde_cv_stl_works) - - if test "$kde_cv_stl_works" = "yes"; then - # back compatible - AC_DEFINE_UNQUOTED(HAVE_SGI_STL, 1, [Define if you have a STL implementation by SGI]) - else - AC_MSG_ERROR([Your Installation isn't able to compile simple C++ programs. -Check config.log for details - if you're using a Linux distribution you might miss -a package named similar to libstdc++-dev.]) - fi - - CXXFLAGS="$ac_save_CXXFLAGS" - AC_LANG_RESTORE -]) - -AC_DEFUN([AC_FIND_QIMGIO], - [AC_REQUIRE([AC_FIND_JPEG]) -AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) -AC_MSG_CHECKING([for qimgio]) -AC_CACHE_VAL(ac_cv_lib_qimgio, -[ -AC_LANG_SAVE -AC_LANG_CPLUSPLUS -ac_save_LIBS="$LIBS" -ac_save_CXXFLAGS="$CXXFLAGS" -LIBS="$all_libraries -lqimgio -lpng -lz $LIBJPEG $LIBTQT" -CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes" -AC_TRY_RUN(dnl -[ -#include <qimageio.h> -#include <qstring.h> -int main() { - QString t = "hallo"; - t.fill('t'); - qInitImageIO(); -} -], - ac_cv_lib_qimgio=yes, - ac_cv_lib_qimgio=no, - ac_cv_lib_qimgio=no) -LIBS="$ac_save_LIBS" -CXXFLAGS="$ac_save_CXXFLAGS" -AC_LANG_RESTORE -])dnl -if eval "test \"`echo $ac_cv_lib_qimgio`\" = yes"; then - LIBQIMGIO="-lqimgio -lpng -lz $LIBJPEG" - AC_MSG_RESULT(yes) - AC_DEFINE_UNQUOTED(HAVE_QIMGIO, 1, [Define if you have the Qt extension qimgio available]) - AC_SUBST(LIBQIMGIO) -else - AC_MSG_RESULT(not found) -fi -]) - -AC_DEFUN([AM_DISABLE_LIBRARIES], -[ - AC_PROVIDE([AM_ENABLE_STATIC]) - AC_PROVIDE([AM_ENABLE_SHARED]) - enable_static=no - enable_shared=yes -]) - - -AC_DEFUN([AC_CHECK_UTMP_FILE], -[ - AC_MSG_CHECKING([for utmp file]) - - AC_CACHE_VAL(kde_cv_utmp_file, - [ - kde_cv_utmp_file=no - - for ac_file in \ - \ - /var/run/utmp \ - /var/adm/utmp \ - /etc/utmp \ - ; \ - do - if test -r "$ac_file"; then - kde_cv_utmp_file=$ac_file - break - fi - done - ]) - - if test "$kde_cv_utmp_file" != "no"; then - AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries]) - $1 - AC_MSG_RESULT($kde_cv_utmp_file) - else - $2 - AC_MSG_RESULT([non found]) - fi -]) - - -AC_DEFUN([KDE_CREATE_SUBDIRSLIST], -[ - -DO_NOT_COMPILE="$DO_NOT_COMPILE CVS debian bsd-port admin" -TOPSUBDIRS="" - -if test ! -s $srcdir/subdirs; then - dnl Note: Makefile.common creates subdirs, so this is just a fallback - files=`cd $srcdir && ls -1` - dirs=`for i in $files; do if test -d $i; then echo $i; fi; done` - for i in $dirs; do - echo $i >> $srcdir/subdirs - done -fi - -ac_topsubdirs= -if test -s $srcdir/inst-apps; then - ac_topsubdirs="`cat $srcdir/inst-apps`" -elif test -s $srcdir/subdirs; then - ac_topsubdirs="`cat $srcdir/subdirs`" -fi - -for i in $ac_topsubdirs; do - AC_MSG_CHECKING([if $i should be compiled]) - if test -d $srcdir/$i; then - install_it="yes" - for j in $DO_NOT_COMPILE; do - if test $i = $j; then - install_it="no" - fi - done - else - install_it="no" - fi - AC_MSG_RESULT($install_it) - vari=`echo $i | sed -e 's,[[-+.@]],_,g'` - if test $install_it = "yes"; then - TOPSUBDIRS="$TOPSUBDIRS $i" - eval "$vari""_SUBDIR_included=yes" - else - eval "$vari""_SUBDIR_included=no" - fi -done - -AC_SUBST(TOPSUBDIRS) -]) - -AC_DEFUN([KDE_CHECK_NAMESPACES], -[ -AC_MSG_CHECKING(whether C++ compiler supports namespaces) -AC_LANG_SAVE -AC_LANG_CPLUSPLUS -AC_TRY_COMPILE([ -], -[ -namespace Foo { - extern int i; - namespace Bar { - extern int i; - } -} - -int Foo::i = 0; -int Foo::Bar::i = 1; -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_NAMESPACES) -], [ -AC_MSG_RESULT(no) -]) -AC_LANG_RESTORE -]) - -dnl ------------------------------------------------------------------------ -dnl Check for S_ISSOCK macro. Doesn't exist on Unix SCO. faure@kde.org -dnl ------------------------------------------------------------------------ -dnl -AC_DEFUN([AC_CHECK_S_ISSOCK], -[ -AC_MSG_CHECKING(for S_ISSOCK) -AC_CACHE_VAL(ac_cv_have_s_issock, -[ -AC_TRY_LINK( -[ -#include <sys/stat.h> -], -[ -struct stat buff; -int b = S_ISSOCK( buff.st_mode ); -], -ac_cv_have_s_issock=yes, -ac_cv_have_s_issock=no) -]) -AC_MSG_RESULT($ac_cv_have_s_issock) -if test "$ac_cv_have_s_issock" = "yes"; then - AC_DEFINE_UNQUOTED(HAVE_S_ISSOCK, 1, [Define if sys/stat.h declares S_ISSOCK.]) -fi - -AH_VERBATIM(_ISSOCK, -[ -#ifndef HAVE_S_ISSOCK -#define HAVE_S_ISSOCK -#define S_ISSOCK(mode) (1==0) -#endif -]) - -]) - -dnl ------------------------------------------------------------------------ -dnl Check for MAXPATHLEN macro, defines KDEMAXPATHLEN. faure@kde.org -dnl ------------------------------------------------------------------------ -dnl -AC_DEFUN([AC_CHECK_KDEMAXPATHLEN], -[ -AC_MSG_CHECKING(for MAXPATHLEN) -AC_CACHE_VAL(ac_cv_maxpathlen, -[ -cat > conftest.$ac_ext <<EOF -#ifdef STDC_HEADERS -# include <stdlib.h> -#endif -#include <stdio.h> -#include <sys/param.h> -#ifndef MAXPATHLEN -#define MAXPATHLEN 1024 -#endif - -KDE_HELLO MAXPATHLEN - -EOF - -ac_try="$ac_cpp conftest.$ac_ext 2>/dev/null | grep '^KDE_HELLO' >conftest.out" - -if AC_TRY_EVAL(ac_try) && test -s conftest.out; then - ac_cv_maxpathlen=`sed 's#KDE_HELLO ##' conftest.out` -else - ac_cv_maxpathlen=1024 -fi - -rm conftest.* - -]) -AC_MSG_RESULT($ac_cv_maxpathlen) -AC_DEFINE_UNQUOTED(KDEMAXPATHLEN,$ac_cv_maxpathlen, [Define a safe value for MAXPATHLEN] ) -]) - -AC_DEFUN([KDE_CHECK_HEADER], -[ - kde_safe_cppflags=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $all_includes" - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_CHECK_HEADER([$1], [$2], [$3], [$4]) - AC_LANG_RESTORE - CPPFLAGS=$kde_safe_cppflags -]) - -AC_DEFUN([KDE_CHECK_HEADERS], -[ - AH_CHECK_HEADERS([$1]) - AC_LANG_SAVE - kde_safe_cppflags=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $all_includes" - AC_LANG_CPLUSPLUS - AC_CHECK_HEADERS([$1], [$2], [$3], [$4]) - CPPFLAGS=$kde_safe_cppflags - AC_LANG_RESTORE -]) - -AC_DEFUN([KDE_FAST_CONFIGURE], -[ - dnl makes configure fast (needs perl) - AC_ARG_ENABLE(fast-perl, AC_HELP_STRING([--disable-fast-perl],[disable fast Makefile generation (needs perl)]), - with_fast_perl=$enableval, with_fast_perl=yes) -]) - -AC_DEFUN([KDE_CONF_FILES], -[ - val= - if test -f $srcdir/configure.files ; then - val=`sed -e 's%^%\$(top_srcdir)/%' $srcdir/configure.files` - fi - CONF_FILES= - if test -n "$val" ; then - for i in $val ; do - CONF_FILES="$CONF_FILES $i" - done - fi - AC_SUBST(CONF_FILES) -])dnl - -dnl This sets the prefix, for arts and tdelibs -dnl Do NOT use in any other module. -dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde -AC_DEFUN([KDE_SET_PREFIX_CORE], -[ - unset CDPATH - dnl make $TDEDIR the default for the installation - AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) - - if test "x$prefix" = "xNONE"; then - prefix=$ac_default_prefix - ac_configure_args="$ac_configure_args --prefix=$prefix" - fi - # And delete superfluous '/' to make compares easier - prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'` - exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'` - - kde_libs_prefix='$(prefix)' - kde_libs_htmldir='$(kde_htmldir)' - AC_SUBST(kde_libs_prefix) - AC_SUBST(kde_libs_htmldir) - KDE_FAST_CONFIGURE - KDE_CONF_FILES -]) - - -AC_DEFUN([KDE_SET_PREFIX], -[ - unset CDPATH - dnl We can't give real code to that macro, only a value. - dnl It only matters for --help, since we set the prefix in this function anyway. - AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix}) - - KDE_SET_DEFAULT_BINDIRS - if test "x$prefix" = "xNONE"; then - dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it - KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend) - else - dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH - kde_save_PATH="$PATH" - PATH="$exec_prefix/bin:$prefix/bin:$PATH" - KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend) - PATH="$kde_save_PATH" - fi - - kde_libs_prefix=`$KDECONFIG --prefix` - if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then - AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs. - This means it has been moved since you installed it. - This won't work. Please recompile tdelibs for the new prefix. - ]) - fi - kde_libs_htmldir=`$KDECONFIG --install html --expandvars` - - AC_MSG_CHECKING([where to install]) - if test "x$prefix" = "xNONE"; then - prefix=$kde_libs_prefix - AC_MSG_RESULT([$prefix (as returned by tde-config)]) - else - dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different - given_prefix=$prefix - AC_MSG_RESULT([$prefix (as requested)]) - fi - - # And delete superfluous '/' to make compares easier - prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'` - exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'` - given_prefix=`echo "$given_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'` - - AC_SUBST(KDECONFIG) - AC_SUBST(kde_libs_prefix) - AC_SUBST(kde_libs_htmldir) - - KDE_FAST_CONFIGURE - KDE_CONF_FILES -]) - -pushdef([AC_PROG_INSTALL], -[ - dnl our own version, testing for a -p flag - popdef([AC_PROG_INSTALL]) - dnl as AC_PROG_INSTALL works as it works we first have - dnl to save if the user didn't specify INSTALL, as the - dnl autoconf one overwrites INSTALL and we have no chance to find - dnl out afterwards - test -n "$INSTALL" && kde_save_INSTALL_given=$INSTALL - test -n "$INSTALL_PROGRAM" && kde_save_INSTALL_PROGRAM_given=$INSTALL_PROGRAM - test -n "$INSTALL_SCRIPT" && kde_save_INSTALL_SCRIPT_given=$INSTALL_SCRIPT - AC_PROG_INSTALL - - if test -z "$kde_save_INSTALL_given" ; then - # OK, user hasn't given any INSTALL, autoconf found one for us - # now we test, if it supports the -p flag - AC_MSG_CHECKING(for -p flag to install) - rm -f confinst.$$.* > /dev/null 2>&1 - echo "Testtest" > confinst.$$.orig - ac_res=no - if ${INSTALL} -p confinst.$$.orig confinst.$$.new > /dev/null 2>&1 ; then - if test -f confinst.$$.new ; then - # OK, -p seems to do no harm to install - INSTALL="${INSTALL} -p" - ac_res=yes - fi - fi - rm -f confinst.$$.* - AC_MSG_RESULT($ac_res) - fi - dnl the following tries to resolve some signs and wonders coming up - dnl with different autoconf/automake versions - dnl e.g.: - dnl *automake 1.4 install-strip sets A_M_INSTALL_PROGRAM_FLAGS to -s - dnl and has INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(A_M_INSTALL_PROGRAM_FLAGS) - dnl it header-vars.am, so there the actual INSTALL_PROGRAM gets the -s - dnl *automake 1.4a (and above) use INSTALL_STRIP_FLAG and only has - dnl INSTALL_PROGRAM = @INSTALL_PROGRAM@ there, but changes the - dnl install-@DIR@PROGRAMS targets to explicitly use that flag - dnl *autoconf 2.13 is dumb, and thinks it can use INSTALL_PROGRAM as - dnl INSTALL_SCRIPT, which breaks with automake <= 1.4 - dnl *autoconf >2.13 (since 10.Apr 1999) has not that failure - dnl *sometimes KDE does not use the install-@DIR@PROGRAM targets from - dnl automake (due to broken Makefile.am or whatever) to install programs, - dnl and so does not see the -s flag in automake > 1.4 - dnl to clean up that mess we: - dnl +set INSTALL_PROGRAM to use INSTALL_STRIP_FLAG - dnl which cleans KDE's program with automake > 1.4; - dnl +set INSTALL_SCRIPT to only use INSTALL, to clean up autoconf's problems - dnl with automake<=1.4 - dnl note that dues to this sometimes two '-s' flags are used (if KDE - dnl properly uses install-@DIR@PROGRAMS, but I don't care - dnl - dnl And to all this comes, that I even can't write in comments variable - dnl names used by automake, because it is so stupid to think I wanted to - dnl _use_ them, therefor I have written A_M_... instead of AM_ - dnl hmm, I wanted to say something ... ahh yes: Arghhh. - - if test -z "$kde_save_INSTALL_PROGRAM_given" ; then - INSTALL_PROGRAM='${INSTALL} $(INSTALL_STRIP_FLAG)' - fi - if test -z "$kde_save_INSTALL_SCRIPT_given" ; then - INSTALL_SCRIPT='${INSTALL}' - fi -])dnl - -AC_DEFUN([KDE_LANG_CPLUSPLUS], -[AC_LANG_CPLUSPLUS -ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC' -pushdef([AC_LANG_CPLUSPLUS], [popdef([AC_LANG_CPLUSPLUS]) KDE_LANG_CPLUSPLUS]) -]) - -pushdef([AC_LANG_CPLUSPLUS], -[popdef([AC_LANG_CPLUSPLUS]) -KDE_LANG_CPLUSPLUS -]) - -AC_DEFUN([KDE_CHECK_LONG_LONG], -[ -AC_MSG_CHECKING(for long long) -AC_CACHE_VAL(kde_cv_c_long_long, -[ - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_LINK([], [ - long long foo = 0; - foo = foo+1; - ], - kde_cv_c_long_long=yes, kde_cv_c_long_long=no) - AC_LANG_RESTORE -]) -AC_MSG_RESULT($kde_cv_c_long_long) -if test "$kde_cv_c_long_long" = yes; then - AC_DEFINE(HAVE_LONG_LONG, 1, [Define if you have long long as datatype]) -fi -]) - -AC_DEFUN([KDE_CHECK_LIB], -[ - kde_save_LDFLAGS="$LDFLAGS" - dnl AC_CHECK_LIB modifies LIBS, so save it here - kde_save_LIBS="$LIBS" - LDFLAGS="$LDFLAGS $all_libraries" - case $host_os in - aix*) LDFLAGS="-brtl $LDFLAGS" - test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS" - ;; - esac - AC_CHECK_LIB($1, $2, $3, $4, $5) - LDFLAGS="$kde_save_LDFLAGS" - LIBS="$kde_save_LIBS" -]) - -AC_DEFUN([KDE_JAVA_PREFIX], -[ - dir=`dirname "$1"` - base=`basename "$1"` - list=`ls -1 $dir 2> /dev/null` - for entry in $list; do - if test -d $dir/$entry/bin; then - case $entry in - $base) - javadirs="$javadirs $dir/$entry/bin" - ;; - esac - elif test -d $dir/$entry/jre/bin; then - case $entry in - $base) - javadirs="$javadirs $dir/$entry/jre/bin" - ;; - esac - fi - done -]) - -dnl KDE_CHEC_JAVA_DIR(onlyjre) -AC_DEFUN([KDE_CHECK_JAVA_DIR], -[ - -AC_ARG_WITH(java, -AC_HELP_STRING([--with-java=javadir],[use java installed in javadir, --without-java disables]), -[ ac_java_dir=$withval -], ac_java_dir="" -) - -AC_MSG_CHECKING([for Java]) - -dnl at this point ac_java_dir is either a dir, 'no' to disable, or '' to say look in $PATH -if test "x$ac_java_dir" = "xno"; then - kde_java_bindir=no - kde_java_includedir=no - kde_java_libjvmdir=no - kde_java_libgcjdir=no - kde_java_libhpidir=no -else - if test "x$ac_java_dir" = "x"; then - - - dnl No option set -> collect list of candidate paths - if test -n "$JAVA_HOME"; then - KDE_JAVA_PREFIX($JAVA_HOME) - fi - KDE_JAVA_PREFIX(/usr/j2se) - KDE_JAVA_PREFIX(/usr/lib/j2se) - KDE_JAVA_PREFIX(/usr/j*dk*) - KDE_JAVA_PREFIX(/usr/lib/j*dk*) - KDE_JAVA_PREFIX(/opt/j*sdk*) - KDE_JAVA_PREFIX(/usr/lib/java*) - KDE_JAVA_PREFIX(/usr/java*) - KDE_JAVA_PREFIX(/usr/java/j*dk*) - KDE_JAVA_PREFIX(/usr/java/j*re*) - KDE_JAVA_PREFIX(/usr/lib/SunJava2*) - KDE_JAVA_PREFIX(/usr/lib/SunJava*) - KDE_JAVA_PREFIX(/usr/lib/IBMJava2*) - KDE_JAVA_PREFIX(/usr/lib/IBMJava*) - KDE_JAVA_PREFIX(/opt/java*) - - kde_cv_path="NONE" - kde_save_IFS=$IFS - IFS=':' - for dir in $PATH; do - if test -d "$dir"; then - javadirs="$javadirs $dir" - fi - done - IFS=$kde_save_IFS - jredirs= - - dnl Now javadirs contains a list of paths that exist, all ending with bin/ - for dir in $javadirs; do - dnl Check for the java executable - if test -x "$dir/java"; then - sane_path=$(cd $dir; /bin/pwd) - dnl And also check for a libjvm.so somewhere under there - dnl Since we have to go to the parent dir, /usr/bin is excluded, /usr is too big. - if test "$sane_path" != "/usr/bin"; then - libjvmdir=`find $dir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1` - if test ! -f $libjvmdir/libjvm.so; then continue; fi - jredirs="$jredirs $dir" - fi - fi - done - - dnl Now jredirs contains a reduced list, of paths where both java and ../**/libjvm.so was found - JAVAC= - JAVA= - kde_java_bindir=no - for dir in $jredirs; do - JAVA="$dir/java" - kde_java_bindir=$dir - if test -x "$dir/javac"; then - JAVAC="$dir/javac" - break - fi - done - - if test -n "$JAVAC"; then - dnl this substitution might not work - well, we test for jni.h below - kde_java_includedir=`echo $JAVAC | sed -e 's,bin/javac$,include/,'` - else - kde_java_includedir=no - fi - else - dnl config option set - kde_java_bindir=$ac_java_dir/bin - if test -x $ac_java_dir/bin/java && test ! -x $ac_java_dir/bin/javac; then - kde_java_includedir=no - else - kde_java_includedir=$ac_java_dir/include - fi - fi -fi - -dnl At this point kde_java_bindir and kde_java_includedir are either set or "no" -if test "x$kde_java_bindir" != "xno"; then - - dnl Look for libjvm.so - kde_java_libjvmdir=`find $kde_java_bindir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1` - dnl Look for libgcj.so - kde_java_libgcjdir=`find $kde_java_bindir/.. -name libgcj.so | sed 's,libgcj.so,,'|head -n 1` - dnl Look for libhpi.so and avoid green threads - kde_java_libhpidir=`find $kde_java_bindir/.. -name libhpi.so | grep -v green | sed 's,libhpi.so,,' | head -n 1` - - dnl Now check everything's fine under there - dnl the include dir is our flag for having the JDK - if test -d "$kde_java_includedir"; then - if test ! -x "$kde_java_bindir/javac"; then - AC_MSG_ERROR([javac not found under $kde_java_bindir - it seems you passed a wrong --with-java.]) - fi - if test ! -x "$kde_java_bindir/javah"; then - AC_MSG_ERROR([javah not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.]) - fi - if test ! -x "$kde_java_bindir/jar"; then - AC_MSG_ERROR([jar not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.]) - fi - if test ! -r "$kde_java_includedir/jni.h"; then - AC_MSG_ERROR([jni.h not found under $kde_java_includedir. Use --with-java or --without-java.]) - fi - - jni_includes="-I$kde_java_includedir" - dnl Strange thing, jni.h requires jni_md.h which is under genunix here.. - dnl and under linux here.. - - dnl not needed for gcj - - if test "x$kde_java_libgcjdir" = "x"; then - test -d "$kde_java_includedir/linux" && jni_includes="$jni_includes -I$kde_java_includedir/linux" - test -d "$kde_java_includedir/solaris" && jni_includes="$jni_includes -I$kde_java_includedir/solaris" - test -d "$kde_java_includedir/genunix" && jni_includes="$jni_includes -I$kde_java_includedir/genunix" - fi - - else - JAVAC= - jni_includes= - fi - - if test "x$kde_java_libgcjdir" = "x"; then - if test ! -r "$kde_java_libjvmdir/libjvm.so"; then - AC_MSG_ERROR([libjvm.so not found under $kde_java_libjvmdir. Use --without-java.]) - fi - else - if test ! -r "$kde_java_libgcjdir/libgcj.so"; then - AC_MSG_ERROR([libgcj.so not found under $kde_java_libgcjdir. Use --without-java.]) - fi - fi - - if test ! -x "$kde_java_bindir/java"; then - AC_MSG_ERROR([java not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.]) - fi - - dnl not needed for gcj compile - - if test "x$kde_java_libgcjdir" = "x"; then - if test ! -r "$kde_java_libhpidir/libhpi.so"; then - AC_MSG_ERROR([libhpi.so not found under $kde_java_libhpidir. Use --without-java.]) - fi - fi - - if test -n "$jni_includes"; then - dnl Check for JNI version - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - ac_cxxflags_safe="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS $all_includes $jni_includes" - - AC_TRY_COMPILE([ - #include <jni.h> - ], - [ - #ifndef JNI_VERSION_1_2 - Syntax Error - #endif - ],[ kde_jni_works=yes ], - [ kde_jni_works=no ]) - - if test $kde_jni_works = no; then - AC_MSG_ERROR([Incorrect version of $kde_java_includedir/jni.h. - You need to have Java Development Kit (JDK) version 1.2. - - Use --with-java to specify another location. - Use --without-java to configure without java support. - Or download a newer JDK and try again. - See e.g. http://java.sun.com/products/jdk/1.2 ]) - fi - - CXXFLAGS="$ac_cxxflags_safe" - AC_LANG_RESTORE - - dnl All tests ok, inform and subst the variables - - JAVAC=$kde_java_bindir/javac - JAVAH=$kde_java_bindir/javah - JAR=$kde_java_bindir/jar - AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) - if test "x$kde_java_libgcjdir" = "x"; then - JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi" - else - JVMLIBS="-L$kde_java_libgcjdir -lgcj" - fi - AC_MSG_RESULT([java JDK in $kde_java_bindir]) - - else - AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) - AC_MSG_RESULT([java JRE in $kde_java_bindir]) - fi -elif test -d "/Library/Java/Home"; then - kde_java_bindir="/Library/Java/Home/bin" - jni_includes="-I/Library/Java/Home/include" - - JAVAC=$kde_java_bindir/javac - JAVAH=$kde_java_bindir/javah - JAR=$kde_java_bindir/jar - JVMLIBS="-Wl,-framework,JavaVM" - - AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) - AC_MSG_RESULT([Apple Java Framework]) -else - AC_MSG_RESULT([none found]) -fi - -AC_SUBST(JAVAC) -AC_SUBST(JAVAH) -AC_SUBST(JAR) -AC_SUBST(JVMLIBS) -AC_SUBST(jni_includes) - -# for backward compat -kde_cv_java_includedir=$kde_java_includedir -kde_cv_java_bindir=$kde_java_bindir -]) - -dnl this is a redefinition of autoconf 2.5x's AC_FOREACH. -dnl When the argument list becomes big, as in KDE for AC_OUTPUT in -dnl big packages, m4_foreach is dog-slow. So use our own version of -dnl it. (matz@kde.org) -m4_define([mm_foreach], -[m4_pushdef([$1])_mm_foreach($@)m4_popdef([$1])]) -m4_define([mm_car], [[$1]]) -m4_define([mm_car2], [[$@]]) -m4_define([_mm_foreach], -[m4_if(m4_quote($2), [], [], - [m4_define([$1], mm_car($2))$3[]_mm_foreach([$1], - mm_car2(m4_shift($2)), - [$3])])]) -m4_define([AC_FOREACH], -[mm_foreach([$1], m4_split(m4_normalize([$2])), [$3])]) - -AC_DEFUN([KDE_NEED_FLEX], -[ -kde_libs_safe=$LIBS -LIBS="$LIBS $USER_LDFLAGS" -AM_PROG_LEX -LIBS=$kde_libs_safe -if test -z "$LEXLIB"; then - AC_MSG_ERROR([You need to have flex installed.]) -fi -AC_SUBST(LEXLIB) -]) - -AC_DEFUN([AC_PATH_TQTOPIA], -[ - dnl TODO: use AC_CACHE_VAL - - if test -z "$1"; then - qtopia_minver_maj=1 - qtopia_minver_min=5 - qtopia_minver_pat=0 - else - qtopia_minver_maj=`echo "$1" | sed -e "s/^\(.*\)\..*\..*$/\1/"` - qtopia_minver_min=`echo "$1" | sed -e "s/^.*\.\(.*\)\..*$/\1/"` - qtopia_minver_pat=`echo "$1" | sed -e "s/^.*\..*\.\(.*\)$/\1/"` - fi - - qtopia_minver="$qtopia_minver_maj$qtopia_minver_min$qtopia_minver_pat" - qtopia_minverstr="$qtopia_minver_maj.$qtopia_minver_min.$qtopia_minver_pat" - - AC_REQUIRE([AC_PATH_TQT]) - - AC_MSG_CHECKING([for Qtopia]) - - LIB_TQTOPIA="-lqpe" - AC_SUBST(LIB_TQTOPIA) - - kde_qtopia_dirs="$QPEDIR /opt/Qtopia" - - ac_qtopia_incdir=NO - - AC_ARG_WITH(qtopia-dir, - AC_HELP_STRING([--with-qtopia-dir=DIR],[where the root of Qtopia is installed]), - [ ac_qtopia_incdir="$withval"/include] ) - - qtopia_incdirs="" - for dir in $kde_qtopia_dirs; do - qtopia_incdirs="$qtopia_incdirs $dir/include" - done - - if test ! "$ac_qtopia_incdir" = "NO"; then - qtopia_incdirs="$ac_qtopia_incdir $qtopia_incdirs" - fi - - qtopia_incdir="" - AC_FIND_FILE(qpe/qpeapplication.h, $qtopia_incdirs, qtopia_incdir) - ac_qtopia_incdir="$qtopia_incdir" - - if test -z "$qtopia_incdir"; then - AC_MSG_ERROR([Cannot find Qtopia headers. Please check your installation.]) - fi - - qtopia_ver_maj=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION "\(.*\)\..*\..*".*,\1,p'`; - qtopia_ver_min=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION ".*\.\(.*\)\..*".*,\1,p'`; - qtopia_ver_pat=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION ".*\..*\.\(.*\)".*,\1,p'`; - - qtopia_ver="$qtopia_ver_maj$qtopia_ver_min$qtopia_ver_pat" - qtopia_verstr="$qtopia_ver_maj.$qtopia_ver_min.$qtopia_ver_pat" - if test "$qtopia_ver" -lt "$qtopia_minver"; then - AC_MSG_ERROR([found Qtopia version $qtopia_verstr but version $qtopia_minverstr -is required.]) - fi - - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - - ac_cxxflags_safe="$CXXFLAGS" - ac_ldflags_safe="$LDFLAGS" - ac_libs_safe="$LIBS" - - CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes" - LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" - LIBS="$LIBS $LIB_TQTOPIA $LIBTQT" - - cat > conftest.$ac_ext <<EOF -#include "confdefs.h" -#include <qpe/qpeapplication.h> -#include <qpe/version.h> - -int main( int argc, char **argv ) -{ - QPEApplication app( argc, argv ); - return 0; -} -EOF - - if AC_TRY_EVAL(ac_link) && test -s conftest; then - rm -f conftest* - else - rm -f conftest* - AC_MSG_ERROR([Cannot link small Qtopia Application. For more details look at -the end of config.log]) - fi - - CXXFLAGS="$ac_cxxflags_safe" - LDFLAGS="$ac_ldflags_safe" - LIBS="$ac_libs_safe" - - AC_LANG_RESTORE - - QTOPIA_INCLUDES="-I$qtopia_incdir" - AC_SUBST(QTOPIA_INCLUDES) - - AC_MSG_RESULT([found version $qtopia_verstr with headers at $qtopia_incdir]) -]) - - -AC_DEFUN([KDE_INIT_DOXYGEN], -[ -AC_MSG_CHECKING([for Qt docs]) -kde_qtdir= -if test "${with_qt_dir+set}" = set; then - kde_qtdir="$with_qt_dir" -fi - -AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $TQTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], TQTDOCDIR) -AC_MSG_RESULT($TQTDOCDIR) - -AC_SUBST(TQTDOCDIR) - -KDE_FIND_PATH(dot, DOT, [], []) -if test -n "$DOT"; then - KDE_HAVE_DOT="YES" -else - KDE_HAVE_DOT="NO" -fi -AC_SUBST(KDE_HAVE_DOT) -KDE_FIND_PATH(doxygen, DOXYGEN, [], []) -AC_SUBST(DOXYGEN) - -DOXYGEN_PROJECT_NAME="$1" -DOXYGEN_PROJECT_NUMBER="$2" -AC_SUBST(DOXYGEN_PROJECT_NAME) -AC_SUBST(DOXYGEN_PROJECT_NUMBER) - -KDE_HAS_DOXYGEN=no -if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $TQTDOCDIR/qsql.html; then - KDE_HAS_DOXYGEN=yes -fi -AC_SUBST(KDE_HAS_DOXYGEN) - -]) - - -AC_DEFUN([AC_FIND_BZIP2], -[ -AC_MSG_CHECKING([for bzDecompress in libbz2]) -AC_CACHE_VAL(ac_cv_lib_bzip2, -[ -AC_LANG_SAVE -AC_LANG_CPLUSPLUS -kde_save_LIBS="$LIBS" -LIBS="$all_libraries $USER_LDFLAGS -lbz2 $LIBSOCKET" -kde_save_CXXFLAGS="$CXXFLAGS" -CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES" -AC_TRY_LINK(dnl -[ -#define BZ_NO_STDIO -#include<bzlib.h> -], - [ bz_stream s; (void) bzDecompress(&s); ], - eval "ac_cv_lib_bzip2='-lbz2'", - eval "ac_cv_lib_bzip2=no") -LIBS="$kde_save_LIBS" -CXXFLAGS="$kde_save_CXXFLAGS" -AC_LANG_RESTORE -])dnl -AC_MSG_RESULT($ac_cv_lib_bzip2) - -if test ! "$ac_cv_lib_bzip2" = no; then - BZIP2DIR=bzip2 - - LIBBZ2="$ac_cv_lib_bzip2" - AC_SUBST(LIBBZ2) - -else - - cxx_shared_flag= - ld_shared_flag= - KDE_CHECK_COMPILER_FLAG(shared, [ - ld_shared_flag="-shared" - ]) - KDE_CHECK_COMPILER_FLAG(fPIC, [ - cxx_shared_flag="-fPIC" - ]) - - AC_MSG_CHECKING([for BZ2_bzDecompress in (shared) libbz2]) - AC_CACHE_VAL(ac_cv_lib_bzip2_prefix, - [ - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - kde_save_LIBS="$LIBS" - LIBS="$all_libraries $USER_LDFLAGS $ld_shared_flag -lbz2 $LIBSOCKET" - kde_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CFLAGS $cxx_shared_flag $all_includes $USER_INCLUDES" - - AC_TRY_LINK(dnl - [ - #define BZ_NO_STDIO - #include<bzlib.h> - ], - [ bz_stream s; (void) BZ2_bzDecompress(&s); ], - eval "ac_cv_lib_bzip2_prefix='-lbz2'", - eval "ac_cv_lib_bzip2_prefix=no") - LIBS="$kde_save_LIBS" - CXXFLAGS="$kde_save_CXXFLAGS" - AC_LANG_RESTORE - ])dnl - - AC_MSG_RESULT($ac_cv_lib_bzip2_prefix) - - if test ! "$ac_cv_lib_bzip2_prefix" = no; then - BZIP2DIR=bzip2 - - LIBBZ2="$ac_cv_lib_bzip2_prefix" - AC_SUBST(LIBBZ2) - - AC_DEFINE(NEED_BZ2_PREFIX, 1, [Define if the libbz2 functions need the BZ2_ prefix]) - dnl else, we just ignore this - fi - -fi -AM_CONDITIONAL(include_BZIP2, test -n "$BZIP2DIR") -]) - -dnl ------------------------------------------------------------------------ -dnl Try to find the SSL headers and libraries. -dnl $(SSL_LDFLAGS) will be -Lsslliblocation (if needed) -dnl and $(SSL_INCLUDES) will be -Isslhdrlocation (if needed) -dnl ------------------------------------------------------------------------ -dnl -AC_DEFUN([KDE_CHECK_SSL], -[ -LIBSSL="-lssl -lcrypto" -AC_REQUIRE([KDE_CHECK_LIB64]) - -ac_ssl_includes=NO ac_ssl_libraries=NO -ssl_libraries="" -ssl_includes="" -AC_ARG_WITH(ssl-dir, - AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]), - [ ac_ssl_includes="$withval"/include - ac_ssl_libraries="$withval"/lib$tdelibsuff - ]) - -want_ssl=yes -AC_ARG_WITH(ssl, - AC_HELP_STRING([--without-ssl],[disable SSL checks]), - [want_ssl=$withval]) - -if test $want_ssl = yes; then - -AC_MSG_CHECKING(for OpenSSL) - -AC_CACHE_VAL(ac_cv_have_ssl, -[#try to guess OpenSSL locations - - ssl_incdirs="/usr/include /usr/local/include /usr/ssl/include /usr/local/ssl/include $prefix/include $kde_extra_includes" - ssl_incdirs="$ac_ssl_includes $ssl_incdirs" - AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir) - ac_ssl_includes="$ssl_incdir" - - ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs" - if test ! "$ac_ssl_libraries" = "NO"; then - ssl_libdirs="$ac_ssl_libraries $ssl_libdirs" - fi - - test=NONE - ssl_libdir=NONE - for dir in $ssl_libdirs; do - try="ls -1 $dir/libssl*" - if test=`eval $try 2> /dev/null`; then ssl_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi - done - - ac_ssl_libraries="$ssl_libdir" - - ac_ldflags_safe="$LDFLAGS" - ac_libs_safe="$LIBS" - - LDFLAGS="$LDFLAGS -L$ssl_libdir $all_libraries" - LIBS="$LIBS $LIBSSL -lRSAglue -lrsaref" - - AC_TRY_LINK(,void RSAPrivateEncrypt(void);RSAPrivateEncrypt();, - ac_ssl_rsaref="yes" - , - ac_ssl_rsaref="no" - ) - - LDFLAGS="$ac_ldflags_safe" - LIBS="$ac_libs_safe" - - if test "$ac_ssl_includes" = NO || test "$ac_ssl_libraries" = NO; then - have_ssl=no - else - have_ssl=yes; - fi - - ]) - - eval "$ac_cv_have_ssl" - - AC_MSG_RESULT([libraries $ac_ssl_libraries, headers $ac_ssl_includes]) - - AC_MSG_CHECKING([whether OpenSSL uses rsaref]) - AC_MSG_RESULT($ac_ssl_rsaref) - - AC_MSG_CHECKING([for easter eggs]) - AC_MSG_RESULT([none found]) - -else - have_ssl=no -fi - -if test "$have_ssl" = yes; then - AC_MSG_CHECKING(for OpenSSL version) - dnl Check for SSL version - AC_CACHE_VAL(ac_cv_ssl_version, - [ - - cat >conftest.$ac_ext <<EOF -#include <openssl/opensslv.h> -#include <stdio.h> - int main() { - -#ifndef OPENSSL_VERSION_NUMBER - printf("ssl_version=\\"error\\"\n"); -#else - if (OPENSSL_VERSION_NUMBER < 0x00906000) - printf("ssl_version=\\"old\\"\n"); - else - printf("ssl_version=\\"ok\\"\n"); -#endif - return (0); - } -EOF - - ac_save_CPPFLAGS=$CPPFLAGS - if test "$ac_ssl_includes" != "/usr/include"; then - CPPFLAGS="$CPPFLAGS -I$ac_ssl_includes" - fi - - if AC_TRY_EVAL(ac_link); then - - if eval `./conftest 2>&5`; then - if test $ssl_version = error; then - AC_MSG_ERROR([$ssl_incdir/openssl/opensslv.h doesn't define OPENSSL_VERSION_NUMBER !]) - else - if test $ssl_version = old; then - AC_MSG_WARN([OpenSSL version too old. Upgrade to 0.9.6 at least, see http://www.openssl.org. SSL support disabled.]) - have_ssl=no - fi - fi - ac_cv_ssl_version="ssl_version=$ssl_version" - else - AC_MSG_ERROR([Your system couldn't run a small SSL test program. - Check config.log, and if you can't figure it out, send a mail to - David Faure <faure@kde.org>, attaching your config.log]) - fi - - else - AC_MSG_ERROR([Your system couldn't link a small SSL test program. - Check config.log, and if you can't figure it out, send a mail to - David Faure <faure@kde.org>, attaching your config.log]) - fi - CPPFLAGS=$ac_save_CPPFLAGS - - ]) - - eval "$ac_cv_ssl_version" - AC_MSG_RESULT($ssl_version) -fi - -if test "$have_ssl" != yes; then - LIBSSL=""; -else - AC_DEFINE(HAVE_SSL, 1, [If we are going to use OpenSSL]) - ac_cv_have_ssl="have_ssl=yes \ - ac_ssl_includes=$ac_ssl_includes ac_ssl_libraries=$ac_ssl_libraries ac_ssl_rsaref=$ac_ssl_rsaref" - - - ssl_libraries="$ac_ssl_libraries" - ssl_includes="$ac_ssl_includes" - - if test "$ac_ssl_rsaref" = yes; then - LIBSSL="-lssl -lcrypto -lRSAglue -lrsaref" - fi - - if test $ssl_version = "old"; then - AC_DEFINE(HAVE_OLD_SSL_API, 1, [Define if you have OpenSSL < 0.9.6]) - fi -fi - -SSL_INCLUDES= - -if test "$ssl_includes" = "/usr/include"; then - if test -f /usr/kerberos/include/krb5.h; then - SSL_INCLUDES="-I/usr/kerberos/include" - fi -elif test "$ssl_includes" != "/usr/local/include" && test -n "$ssl_includes"; then - SSL_INCLUDES="-I$ssl_includes" -fi - -if test "$ssl_libraries" = "/usr/lib" || test "$ssl_libraries" = "/usr/local/lib" || test -z "$ssl_libraries" || test "$ssl_libraries" = "NONE"; then - SSL_LDFLAGS="" -else - SSL_LDFLAGS="-L$ssl_libraries -R$ssl_libraries" -fi - -AC_SUBST(SSL_INCLUDES) -AC_SUBST(SSL_LDFLAGS) -AC_SUBST(LIBSSL) -]) - -AC_DEFUN([KDE_CHECK_STRLCPY], -[ - AC_REQUIRE([AC_CHECK_STRLCAT]) - AC_REQUIRE([AC_CHECK_STRLCPY]) - AC_CHECK_SIZEOF(size_t) - AC_CHECK_SIZEOF(unsigned long) - - AC_MSG_CHECKING([sizeof size_t == sizeof unsigned long]) - AC_TRY_COMPILE(,[ - #if SIZEOF_SIZE_T != SIZEOF_UNSIGNED_LONG - choke me - #endif - ],AC_MSG_RESULT([yes]),[ - AC_MSG_RESULT(no) - AC_MSG_ERROR([ - Apparently on your system our assumption sizeof size_t == sizeof unsigned long - does not apply. Please mail kde-devel@kde.org with a description of your system! - ]) - ]) -]) - -AC_DEFUN([KDE_CHECK_BINUTILS], -[ - AC_MSG_CHECKING([if ld supports unversioned version maps]) - - kde_save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map" - echo "{ local: extern \"C++\" { foo }; };" > conftest.map - AC_TRY_LINK([int foo;], -[ -#ifdef __INTEL_COMPILER -icc apparently does not support libtools version-info and version-script -at the same time. Dunno where the bug is, but until somebody figured out, -better disable the optional version scripts. -#endif - - foo = 42; -], kde_supports_versionmaps=yes, kde_supports_versionmaps=no) - LDFLAGS="$kde_save_LDFLAGS" - rm -f conftest.map - AM_CONDITIONAL(include_VERSION_SCRIPT, - [test "$kde_supports_versionmaps" = "yes" && test "$kde_use_debug_code" = "no"]) - - AC_MSG_RESULT($kde_supports_versionmaps) -]) - -AC_DEFUN([AM_PROG_OBJC],[ -AC_CHECK_PROGS(OBJC, gcc, gcc) -test -z "$OBJC" && AC_MSG_ERROR([no acceptable objective-c gcc found in \$PATH]) -if test "x${OBJCFLAGS-unset}" = xunset; then - OBJCFLAGS="-g -O2" -fi -AC_SUBST(OBJCFLAGS) -_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES(OBJC)]) -]) - -AC_DEFUN([KDE_CHECK_PERL], -[ - KDE_FIND_PATH(perl, PERL, [$bindir $exec_prefix/bin $prefix/bin], [ - AC_MSG_ERROR([No Perl found in your $PATH. -We need perl to generate some code.]) - ]) - AC_SUBST(PERL) -]) - -AC_DEFUN([KDE_CHECK_LARGEFILE], -[ -AC_SYS_LARGEFILE -if test "$ac_cv_sys_file_offset_bits" != no; then - CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits" -fi - -if test "x$ac_cv_sys_large_files" != "xno"; then - CPPFLAGS="$CPPFLAGS -D_LARGE_FILES=1" -fi - -]) - -dnl A small extension to PKG_CHECK_MODULES (defined in pkg.m4.in) -dnl which allows to search for libs that get installed into the KDE prefix. -dnl -dnl Syntax: KDE_PKG_CHECK_MODULES(KSTUFF, libkexif >= 0.2 glib = 1.3.4, action-if, action-not) -dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page -dnl also defines KSTUFF_PKG_ERRORS on error -AC_DEFUN([KDE_PKG_CHECK_MODULES], [ - - PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" - if test "$prefix" != "$kde_libs_prefix"; then - PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" - fi - export PKG_CONFIG_PATH - PKG_CHECK_MODULES([$1],[$2],[$3],[$4]) -]) - - -dnl Check for PIE support in the compiler and linker -AC_DEFUN([KDE_CHECK_PIE_SUPPORT], -[ - AC_CACHE_CHECK([for PIE support], kde_cv_val_pie_support, - [ - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - safe_CXXFLAGS=$CXXFLAGS - safe_LDFLAGS=$LDFLAGS - CXXFLAGS="$CXXFLAGS -fPIE" - LDFLAGS="$LDFLAGS -pie" - - AC_TRY_LINK([int foo;], [], [kde_cv_val_pie_support=yes], [kde_cv_val_pie_support=no]) - - CXXFLAGS=$safe_CXXFLAGS - LDFLAGS=$safe_LDFLAGS - AC_LANG_RESTORE - ]) - - AC_MSG_CHECKING(if enabling -pie/fPIE support) - - AC_ARG_ENABLE(pie, - AC_HELP_STRING([--enable-pie],[platform supports PIE linking [default=detect]]), - [kde_has_pie_support=$enableval], - [kde_has_pie_support=detect]) - - if test "$kde_has_pie_support" = "detect"; then - kde_has_pie_support=$kde_cv_val_pie_support - fi - - AC_MSG_RESULT([$kde_has_pie_support]) - - KDE_USE_FPIE="" - KDE_USE_PIE="" - - AC_SUBST([KDE_USE_FPIE]) - AC_SUBST([KDE_USE_PIE]) - - if test "$kde_has_pie_support" = "yes"; then - KDE_USE_FPIE="-fPIE" - KDE_USE_PIE="-pie" - fi -]) -# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -## Copyright 1996, 1997, 1998, 1999, 2000, 2001 -## Free Software Foundation, Inc. -## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 -## -## 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -## -## As a special exception to the GNU General Public License, if you -## distribute this file as part of a program that contains a -## configuration script generated by Autoconf, you may include it under -## the same distribution terms that you use for the rest of that program. - -# serial 47 AC_PROG_LIBTOOL - - -# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -# ----------------------------------------------------------- -# If this macro is not defined by Autoconf, define it here. -m4_ifdef([AC_PROVIDE_IFELSE], - [], - [m4_define([AC_PROVIDE_IFELSE], - [m4_ifdef([AC_PROVIDE_$1], - [$2], [$3])])]) - - -# AC_PROG_LIBTOOL -# --------------- -AC_DEFUN([AC_PROG_LIBTOOL], -[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl -dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX -dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. - AC_PROVIDE_IFELSE([AC_PROG_CXX], - [AC_LIBTOOL_CXX], - [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX - ])]) -dnl And a similar setup for Fortran 77 support - AC_PROVIDE_IFELSE([AC_PROG_F77], - [AC_LIBTOOL_F77], - [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 -])]) - -dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. -dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run -dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. - AC_PROVIDE_IFELSE([AC_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [ifdef([AC_PROG_GCJ], - [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) - ifdef([A][M_PROG_GCJ], - [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) - ifdef([LT_AC_PROG_GCJ], - [define([LT_AC_PROG_GCJ], - defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) -])])# AC_PROG_LIBTOOL - - -# _AC_PROG_LIBTOOL -# ---------------- -AC_DEFUN([_AC_PROG_LIBTOOL], -[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl -AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl -AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl -AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent' -AC_SUBST(LIBTOOL)dnl - -# Prevent multiple expansion -define([AC_PROG_LIBTOOL], []) -])# _AC_PROG_LIBTOOL - - -# AC_LIBTOOL_SETUP -# ---------------- -AC_DEFUN([AC_LIBTOOL_SETUP], -[AC_PREREQ(2.50)dnl -AC_REQUIRE([AC_ENABLE_SHARED])dnl -AC_REQUIRE([AC_ENABLE_STATIC])dnl -AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_LD])dnl -AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl -AC_REQUIRE([AC_PROG_NM])dnl - -AC_REQUIRE([AC_PROG_LN_S])dnl -AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl -# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! -AC_REQUIRE([AC_OBJEXT])dnl -AC_REQUIRE([AC_EXEEXT])dnl -dnl - -AC_LIBTOOL_SYS_MAX_CMD_LEN -AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -AC_LIBTOOL_OBJDIR - -AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -_LT_AC_PROG_ECHO_BACKSLASH - -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed='sed -e s/^X//' -[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] - -# Same as above, but do not quote variable references. -[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - -# Constants: -rm="rm -f" - -# Global variables: -default_ofile=libtool -can_build_shared=yes - -# All known linkers require a `.a' archive for static linking (except M$VC, -# which needs '.lib'). -libext=a -ltmain="$ac_aux_dir/ltmain.sh" -ofile="$default_ofile" -with_gnu_ld="$lt_cv_prog_gnu_ld" - -AC_CHECK_TOOL(AR, ar, false) -AC_CHECK_TOOL(RANLIB, ranlib, :) -AC_CHECK_TOOL(STRIP, strip, :) - -old_CC="$CC" -old_CFLAGS="$CFLAGS" - -# Set sane defaults for various variables -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru -test -z "$AS" && AS=as -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$DLLTOOL" && DLLTOOL=dlltool -test -z "$LD" && LD=ld -test -z "$LN_S" && LN_S="ln -s" -test -z "$MAGIC_CMD" && MAGIC_CMD=file -test -z "$NM" && NM=nm -test -z "$SED" && SED=sed -test -z "$OBJDUMP" && OBJDUMP=objdump -test -z "$RANLIB" && RANLIB=: -test -z "$STRIP" && STRIP=: -test -z "$ac_objext" && ac_objext=o - -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" - ;; - *) - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -fi - -# Only perform the check for file, if the check method requires it -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - AC_PATH_MAGIC - fi - ;; -esac - -AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) -AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], -enable_win32_dll=yes, enable_win32_dll=no) - -AC_ARG_ENABLE([libtool-lock], - [AC_HELP_STRING([--disable-libtool-lock], - [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -AC_ARG_WITH([pic], - [AC_HELP_STRING([--with-pic], - [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], - [pic_mode=default]) -test -z "$pic_mode" && pic_mode=default - -# Use C for the default configuration in the libtool script -tagname= -AC_LIBTOOL_LANG_C_CONFIG -_LT_AC_TAGCONFIG -])# AC_LIBTOOL_SETUP - - -# _LT_AC_SYS_COMPILER -# ------------------- -AC_DEFUN([_LT_AC_SYS_COMPILER], -[AC_REQUIRE([AC_PROG_CC])dnl - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# Allow CC to be a program name with arguments. -compiler=$CC -])# _LT_AC_SYS_COMPILER - - -# _LT_AC_SYS_LIBPATH_AIX -# ---------------------- -# Links a minimal program and checks the executable -# for the system default hardcoded library path. In most cases, -# this is /usr/lib:/lib, but when the MPI compilers are used -# the location of the communication and MPI libs are included too. -# If we don't find anything, use the default library path according -# to the aix ld manual. -AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], -[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi],[]) -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -])# _LT_AC_SYS_LIBPATH_AIX - - -# _LT_AC_SHELL_INIT(ARG) -# ---------------------- -AC_DEFUN([_LT_AC_SHELL_INIT], -[ifdef([AC_DIVERSION_NOTICE], - [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], - [AC_DIVERT_PUSH(NOTICE)]) -$1 -AC_DIVERT_POP -])# _LT_AC_SHELL_INIT - - -# _LT_AC_PROG_ECHO_BACKSLASH -# -------------------------- -# Add some code to the start of the generated configure script which -# will find an echo command which doesn't interpret backslashes. -AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], -[_LT_AC_SHELL_INIT([ -# Check that we are running under the correct shell. -SHELL=${CONFIG_SHELL-/bin/sh} - -case X$ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` - ;; -esac - -echo=${ECHO-echo} -if test "X[$]1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X[$]1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then - # Yippee, $echo works! - : -else - # Restart under the correct shell. - exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} -fi - -if test "X[$]1" = X--fallback-echo; then - # used as fallback echo - shift - cat <<EOF -[$]* -EOF - exit 0 -fi - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi - -if test -z "$ECHO"; then -if test "X${echo_test_string+set}" != Xset; then -# find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if (echo_test_string="`eval $cmd`") 2>/dev/null && - echo_test_string="`eval $cmd`" && - (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null - then - break - fi - done -fi - -if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : -else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. - - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do - IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - echo="$dir/echo" - break - fi - done - IFS="$lt_save_ifs" - - if test "X$echo" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - echo='print -r' - elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} - else - # Try using printf. - echo='printf %s\n' - if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - echo="$CONFIG_SHELL [$]0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - echo="$CONFIG_SHELL [$]0 --fallback-echo" - else - # maybe with a smaller string... - prev=: - - for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do - if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null - then - break - fi - prev="$cmd" - done - - if test "$prev" != 'sed 50q "[$]0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} - else - # Oops. We lost completely, so just stick with echo. - echo=echo - fi - fi - fi - fi -fi -fi - -# Copy echo and quote the copy suitably for passing to libtool from -# the Makefile, instead of quoting the original, which is used later. -ECHO=$echo -if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then - ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" -fi - -AC_SUBST(ECHO) -])])# _LT_AC_PROG_ECHO_BACKSLASH - - -# _LT_AC_LOCK -# ----------- -AC_DEFUN([_LT_AC_LOCK], -[AC_ARG_ENABLE([libtool-lock], - [AC_HELP_STRING([--disable-libtool-lock], - [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; - esac - fi - rm -rf conftest* - ;; -*-*-irix6*) - # Find out which ABI we are using. - echo '[#]line __oline__ "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - fi - rm -rf conftest* - ;; - -x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case "`/usr/bin/file conftest.o`" in - *32-bit*) - LINUX_64_MODE="32" - case $host in - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - LINUX_64_MODE="64" - case $host in - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - ppc*-*linux*|powerpc*-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, - [AC_LANG_PUSH(C) - AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) - AC_LANG_POP]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; -AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], -[*-*-cygwin* | *-*-mingw* | *-*-pw32*) - AC_CHECK_TOOL(DLLTOOL, dlltool, false) - AC_CHECK_TOOL(AS, as, false) - AC_CHECK_TOOL(OBJDUMP, objdump, false) - ;; - ]) -esac - -need_locks="$enable_libtool_lock" - -])# _LT_AC_LOCK - - -# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) -# ---------------------------------------------------------------- -# Check whether the given compiler option works -AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], -[AC_REQUIRE([LT_AC_PROG_SED]) -AC_CACHE_CHECK([$1], [$2], - [$2=no - ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) - printf "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - 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 - if test ! -s conftest.err; then - $2=yes - fi - fi - $rm conftest* -]) - -if test x"[$]$2" = xyes; then - ifelse([$5], , :, [$5]) -else - ifelse([$6], , :, [$6]) -fi -])# AC_LIBTOOL_COMPILER_OPTION - - -# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [ACTION-SUCCESS], [ACTION-FAILURE]) -# ------------------------------------------------------------ -# Check whether the given compiler option works -AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], -[AC_CACHE_CHECK([$1], [$2], - [$2=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $3" - printf "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&AS_MESSAGE_LOG_FD - else - $2=yes - fi - fi - $rm conftest* - LDFLAGS="$save_LDFLAGS" -]) - -if test x"[$]$2" = xyes; then - ifelse([$4], , :, [$4]) -else - ifelse([$5], , :, [$5]) -fi -])# AC_LIBTOOL_LINKER_OPTION - - -# AC_LIBTOOL_SYS_MAX_CMD_LEN -# -------------------------- -AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], -[# find the maximum length of command line arguments -AC_MSG_CHECKING([the maximum length of command line arguments]) -AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl - i=0 - testring="ABCD" - - case $build_os in - msdosdjgpp*) - # On DJGPP, this test can blow up pretty badly due to problems in libc - # (any single argument exceeding 2000 bytes causes a buffer overrun - # during glob expansion). Even if it were fixed, the result of this - # check would be larger than it should be. - lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; - - gnu*) - # Under GNU Hurd, this test is not required because there is - # no limit to the length of command line arguments. - # Libtool will interpret -1 as no limit whatsoever - lt_cv_sys_max_cmd_len=-1; - ;; - - cygwin* | mingw*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, - # you end up with a "frozen" computer, even though with patience - # the test eventually succeeds (with a max line length of 256k). - # Instead, let's just punt: use the minimum linelength reported by - # all of the supported platforms: 8192 (on NT/2K/XP). - lt_cv_sys_max_cmd_len=8192; - ;; - - *) - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \ - = "XX$testring") >/dev/null 2>&1 && - new_result=`expr "X$testring" : ".*" 2>&1` && - lt_cv_sys_max_cmd_len=$new_result && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - testring=$testring$testring - done - testring= - # Add a significant safety factor because C++ compilers can tack on massive - # amounts of additional arguments before passing them to the linker. - # It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` - ;; - esac -]) -if test -n $lt_cv_sys_max_cmd_len ; then - AC_MSG_RESULT($lt_cv_sys_max_cmd_len) -else - AC_MSG_RESULT(none) -fi -])# AC_LIBTOOL_SYS_MAX_CMD_LEN - - -# _LT_AC_CHECK_DLFCN -# -------------------- -AC_DEFUN([_LT_AC_CHECK_DLFCN], -[AC_CHECK_HEADERS(dlfcn.h)dnl -])# _LT_AC_CHECK_DLFCN - - -# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, -# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -# ------------------------------------------------------------------ -AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], -[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl -if test "$cross_compiling" = yes; then : - [$4] -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF -[#line __oline__ "configure" -#include "confdefs.h" - -#if HAVE_DLFCN_H -#include <dlfcn.h> -#endif - -#include <stdio.h> - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -#ifdef __cplusplus -extern "C" void exit (int); -#endif - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - - exit (status); -}] -EOF - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) $1 ;; - x$lt_dlneed_uscore) $2 ;; - x$lt_unknown|x*) $3 ;; - esac - else : - # compilation failed - $3 - fi -fi -rm -fr conftest* -])# _LT_AC_TRY_DLOPEN_SELF - - -# AC_LIBTOOL_DLOPEN_SELF -# ------------------- -AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], -[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl -if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - - mingw* | pw32*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; - - darwin*) - # if libdl is installed we need to link against it - AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ]) - ;; - - *) - AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], - [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], - [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], - [AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], - [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], - [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) - ]) - ]) - ]) - ]) - ]) - ;; - esac - - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" - eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - - AC_CACHE_CHECK([whether a program can dlopen itself], - lt_cv_dlopen_self, [dnl - _LT_AC_TRY_DLOPEN_SELF( - lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, - lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) - ]) - - if test "x$lt_cv_dlopen_self" = xyes; then - LDFLAGS="$LDFLAGS $link_static_flag" - AC_CACHE_CHECK([whether a statically linked program can dlopen itself], - lt_cv_dlopen_self_static, [dnl - _LT_AC_TRY_DLOPEN_SELF( - lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, - lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) - ]) - fi - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi -])# AC_LIBTOOL_DLOPEN_SELF - - -# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) -# --------------------------------- -# Check to see if options -c and -o are simultaneously supported by compiler -AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], - [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], - [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no - $rm -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - printf "$lt_simple_compile_test_code" > conftest.$ac_ext - - # According to Tom Tromey, Ian Lance Taylor reported there are C compilers - # that will create temporary files in the current directory regardless of - # the output directory. Thus, making CWD read-only will cause this test - # to fail, enabling locking or at least warning the user not to do parallel - # builds. - chmod -w . - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - if test ! -s out/conftest.err; then - _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - fi - fi - chmod u+w . - $rm conftest* out/* - rmdir out - cd .. - rmdir conftest - $rm conftest* -]) -])# AC_LIBTOOL_PROG_CC_C_O - - -# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) -# ----------------------------------------- -# Check to see if we can do hard links to lock some files if needed -AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], -[AC_REQUIRE([_LT_AC_LOCK])dnl - -hard_links="nottested" -if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - AC_MSG_CHECKING([if we can lock with hard links]) - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - AC_MSG_RESULT([$hard_links]) - if test "$hard_links" = no; then - AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) - need_locks=warn - fi -else - need_locks=no -fi -])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS - - -# AC_LIBTOOL_OBJDIR -# ----------------- -AC_DEFUN([AC_LIBTOOL_OBJDIR], -[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], -[rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - lt_cv_objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - lt_cv_objdir=_libs -fi -rmdir .libs 2>/dev/null]) -objdir=$lt_cv_objdir -])# AC_LIBTOOL_OBJDIR - - -# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) -# ---------------------------------------------- -# Check hardcoding attributes. -AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], -[AC_MSG_CHECKING([how to hardcode library paths into programs]) -_LT_AC_TAGVAR(hardcode_action, $1)= -if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ - test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \ - test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then - - # We can hardcode non-existant directories. - if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && - test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then - # Linking always hardcodes the temporary library directory. - _LT_AC_TAGVAR(hardcode_action, $1)=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - _LT_AC_TAGVAR(hardcode_action, $1)=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - _LT_AC_TAGVAR(hardcode_action, $1)=unsupported -fi -AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) - -if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi -])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH - - -# AC_LIBTOOL_SYS_LIB_STRIP -# ------------------------ -AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], -[striplib= -old_striplib= -AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) -fi - ;; - *) - AC_MSG_RESULT([no]) - ;; - esac -fi -])# AC_LIBTOOL_SYS_LIB_STRIP - - -# AC_LIBTOOL_SYS_DYNAMIC_LINKER -# ----------------------------- -# PORTME Fill in your ld.so characteristics -AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], -[AC_MSG_CHECKING([dynamic linker characteristics]) -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix4* | aix5*) - version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[[01]] | aix4.[[01]].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib<name>.so - # instead of lib<name>.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi4*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32*) - version_type=windows - shrext=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; - mingw*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - ;; - - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext='$(test .$module = .yes && echo .so || echo .dylib)' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -freebsd1*) - dynamic_linker=no - ;; - -kfreebsd*-gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - -freebsd*) - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - *) # from 3.2 on - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - esac - ;; - -gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; - -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case "$host_cpu" in - ia64*) - shrext='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - -# This must be Linux ELF. -linux*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - libsuff= - if test "x$LINUX_64_MODE" = x64; then - # Some platforms are per default 64-bit, so there's no /lib64 - if test -d /lib64 -a ! -h /lib64; then - libsuff=64 - fi - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # 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' - ;; - -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - -newsos6) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -nto-qnx*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -openbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[[89]] | openbsd2.[[89]].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; - -os2*) - libname_spec='$name' - shrext=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -sco3.2v5*) - version_type=osf - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - ;; - -solaris*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; - -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; - -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - export_dynamic_flag_spec='${wl}-Blargedynsym' - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -uts4*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -*) - dynamic_linker=no - ;; -esac -AC_MSG_RESULT([$dynamic_linker]) -test "$dynamic_linker" = no && can_build_shared=no -])# AC_LIBTOOL_SYS_DYNAMIC_LINKER - - -# _LT_AC_TAGCONFIG -# ---------------- -AC_DEFUN([_LT_AC_TAGCONFIG], -[AC_ARG_WITH([tags], - [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], - [include additional configurations @<:@automatic@:>@])], - [tagnames="$withval"]) - -if test -f "$ltmain" && test -n "$tagnames"; then - if test ! -f "${ofile}"; then - AC_MSG_WARN([output file `$ofile' does not exist]) - fi - - if test -z "$LTCC"; then - eval "`$SHELL ${ofile} --config | grep '^LTCC='`" - if test -z "$LTCC"; then - AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) - else - AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) - fi - fi - - # Extract list of available tagged configurations in $ofile. - # Note that this assumes the entire list is on one line. - available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` - - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for tagname in $tagnames; do - IFS="$lt_save_ifs" - # Check whether tagname contains only valid characters - case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in - "") ;; - *) AC_MSG_ERROR([invalid tag name: $tagname]) - ;; - esac - - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null - then - AC_MSG_ERROR([tag name \"$tagname\" already exists]) - fi - - # Update the list of available tags. - if test -n "$tagname"; then - echo appending configuration tag \"$tagname\" to $ofile - - case $tagname in - CXX) - if test -n "$CXX" && test "X$CXX" != "Xno"; then - AC_LIBTOOL_LANG_CXX_CONFIG - else - tagname="" - fi - ;; - - F77) - if test -n "$F77" && test "X$F77" != "Xno"; then - AC_LIBTOOL_LANG_F77_CONFIG - else - tagname="" - fi - ;; - - GCJ) - if test -n "$GCJ" && test "X$GCJ" != "Xno"; then - AC_LIBTOOL_LANG_GCJ_CONFIG - else - tagname="" - fi - ;; - - RC) - AC_LIBTOOL_LANG_RC_CONFIG - ;; - - *) - AC_MSG_ERROR([Unsupported tag name: $tagname]) - ;; - esac - - # Append the new tag name to the list of available tags. - if test -n "$tagname" ; then - available_tags="$available_tags $tagname" - fi - fi - done - IFS="$lt_save_ifs" - - # Now substitute the updated list of available tags. - if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then - mv "${ofile}T" "$ofile" - chmod +x "$ofile" - else - rm -f "${ofile}T" - AC_MSG_ERROR([unable to update list of available tagged configurations.]) - fi -fi -])# _LT_AC_TAGCONFIG - - -# AC_LIBTOOL_DLOPEN -# ----------------- -# enable checks for dlopen support -AC_DEFUN([AC_LIBTOOL_DLOPEN], - [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) -])# AC_LIBTOOL_DLOPEN - - -# AC_LIBTOOL_WIN32_DLL -# -------------------- -# declare package support for building win32 dll's -AC_DEFUN([AC_LIBTOOL_WIN32_DLL], -[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) -])# AC_LIBTOOL_WIN32_DLL - - -# AC_ENABLE_SHARED([DEFAULT]) -# --------------------------- -# implement the --enable-shared flag -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -AC_DEFUN([AC_ENABLE_SHARED], -[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE([shared], - [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], - [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_shared=]AC_ENABLE_SHARED_DEFAULT) -])# AC_ENABLE_SHARED - - -# AC_DISABLE_SHARED -# ----------------- -#- set the default shared flag to --disable-shared -AC_DEFUN([AC_DISABLE_SHARED], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_SHARED(no) -])# AC_DISABLE_SHARED - - -# AC_ENABLE_STATIC([DEFAULT]) -# --------------------------- -# implement the --enable-static flag -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -AC_DEFUN([AC_ENABLE_STATIC], -[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE([static], - [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], - [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_static=]AC_ENABLE_STATIC_DEFAULT) -])# AC_ENABLE_STATIC - - -# AC_DISABLE_STATIC -# ----------------- -# set the default static flag to --disable-static -AC_DEFUN([AC_DISABLE_STATIC], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_STATIC(no) -])# AC_DISABLE_STATIC - - -# AC_ENABLE_FAST_INSTALL([DEFAULT]) -# --------------------------------- -# implement the --enable-fast-install flag -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -AC_DEFUN([AC_ENABLE_FAST_INSTALL], -[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE([fast-install], - [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], - [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) -])# AC_ENABLE_FAST_INSTALL - - -# AC_DISABLE_FAST_INSTALL -# ----------------------- -# set the default to --disable-fast-install -AC_DEFUN([AC_DISABLE_FAST_INSTALL], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_FAST_INSTALL(no) -])# AC_DISABLE_FAST_INSTALL - - -# AC_LIBTOOL_PICMODE([MODE]) -# -------------------------- -# implement the --with-pic flag -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. -AC_DEFUN([AC_LIBTOOL_PICMODE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -pic_mode=ifelse($#,1,$1,default) -])# AC_LIBTOOL_PICMODE - - -# AC_PROG_EGREP -# ------------- -# This is predefined starting with Autoconf 2.54, so this conditional -# definition can be removed once we require Autoconf 2.54 or later. -m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], -[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], - [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' - fi]) - EGREP=$ac_cv_prog_egrep - AC_SUBST([EGREP]) -])]) - - -# AC_PATH_TOOL_PREFIX -# ------------------- -# find a file program which can recognise shared library -AC_DEFUN([AC_PATH_TOOL_PREFIX], -[AC_REQUIRE([AC_PROG_EGREP])dnl -AC_MSG_CHECKING([for $1]) -AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, -[case $MAGIC_CMD in -[[\\/*] | ?:[\\/]*]) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -dnl $ac_dummy forces splitting on constant user-supplied paths. -dnl POSIX.2 word splitting is done only on the output of word expansions, -dnl not every word. This closes a longstanding sh security hole. - ac_dummy="ifelse([$2], , $PATH, [$2])" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$1; then - lt_cv_path_MAGIC_CMD="$ac_dir/$1" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <<EOF 1>&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - AC_MSG_RESULT($MAGIC_CMD) -else - AC_MSG_RESULT(no) -fi -])# AC_PATH_TOOL_PREFIX - - -# AC_PATH_MAGIC -# ------------- -# find a file program which can recognise a shared library -AC_DEFUN([AC_PATH_MAGIC], -[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) - else - MAGIC_CMD=: - fi -fi -])# AC_PATH_MAGIC - - -# AC_PROG_LD -# ---------- -# find the pathname to the GNU or non-GNU linker -AC_DEFUN([AC_PROG_LD], -[AC_ARG_WITH([gnu-ld], - [AC_HELP_STRING([--with-gnu-ld], - [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test "$withval" = no || with_gnu_ld=yes], - [with_gnu_ld=no]) -AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by $CC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]]* | ?:[[\\/]]*) - re_direlt='/[[^/]][[^/]]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL(lt_cv_path_LD, -[if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in - *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break - ;; - *) - test "$with_gnu_ld" != yes && break - ;; - esac - fi - done - IFS="$lt_save_ifs" -else - lt_cv_path_LD="$LD" # Let the user override the test with a path. -fi]) -LD="$lt_cv_path_LD" -if test -n "$LD"; then - AC_MSG_RESULT($LD) -else - AC_MSG_RESULT(no) -fi -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) -AC_PROG_LD_GNU -])# AC_PROG_LD - - -# AC_PROG_LD_GNU -# -------------- -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 -*GNU* | *'with BFD'*) - lt_cv_prog_gnu_ld=yes - ;; -*) - lt_cv_prog_gnu_ld=no - ;; -esac]) -with_gnu_ld=$lt_cv_prog_gnu_ld -])# AC_PROG_LD_GNU - - -# AC_PROG_LD_RELOAD_FLAG -# ---------------------- -# find reload flag for linker -# -- PORTME Some linkers may need a different reload flag. -AC_DEFUN([AC_PROG_LD_RELOAD_FLAG], -[AC_CACHE_CHECK([for $LD option to reload object files], - lt_cv_ld_reload_flag, - [lt_cv_ld_reload_flag='-r']) -reload_flag=$lt_cv_ld_reload_flag -case $reload_flag in -"" | " "*) ;; -*) reload_flag=" $reload_flag" ;; -esac -reload_cmds='$LD$reload_flag -o $output$reload_objs' -])# AC_PROG_LD_RELOAD_FLAG - - -# AC_DEPLIBS_CHECK_METHOD -# ----------------------- -# how to check for library dependencies -# -- PORTME fill in with the dynamic library characteristics -AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], -[AC_CACHE_CHECK([how to recognise dependent libraries], -lt_cv_deplibs_check_method, -[lt_cv_file_magic_cmd='$MAGIC_CMD' -lt_cv_file_magic_test_file= -lt_cv_deplibs_check_method='unknown' -# Need to set the preceding variable on all platforms that support -# interlibrary dependencies. -# 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. -# 'pass_all' -- all dependencies passed with no checks. -# 'test_compile' -- check by making test program. -# 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. - -case $host_os in -aix4* | aix5*) - lt_cv_deplibs_check_method=pass_all - ;; - -beos*) - lt_cv_deplibs_check_method=pass_all - ;; - -bsdi4*) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' - lt_cv_file_magic_test_file=/shlib/libc.so - ;; - -cygwin*) - lt_cv_deplibs_check_method=pass_all - ;; - -mingw* | pw32*) - # win32_libid is a shell function defined in ltmain.sh - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='win32_libid' - ;; - -darwin* | rhapsody*) - # this will be overwritten by pass_all, but leave it in just in case - lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' - lt_cv_file_magic_cmd='/usr/bin/file -L' - case "$host_os" in - rhapsody* | darwin1.[[012]]) - lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System` - ;; - *) # Darwin 1.3 on - lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' - ;; - esac - lt_cv_deplibs_check_method=pass_all - ;; - -freebsd* | kfreebsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; - esac - else - lt_cv_deplibs_check_method=pass_all - fi - ;; - -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file - case "$host_cpu" in - ia64*) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - hppa*64*) - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - irix5* | nonstopux*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" - ;; - *) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1" - ;; - esac - lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` - lt_cv_deplibs_check_method=pass_all - ;; - -# This must be Linux ELF. -linux*) - case $host_cpu in - alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* ) - lt_cv_deplibs_check_method=pass_all ;; - # the debian people say, arm and glibc 2.3.1 works for them with pass_all - arm* ) - lt_cv_deplibs_check_method=pass_all ;; - *) - # glibc up to 2.1.1 does not perform some relocations on ARM - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;; - esac - lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` - ;; - -netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' - fi - ;; - -newos6*) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - -nto-qnx*) - lt_cv_deplibs_check_method=unknown - ;; - -openbsd*) - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object' - else - lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' - fi - ;; - -osf3* | osf4* | osf5*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' - lt_cv_file_magic_test_file=/shlib/libc.so - lt_cv_deplibs_check_method=pass_all - ;; - -sco3.2v5*) - lt_cv_deplibs_check_method=pass_all - ;; - -solaris*) - lt_cv_deplibs_check_method=pass_all - lt_cv_file_magic_test_file=/lib/libc.so - ;; - -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' - ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so - ;; - siemens) - lt_cv_deplibs_check_method=pass_all - ;; - esac - ;; - -sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; -esac -]) -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method -test -z "$deplibs_check_method" && deplibs_check_method=unknown -])# AC_DEPLIBS_CHECK_METHOD - - -# AC_PROG_NM -# ---------- -# find the pathname to a BSD-compatible name lister -AC_DEFUN([AC_PROG_NM], -[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM, -[if test -n "$NM"; then - # Let the user override the test. - lt_cv_path_NM="$NM" -else - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/${ac_tool_prefix}nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - ;; - esac - esac - fi - done - IFS="$lt_save_ifs" - test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm -fi]) -NM="$lt_cv_path_NM" -])# AC_PROG_NM - - -# AC_CHECK_LIBM -# ------------- -# check for math library -AC_DEFUN([AC_CHECK_LIBM], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -LIBM= -case $host in -*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) - # These system don't have libm, or don't need it - ;; -*-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") - AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") - ;; -*) - AC_CHECK_LIB(m, cos, LIBM="-lm") - ;; -esac -])# AC_CHECK_LIBM - - -# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) -# ----------------------------------- -# sets LIBLTDL to the link flags for the libltdl convenience library and -# LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-convenience to the configure arguments. Note that LIBLTDL -# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If -# DIRECTORY is not provided, it is assumed to be `libltdl'. LIBLTDL will -# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with -# '${top_srcdir}/' (note the single quotes!). If your package is not -# flat and you're not using automake, define top_builddir and -# top_srcdir appropriately in the Makefiles. -AC_DEFUN([AC_LIBLTDL_CONVENIENCE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl - case $enable_ltdl_convenience in - no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; - "") enable_ltdl_convenience=yes - ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; - esac - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la - LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) - # For backwards non-gettext consistent compatibility... - INCLTDL="$LTDLINCL" -])# AC_LIBLTDL_CONVENIENCE - - -# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) -# ----------------------------------- -# sets LIBLTDL to the link flags for the libltdl installable library and -# LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-install to the configure arguments. Note that LIBLTDL -# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If -# DIRECTORY is not provided and an installed libltdl is not found, it is -# assumed to be `libltdl'. LIBLTDL will be prefixed with '${top_builddir}/' -# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single -# quotes!). If your package is not flat and you're not using automake, -# define top_builddir and top_srcdir appropriately in the Makefiles. -# In the future, this macro may have to be called after AC_PROG_LIBTOOL. -AC_DEFUN([AC_LIBLTDL_INSTALLABLE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl - AC_CHECK_LIB(ltdl, lt_dlinit, - [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], - [if test x"$enable_ltdl_install" = xno; then - AC_MSG_WARN([libltdl not installed, but installation disabled]) - else - enable_ltdl_install=yes - fi - ]) - if test x"$enable_ltdl_install" = x"yes"; then - ac_configure_args="$ac_configure_args --enable-ltdl-install" - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la - LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) - else - ac_configure_args="$ac_configure_args --enable-ltdl-install=no" - LIBLTDL="-lltdl" - LTDLINCL= - fi - # For backwards non-gettext consistent compatibility... - INCLTDL="$LTDLINCL" -])# AC_LIBLTDL_INSTALLABLE - - -# AC_LIBTOOL_CXX -# -------------- -# enable support for C++ libraries -AC_DEFUN([AC_LIBTOOL_CXX], -[AC_REQUIRE([_LT_AC_LANG_CXX]) -])# AC_LIBTOOL_CXX - - -# _LT_AC_LANG_CXX -# --------------- -AC_DEFUN([_LT_AC_LANG_CXX], -[AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([AC_PROG_CXXCPP]) -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) -])# _LT_AC_LANG_CXX - - -# AC_LIBTOOL_F77 -# -------------- -# enable support for Fortran 77 libraries -AC_DEFUN([AC_LIBTOOL_F77], -[AC_REQUIRE([_LT_AC_LANG_F77]) -])# AC_LIBTOOL_F77 - - -# _LT_AC_LANG_F77 -# --------------- -AC_DEFUN([_LT_AC_LANG_F77], -[AC_REQUIRE([AC_PROG_F77]) -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) -])# _LT_AC_LANG_F77 - - -# AC_LIBTOOL_GCJ -# -------------- -# enable support for GCJ libraries -AC_DEFUN([AC_LIBTOOL_GCJ], -[AC_REQUIRE([_LT_AC_LANG_GCJ]) -])# AC_LIBTOOL_GCJ - - -# _LT_AC_LANG_GCJ -# --------------- -AC_DEFUN([_LT_AC_LANG_GCJ], -[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], - [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], - [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], - [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) -])# _LT_AC_LANG_GCJ - - -# AC_LIBTOOL_RC -# -------------- -# enable support for Windows resource files -AC_DEFUN([AC_LIBTOOL_RC], -[AC_REQUIRE([LT_AC_PROG_RC]) -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC]) -])# AC_LIBTOOL_RC - - -# AC_LIBTOOL_LANG_C_CONFIG -# ------------------------ -# Ensure that the configuration vars for the C compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) -AC_DEFUN([_LT_AC_LANG_C_CONFIG], -[lt_save_CC="$CC" -AC_LANG_PUSH(C) - -# Source file extension for C test sources. -ac_ext=c - -# Object file extension for compiled C test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;\n" - -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}\n' - -_LT_AC_SYS_COMPILER - -# -# Check for any special shared library compilation flags. -# -_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)= -if test "$GCC" = no; then - case $host_os in - sco3.2v5*) - _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf' - ;; - esac -fi -if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then - AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries]) - if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ ]]" >/dev/null; then : - else - AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure]) - _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no - fi -fi - - -# -# Check to make sure the static flag actually works. -# -AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works], - _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), - $_LT_AC_TAGVAR(lt_prog_compiler_static, $1), - [], - [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) - - -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... -AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) -AC_LIBTOOL_PROG_COMPILER_PIC($1) -AC_LIBTOOL_PROG_CC_C_O($1) -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -AC_LIBTOOL_PROG_LD_SHLIBS($1) -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -AC_LIBTOOL_SYS_LIB_STRIP -AC_LIBTOOL_DLOPEN_SELF($1) - -# Report which librarie types wil actually be built -AC_MSG_CHECKING([if libtool supports shared libraries]) -AC_MSG_RESULT([$can_build_shared]) - -AC_MSG_CHECKING([whether to build shared libraries]) -test "$can_build_shared" = "no" && enable_shared=no - -# On AIX, shared libraries and static libraries use the same namespace, and -# are all built from PIC. -case "$host_os" in -aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - -aix4*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - darwin* | rhapsody*) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - case "$host_os" in - rhapsody* | darwin1.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - ;; - 10.*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup' - ;; - esac - fi - ;; - esac - output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; -esac -AC_MSG_RESULT([$enable_shared]) - -AC_MSG_CHECKING([whether to build static libraries]) -# Make sure either enable_shared or enable_static is yes. -test "$enable_shared" = yes || enable_static=yes -AC_MSG_RESULT([$enable_static]) - -AC_LIBTOOL_CONFIG($1) - -AC_LANG_POP -CC="$lt_save_CC" -])# AC_LIBTOOL_LANG_C_CONFIG - - -# AC_LIBTOOL_LANG_CXX_CONFIG -# -------------------------- -# Ensure that the configuration vars for the C compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) -AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], -[AC_LANG_PUSH(C++) -AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([AC_PROG_CXXCPP]) - -_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_AC_TAGVAR(allow_undefined_flag, $1)= -_LT_AC_TAGVAR(always_export_symbols, $1)=no -_LT_AC_TAGVAR(archive_expsym_cmds, $1)= -_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_AC_TAGVAR(hardcode_direct, $1)=no -_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -_LT_AC_TAGVAR(hardcode_minus_L, $1)=no -_LT_AC_TAGVAR(hardcode_automatic, $1)=no -_LT_AC_TAGVAR(module_cmds, $1)= -_LT_AC_TAGVAR(module_expsym_cmds, $1)= -_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown -_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_AC_TAGVAR(no_undefined_flag, $1)= -_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Dependencies to place before and after the object being linked: -_LT_AC_TAGVAR(predep_objects, $1)= -_LT_AC_TAGVAR(postdep_objects, $1)= -_LT_AC_TAGVAR(predeps, $1)= -_LT_AC_TAGVAR(postdeps, $1)= -_LT_AC_TAGVAR(compiler_lib_search_path, $1)= - -# Source file extension for C++ test sources. -ac_ext=cc - -# Object file extension for compiled C++ test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;\n" - -# Code to be used in simple link tests -lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n' - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_AC_SYS_COMPILER - -# Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_LD=$LD -lt_save_GCC=$GCC -GCC=$GXX -lt_save_with_gnu_ld=$with_gnu_ld -lt_save_path_LD=$lt_cv_path_LD -if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx -else - unset lt_cv_prog_gnu_ld -fi -if test -n "${lt_cv_path_LDCXX+set}"; then - lt_cv_path_LD=$lt_cv_path_LDCXX -else - unset lt_cv_path_LD -fi -test -z "${LDCXX+set}" || LD=$LDCXX -CC=${CXX-"c++"} -compiler=$CC -_LT_AC_TAGVAR(compiler, $1)=$CC -cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` - -# We don't want -fno-exception wen compiling C++ code, so set the -# no_builtin_flag separately -if test "$GXX" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' -else - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -fi - -if test "$GXX" = yes; then - # Set up default GNU C++ configuration - - AC_PROG_LD - - # Check if GNU C++ uses GNU ld as the underlying linker, since the - # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - - # If archive_cmds runs LD, not CC, wlarc should be empty - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to - # investigate it a little bit more. (MM) - wlarc='${wl}' - - # ancient GNU ld didn't support --whole-archive et. al. - if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ - grep 'no-whole-archive' > /dev/null; then - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - with_gnu_ld=no - wlarc= - - # A generic and very simple default shared library creation - # command for GNU C++ for the case where it uses the native - # 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 -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib' - fi - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - -else - GXX=no - with_gnu_ld=no - wlarc= -fi - -# PORTME: fill in a description of your system's C++ link characteristics -AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -_LT_AC_TAGVAR(ld_shlibs, $1)=yes -case $host_os in - aix3*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - aix4* | aix5*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # KDE requires run time linking. Make it the default. - aix_use_runtimelinking=yes - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_AC_TAGVAR(archive_cmds, $1)='' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - - if test "$GXX" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - else - # We have old collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= - fi - esac - shared_flag='-shared' - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='-qmkshrobj ${wl}-G' - else - shared_flag='-qmkshrobj' - fi - fi - fi - - # Let the compiler handle the export list. - _LT_AC_TAGVAR(always_export_symbols, $1)=no - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - - _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' - _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # -bexpall does not export symbols beginning with underscore (_) - _LT_AC_TAGVAR(always_export_symbols, $1)=yes - # Exported symbols can be pulled into shared objects from archives - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds it's shared libraries. - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=no - _LT_AC_TAGVAR(always_export_symbols, $1)=no - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - darwin* | rhapsody*) - if test "$GXX" = yes; then - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - case "$host_os" in - rhapsody* | darwin1.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - ;; - 10.*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup' - ;; - esac - fi - ;; - esac - lt_int_apple_cc_single_mod=no - output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes - fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring' - fi - _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' - - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - dgux*) - case $cc_basename in - ec++) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - ghcx) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - freebsd[12]*) - # C++ shared libraries reported to be fairly broken before switch to ELF - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - freebsd-elf*) - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - ;; - freebsd* | kfreebsd*-gnu) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - _LT_AC_TAGVAR(ld_shlibs, $1)=yes - ;; - gnu*) - ;; - hpux9*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - - case $cc_basename in - CC) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - aCC) - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - hpux10*|hpux11*) - if test $with_gnu_ld = no; then - case "$host_cpu" in - hppa*64*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - ia64*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - ;; - *) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - esac - fi - case "$host_cpu" in - hppa*64*) - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - ia64*) - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; - *) - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; - esac - - case $cc_basename in - CC) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - aCC) - case "$host_cpu" in - hppa*64*|ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects' - ;; - esac - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then - case "$host_cpu" in - ia64*|hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects' - ;; - esac - fi - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - irix5* | irix6*) - case $cc_basename in - CC) - # SGI C++ - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' - ;; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' - fi - fi - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - ;; - esac - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - linux*) - case $cc_basename in - KCC) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - ;; - icpc) - # Intel C++ - with_gnu_ld=yes - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; - cxx) - # Compaq C++ - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - - runpath_var=LD_RUN_PATH - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - esac - ;; - lynxos*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - m88k*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - mvs*) - case $cc_basename in - cxx) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - fi - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' - ;; - osf3*) - case $cc_basename in - KCC) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - - ;; - RCC) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - cxx) - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - osf4* | osf5*) - case $cc_basename in - KCC) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' - ;; - RCC) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - cxx) - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ - $rm $lib.exp' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - psos*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - sco*) - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - case $cc_basename in - CC) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - lcc) - # Lucid - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - solaris*) - case $cc_basename in - CC) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The C++ compiler is used as linker so we must use $wl - # flag to pass the commands to the underlying system - # linker. - # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - ;; - esac - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - gcx) - # Green Hills C++ Compiler - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' - - # The C++ compiler must be used to create the archive. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' - ;; - *) - # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' - if $CC --version | grep -v '^2\.7' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" - fi - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' - fi - ;; - esac - ;; - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - ;; - tandem*) - case $cc_basename in - NCC) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - vxworks*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -esac -AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - -_LT_AC_TAGVAR(GCC, $1)="$GXX" -_LT_AC_TAGVAR(LD, $1)="$LD" - -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... -AC_LIBTOOL_POSTDEP_PREDEP($1) -AC_LIBTOOL_PROG_COMPILER_PIC($1) -AC_LIBTOOL_PROG_CC_C_O($1) -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -AC_LIBTOOL_PROG_LD_SHLIBS($1) -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -AC_LIBTOOL_SYS_LIB_STRIP -AC_LIBTOOL_DLOPEN_SELF($1) - -AC_LIBTOOL_CONFIG($1) - -AC_LANG_POP -CC=$lt_save_CC -LDCXX=$LD -LD=$lt_save_LD -GCC=$lt_save_GCC -with_gnu_ldcxx=$with_gnu_ld -with_gnu_ld=$lt_save_with_gnu_ld -lt_cv_path_LDCXX=$lt_cv_path_LD -lt_cv_path_LD=$lt_save_path_LD -lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld -lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -])# AC_LIBTOOL_LANG_CXX_CONFIG - -# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) -# ------------------------ -# Figure out "hidden" library dependencies from verbose -# compiler output when linking a shared library. -# Parse the compiler output and extract the necessary -# objects, libraries and library flags. -AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ -dnl we can't use the lt_simple_compile_test_code here, -dnl because it contains code intended for an executable, -dnl not a library. It's possible we should let each -dnl tag define a new lt_????_link_test_code variable, -dnl but it's only used here... -ifelse([$1],[],[cat > conftest.$ac_ext <<EOF -int a; -void foo (void) { a = 0; } -EOF -],[$1],[CXX],[cat > conftest.$ac_ext <<EOF -class Foo -{ -public: - Foo (void) { a = 0; } -private: - int a; -}; -EOF -],[$1],[F77],[cat > conftest.$ac_ext <<EOF - subroutine foo - implicit none - integer*4 a - a=0 - return - end -EOF -],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF -public class foo { - private int a; - public void bar (void) { - a = 0; - } -}; -EOF -]) -dnl Parse the compiler output and extract the necessary -dnl objects, libraries and library flags. -if AC_TRY_EVAL(ac_compile); then - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. - - # Sentinel used to keep track of whether or not we are before - # the conftest object file. - pre_test_object_deps_done=no - - # The `*' in the case matches for architectures that use `case' in - # $output_verbose_cmd can trigger glob expansion during the loop - # eval without this substitution. - output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`" - - for p in `eval $output_verbose_link_cmd`; do - case $p in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. - # Remove the space. - if test $p = "-L" \ - || test $p = "-R"; then - prev=$p - continue - else - prev= - fi - - if test "$pre_test_object_deps_done" = no; then - case $p in - -L* | -R*) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. - if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then - _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" - else - _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" - fi - ;; - # The "-l" case would never come before the object being - # linked, so don't bother handling this case. - esac - else - if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then - _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}" - else - _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}" - fi - fi - ;; - - *.$objext|*.$libext) - # This assumes that the test object file only shows up - # once in the compiler output. - if test "$p" = "conftest.$objext"; then - pre_test_object_deps_done=yes - continue - fi - - if test "$pre_test_object_deps_done" = no; then - if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then - _LT_AC_TAGVAR(predep_objects, $1)="$p" - else - _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p" - fi - else - if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then - _LT_AC_TAGVAR(postdep_objects, $1)="$p" - else - _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p" - fi - fi - ;; - - *) ;; # Ignore the rest. - - esac - done - - # Clean up. - rm -f a.out a.exe -else - echo "libtool.m4: error: problem compiling $1 test program" -fi - -$rm -f confest.$objext - -case " $_LT_AC_TAGVAR(postdeps, $1) " in -*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; -esac -])# AC_LIBTOOL_POSTDEP_PREDEP - -# AC_LIBTOOL_LANG_F77_CONFIG -# ------------------------ -# Ensure that the configuration vars for the C compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)]) -AC_DEFUN([_LT_AC_LANG_F77_CONFIG], -[AC_REQUIRE([AC_PROG_F77]) -AC_LANG_PUSH(Fortran 77) - -_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_AC_TAGVAR(allow_undefined_flag, $1)= -_LT_AC_TAGVAR(always_export_symbols, $1)=no -_LT_AC_TAGVAR(archive_expsym_cmds, $1)= -_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_AC_TAGVAR(hardcode_direct, $1)=no -_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -_LT_AC_TAGVAR(hardcode_minus_L, $1)=no -_LT_AC_TAGVAR(hardcode_automatic, $1)=no -_LT_AC_TAGVAR(module_cmds, $1)= -_LT_AC_TAGVAR(module_expsym_cmds, $1)= -_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown -_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_AC_TAGVAR(no_undefined_flag, $1)= -_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for f77 test sources. -ac_ext=f - -# Object file extension for compiled f77 test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code=" subroutine t\n return\n end\n" - -# Code to be used in simple link tests -lt_simple_link_test_code=" program t\n end\n" - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_AC_SYS_COMPILER - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -CC=${F77-"f77"} -compiler=$CC -_LT_AC_TAGVAR(compiler, $1)=$CC -cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` - -AC_MSG_CHECKING([if libtool supports shared libraries]) -AC_MSG_RESULT([$can_build_shared]) - -AC_MSG_CHECKING([whether to build shared libraries]) -test "$can_build_shared" = "no" && enable_shared=no - -# On AIX, shared libraries and static libraries use the same namespace, and -# are all built from PIC. -case "$host_os" in -aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; -aix4*) - test "$enable_shared" = yes && enable_static=no - ;; -esac -AC_MSG_RESULT([$enable_shared]) - -AC_MSG_CHECKING([whether to build static libraries]) -# Make sure either enable_shared or enable_static is yes. -test "$enable_shared" = yes || enable_static=yes -AC_MSG_RESULT([$enable_static]) - -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - -_LT_AC_TAGVAR(GCC, $1)="$G77" -_LT_AC_TAGVAR(LD, $1)="$LD" - -AC_LIBTOOL_PROG_COMPILER_PIC($1) -AC_LIBTOOL_PROG_CC_C_O($1) -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -AC_LIBTOOL_PROG_LD_SHLIBS($1) -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -AC_LIBTOOL_SYS_LIB_STRIP - - -AC_LIBTOOL_CONFIG($1) - -AC_LANG_POP -CC="$lt_save_CC" -])# AC_LIBTOOL_LANG_F77_CONFIG - - -# AC_LIBTOOL_LANG_GCJ_CONFIG -# -------------------------- -# Ensure that the configuration vars for the C compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)]) -AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG], -[AC_LANG_SAVE - -# Source file extension for Java test sources. -ac_ext=java - -# Object file extension for compiled Java test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}\n" - -# Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_AC_SYS_COMPILER - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -CC=${GCJ-"gcj"} -compiler=$CC -_LT_AC_TAGVAR(compiler, $1)=$CC - -# GCJ did not exist at the time GCC didn't implicitly link libc in. -_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... -AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) -AC_LIBTOOL_PROG_COMPILER_PIC($1) -AC_LIBTOOL_PROG_CC_C_O($1) -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -AC_LIBTOOL_PROG_LD_SHLIBS($1) -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -AC_LIBTOOL_SYS_LIB_STRIP -AC_LIBTOOL_DLOPEN_SELF($1) - -AC_LIBTOOL_CONFIG($1) - -AC_LANG_RESTORE -CC="$lt_save_CC" -])# AC_LIBTOOL_LANG_GCJ_CONFIG - - -# AC_LIBTOOL_LANG_RC_CONFIG -# -------------------------- -# Ensure that the configuration vars for the Windows resource compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)]) -AC_DEFUN([_LT_AC_LANG_RC_CONFIG], -[AC_LANG_SAVE - -# Source file extension for RC test sources. -ac_ext=rc - -# Object file extension for compiled RC test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' - -# Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_AC_SYS_COMPILER - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -CC=${RC-"windres"} -compiler=$CC -_LT_AC_TAGVAR(compiler, $1)=$CC -_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - -AC_LIBTOOL_CONFIG($1) - -AC_LANG_RESTORE -CC="$lt_save_CC" -])# AC_LIBTOOL_LANG_RC_CONFIG - - -# AC_LIBTOOL_CONFIG([TAGNAME]) -# ---------------------------- -# If TAGNAME is not passed, then create an initial libtool script -# with a default configuration from the untagged config vars. Otherwise -# add code to config.status for appending the configuration named by -# TAGNAME from the matching tagged config vars. -AC_DEFUN([AC_LIBTOOL_CONFIG], -[# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # See if we are running on zsh, and set the options which allow our commands through - # without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ - libname_spec library_names_spec soname_spec extract_expsyms_cmds \ - old_striplib striplib file_magic_cmd finish_cmds finish_eval \ - deplibs_check_method reload_flag reload_cmds need_locks \ - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - old_postinstall_cmds old_postuninstall_cmds \ - _LT_AC_TAGVAR(compiler, $1) \ - _LT_AC_TAGVAR(CC, $1) \ - _LT_AC_TAGVAR(LD, $1) \ - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \ - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \ - _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \ - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \ - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \ - _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \ - _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \ - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \ - _LT_AC_TAGVAR(old_archive_cmds, $1) \ - _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \ - _LT_AC_TAGVAR(predep_objects, $1) \ - _LT_AC_TAGVAR(postdep_objects, $1) \ - _LT_AC_TAGVAR(predeps, $1) \ - _LT_AC_TAGVAR(postdeps, $1) \ - _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ - _LT_AC_TAGVAR(archive_cmds, $1) \ - _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ - _LT_AC_TAGVAR(postinstall_cmds, $1) \ - _LT_AC_TAGVAR(postuninstall_cmds, $1) \ - _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \ - _LT_AC_TAGVAR(allow_undefined_flag, $1) \ - _LT_AC_TAGVAR(no_undefined_flag, $1) \ - _LT_AC_TAGVAR(export_symbols_cmds, $1) \ - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \ - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \ - _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \ - _LT_AC_TAGVAR(hardcode_automatic, $1) \ - _LT_AC_TAGVAR(module_cmds, $1) \ - _LT_AC_TAGVAR(module_expsym_cmds, $1) \ - _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \ - _LT_AC_TAGVAR(exclude_expsyms, $1) \ - _LT_AC_TAGVAR(include_expsyms, $1); do - - case $var in - _LT_AC_TAGVAR(old_archive_cmds, $1) | \ - _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \ - _LT_AC_TAGVAR(archive_cmds, $1) | \ - _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \ - _LT_AC_TAGVAR(module_cmds, $1) | \ - _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ - _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \ - _LT_AC_TAGVAR(export_symbols_cmds, $1) | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; - esac - done - - case $lt_echo in - *'\[$]0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'` - ;; - esac - -ifelse([$1], [], - [cfgfile="${ofile}T" - trap "$rm \"$cfgfile\"; exit 1" 1 2 15 - $rm -f "$cfgfile" - AC_MSG_NOTICE([creating $ofile])], - [cfgfile="$ofile"]) - - cat <<__EOF__ >> "$cfgfile" -ifelse([$1], [], -[#! $SHELL - -# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 -# Free Software Foundation, Inc. -# -# This file is part of GNU Libtool: -# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 -# -# 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# A sed program that does not truncate output. -SED=$lt_SED - -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="$SED -e s/^X//" - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi - -# The names of the tagged configurations supported by this script. -available_tags= - -# ### BEGIN LIBTOOL CONFIG], -[# ### BEGIN LIBTOOL TAG CONFIG: $tagname]) - -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared - -# Whether or not to build static libraries. -build_old_libs=$enable_static - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) - -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install - -# The host system. -host_alias=$host_alias -host=$host - -# An echo program that does not interpret backslashes. -echo=$lt_echo - -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS - -# A C compiler. -LTCC=$lt_LTCC - -# A language-specific compiler. -CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) - -# Is the compiler the GNU C compiler? -with_gcc=$_LT_AC_TAGVAR(GCC, $1) - -# An ERE matcher. -EGREP=$lt_EGREP - -# The linker used to build libraries. -LD=$lt_[]_LT_AC_TAGVAR(LD, $1) - -# Whether we need hard or soft links. -LN_S=$lt_LN_S - -# A BSD-compatible nm program. -NM=$lt_NM - -# A symbol stripping program -STRIP=$STRIP - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD - -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" - -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" - -# Used on cygwin: assembler. -AS="$AS" - -# The name of the directory that contains temporary libtool files. -objdir=$objdir - -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - -# How to pass a linker flag through the compiler. -wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) - -# Object file suffix (normally "o"). -objext="$ac_objext" - -# Old archive suffix (normally "a"). -libext="$libext" - -# Shared library suffix (normally ".so"). -shrext='$shrext' - -# Executable file suffix (normally ""). -exeext="$exeext" - -# Additional compiler flags for building library objects. -pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) -pic_mode=$pic_mode - -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) - -# Must we lock files when doing compilation ? -need_locks=$lt_need_locks - -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix - -# Do we need a version for libraries? -need_version=$need_version - -# Whether dlopen is supported. -dlopen_support=$enable_dlopen - -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1) - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1) - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1) - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1) - -# Library versioning type. -version_type=$version_type - -# Format of library name prefix. -libname_spec=$lt_libname_spec - -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec=$lt_library_names_spec - -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec - -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1) -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1) - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) - -# Commands used to build and install a shared archive. -archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1) -archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1) -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1) -module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1) - -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1) - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1) - -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1) - -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - -# This is the shared library runtime path variable. -runpath_var=$runpath_var - -# This is the shared library path variable. -shlibpath_var=$shlibpath_var - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath - -# How to hardcode a shared library path into an executable. -hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1) - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) - -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) - -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1) - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1) - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1) - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1) - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) - -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)" - -# Set to yes if exported symbols are required. -always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) - -# The commands to list exported symbols. -export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1) - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1) - -# Symbols that must always be exported. -include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1) - -ifelse([$1],[], -[# ### END LIBTOOL CONFIG], -[# ### END LIBTOOL TAG CONFIG: $tagname]) - -__EOF__ - -ifelse([$1],[], [ - case $host_os in - aix3*) - cat <<\EOF >> "$cfgfile" - -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -EOF - ;; - esac - - # We use sed instead of cat because bash on DJGPP gets confused if - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) - - mv -f "$cfgfile" "$ofile" || \ - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" -]) -else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - test -f Makefile && make "$ltmain" -fi -])# AC_LIBTOOL_CONFIG - - -# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) -# ------------------------------------------- -AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl - -_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - -if test "$GCC" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' - - AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], - lt_cv_prog_compiler_rtti_exceptions, - [-fno-rtti -fno-exceptions], [], - [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) -fi -])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI - - -# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -# --------------------------------- -AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], -[AC_REQUIRE([AC_CANONICAL_HOST]) -AC_REQUIRE([AC_PROG_NM]) -AC_REQUIRE([AC_OBJEXT]) -# Check for command to grab the raw symbol name followed by C symbol from nm. -AC_MSG_CHECKING([command to parse $NM output from $compiler object]) -AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], -[ -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] - -# Character class describing NM global symbol codes. -symcode='[[BCDEGRST]]' - -# Regexp to match symbols that can be accessed directly from C. -sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' - -# Transform the above into a raw symbol and a C symbol. -symxfrm='\1 \2\3 \3' - -# Transform an extracted symbol line into a proper C declaration -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" - -# Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - -# Define system-specific variables. -case $host_os in -aix*) - symcode='[[BCDT]]' - ;; -cygwin* | mingw* | pw32*) - symcode='[[ABCDGISTW]]' - ;; -hpux*) # Its linker distinguishes data from code symbols - if test "$host_cpu" = ia64; then - symcode='[[ABCDEGRST]]' - fi - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - ;; -irix* | nonstopux*) - symcode='[[BCDEGRST]]' - ;; -osf*) - symcode='[[BCDEGQRST]]' - ;; -solaris* | sysv5*) - symcode='[[BDT]]' - ;; -sysv4) - symcode='[[DFNSTU]]' - ;; -esac - -# Handle CRLF in mingw tool chain -opt_cr= -case $build_os in -mingw*) - opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp - ;; -esac - -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[[ABCDGISTW]]' ;; -esac - -# Try without a prefix undercore, then with it. -for ac_symprfx in "" "_"; do - - # Write the raw and C identifiers. - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" - - # Check to see that the pipe works correctly. - pipe_works=no - - rm -f conftest* - cat > conftest.$ac_ext <<EOF -#ifdef __cplusplus -extern "C" { -#endif -char nm_test_var; -void nm_test_func(){} -#ifdef __cplusplus -} -#endif -int main(){nm_test_var='a';nm_test_func();return(0);} -EOF - - if AC_TRY_EVAL(ac_compile); then - # Now try to grab the symbols. - nlist=conftest.nm - if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - else - rm -f "$nlist"T - fi - - # Make sure that we snagged all the symbols we need. - if grep ' nm_test_var$' "$nlist" >/dev/null; then - if grep ' nm_test_func$' "$nlist" >/dev/null; then - cat <<EOF > conftest.$ac_ext -#ifdef __cplusplus -extern "C" { -#endif - -EOF - # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' - - cat <<EOF >> conftest.$ac_ext -#if defined (__STDC__) && __STDC__ -# define lt_ptr_t void * -#else -# define lt_ptr_t char * -# define const -#endif - -/* The mapping between symbol names and symbols. */ -const struct { - const char *name; - lt_ptr_t address; -} -lt_preloaded_symbols[[]] = -{ -EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext - cat <<\EOF >> conftest.$ac_ext - {0, (lt_ptr_t) 0} -}; - -#ifdef __cplusplus -} -#endif -EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then - pipe_works=yes - fi - LIBS="$lt_save_LIBS" - CFLAGS="$lt_save_CFLAGS" - else - echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD - fi - else - echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD - cat conftest.$ac_ext >&5 - fi - rm -f conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then - break - else - lt_cv_sys_global_symbol_pipe= - fi -done -]) -if test -z "$lt_cv_sys_global_symbol_pipe"; then - lt_cv_sys_global_symbol_to_cdecl= -fi -if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - AC_MSG_RESULT(failed) -else - AC_MSG_RESULT(ok) -fi -]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE - - -# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) -# --------------------------------------- -AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], -[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)= -_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -_LT_AC_TAGVAR(lt_prog_compiler_static, $1)= - -AC_MSG_CHECKING([for $compiler option to produce PIC]) - ifelse([$1],[CXX],[ - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | os2* | pw32*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - *djgpp*) - # DJGPP does not support shared libraries at all - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - sysv4*MP*) - if test -d /usr/nec; then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case "$host_cpu" in - hppa*64*|ia64*) - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - else - case $host_os in - aix4* | aix5*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - chorus*) - case $cc_basename in - cxch68) - # Green Hills C++ Compiler - # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac - ;; - dgux*) - case $cc_basename in - ec++) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - ghcx) - # Green Hills C++ Compiler - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | kfreebsd*-gnu) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in - CC) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" - if test "$host_cpu" != ia64; then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - fi - ;; - aCC) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" - case "$host_cpu" in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - ;; - *) - ;; - esac - ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux*) - case $cc_basename in - KCC) - # KAI C++ Compiler - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - icpc) - # Intel C++ - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - cxx) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - ;; - esac - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd*) - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - ;; - RCC) - # Rational C++ 2.4.1 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - cxx) - # Digital/Compaq C++ - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - sco*) - case $cc_basename in - CC) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - *) - ;; - esac - ;; - solaris*) - case $cc_basename in - CC) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - gcx) - # Green Hills C++ Compiler - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC) - # Sun C++ 4.x - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - lcc) - # Lucid - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC) - # NonStop-UX NCC 3.20 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - *) - ;; - esac - ;; - unixware*) - ;; - vxworks*) - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -], -[ - if test "$GCC" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - - mingw* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' - ;; - - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - enable_shared=no - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case "$host_cpu" in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - - mingw* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' - ;; - - hpux9* | hpux10* | hpux11*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case "$host_cpu" in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - ;; - - irix5* | irix6* | nonstopux*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC (with -KPIC) is the default. - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - newsos6) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - linux*) - case $CC in - icc* | ecc*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - ccc*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All Alpha code is PIC. - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - esac - ;; - - osf3* | osf4* | osf5*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All OSF/1 code is PIC. - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - sco3.2v5*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn' - ;; - - solaris*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - sunos4*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - uts4*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - *) - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -]) -AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then - AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], - _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), - [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], - [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in - "" | " "*) ;; - *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; - esac], - [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) -fi -case "$host_os" in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" - ;; -esac -]) - - -# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) -# ------------------------------------ -# See if the linker supports building shared libraries. -AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], -[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -ifelse([$1],[CXX],[ - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - case $host_os in - aix4* | aix5*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' - else - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) - _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" - ;; - cygwin* | mingw*) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' - ;; - *) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac -],[ - runpath_var= - _LT_AC_TAGVAR(allow_undefined_flag, $1)= - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no - _LT_AC_TAGVAR(archive_cmds, $1)= - _LT_AC_TAGVAR(archive_expsym_cmds, $1)= - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= - _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= - _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_minus_L, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown - _LT_AC_TAGVAR(hardcode_automatic, $1)=no - _LT_AC_TAGVAR(module_cmds, $1)= - _LT_AC_TAGVAR(module_expsym_cmds, $1)= - _LT_AC_TAGVAR(always_export_symbols, $1)=no - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - _LT_AC_TAGVAR(include_expsyms, $1)= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - extract_expsyms_cmds= - - case $host_os in - cygwin* | mingw* | pw32*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - openbsd*) - with_gnu_ld=no - ;; - esac - - _LT_AC_TAGVAR(ld_shlibs, $1)=yes - if test "$with_gnu_ld" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - - # See if GNU ld supports shared libraries. - case $host_os in - aix3* | aix4* | aix5*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - _LT_AC_TAGVAR(ld_shlibs, $1)=no - cat <<EOF 1>&2 - -*** Warning: the GNU linker, at least up to release 2.9.1, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. - -EOF - fi - ;; - - amigaos*) - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - - # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach <jrb3@best.com> says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=no - _LT_AC_TAGVAR(always_export_symbols, $1)=no - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' - else - ld_shlibs=no - fi - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - - solaris* | sysv5*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - _LT_AC_TAGVAR(ld_shlibs, $1)=no - cat <<EOF 1>&2 - -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -EOF - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - sunos4*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - - if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then - runpath_var=LD_RUN_PATH - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= - fi - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(always_export_symbols, $1)=yes - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$link_static_flag"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported - fi - ;; - - aix4* | aix5*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' - else - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' - fi - - # KDE requires run time linking. Make it the default. - aix_use_runtimelinking=yes - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_AC_TAGVAR(archive_cmds, $1)='' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - - if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - else - # We have old collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= - fi - esac - shared_flag='-shared' - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='-qmkshrobj ${wl}-G' - else - shared_flag='-qmkshrobj' - fi - fi - fi - - # Let the compiler handle the export list. - _LT_AC_TAGVAR(always_export_symbols, $1)=no - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' - _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # -bexpall does not export symbols beginning with underscore (_) - _LT_AC_TAGVAR(always_export_symbols, $1)=yes - # Exported symbols can be pulled into shared objects from archives - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds it's shared libraries. - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - amigaos*) - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - # see comment about different semantics on the GNU ld section - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - - bsdi4*) - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic - ;; - - cygwin* | mingw* | pw32*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=no - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' - # FIXME: Should let the user specify the lib program. - _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; - - darwin* | rhapsody*) - if test "$GXX" = yes ; then - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - case "$host_os" in - rhapsody* | darwin1.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - ;; - 10.*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup' - ;; - esac - fi - ;; - esac - lt_int_apple_cc_single_mod=no - output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes - fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring' - fi - _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - dgux*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - freebsd1*) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - hpux9*) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - - hpux10* | hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case "$host_cpu" in - hppa*64*|ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs' - ;; - esac - else - case "$host_cpu" in - hppa*64*|ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - ;; - esac - fi - if test "$with_gnu_ld" = no; then - case "$host_cpu" in - hppa*64*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - ia64*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - ;; - *) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - fi - ;; - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - newsos6) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - openbsd*) - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac - fi - ;; - - os2*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def' - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - else - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' - - # Both c and cxx compiler support -rpath directly - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - fi - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - sco3.2v5*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ;; - - solaris*) - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; - esac - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4) - case $host_vendor in - sni) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' - _LT_AC_TAGVAR(hardcode_direct, $1)=no - ;; - motorola) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4.3*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - _LT_AC_TAGVAR(ld_shlibs, $1)=yes - fi - ;; - - sysv4.2uw2*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - hardcode_runpath_var=yes - runpath_var=LD_RUN_PATH - ;; - - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text' - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' - fi - runpath_var='LD_RUN_PATH' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv5*) - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' - # $CC -shared without GNU ld will not create a library from C++ - # object files and a static libstdc++, better avoid it by now - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - ;; - - uts4*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - fi -]) -AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - -# -# Do we need to explicitly link libc? -# -case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in -x|xyes) - # Assume -lc should be added - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $_LT_AC_TAGVAR(archive_cmds, $1) in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - AC_MSG_CHECKING([whether -lc should be explicitly linked in]) - $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext - - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) - _LT_AC_TAGVAR(allow_undefined_flag, $1)= - if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) - then - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - else - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - fi - _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $rm conftest* - AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) - ;; - esac - fi - ;; -esac -])# AC_LIBTOOL_PROG_LD_SHLIBS - - -# _LT_AC_FILE_LTDLL_C -# ------------------- -# Be careful that the start marker always follows a newline. -AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ -# /* ltdll.c starts here */ -# #define WIN32_LEAN_AND_MEAN -# #include <windows.h> -# #undef WIN32_LEAN_AND_MEAN -# #include <stdio.h> -# -# #ifndef __CYGWIN__ -# # ifdef __CYGWIN32__ -# # define __CYGWIN__ __CYGWIN32__ -# # endif -# #endif -# -# #ifdef __cplusplus -# extern "C" { -# #endif -# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); -# #ifdef __cplusplus -# } -# #endif -# -# #ifdef __CYGWIN__ -# #include <cygwin/cygwin_dll.h> -# DECLARE_CYGWIN_DLL( DllMain ); -# #endif -# HINSTANCE __hDllInstance_base; -# -# BOOL APIENTRY -# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) -# { -# __hDllInstance_base = hInst; -# return TRUE; -# } -# /* ltdll.c ends here */ -])# _LT_AC_FILE_LTDLL_C - - -# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) -# --------------------------------- -AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) - - -# old names -AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) -AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) -AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) -AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) -AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) -AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) - -# This is just to silence aclocal about the macro not being used -ifelse([AC_DISABLE_FAST_INSTALL]) - -AC_DEFUN([LT_AC_PROG_GCJ], -[AC_CHECK_TOOL(GCJ, gcj, no) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" - AC_SUBST(GCJFLAGS) -]) - -AC_DEFUN([LT_AC_PROG_RC], -[AC_CHECK_TOOL(RC, windres, no) -]) - -############################################################ -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_SED. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # -############################################################ -# LT_AC_PROG_SED -# -------------- -# Check for a fully-functional sed program, that truncates -# as few characters as possible. Prefer GNU sed if found. -AC_DEFUN([LT_AC_PROG_SED], -[AC_MSG_CHECKING([for a sed that does not truncate output]) -AC_CACHE_VAL(lt_cv_path_SED, -[# Loop through the user's path and test for sed and gsed. -# Then use that list of sed's as ones to test for truncation. -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi - done - done -done -lt_ac_max=0 -lt_ac_count=0 -# Add /usr/xpg4/bin/sed as it is typically found on Solaris -# along with /bin/sed that truncates output. -for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && break - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in - # Check for GNU sed and select it if it is found. - if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then - lt_cv_path_SED=$lt_ac_sed - break - fi - while true; do - cat conftest.in conftest.in >conftest.tmp - mv conftest.tmp conftest.in - cp conftest.in conftest.nl - echo >>conftest.nl - $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break - cmp -s conftest.out conftest.nl || break - # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break - lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then - lt_ac_max=$lt_ac_count - lt_cv_path_SED=$lt_ac_sed - fi - done -done -]) -SED=$lt_cv_path_SED -AC_MSG_RESULT([$SED]) -]) - -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 - - 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) - - if $PKG_CONFIG --exists "$2" ; then - AC_MSG_RESULT(yes) - succeeded=yes - - AC_MSG_CHECKING($1_CFLAGS) - $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` - AC_MSG_RESULT($$1_CFLAGS) - - 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 -]) - - diff --git a/aclocal.m4 b/aclocal.m4 deleted file mode 100644 index bb1b2f2..0000000 --- a/aclocal.m4 +++ /dev/null @@ -1,12935 +0,0 @@ -# generated automatically by aclocal 1.7.9 -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. -# This file 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. - - -dnl This file is part of the KDE libraries/packages -dnl Copyright (C) 1997 Janos Farkas (chexum@shadow.banki.hu) -dnl (C) 1997,98,99 Stephan Kulow (coolo@kde.org) - -dnl This file is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Library General Public -dnl License as published by the Free Software Foundation; either -dnl version 2 of the License, or (at your option) any later version. - -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Library General Public License for more details. - -dnl You should have received a copy of the GNU Library General Public License -dnl along with this library; see the file COPYING.LIB. If not, write to -dnl the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -dnl Boston, MA 02110-1301, USA. - -dnl IMPORTANT NOTE: -dnl Please do not modify this file unless you expect your modifications to be -dnl carried into every other module in the repository. -dnl -dnl Single-module modifications are best placed in configure.in for tdelibs -dnl and tdebase or configure.in.in if present. - -# KDE_PATH_X_DIRECT -dnl Internal subroutine of AC_PATH_X. -dnl Set ac_x_includes and/or ac_x_libraries. -AC_DEFUN([KDE_PATH_X_DIRECT], -[ -AC_REQUIRE([KDE_CHECK_LIB64]) - -if test "$ac_x_includes" = NO; then - # Guess where to find include files, by looking for this one X11 .h file. - test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h - - # First, try using that file with no special directory specified. -AC_TRY_CPP([#include <$x_direct_test_include>], -[# We can compile using X headers with no special include directory. -ac_x_includes=], -[# Look for the header file in a standard set of common directories. -# Check X11 before X11Rn because it is often a symlink to the current release. - for ac_dir in \ - /usr/X11/include \ - /usr/X11R6/include \ - /usr/X11R5/include \ - /usr/X11R4/include \ - \ - /usr/include/X11 \ - /usr/include/X11R6 \ - /usr/include/X11R5 \ - /usr/include/X11R4 \ - \ - /usr/local/X11/include \ - /usr/local/X11R6/include \ - /usr/local/X11R5/include \ - /usr/local/X11R4/include \ - \ - /usr/local/include/X11 \ - /usr/local/include/X11R6 \ - /usr/local/include/X11R5 \ - /usr/local/include/X11R4 \ - \ - /usr/X386/include \ - /usr/x386/include \ - /usr/XFree86/include/X11 \ - \ - /usr/include \ - /usr/local/include \ - /usr/unsupported/include \ - /usr/athena/include \ - /usr/local/x11r5/include \ - /usr/lpp/Xamples/include \ - \ - /usr/openwin/include \ - /usr/openwin/share/include \ - ; \ - do - if test -r "$ac_dir/$x_direct_test_include"; then - ac_x_includes=$ac_dir - break - fi - done]) -fi # $ac_x_includes = NO - -if test "$ac_x_libraries" = NO; then - # Check for the libraries. - - test -z "$x_direct_test_library" && x_direct_test_library=Xt - test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc - - # See if we find them without any special options. - # Don't add to $LIBS permanently. - ac_save_LIBS="$LIBS" - LIBS="-l$x_direct_test_library $LIBS" -AC_TRY_LINK([#include <X11/Intrinsic.h>], [${x_direct_test_function}(1)], -[LIBS="$ac_save_LIBS" -# We can link X programs with no special library path. -ac_x_libraries=], -[LIBS="$ac_save_LIBS" -# First see if replacing the include by lib works. -# Check X11 before X11Rn because it is often a symlink to the current release. -for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \ - /usr/X11/lib${tdelibsuff} \ - /usr/X11R6/lib${tdelibsuff} \ - /usr/X11R5/lib${tdelibsuff} \ - /usr/X11R4/lib${tdelibsuff} \ - \ - /usr/lib${tdelibsuff}/X11 \ - /usr/lib${tdelibsuff}/X11R6 \ - /usr/lib${tdelibsuff}/X11R5 \ - /usr/lib${tdelibsuff}/X11R4 \ - \ - /usr/local/X11/lib${tdelibsuff} \ - /usr/local/X11R6/lib${tdelibsuff} \ - /usr/local/X11R5/lib${tdelibsuff} \ - /usr/local/X11R4/lib${tdelibsuff} \ - \ - /usr/local/lib${tdelibsuff}/X11 \ - /usr/local/lib${tdelibsuff}/X11R6 \ - /usr/local/lib${tdelibsuff}/X11R5 \ - /usr/local/lib${tdelibsuff}/X11R4 \ - \ - /usr/X386/lib${tdelibsuff} \ - /usr/x386/lib${tdelibsuff} \ - /usr/XFree86/lib${tdelibsuff}/X11 \ - \ - /usr/lib${tdelibsuff} \ - /usr/local/lib${tdelibsuff} \ - /usr/unsupported/lib${tdelibsuff} \ - /usr/athena/lib${tdelibsuff} \ - /usr/local/x11r5/lib${tdelibsuff} \ - /usr/lpp/Xamples/lib${tdelibsuff} \ - /lib/usr/lib${tdelibsuff}/X11 \ - \ - /usr/openwin/lib${tdelibsuff} \ - /usr/openwin/share/lib${tdelibsuff} \ - ; \ -do -dnl Don't even attempt the hair of trying to link an X program! - for ac_extension in a so sl; do - if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then - ac_x_libraries=$ac_dir - break 2 - fi - done -done]) -fi # $ac_x_libraries = NO -]) - - -dnl ------------------------------------------------------------------------ -dnl Find a file (or one of more files in a list of dirs) -dnl ------------------------------------------------------------------------ -dnl -AC_DEFUN([AC_FIND_FILE], -[ -$3=NO -for i in $2; -do - for j in $1; - do - echo "configure: __oline__: $i/$j" >&AC_FD_CC - if test -r "$i/$j"; then - echo "taking that" >&AC_FD_CC - $3=$i - break 2 - fi - done -done -]) - -dnl KDE_FIND_PATH(program-name, variable-name, list-of-dirs, -dnl if-not-found, test-parameter, prepend-path) -dnl -dnl Look for program-name in list-of-dirs+$PATH. -dnl If prepend-path is set, look in $PATH+list-of-dirs instead. -dnl If found, $variable-name is set. If not, if-not-found is evaluated. -dnl test-parameter: if set, the program is executed with this arg, -dnl and only a successful exit code is required. -AC_DEFUN([KDE_FIND_PATH], -[ - AC_MSG_CHECKING([for $1]) - if test -n "$$2"; then - kde_cv_path="$$2"; - else - kde_cache=`echo $1 | sed 'y%./+-%__p_%'` - - AC_CACHE_VAL(kde_cv_path_$kde_cache, - [ - kde_cv_path="NONE" - kde_save_IFS=$IFS - IFS=':' - dirs="" - for dir in $PATH; do - dirs="$dirs $dir" - done - if test -z "$6"; then dnl Append dirs in PATH (default) - dirs="$3 $dirs" - else dnl Prepend dirs in PATH (if 6th arg is set) - dirs="$dirs $3" - fi - IFS=$kde_save_IFS - - for dir in $dirs; do - if test -x "$dir/$1"; then - if test -n "$5" - then - evalstr="$dir/$1 $5 2>&1 " - if eval $evalstr; then - kde_cv_path="$dir/$1" - break - fi - else - kde_cv_path="$dir/$1" - break - fi - fi - done - - eval "kde_cv_path_$kde_cache=$kde_cv_path" - - ]) - - eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\"" - - fi - - if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - AC_MSG_RESULT(not found) - $4 - else - AC_MSG_RESULT($kde_cv_path) - $2=$kde_cv_path - - fi -]) - -AC_DEFUN([KDE_MOC_ERROR_MESSAGE], -[ - AC_MSG_ERROR([No Qt meta object compiler (moc) found! -Please check whether you installed Qt correctly. -You need to have a running moc binary. -configure tried to run $ac_cv_path_moc and the test didn't -succeed. If configure shouldn't have tried this one, set -the environment variable MOC to the right one before running -configure. -]) -]) - -AC_DEFUN([KDE_UIC_ERROR_MESSAGE], -[ - AC_MSG_WARN([No Qt ui compiler (uic) found! -Please check whether you installed Qt correctly. -You need to have a running uic binary. -configure tried to run $ac_cv_path_uic and the test didn't -succeed. If configure shouldn't have tried this one, set -the environment variable UIC to the right one before running -configure. -]) -]) - - -AC_DEFUN([KDE_CHECK_UIC_FLAG], -[ - AC_MSG_CHECKING([whether uic supports -$1 ]) - kde_cache=`echo $1 | sed 'y% .=/+-%____p_%'` - AC_CACHE_VAL(kde_cv_prog_uic_$kde_cache, - [ - cat >conftest.ui <<EOT - <!DOCTYPE UI><UI version="3" stdsetdef="1"></UI> -EOT - ac_uic_testrun="$UIC_PATH -$1 $2 conftest.ui >/dev/null" - if AC_TRY_EVAL(ac_uic_testrun); then - eval "kde_cv_prog_uic_$kde_cache=yes" - else - eval "kde_cv_prog_uic_$kde_cache=no" - fi - rm -f conftest* - ]) - - if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then - AC_MSG_RESULT([yes]) - : - $3 - else - AC_MSG_RESULT([no]) - : - $4 - fi -]) - - -dnl ------------------------------------------------------------------------ -dnl Find the meta object compiler and the ui compiler in the PATH, -dnl in $TQTDIR/bin, and some more usual places -dnl ------------------------------------------------------------------------ -dnl -AC_DEFUN([AC_PATH_TQT_MOC_UIC], -[ - AC_REQUIRE([KDE_CHECK_PERL]) - qt_bindirs="" - for dir in $kde_qt_dirs; do - qt_bindirs="$qt_bindirs $dir/bin $dir/src/moc" - done - qt_bindirs="$qt_bindirs /usr/bin /usr/X11R6/bin /usr/local/qt/bin" - if test ! "$ac_qt_bindir" = "NO"; then - qt_bindirs="$ac_qt_bindir $qt_bindirs" - fi - - KDE_FIND_PATH(moc, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE]) - if test -z "$UIC_NOT_NEEDED"; then - KDE_FIND_PATH(uic, UIC_PATH, [$qt_bindirs], [UIC_PATH=""]) - if test -z "$UIC_PATH" ; then - KDE_UIC_ERROR_MESSAGE - exit 1 - else - UIC=$UIC_PATH - - if test $kde_qtver = 3; then - KDE_CHECK_UIC_FLAG(L,[/nonexistent],ac_uic_supports_libpath=yes,ac_uic_supports_libpath=no) - KDE_CHECK_UIC_FLAG(nounload,,ac_uic_supports_nounload=yes,ac_uic_supports_nounload=no) - - if test x$ac_uic_supports_libpath = xyes; then - UIC="$UIC -L \$(kde_widgetdir)" - fi - if test x$ac_uic_supports_nounload = xyes; then - UIC="$UIC -nounload" - fi - fi - fi - else - UIC="echo uic not available: " - fi - - AC_SUBST(MOC) - AC_SUBST(UIC) - - UIC_TR="i18n" - if test $kde_qtver = 3; then - UIC_TR="tr2i18n" - fi - - AC_SUBST(UIC_TR) -]) - -AC_DEFUN([KDE_1_CHECK_PATHS], -[ - KDE_1_CHECK_PATH_HEADERS - - KDE_TEST_RPATH= - - if test -n "$USE_RPATH"; then - - if test -n "$kde_libraries"; then - KDE_TEST_RPATH="-R $kde_libraries" - fi - - if test -n "$qt_libraries"; then - KDE_TEST_RPATH="$KDE_TEST_RPATH -R $qt_libraries" - fi - - if test -n "$x_libraries"; then - KDE_TEST_RPATH="$KDE_TEST_RPATH -R $x_libraries" - fi - - KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH" - fi - -AC_MSG_CHECKING([for KDE libraries installed]) -ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBTQT $KDE_TEST_RPATH 1>&5' - -if AC_TRY_EVAL(ac_link) && test -s conftest; then - AC_MSG_RESULT(yes) -else - AC_MSG_ERROR([your system fails at linking a small KDE application! -Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and tdelibs as you did use now. -For more details about this problem, look at the end of config.log.]) -fi - -if eval `TDEDIR= ./conftest 2>&5`; then - kde_result=done -else - kde_result=problems -fi - -TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log -kde_have_all_paths=yes - -KDE_SET_PATHS($kde_result) - -]) - -AC_DEFUN([KDE_SET_PATHS], -[ - kde_cv_all_paths="kde_have_all_paths=\"yes\" \ - kde_htmldir=\"$kde_htmldir\" \ - kde_appsdir=\"$kde_appsdir\" \ - kde_icondir=\"$kde_icondir\" \ - kde_sounddir=\"$kde_sounddir\" \ - kde_datadir=\"$kde_datadir\" \ - kde_locale=\"$kde_locale\" \ - kde_cgidir=\"$kde_cgidir\" \ - kde_confdir=\"$kde_confdir\" \ - kde_kcfgdir=\"$kde_kcfgdir\" \ - kde_mimedir=\"$kde_mimedir\" \ - kde_toolbardir=\"$kde_toolbardir\" \ - kde_wallpaperdir=\"$kde_wallpaperdir\" \ - kde_templatesdir=\"$kde_templatesdir\" \ - kde_bindir=\"$kde_bindir\" \ - kde_servicesdir=\"$kde_servicesdir\" \ - kde_servicetypesdir=\"$kde_servicetypesdir\" \ - kde_moduledir=\"$kde_moduledir\" \ - kde_styledir=\"$kde_styledir\" \ - kde_widgetdir=\"$kde_widgetdir\" \ - xdg_appsdir=\"$xdg_appsdir\" \ - xdg_menudir=\"$xdg_menudir\" \ - xdg_directorydir=\"$xdg_directorydir\" \ - kde_result=$1" -]) - -AC_DEFUN([KDE_SET_DEFAULT_PATHS], -[ -if test "$1" = "default"; then - - if test -z "$kde_htmldir"; then - kde_htmldir='\${datadir}/doc/tde/HTML' - fi - if test -z "$kde_appsdir"; then - kde_appsdir='\${datadir}/applnk' - fi - if test -z "$kde_icondir"; then - kde_icondir='\${datadir}/icons' - fi - if test -z "$kde_sounddir"; then - kde_sounddir='\${datadir}/sounds' - fi - if test -z "$kde_datadir"; then - kde_datadir='\${datadir}/apps' - fi - if test -z "$kde_locale"; then - kde_locale='\${datadir}/locale' - fi - if test -z "$kde_cgidir"; then - kde_cgidir='\${exec_prefix}/cgi-bin' - fi - if test -z "$kde_confdir"; then - kde_confdir='\${datadir}/config' - fi - if test -z "$kde_kcfgdir"; then - kde_kcfgdir='\${datadir}/config.kcfg' - fi - if test -z "$kde_mimedir"; then - kde_mimedir='\${datadir}/mimelnk' - fi - if test -z "$kde_toolbardir"; then - kde_toolbardir='\${datadir}/toolbar' - fi - if test -z "$kde_wallpaperdir"; then - kde_wallpaperdir='\${datadir}/wallpapers' - fi - if test -z "$kde_templatesdir"; then - kde_templatesdir='\${datadir}/templates' - fi - if test -z "$kde_bindir"; then - kde_bindir='\${exec_prefix}/bin' - fi - if test -z "$kde_servicesdir"; then - kde_servicesdir='\${datadir}/services' - fi - if test -z "$kde_servicetypesdir"; then - kde_servicetypesdir='\${datadir}/servicetypes' - fi - if test -z "$kde_moduledir"; then - if test "$kde_qtver" = "2"; then - kde_moduledir='\${libdir}/kde2' - else - kde_moduledir='\${libdir}/kde3' - fi - fi - if test -z "$kde_styledir"; then - kde_styledir='\${libdir}/kde3/plugins/styles' - fi - if test -z "$kde_widgetdir"; then - kde_widgetdir='\${libdir}/kde3/plugins/designer' - fi - if test -z "$xdg_appsdir"; then - xdg_appsdir='\${datadir}/applications/tde' - fi - if test -z "$xdg_menudir"; then - xdg_menudir='\${sysconfdir}/xdg/menus' - fi - if test -z "$xdg_directorydir"; then - xdg_directorydir='\${datadir}/desktop-directories' - fi - - KDE_SET_PATHS(defaults) - -else - - if test $kde_qtver = 1; then - AC_MSG_RESULT([compiling]) - KDE_1_CHECK_PATHS - else - AC_MSG_ERROR([path checking not yet supported for KDE 2]) - fi - -fi -]) - -AC_DEFUN([KDE_CHECK_PATHS_FOR_COMPLETENESS], -[ if test -z "$kde_htmldir" || test -z "$kde_appsdir" || - test -z "$kde_icondir" || test -z "$kde_sounddir" || - test -z "$kde_datadir" || test -z "$kde_locale" || - test -z "$kde_cgidir" || test -z "$kde_confdir" || - test -z "$kde_kcfgdir" || - test -z "$kde_mimedir" || test -z "$kde_toolbardir" || - test -z "$kde_wallpaperdir" || test -z "$kde_templatesdir" || - test -z "$kde_bindir" || test -z "$kde_servicesdir" || - test -z "$kde_servicetypesdir" || test -z "$kde_moduledir" || - test -z "$kde_styledir" || test -z "kde_widgetdir" || - test -z "$xdg_appsdir" || test -z "$xdg_menudir" || test -z "$xdg_directorydir" || - test "x$kde_have_all_paths" != "xyes"; then - kde_have_all_paths=no - fi -]) - -AC_DEFUN([KDE_MISSING_PROG_ERROR], -[ - AC_MSG_ERROR([The important program $1 was not found! -Please check whether you installed KDE correctly. -]) -]) - -AC_DEFUN([KDE_MISSING_ARTS_ERROR], -[ - AC_MSG_ERROR([The important program $1 was not found! -Please check whether you installed aRts correctly or use ---without-arts to compile without aRts support (this will remove functionality). -]) -]) - -AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], -[ - kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" - test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs" - if test -n "$TDEDIRS"; then - kde_save_IFS=$IFS - IFS=: - for dir in $TDEDIRS; do - kde_default_bindirs="$dir/bin $kde_default_bindirs " - done - IFS=$kde_save_IFS - fi -]) - -AC_DEFUN([KDE_SUBST_PROGRAMS], -[ - AC_ARG_WITH(arts, - AC_HELP_STRING([--without-arts],[build without aRts [default=no]]), - [build_arts=$withval], - [build_arts=yes] - ) - AM_CONDITIONAL(include_ARTS, test "$build_arts" '!=' "no") - if test "$build_arts" = "no"; then - AC_DEFINE(WITHOUT_ARTS, 1, [Defined if compiling without arts]) - fi - - KDE_SET_DEFAULT_BINDIRS - kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs" - KDE_FIND_PATH(dcopidl, DCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)]) - KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp)]) - if test "$build_arts" '!=' "no"; then - KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)]) - KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)]) - fi - KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs]) - - kde32ornewer=1 - kde33ornewer=1 - if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then - kde32ornewer= - kde33ornewer= - else - if test "$kde_qtver" = "3"; then - if test "$kde_qtsubver" -le 1; then - kde32ornewer= - fi - if test "$kde_qtsubver" -le 2; then - kde33ornewer= - fi - if test "$KDECONFIG" != "compiled"; then - if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then - kde33ornewer= - fi - fi - fi - fi - - if test -n "$kde32ornewer"; then - KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)]) - KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) - fi - if test -n "$kde33ornewer"; then - KDE_FIND_PATH(maketdewidgets, MAKETDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)]) - AC_SUBST(MAKETDEWIDGETS) - fi - KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) - - if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then - kde_sharedirs="$prefix/share /opt/trinity/share /opt/trinity/share /opt/kde/share /usr/share/kde /usr/local/share /usr/share" - test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs" - AC_FIND_FILE(apps/ksgmltools2/customization/tde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) - if test "$KDE_XSL_STYLESHEET" = "NO"; then - KDE_XSL_STYLESHEET="" - else - KDE_XSL_STYLESHEET="$KDE_XSL_STYLESHEET/apps/ksgmltools2/customization/tde-chunk.xsl" - fi - fi - - DCOP_DEPENDENCIES='$(DCOPIDL)' - if test -n "$kde32ornewer"; then - KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)' - DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)' - AC_SUBST(KCONFIG_COMPILER) - AC_SUBST(KCFG_DEPENDENCIES) - AC_SUBST(DCOPIDLNG) - fi - AC_SUBST(DCOPIDL) - AC_SUBST(DCOPIDL2CPP) - AC_SUBST(DCOP_DEPENDENCIES) - AC_SUBST(MCOPIDL) - AC_SUBST(ARTSCCONFIG) - AC_SUBST(MEINPROC) - AC_SUBST(KDE_XSL_STYLESHEET) - AC_SUBST(XMLLINT) -])dnl - -AC_DEFUN([AC_CREATE_KFSSTND], -[ -AC_REQUIRE([AC_CHECK_RPATH]) - -AC_MSG_CHECKING([for KDE paths]) -kde_result="" -kde_cached_paths=yes -AC_CACHE_VAL(kde_cv_all_paths, -[ - KDE_SET_DEFAULT_PATHS($1) - kde_cached_paths=no -]) -eval "$kde_cv_all_paths" -KDE_CHECK_PATHS_FOR_COMPLETENESS -if test "$kde_have_all_paths" = "no" && test "$kde_cached_paths" = "yes"; then - # wrong values were cached, may be, we can set better ones - kde_result= - kde_htmldir= kde_appsdir= kde_icondir= kde_sounddir= - kde_datadir= kde_locale= kde_cgidir= kde_confdir= kde_kcfgdir= - kde_mimedir= kde_toolbardir= kde_wallpaperdir= kde_templatesdir= - kde_bindir= kde_servicesdir= kde_servicetypesdir= kde_moduledir= - kde_have_all_paths= - kde_styledir= - kde_widgetdir= - xdg_appsdir = xdg_menudir= xdg_directorydir= - KDE_SET_DEFAULT_PATHS($1) - eval "$kde_cv_all_paths" - KDE_CHECK_PATHS_FOR_COMPLETENESS - kde_result="$kde_result (cache overridden)" -fi -if test "$kde_have_all_paths" = "no"; then - AC_MSG_ERROR([configure could not run a little KDE program to test the environment. -Since it had compiled and linked before, it must be a strange problem on your system. -Look at config.log for details. If you are not able to fix this, look at -http://www.kde.org/faq/installation.html or any www.kde.org mirror. -(If you're using an egcs version on Linux, you may update binutils!) -]) -else - rm -f conftest* - AC_MSG_RESULT($kde_result) -fi - -bindir=$kde_bindir - -KDE_SUBST_PROGRAMS - -]) - -AC_DEFUN([AC_SUBST_KFSSTND], -[ -AC_SUBST(kde_htmldir) -AC_SUBST(kde_appsdir) -AC_SUBST(kde_icondir) -AC_SUBST(kde_sounddir) -AC_SUBST(kde_datadir) -AC_SUBST(kde_locale) -AC_SUBST(kde_confdir) -AC_SUBST(kde_kcfgdir) -AC_SUBST(kde_mimedir) -AC_SUBST(kde_wallpaperdir) -AC_SUBST(kde_bindir) -dnl X Desktop Group standards -AC_SUBST(xdg_appsdir) -AC_SUBST(xdg_menudir) -AC_SUBST(xdg_directorydir) -dnl for KDE 2 -AC_SUBST(kde_templatesdir) -AC_SUBST(kde_servicesdir) -AC_SUBST(kde_servicetypesdir) -AC_SUBST(kde_moduledir) -AC_SUBST(tdeinitdir, '$(kde_moduledir)') -AC_SUBST(kde_styledir) -AC_SUBST(kde_widgetdir) -if test "$kde_qtver" = 1; then - kde_minidir="$kde_icondir/mini" -else -# for KDE 1 - this breaks KDE2 apps using minidir, but -# that's the plan ;-/ - kde_minidir="/dev/null" -fi -dnl AC_SUBST(kde_minidir) -dnl AC_SUBST(kde_cgidir) -dnl AC_SUBST(kde_toolbardir) -]) - -AC_DEFUN([KDE_MISC_TESTS], -[ - dnl Checks for libraries. - AC_CHECK_LIB(util, main, [LIBUTIL="-lutil"]) dnl for *BSD - AC_SUBST(LIBUTIL) - AC_CHECK_LIB(compat, main, [LIBCOMPAT="-lcompat"]) dnl for *BSD - AC_SUBST(LIBCOMPAT) - kde_have_crypt= - AC_CHECK_LIB(crypt, crypt, [LIBCRYPT="-lcrypt"; kde_have_crypt=yes], - AC_CHECK_LIB(c, crypt, [kde_have_crypt=yes], [ - AC_MSG_WARN([you have no crypt in either libcrypt or libc. -You should install libcrypt from another source or configure with PAM -support]) - kde_have_crypt=no - ])) - AC_SUBST(LIBCRYPT) - if test $kde_have_crypt = yes; then - AC_DEFINE_UNQUOTED(HAVE_CRYPT, 1, [Defines if your system has the crypt function]) - fi - AC_CHECK_SOCKLEN_T - AC_CHECK_LIB(dnet, dnet_ntoa, [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"]) - if test $ac_cv_lib_dnet_dnet_ntoa = no; then - AC_CHECK_LIB(dnet_stub, dnet_ntoa, - [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"]) - fi - AC_CHECK_FUNC(inet_ntoa) - if test $ac_cv_func_inet_ntoa = no; then - AC_CHECK_LIB(nsl, inet_ntoa, X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl") - fi - AC_CHECK_FUNC(connect) - if test $ac_cv_func_connect = no; then - AC_CHECK_LIB(socket, connect, X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS", , - $X_EXTRA_LIBS) - fi - - AC_CHECK_FUNC(remove) - if test $ac_cv_func_remove = no; then - AC_CHECK_LIB(posix, remove, X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix") - fi - - # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - AC_CHECK_FUNC(shmat, , - AC_CHECK_LIB(ipc, shmat, X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc")) - - # more headers that need to be explicitly included on darwin - AC_CHECK_HEADERS(sys/types.h stdint.h) - - # sys/bitypes.h is needed for uint32_t and friends on Tru64 - AC_CHECK_HEADERS(sys/bitypes.h) - - # darwin requires a poll emulation library - AC_CHECK_LIB(poll, poll, LIB_POLL="-lpoll") - - # for some image handling on Mac OS X - AC_CHECK_HEADERS(Carbon/Carbon.h) - - # CoreAudio framework - AC_CHECK_HEADER(CoreAudio/CoreAudio.h, [ - AC_DEFINE(HAVE_COREAUDIO, 1, [Define if you have the CoreAudio API]) - FRAMEWORK_COREAUDIO="-Wl,-framework,CoreAudio" - ]) - - AC_CHECK_RES_INIT - AC_SUBST(LIB_POLL) - AC_SUBST(FRAMEWORK_COREAUDIO) - LIBSOCKET="$X_EXTRA_LIBS" - AC_SUBST(LIBSOCKET) - AC_SUBST(X_EXTRA_LIBS) - AC_CHECK_LIB(ucb, killpg, [LIBUCB="-lucb"]) dnl for Solaris2.4 - AC_SUBST(LIBUCB) - - case $host in dnl this *is* LynxOS specific - *-*-lynxos* ) - AC_MSG_CHECKING([LynxOS header file wrappers]) - [CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"] - AC_MSG_RESULT(disabled) - AC_CHECK_LIB(bsd, gethostbyname, [LIBSOCKET="-lbsd"]) dnl for LynxOS - ;; - esac - - KDE_CHECK_TYPES - KDE_CHECK_LIBDL - KDE_CHECK_STRLCPY - KDE_CHECK_PIE_SUPPORT - -# darwin needs this to initialize the environment -AC_CHECK_HEADERS(crt_externs.h) -AC_CHECK_FUNC(_NSGetEnviron, [AC_DEFINE(HAVE_NSGETENVIRON, 1, [Define if your system needs _NSGetEnviron to set up the environment])]) - -AH_VERBATIM(_DARWIN_ENVIRON, -[ -#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H) -# include <sys/time.h> -# include <crt_externs.h> -# define environ (*_NSGetEnviron()) -#endif -]) - -AH_VERBATIM(_AIX_STRINGS_H_BZERO, -[ -/* - * AIX defines FD_SET in terms of bzero, but fails to include <strings.h> - * that defines bzero. - */ - -#if defined(_AIX) -#include <strings.h> -#endif -]) - -AC_CHECK_FUNCS([vsnprintf snprintf]) - -AH_VERBATIM(_TRU64,[ -/* - * On HP-UX, the declaration of vsnprintf() is needed every time ! - */ - -#if !defined(HAVE_VSNPRINTF) || defined(hpux) -#if __STDC__ -#include <stdarg.h> -#include <stdlib.h> -#else -#include <varargs.h> -#endif -#ifdef __cplusplus -extern "C" -#endif -int vsnprintf(char *str, size_t n, char const *fmt, va_list ap); -#ifdef __cplusplus -extern "C" -#endif -int snprintf(char *str, size_t n, char const *fmt, ...); -#endif -]) - -]) - -dnl ------------------------------------------------------------------------ -dnl Find the header files and libraries for X-Windows. Extended the -dnl macro AC_PATH_X -dnl ------------------------------------------------------------------------ -dnl -AC_DEFUN([K_PATH_X], -[ -AC_REQUIRE([KDE_MISC_TESTS])dnl -AC_REQUIRE([KDE_CHECK_LIB64]) - -AC_ARG_ENABLE( - embedded, - AC_HELP_STRING([--enable-embedded],[link to Qt-embedded, don't use X]), - kde_use_qt_emb=$enableval, - kde_use_qt_emb=no -) - -AC_ARG_ENABLE( - qtopia, - AC_HELP_STRING([--enable-qtopia],[link to Qt-embedded, link to the Qtopia Environment]), - kde_use_qt_emb_palm=$enableval, - kde_use_qt_emb_palm=no -) - -AC_ARG_ENABLE( - mac, - AC_HELP_STRING([--enable-mac],[link to Qt/Mac (don't use X)]), - kde_use_qt_mac=$enableval, - kde_use_qt_mac=no -) - -# used to disable x11-specific stuff on special platforms -AM_CONDITIONAL(include_x11, test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no") - -if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then - -AC_MSG_CHECKING(for X) - -AC_CACHE_VAL(kde_cv_have_x, -[# One or both of the vars are not set, and there is no cached value. -if test "{$x_includes+set}" = set || test "$x_includes" = NONE; then - kde_x_includes=NO -else - kde_x_includes=$x_includes -fi -if test "{$x_libraries+set}" = set || test "$x_libraries" = NONE; then - kde_x_libraries=NO -else - kde_x_libraries=$x_libraries -fi - -# below we use the standard autoconf calls -ac_x_libraries=$kde_x_libraries -ac_x_includes=$kde_x_includes - -KDE_PATH_X_DIRECT -dnl AC_PATH_X_XMKMF picks /usr/lib as the path for the X libraries. -dnl Unfortunately, if compiling with the N32 ABI, this is not the correct -dnl location. The correct location is /usr/lib32 or an undefined value -dnl (the linker is smart enough to pick the correct default library). -dnl Things work just fine if you use just AC_PATH_X_DIRECT. -dnl Solaris has a similar problem. AC_PATH_X_XMKMF forces x_includes to -dnl /usr/openwin/include, which doesn't work. /usr/include does work, so -dnl x_includes should be left alone. -case "$host" in -mips-sgi-irix6*) - ;; -*-*-solaris*) - ;; -*) - _AC_PATH_X_XMKMF - if test -z "$ac_x_includes"; then - ac_x_includes="." - fi - if test -z "$ac_x_libraries"; then - ac_x_libraries="/usr/lib${tdelibsuff}" - fi -esac -#from now on we use our own again - -# when the user already gave --x-includes, we ignore -# what the standard autoconf macros told us. -if test "$kde_x_includes" = NO; then - kde_x_includes=$ac_x_includes -fi - -# for --x-libraries too -if test "$kde_x_libraries" = NO; then - kde_x_libraries=$ac_x_libraries -fi - -if test "$kde_x_includes" = NO; then - AC_MSG_ERROR([Can't find X includes. Please check your installation and add the correct paths!]) -fi - -if test "$kde_x_libraries" = NO; then - AC_MSG_ERROR([Can't find X libraries. Please check your installation and add the correct paths!]) -fi - -# Record where we found X for the cache. -kde_cv_have_x="have_x=yes \ - kde_x_includes=$kde_x_includes kde_x_libraries=$kde_x_libraries" -])dnl - -eval "$kde_cv_have_x" - -if test "$have_x" != yes; then - AC_MSG_RESULT($have_x) - no_x=yes -else - AC_MSG_RESULT([libraries $kde_x_libraries, headers $kde_x_includes]) -fi - -if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then - X_INCLUDES="" - x_includes="."; dnl better than nothing :- - else - x_includes=$kde_x_includes - X_INCLUDES="-I$x_includes" -fi - -if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE || test "$kde_x_libraries" = "/usr/lib"; then - X_LDFLAGS="" - x_libraries="/usr/lib"; dnl better than nothing :- - else - x_libraries=$kde_x_libraries - X_LDFLAGS="-L$x_libraries" -fi -all_includes="$X_INCLUDES" -all_libraries="$X_LDFLAGS $LDFLAGS_AS_NEEDED $LDFLAGS_NEW_DTAGS" - -# Check for libraries that X11R6 Xt/Xaw programs need. -ac_save_LDFLAGS="$LDFLAGS" -LDFLAGS="$LDFLAGS $X_LDFLAGS" -# SM needs ICE to (dynamically) link under SunOS 4.x (so we have to -# check for ICE first), but we must link in the order -lSM -lICE or -# we get undefined symbols. So assume we have SM if we have ICE. -# These have to be linked with before -lX11, unlike the other -# libraries we check for below, so use a different variable. -# --interran@uluru.Stanford.EDU, kb@cs.umb.edu. -AC_CHECK_LIB(ICE, IceConnectionNumber, - [LIBSM="-lSM -lICE"], , $X_EXTRA_LIBS) -LDFLAGS="$ac_save_LDFLAGS" - -LIB_X11='-lX11 $(LIBSOCKET)' - -AC_MSG_CHECKING(for libXext) -AC_CACHE_VAL(kde_cv_have_libXext, -[ -kde_ldflags_safe="$LDFLAGS" -kde_libs_safe="$LIBS" - -LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS" -LIBS="-lXext -lX11 $LIBSOCKET" - -AC_TRY_LINK([ -#include <stdio.h> -#ifdef STDC_HEADERS -# include <stdlib.h> -#endif -], -[ -printf("hello Xext\n"); -], -kde_cv_have_libXext=yes, -kde_cv_have_libXext=no -) - -LDFLAGS=$kde_ldflags_safe -LIBS=$kde_libs_safe -]) - -AC_MSG_RESULT($kde_cv_have_libXext) - -if test "$kde_cv_have_libXext" = "no"; then - AC_MSG_ERROR([We need a working libXext to proceed. Since configure -can't find it itself, we stop here assuming that make wouldn't find -them either.]) -fi - -LIB_XEXT="-lXext" -QTE_NORTTI="" - -elif test "$kde_use_qt_emb" = "yes"; then - dnl We're using QT Embedded - CPPFLAGS=-DQWS - CXXFLAGS="$CXXFLAGS -fno-rtti" - QTE_NORTTI="-fno-rtti -DQWS" - X_PRE_LIBS="" - LIB_X11="" - LIB_XEXT="" - LIB_XRENDER="" - LIBSM="" - X_INCLUDES="" - X_LDFLAGS="" - x_includes="" - x_libraries="" -elif test "$kde_use_qt_mac" = "yes"; then - dnl We're using QT/Mac (I use QT_MAC so that qglobal.h doesn't *have* to - dnl be included to get the information) --Sam - CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp" - CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp" - X_PRE_LIBS="" - LIB_X11="" - LIB_XEXT="" - LIB_XRENDER="" - LIBSM="" - X_INCLUDES="" - X_LDFLAGS="" - x_includes="" - x_libraries="" -fi -AC_SUBST(X_PRE_LIBS) -AC_SUBST(LIB_X11) -AC_SUBST(LIB_XRENDER) -AC_SUBST(LIBSM) -AC_SUBST(X_INCLUDES) -AC_SUBST(X_LDFLAGS) -AC_SUBST(x_includes) -AC_SUBST(x_libraries) -AC_SUBST(QTE_NORTTI) -AC_SUBST(LIB_XEXT) - -]) - -AC_DEFUN([KDE_PRINT_QT_PROGRAM], -[ -AC_REQUIRE([KDE_USE_TQT]) -cat > conftest.$ac_ext <<EOF -#include "confdefs.h" -#include <qglobal.h> -#include <qapplication.h> -EOF -if test "$kde_qtver" = "2"; then -cat >> conftest.$ac_ext <<EOF -#include <qevent.h> -#include <qstring.h> -#include <qstyle.h> -EOF - -if test $kde_qtsubver -gt 0; then -cat >> conftest.$ac_ext <<EOF -#if QT_VERSION < 210 -#error 1 -#endif -EOF -fi -fi - -if test "$kde_qtver" = "3"; then -cat >> conftest.$ac_ext <<EOF -#include <qcursor.h> -#include <qstylefactory.h> -#include <private/qucomextra_p.h> -EOF -fi - -echo "#if ! ($kde_qt_verstring)" >> conftest.$ac_ext -cat >> conftest.$ac_ext <<EOF -#error 1 -#endif - -int main() { -EOF -if test "$kde_qtver" = "2"; then -cat >> conftest.$ac_ext <<EOF - QStringList *t = new QStringList(); - Q_UNUSED(t); -EOF -if test $kde_qtsubver -gt 0; then -cat >> conftest.$ac_ext <<EOF - QString s; - s.setLatin1("Elvis is alive", 14); -EOF -fi -fi -if test "$kde_qtver" = "3"; then -cat >> conftest.$ac_ext <<EOF - (void)QStyleFactory::create(QString::null); - QCursor c(Qt::WhatsThisCursor); -EOF -fi -cat >> conftest.$ac_ext <<EOF - return 0; -} -EOF -]) - -AC_DEFUN([KDE_USE_TQT], -[ -if test -z "$1"; then - # Current default Qt version: 3.3 - kde_qtver=3 - kde_qtsubver=3 -else - kde_qtsubver=`echo "$1" | sed -e 's#[0-9][0-9]*\.\([0-9][0-9]*\).*#\1#'` - # following is the check if subversion isnt found in passed argument - if test "$kde_qtsubver" = "$1"; then - kde_qtsubver=1 - fi - kde_qtver=`echo "$1" | sed -e 's#^\([0-9][0-9]*\)\..*#\1#'` - if test "$kde_qtver" = "1"; then - kde_qtsubver=42 - fi -fi - -if test -z "$2"; then - if test "$kde_qtver" = "2"; then - if test $kde_qtsubver -gt 0; then - kde_qt_minversion=">= Qt 2.2.2" - else - kde_qt_minversion=">= Qt 2.0.2" - fi - fi - if test "$kde_qtver" = "3"; then - if test $kde_qtsubver -gt 0; then - if test $kde_qtsubver -gt 1; then - if test $kde_qtsubver -gt 2; then - kde_qt_minversion=">= Qt 3.3 and < 4.0" - else - kde_qt_minversion=">= Qt 3.2 and < 4.0" - fi - else - kde_qt_minversion=">= Qt 3.1 (20021021) and < 4.0" - fi - else - kde_qt_minversion=">= Qt 3.0 and < 4.0" - fi - fi - if test "$kde_qtver" = "1"; then - kde_qt_minversion=">= 1.42 and < 2.0" - fi -else - kde_qt_minversion="$2" -fi - -if test -z "$3"; then - if test $kde_qtver = 3; then - if test $kde_qtsubver -gt 0; then - kde_qt_verstring="QT_VERSION >= 0x03@VER@00 && QT_VERSION < 0x040000" - qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'` - kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"` - else - kde_qt_verstring="QT_VERSION >= 300 && QT_VERSION < 0x040000" - fi - fi - if test $kde_qtver = 2; then - if test $kde_qtsubver -gt 0; then - kde_qt_verstring="QT_VERSION >= 222" - else - kde_qt_verstring="QT_VERSION >= 200" - fi - fi - if test $kde_qtver = 1; then - kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200" - fi -else - kde_qt_verstring="$3" -fi - -if test $kde_qtver = 4; then - kde_qt_dirs="$TQTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4" -fi -if test $kde_qtver = 3; then - kde_qt_dirs="$TQTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${tdelibsuff}/qt-3.3" - if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - fi - if test "$PKG_CONFIG" != "no" ; then - if $PKG_CONFIG --exists qt-mt ; then - kde_qt_dirs="$kde_qt_dirs `$PKG_CONFIG --variable=prefix qt-mt`" - fi - fi -fi -if test $kde_qtver = 2; then - kde_qt_dirs="$TQTDIR /usr/lib/qt2 /usr/lib/qt" -fi -if test $kde_qtver = 1; then - kde_qt_dirs="$TQTDIR /usr/lib/qt" -fi -]) - -AC_DEFUN([KDE_CHECK_QT_DIRECT], -[ -AC_REQUIRE([KDE_USE_TQT]) -AC_MSG_CHECKING([if Qt compiles without flags]) -AC_CACHE_VAL(kde_cv_qt_direct, -[ -AC_LANG_SAVE -AC_LANG_CPLUSPLUS -ac_LD_LIBRARY_PATH_safe=$LD_LIBRARY_PATH -ac_LIBRARY_PATH="$LIBRARY_PATH" -ac_cxxflags_safe="$CXXFLAGS" -ac_ldflags_safe="$LDFLAGS" -ac_libs_safe="$LIBS" - -CXXFLAGS="$CXXFLAGS -I$tqt_includes" -LDFLAGS="$LDFLAGS $X_LDFLAGS" -if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then -LIBS="$LIBTQT -lXext -lX11 $LIBSOCKET" -else -LIBS="$LIBTQT $LIBSOCKET" -fi -LD_LIBRARY_PATH= -export LD_LIBRARY_PATH -LIBRARY_PATH= -export LIBRARY_PATH - -KDE_PRINT_QT_PROGRAM - -if AC_TRY_EVAL(ac_link) && test -s conftest; then - kde_cv_qt_direct="yes" -else - kde_cv_qt_direct="no" - echo "configure: failed program was:" >&AC_FD_CC - cat conftest.$ac_ext >&AC_FD_CC -fi - -rm -f conftest* -CXXFLAGS="$ac_cxxflags_safe" -LDFLAGS="$ac_ldflags_safe" -LIBS="$ac_libs_safe" - -LD_LIBRARY_PATH="$ac_LD_LIBRARY_PATH_safe" -export LD_LIBRARY_PATH -LIBRARY_PATH="$ac_LIBRARY_PATH" -export LIBRARY_PATH -AC_LANG_RESTORE -]) - -if test "$kde_cv_qt_direct" = "yes"; then - AC_MSG_RESULT(yes) - $1 -else - AC_MSG_RESULT(no) - $2 -fi -]) - -dnl ------------------------------------------------------------------------ -dnl Try to find the Qt headers and libraries. -dnl $(QT_LDFLAGS) will be -Ltqtliblocation (if needed) -dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed) -dnl ------------------------------------------------------------------------ -dnl -AC_DEFUN([AC_PATH_TQT_1_3], -[ -AC_REQUIRE([K_PATH_X]) -AC_REQUIRE([KDE_USE_TQT]) -AC_REQUIRE([KDE_CHECK_LIB64]) - -dnl ------------------------------------------------------------------------ -dnl Add configure flag to enable linking to MT version of Qt library. -dnl ------------------------------------------------------------------------ - -AC_ARG_ENABLE( - mt, - AC_HELP_STRING([--disable-mt],[link to non-threaded Qt (deprecated)]), - kde_use_qt_mt=$enableval, - [ - if test $kde_qtver = 3; then - kde_use_qt_mt=yes - else - kde_use_qt_mt=no - fi - ] -) - -USING_QT_MT="" - -dnl ------------------------------------------------------------------------ -dnl If we not get --disable-qt-mt then adjust some vars for the host. -dnl ------------------------------------------------------------------------ - -KDE_MT_LDFLAGS= -KDE_MT_LIBS= -if test "x$kde_use_qt_mt" = "xyes"; then - KDE_CHECK_THREADING - if test "x$kde_use_threading" = "xyes"; then - CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS" - KDE_MT_LDFLAGS="$USE_THREADS" - KDE_MT_LIBS="$LIBPTHREAD" - else - kde_use_qt_mt=no - fi -fi -AC_SUBST(KDE_MT_LDFLAGS) -AC_SUBST(KDE_MT_LIBS) - -kde_qt_was_given=yes - -dnl ------------------------------------------------------------------------ -dnl If we haven't been told how to link to Qt, we work it out for ourselves. -dnl ------------------------------------------------------------------------ -if test -z "$LIBTQT_GLOB"; then - if test "x$kde_use_qt_emb" = "xyes"; then - LIBTQT_GLOB="libtqte.*" - else - LIBTQT_GLOB="libtqt.*" - fi -fi - -dnl ------------------------------------------------------------ -dnl If we got --enable-embedded then adjust the Qt library name. -dnl ------------------------------------------------------------ -if test "x$kde_use_qt_emb" = "xyes"; then - tqtlib="qte" -else - tqtlib="qt" -fi - -kde_int_qt="-l$tqtlib" - -if test -z "$LIBQPE"; then -dnl ------------------------------------------------------------ -dnl If we got --enable-palmtop then add -lqpe to the link line -dnl ------------------------------------------------------------ - if test "x$kde_use_qt_emb" = "xyes"; then - if test "x$kde_use_qt_emb_palm" = "xyes"; then - LIB_QPE="-lqpe" - else - LIB_QPE="" - fi - else - LIB_QPE="" - fi -fi - -dnl ------------------------------------------------------------------------ -dnl If we got --enable-qt-mt then adjust the Qt library name for the host. -dnl ------------------------------------------------------------------------ - -if test "x$kde_use_qt_mt" = "xyes"; then - LIBTQT="-l$tqtlib-mt" - kde_int_qt="-l$tqtlib-mt" - LIBTQT_GLOB="lib$tqtlib-mt.*" - USING_QT_MT="using -mt" -else - LIBTQT="-l$tqtlib" -fi - -if test $kde_qtver != 1; then - - AC_REQUIRE([AC_FIND_PNG]) - AC_REQUIRE([AC_FIND_JPEG]) - LIBTQT="$LIBTQT $LIBPNG $LIBJPEG" -fi - -if test $kde_qtver = 3; then - AC_REQUIRE([KDE_CHECK_LIBDL]) - LIBTQT="$LIBTQT $LIBDL" -fi - -AC_MSG_CHECKING([for Qt]) - -if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then -LIBTQT="$LIBTQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET" -fi -ac_tqt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO -qt_libraries="" -tqt_includes="" -AC_ARG_WITH(qt-dir, - AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]), - [ ac_tqt_includes="$withval"/include - ac_qt_libraries="$withval"/lib${tdelibsuff} - ac_qt_bindir="$withval"/bin - ]) - -AC_ARG_WITH(qt-includes, - AC_HELP_STRING([--with-qt-includes=DIR],[where the Qt includes are. ]), - [ - ac_tqt_includes="$withval" - ]) - -kde_qt_libs_given=no - -AC_ARG_WITH(qt-libraries, - AC_HELP_STRING([--with-qt-libraries=DIR],[where the Qt library is installed.]), - [ ac_qt_libraries="$withval" - kde_qt_libs_given=yes - ]) - -AC_CACHE_VAL(ac_cv_have_qt, -[#try to guess Qt locations - -qt_incdirs="" -for dir in $kde_qt_dirs; do - qt_incdirs="$qt_incdirs $dir/include $dir" -done -if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -fi -if test "$PKG_CONFIG" != "no" ; then - if $PKG_CONFIG --exists qt-mt ; then - qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir qt-mt`" - fi -fi -qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes" -if test ! "$ac_tqt_includes" = "NO"; then - qt_incdirs="$ac_tqt_includes $qt_incdirs" -fi - -if test "$kde_qtver" != "1"; then - kde_qt_header=qstyle.h -else - kde_qt_header=qglobal.h -fi - -AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir) -ac_tqt_includes="$qt_incdir" - -qt_libdirs="" -for dir in $kde_qt_dirs; do - qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir/lib $dir" -done -if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -fi -if test "$PKG_CONFIG" != "no" ; then - if $PKG_CONFIG --exists qt-mt ; then - qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir qt-mt`" - fi -fi -qt_libdirs="$TQTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" -if test ! "$ac_qt_libraries" = "NO"; then - qt_libdir=$ac_qt_libraries -else - qt_libdirs="$ac_qt_libraries $qt_libdirs" - # if the Qt was given, the chance is too big that libtqt.* doesn't exist - qt_libdir=NONE - for dir in $qt_libdirs; do - try="ls -1 $dir/${LIBTQT_GLOB}" - if test -n "`$try 2> /dev/null`"; then qt_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi - done -fi -for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do - if test -e "$a"; then - LIBTQT="$LIBTQT ${kde_int_qt}_incremental" - break - fi -done - -ac_qt_libraries="$qt_libdir" - -AC_LANG_SAVE -AC_LANG_CPLUSPLUS - -ac_cxxflags_safe="$CXXFLAGS" -ac_ldflags_safe="$LDFLAGS" -ac_libs_safe="$LIBS" - -CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes" -LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" -LIBS="$LIBS $LIBTQT $KDE_MT_LIBS" - -KDE_PRINT_QT_PROGRAM - -if AC_TRY_EVAL(ac_link) && test -s conftest; then - rm -f conftest* -else - echo "configure: failed program was:" >&AC_FD_CC - cat conftest.$ac_ext >&AC_FD_CC - ac_qt_libraries="NO" -fi -rm -f conftest* -CXXFLAGS="$ac_cxxflags_safe" -LDFLAGS="$ac_ldflags_safe" -LIBS="$ac_libs_safe" - -AC_LANG_RESTORE -if test "$ac_tqt_includes" = NO || test "$ac_qt_libraries" = NO; then - ac_cv_have_qt="have_qt=no" - ac_qt_notfound="" - missing_qt_mt="" - if test "$ac_tqt_includes" = NO; then - if test "$ac_qt_libraries" = NO; then - ac_qt_notfound="(headers and libraries)"; - else - ac_qt_notfound="(headers)"; - fi - else - if test "x$kde_use_qt_mt" = "xyes"; then - missing_qt_mt=" -Make sure that you have compiled Qt with thread support!" - ac_qt_notfound="(library $tqtlib-mt)"; - else - ac_qt_notfound="(library $tqtlib)"; - fi - fi - - AC_MSG_ERROR([Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation! -For more details about this problem, look at the end of config.log.$missing_qt_mt]) -else - have_qt="yes" -fi -]) - -eval "$ac_cv_have_qt" - -if test "$have_qt" != yes; then - AC_MSG_RESULT([$have_qt]); -else - ac_cv_have_qt="have_qt=yes \ - ac_tqt_includes=$ac_tqt_includes ac_qt_libraries=$ac_qt_libraries" - AC_MSG_RESULT([libraries $ac_qt_libraries, headers $ac_tqt_includes $USING_QT_MT]) - - qt_libraries="$ac_qt_libraries" - tqt_includes="$ac_tqt_includes" -fi - -if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then - KDE_CHECK_QT_DIRECT(qt_libraries= ,[]) -fi - -AC_SUBST(qt_libraries) -AC_SUBST(tqt_includes) - -if test "$tqt_includes" = "$x_includes" || test -z "$tqt_includes"; then - TQT_INCLUDES="" -else - TQT_INCLUDES="-I$tqt_includes" - all_includes="$TQT_INCLUDES $all_includes" -fi - -if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then - QT_LDFLAGS="" -else - QT_LDFLAGS="-L$qt_libraries" - all_libraries="$QT_LDFLAGS $all_libraries" -fi -test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS" - -AC_SUBST(TQT_INCLUDES) -AC_SUBST(QT_LDFLAGS) -AC_PATH_TQT_MOC_UIC - -KDE_CHECK_QT_JPEG - -if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then -LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)' -else -LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)' -fi -test -z "$KDE_MT_LIBS" || LIB_TQT="$LIB_TQT $KDE_MT_LIBS" -for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do - if test -e "$a"; then - LIB_TQT="$LIB_TQT ${kde_int_qt}_incremental" - break - fi -done - -AC_SUBST(LIB_TQT) -AC_SUBST(LIB_QPE) - -AC_SUBST(kde_qtver) -]) - -AC_DEFUN([AC_PATH_TQT], -[ -AC_PATH_TQT_1_3 -]) - -AC_DEFUN([KDE_CHECK_UIC_PLUGINS], -[ -AC_REQUIRE([AC_PATH_TQT_MOC_UIC]) - -if test x$ac_uic_supports_libpath = xyes; then - -AC_MSG_CHECKING([if UIC has KDE plugins available]) -AC_CACHE_VAL(kde_cv_uic_plugins, -[ -cat > actest.ui << EOF -<!DOCTYPE UI><UI version="3.0" stdsetdef="1"> -<class>NewConnectionDialog</class> -<widget class="QDialog"> - <widget class="KLineEdit"> - <property name="name"> - <cstring>testInput</cstring> - </property> - </widget> -</widget> -</UI> -EOF - - - -kde_cv_uic_plugins=no -kde_line="$UIC_PATH -L $kde_widgetdir" -if test x$ac_uic_supports_nounload = xyes; then - kde_line="$kde_line -nounload" -fi -kde_line="$kde_line -impl actest.h actest.ui > actest.cpp" -if AC_TRY_EVAL(kde_line); then - # if you're trying to debug this check and think it's incorrect, - # better check your installation. The check _is_ correct - your - # installation is not. - if test -f actest.cpp && grep klineedit actest.cpp > /dev/null; then - kde_cv_uic_plugins=yes - fi -fi -rm -f actest.ui actest.cpp -]) - -AC_MSG_RESULT([$kde_cv_uic_plugins]) -if test "$kde_cv_uic_plugins" != yes; then - AC_MSG_ERROR([ -you need to install tdelibs first. - -If you did install tdelibs, then the Qt version that is picked up by -this configure is not the same version you used to compile tdelibs. -The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the -_same Qt version_, compiled with the _same compiler_ and the same Qt -configuration settings. -]) -fi -fi -]) - -AC_DEFUN([KDE_CHECK_FINAL], -[ - AC_ARG_ENABLE(final, - AC_HELP_STRING([--enable-final], - [build size optimized apps (experimental - needs lots of memory)]), - kde_use_final=$enableval, kde_use_final=no) - - if test "x$kde_use_final" = "xyes"; then - KDE_USE_FINAL_TRUE="" - KDE_USE_FINAL_FALSE="#" - else - KDE_USE_FINAL_TRUE="#" - KDE_USE_FINAL_FALSE="" - fi - AC_SUBST(KDE_USE_FINAL_TRUE) - AC_SUBST(KDE_USE_FINAL_FALSE) -]) - -AC_DEFUN([KDE_CHECK_CLOSURE], -[ - AC_ARG_ENABLE(closure, - AC_HELP_STRING([--enable-closure],[delay template instantiation]), - kde_use_closure=$enableval, kde_use_closure=no) - - KDE_NO_UNDEFINED="" - if test "x$kde_use_closure" = "xyes"; then - KDE_USE_CLOSURE_TRUE="" - KDE_USE_CLOSURE_FALSE="#" -# CXXFLAGS="$CXXFLAGS $REPO" - else - KDE_USE_CLOSURE_TRUE="#" - KDE_USE_CLOSURE_FALSE="" - KDE_NO_UNDEFINED="" - case $host in - *-*-linux-gnu) - KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined], - [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined], - [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"], - [KDE_NO_UNDEFINED=""])], - [KDE_NO_UNDEFINED=""]) - ;; - esac - fi - AC_SUBST(KDE_USE_CLOSURE_TRUE) - AC_SUBST(KDE_USE_CLOSURE_FALSE) - AC_SUBST(KDE_NO_UNDEFINED) -]) - -dnl Check if the linker supports --enable-new-dtags and --as-needed -AC_DEFUN([KDE_CHECK_NEW_LDFLAGS], -[ - AC_ARG_ENABLE(new_ldflags, - AC_HELP_STRING([--enable-new-ldflags], - [enable the new linker flags]), - kde_use_new_ldflags=$enableval, - kde_use_new_ldflags=no) - - LDFLAGS_AS_NEEDED="" - LDFLAGS_NEW_DTAGS="" - if test "x$kde_use_new_ldflags" = "xyes"; then - LDFLAGS_NEW_DTAGS="" - KDE_CHECK_COMPILER_FLAG([Wl,--enable-new-dtags], - [LDFLAGS_NEW_DTAGS="-Wl,--enable-new-dtags"],) - - KDE_CHECK_COMPILER_FLAG([Wl,--as-needed], - [LDFLAGS_AS_NEEDED="-Wl,--as-needed"],) - fi - AC_SUBST(LDFLAGS_AS_NEEDED) - AC_SUBST(LDFLAGS_NEW_DTAGS) -]) - -AC_DEFUN([KDE_CHECK_NMCHECK], -[ - AC_ARG_ENABLE(nmcheck,AC_HELP_STRING([--enable-nmcheck],[enable automatic namespace cleanness check]), - kde_use_nmcheck=$enableval, kde_use_nmcheck=no) - - if test "$kde_use_nmcheck" = "yes"; then - KDE_USE_NMCHECK_TRUE="" - KDE_USE_NMCHECK_FALSE="#" - else - KDE_USE_NMCHECK_TRUE="#" - KDE_USE_NMCHECK_FALSE="" - fi - AC_SUBST(KDE_USE_NMCHECK_TRUE) - AC_SUBST(KDE_USE_NMCHECK_FALSE) -]) - -AC_DEFUN([KDE_EXPAND_MAKEVAR], [ -savex=$exec_prefix -test "x$exec_prefix" = xNONE && exec_prefix=$prefix -tmp=$$2 -while $1=`eval echo "$tmp"`; test "x$$1" != "x$tmp"; do tmp=$$1; done -exec_prefix=$savex -]) - -dnl ------------------------------------------------------------------------ -dnl Now, the same with KDE -dnl $(KDE_LDFLAGS) will be the kdeliblocation (if needed) -dnl and $(kde_includes) will be the kdehdrlocation (if needed) -dnl ------------------------------------------------------------------------ -dnl -AC_DEFUN([AC_BASE_PATH_KDE], -[ -AC_REQUIRE([KDE_CHECK_STL]) -AC_REQUIRE([AC_PATH_TQT])dnl -AC_REQUIRE([KDE_CHECK_LIB64]) - -AC_CHECK_RPATH -AC_MSG_CHECKING([for KDE]) - -if test "${prefix}" != NONE; then - kde_includes=${includedir} - KDE_EXPAND_MAKEVAR(ac_kde_includes, includedir) - - kde_libraries=${libdir} - KDE_EXPAND_MAKEVAR(ac_kde_libraries, libdir) - -else - ac_kde_includes= - ac_kde_libraries= - kde_libraries="" - kde_includes="" -fi - -AC_CACHE_VAL(ac_cv_have_kde, -[#try to guess kde locations - -if test "$kde_qtver" = 1; then - kde_check_header="ksock.h" - kde_check_lib="libtdecore.la" -else - kde_check_header="ksharedptr.h" - kde_check_lib="libtdeio.la" -fi - -if test -z "$1"; then - -kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $tqt_includes" -test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs" -kde_incdirs="$ac_kde_includes $kde_incdirs" -AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) -ac_kde_includes="$kde_incdir" - -if test -n "$ac_kde_includes" && test ! -r "$ac_kde_includes/$kde_check_header"; then - AC_MSG_ERROR([ -in the prefix, you've chosen, are no KDE headers installed. This will fail. -So, check this please and use another prefix!]) -fi - -kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}" -test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs" -kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" -AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) -ac_kde_libraries="$kde_libdir" - -kde_widgetdir=NO -dnl this might be somewhere else -AC_FIND_FILE("kde3/plugins/designer/tdewidgets.la", $kde_libdirs, kde_widgetdir) - -if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then -AC_MSG_ERROR([ -in the prefix, you've chosen, are no KDE libraries installed. This will fail. -So, check this please and use another prefix!]) -fi - -if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/tdewidgets.la"; then -AC_MSG_ERROR([ -I can't find the designer plugins. These are required and should have been installed -by tdelibs]) -fi - -if test -n "$kde_widgetdir"; then - kde_widgetdir="$kde_widgetdir/kde3/plugins/designer" -fi - - -if test "$ac_kde_includes" = NO || test "$ac_kde_libraries" = NO || test "$kde_widgetdir" = NO; then - ac_cv_have_kde="have_kde=no" -else - ac_cv_have_kde="have_kde=yes \ - ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" -fi - -else dnl test -z $1, e.g. from tdelibs - - ac_cv_have_kde="have_kde=no" - -fi -])dnl - -eval "$ac_cv_have_kde" - -if test "$have_kde" != "yes"; then - if test "${prefix}" = NONE; then - ac_kde_prefix="$ac_default_prefix" - else - ac_kde_prefix="$prefix" - fi - if test "$exec_prefix" = NONE; then - ac_kde_exec_prefix="$ac_kde_prefix" - AC_MSG_RESULT([will be installed in $ac_kde_prefix]) - else - ac_kde_exec_prefix="$exec_prefix" - AC_MSG_RESULT([will be installed in $ac_kde_prefix and $ac_kde_exec_prefix]) - fi - - kde_libraries="${libdir}" - kde_includes="${includedir}" - -else - ac_cv_have_kde="have_kde=yes \ - ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" - AC_MSG_RESULT([libraries $ac_kde_libraries, headers $ac_kde_includes]) - - kde_libraries="$ac_kde_libraries" - kde_includes="$ac_kde_includes" -fi -AC_SUBST(kde_libraries) -AC_SUBST(kde_includes) - -if test "$kde_includes" = "$x_includes" || test "$kde_includes" = "$tqt_includes" || test "$kde_includes" = "/usr/include"; then - KDE_INCLUDES="" -else - KDE_INCLUDES="-I$kde_includes" - all_includes="$KDE_INCLUDES $all_includes" -fi - -KDE_DEFAULT_CXXFLAGS="-DTQT_NO_ASCII_CAST -DTQT_NO_STL -DTQT_NO_COMPAT -DTQT_NO_TRANSLATION" - -KDE_LDFLAGS="-L$kde_libraries" -if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$qt_libraries" ; then - all_libraries="$KDE_LDFLAGS $all_libraries" -fi - -AC_SUBST(KDE_LDFLAGS) -AC_SUBST(KDE_INCLUDES) - -AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) - -all_libraries="$all_libraries $USER_LDFLAGS" -all_includes="$all_includes $USER_INCLUDES" -AC_SUBST(all_includes) -AC_SUBST(all_libraries) - -if test -z "$1"; then -KDE_CHECK_UIC_PLUGINS -fi - -ac_kde_libraries="$kde_libdir" - -AC_SUBST(AUTODIRS) - - -]) - -AC_DEFUN([KDE_CHECK_EXTRA_LIBS], -[ -AC_MSG_CHECKING(for extra includes) -AC_ARG_WITH(extra-includes,AC_HELP_STRING([--with-extra-includes=DIR],[adds non standard include paths]), - kde_use_extra_includes="$withval", - kde_use_extra_includes=NONE -) -kde_extra_includes= -if test -n "$kde_use_extra_includes" && \ - test "$kde_use_extra_includes" != "NONE"; then - - ac_save_ifs=$IFS - IFS=':' - for dir in $kde_use_extra_includes; do - kde_extra_includes="$kde_extra_includes $dir" - USER_INCLUDES="$USER_INCLUDES -I$dir" - done - IFS=$ac_save_ifs - kde_use_extra_includes="added" -else - kde_use_extra_includes="no" -fi -AC_SUBST(USER_INCLUDES) - -AC_MSG_RESULT($kde_use_extra_includes) - -kde_extra_libs= -AC_MSG_CHECKING(for extra libs) -AC_ARG_WITH(extra-libs,AC_HELP_STRING([--with-extra-libs=DIR],[adds non standard library paths]), - kde_use_extra_libs=$withval, - kde_use_extra_libs=NONE -) -if test -n "$kde_use_extra_libs" && \ - test "$kde_use_extra_libs" != "NONE"; then - - ac_save_ifs=$IFS - IFS=':' - for dir in $kde_use_extra_libs; do - kde_extra_libs="$kde_extra_libs $dir" - KDE_EXTRA_RPATH="$KDE_EXTRA_RPATH -R $dir" - USER_LDFLAGS="$USER_LDFLAGS -L$dir" - done - IFS=$ac_save_ifs - kde_use_extra_libs="added" -else - kde_use_extra_libs="no" -fi - -AC_SUBST(USER_LDFLAGS) - -AC_MSG_RESULT($kde_use_extra_libs) - -]) - -AC_DEFUN([KDE_1_CHECK_PATH_HEADERS], -[ - AC_MSG_CHECKING([for KDE headers installed]) - AC_LANG_SAVE - AC_LANG_CPLUSPLUS -cat > conftest.$ac_ext <<EOF -#ifdef STDC_HEADERS -# include <stdlib.h> -#endif -#include <stdio.h> -#include "confdefs.h" -#include <kapp.h> - -int main() { - printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data()); - printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data()); - printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data()); - printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data()); - printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data()); - printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data()); - printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data()); - printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data()); - printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data()); - printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data()); - printf("kde_wallpaperdir=\\"%s\\"\n", - TDEApplication::kde_wallpaperdir().data()); - printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data()); - printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data()); - printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); - printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); - printf("kde_moduledir=\\"/tmp/dummy\\"\n"); - printf("kde_styledir=\\"/tmp/dummy\\"\n"); - printf("kde_widgetdir=\\"/tmp/dummy\\"\n"); - printf("xdg_appsdir=\\"/tmp/dummy\\"\n"); - printf("xdg_menudir=\\"/tmp/dummy\\"\n"); - printf("xdg_directorydir=\\"/tmp/dummy\\"\n"); - printf("kde_kcfgdir=\\"/tmp/dummy\\"\n"); - return 0; - } -EOF - - ac_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$all_includes $CPPFLAGS" - if AC_TRY_EVAL(ac_compile); then - AC_MSG_RESULT(yes) - else - AC_MSG_ERROR([your system is not able to compile a small KDE application! -Check, if you installed the KDE header files correctly. -For more details about this problem, look at the end of config.log.]) - fi - CPPFLAGS=$ac_save_CPPFLAGS - - AC_LANG_RESTORE -]) - -AC_DEFUN([KDE_CHECK_KDEQTADDON], -[ -AC_MSG_CHECKING(for kde-qt-addon) -AC_CACHE_VAL(kde_cv_have_kdetqtaddon, -[ - kde_ldflags_safe="$LDFLAGS" - kde_libs_safe="$LIBS" - kde_cxxflags_safe="$CXXFLAGS" - - LIBS="-lkde-qt-addon $LIBTQT $LIBS" - CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes" - LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" - - AC_TRY_LINK([ - #include <qdom.h> - ], - [ - QDomDocument doc; - ], - kde_cv_have_kdetqtaddon=yes, - kde_cv_have_kdetqtaddon=no - ) - - LDFLAGS=$kde_ldflags_safe - LIBS=$kde_libs_safe - CXXFLAGS=$kde_cxxflags_safe -]) - -AC_MSG_RESULT($kde_cv_have_kdetqtaddon) - -if test "$kde_cv_have_kdetqtaddon" = "no"; then - AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first. -It is a separate package (and CVS module) named kde-qt-addon.]) -fi -]) - -AC_DEFUN([KDE_CREATE_LIBS_ALIASES], -[ - AC_REQUIRE([KDE_MISC_TESTS]) - AC_REQUIRE([KDE_CHECK_LIBDL]) - AC_REQUIRE([K_PATH_X]) - -if test $kde_qtver = 3; then - case $host in - *cygwin*) lib_kded="-ltdeinit_kded" ;; - *) lib_kded="" ;; - esac - AC_SUBST(LIB_KDED, $lib_kded) - AC_SUBST(LIB_TDECORE, "-ltdecore") - AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_TDEIO, "-ltdeio") - AC_SUBST(LIB_KJS, "-lkjs") - AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_TDEABC, "-ltdeabc") - AC_SUBST(LIB_TDEHTML, "-ltdehtml") - AC_SUBST(LIB_TDESPELL, "-ltdespell") - AC_SUBST(LIB_TDEPARTS, "-ltdeparts") - AC_SUBST(LIB_TDEPRINT, "-ltdeprint") - AC_SUBST(LIB_TDEUTILS, "-ltdeutils") - AC_SUBST(LIB_TDEPIM, "-ltdepim") - AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy") - AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") - AC_SUBST(LIB_TDEDNSSD, "-ltdednssd") - AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest") -# these are for backward compatibility - AC_SUBST(LIB_TDESYCOCA, "-ltdeio") - AC_SUBST(LIB_TDEFILE, "-ltdeio") -elif test $kde_qtver = 2; then - AC_SUBST(LIB_TDECORE, "-ltdecore") - AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_TDEIO, "-ltdeio") - AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca") - AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_TDEFILE, "-ltdefile") - AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_TDEHTML, "-ltdehtml") - AC_SUBST(LIB_TDESPELL, "-ltdespell") - AC_SUBST(LIB_TDEPARTS, "-ltdeparts") - AC_SUBST(LIB_TDEPRINT, "-ltdeprint") -else - AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_TQT)") - AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") - AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") - AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") - AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") -fi -]) - -AC_DEFUN([AC_PATH_KDE], -[ - AC_BASE_PATH_KDE - AC_ARG_ENABLE(path-check,AC_HELP_STRING([--disable-path-check],[don't try to find out, where to install]), - [ - if test "$enableval" = "no"; - then ac_use_path_checking="default" - else ac_use_path_checking="" - fi - ], - [ - if test "$kde_qtver" = 1; - then ac_use_path_checking="" - else ac_use_path_checking="default" - fi - ] - ) - - AC_CREATE_KFSSTND($ac_use_path_checking) - - AC_SUBST_KFSSTND - KDE_CREATE_LIBS_ALIASES -]) - -dnl KDE_CHECK_FUNC_EXT(<func>, [headers], [sample-use], [C prototype], [autoheader define], [call if found]) -AC_DEFUN([KDE_CHECK_FUNC_EXT], -[ -AC_MSG_CHECKING(for $1) -AC_CACHE_VAL(kde_cv_func_$1, -[ -AC_LANG_SAVE -AC_LANG_CPLUSPLUS -save_CXXFLAGS="$CXXFLAGS" -kde_safe_LIBS="$LIBS" -LIBS="$LIBS $X_EXTRA_LIBS" -if test "$GXX" = "yes"; then -CXXFLAGS="$CXXFLAGS -pedantic-errors" -fi -AC_TRY_COMPILE([ -$2 -], -[ -$3 -], -kde_cv_func_$1=yes, -kde_cv_func_$1=no) -CXXFLAGS="$save_CXXFLAGS" -LIBS="$kde_safe_LIBS" -AC_LANG_RESTORE -]) - -AC_MSG_RESULT($kde_cv_func_$1) - -AC_MSG_CHECKING([if $1 needs custom prototype]) -AC_CACHE_VAL(kde_cv_proto_$1, -[ -if test "x$kde_cv_func_$1" = xyes; then - kde_cv_proto_$1=no -else - case "$1" in - setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) - kde_cv_proto_$1="yes - in libtdefakes" - ;; - *) - kde_cv_proto_$1=unknown - ;; - esac -fi - -if test "x$kde_cv_proto_$1" = xunknown; then - -AC_LANG_SAVE -AC_LANG_CPLUSPLUS - kde_safe_libs=$LIBS - LIBS="$LIBS $X_EXTRA_LIBS" - AC_TRY_LINK([ -$2 - -extern "C" $4; -], -[ -$3 -], -[ kde_cv_func_$1=yes - kde_cv_proto_$1=yes ], - [kde_cv_proto_$1="$1 unavailable"] -) -LIBS=$kde_safe_libs -AC_LANG_RESTORE -fi -]) -AC_MSG_RESULT($kde_cv_proto_$1) - -if test "x$kde_cv_func_$1" = xyes; then - AC_DEFINE(HAVE_$5, 1, [Define if you have $1]) - $6 -fi -if test "x$kde_cv_proto_$1" = xno; then - AC_DEFINE(HAVE_$5_PROTO, 1, - [Define if you have the $1 prototype]) -fi - -AH_VERBATIM([_HAVE_$5_PROTO], -[ -#if !defined(HAVE_$5_PROTO) -#ifdef __cplusplus -extern "C" { -#endif -$4; -#ifdef __cplusplus -} -#endif -#endif -]) -]) - -AC_DEFUN([AC_CHECK_SETENV], -[ - KDE_CHECK_FUNC_EXT(setenv, [ -#include <stdlib.h> -], - [setenv("VAR", "VALUE", 1);], - [int setenv (const char *, const char *, int)], - [SETENV]) -]) - -AC_DEFUN([AC_CHECK_UNSETENV], -[ - KDE_CHECK_FUNC_EXT(unsetenv, [ -#include <stdlib.h> -], - [unsetenv("VAR");], - [void unsetenv (const char *)], - [UNSETENV]) -]) - -AC_DEFUN([AC_CHECK_GETDOMAINNAME], -[ - KDE_CHECK_FUNC_EXT(getdomainname, [ -#include <stdlib.h> -#include <unistd.h> -#include <netdb.h> -], - [ -char buffer[200]; -getdomainname(buffer, 200); -], - [#include <sys/types.h> - int getdomainname (char *, size_t)], - [GETDOMAINNAME]) -]) - -AC_DEFUN([AC_CHECK_GETHOSTNAME], -[ - KDE_CHECK_FUNC_EXT(gethostname, [ -#include <stdlib.h> -#include <unistd.h> -], - [ -char buffer[200]; -gethostname(buffer, 200); -], - [int gethostname (char *, unsigned int)], - [GETHOSTNAME]) -]) - -AC_DEFUN([AC_CHECK_USLEEP], -[ - KDE_CHECK_FUNC_EXT(usleep, [ -#include <unistd.h> -], - [ -usleep(200); -], - [int usleep (unsigned int)], - [USLEEP]) -]) - - -AC_DEFUN([AC_CHECK_RANDOM], -[ - KDE_CHECK_FUNC_EXT(random, [ -#include <stdlib.h> -], - [ -random(); -], - [long int random(void)], - [RANDOM]) - - KDE_CHECK_FUNC_EXT(srandom, [ -#include <stdlib.h> -], - [ -srandom(27); -], - [void srandom(unsigned int)], - [SRANDOM]) - -]) - -AC_DEFUN([AC_CHECK_INITGROUPS], -[ - KDE_CHECK_FUNC_EXT(initgroups, [ -#include <sys/types.h> -#include <unistd.h> -#include <grp.h> -], - [ -char buffer[200]; -initgroups(buffer, 27); -], - [int initgroups(const char *, gid_t)], - [INITGROUPS]) -]) - -AC_DEFUN([AC_CHECK_MKSTEMPS], -[ - KDE_CHECK_FUNC_EXT(mkstemps, [ -#include <stdlib.h> -#include <unistd.h> -], - [ -mkstemps("/tmp/aaaXXXXXX", 6); -], - [int mkstemps(char *, int)], - [MKSTEMPS]) -]) - -AC_DEFUN([AC_CHECK_MKSTEMP], -[ - KDE_CHECK_FUNC_EXT(mkstemp, [ -#include <stdlib.h> -#include <unistd.h> -], - [ -mkstemp("/tmp/aaaXXXXXX"); -], - [int mkstemp(char *)], - [MKSTEMP]) -]) - -AC_DEFUN([AC_CHECK_MKDTEMP], -[ - KDE_CHECK_FUNC_EXT(mkdtemp, [ -#include <stdlib.h> -#include <unistd.h> -], - [ -mkdtemp("/tmp/aaaXXXXXX"); -], - [char *mkdtemp(char *)], - [MKDTEMP]) -]) - - -AC_DEFUN([AC_CHECK_RES_INIT], -[ - AC_MSG_CHECKING([if res_init needs -lresolv]) - kde_libs_safe="$LIBS" - LIBS="$LIBS $X_EXTRA_LIBS -lresolv" - AC_TRY_LINK( - [ -#include <sys/types.h> -#include <netinet/in.h> -#include <arpa/nameser.h> -#include <resolv.h> - ], - [ - res_init(); - ], - [ - LIBRESOLV="-lresolv" - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_RES_INIT, 1, [Define if you have the res_init function]) - ], - [ AC_MSG_RESULT(no) ] - ) - LIBS=$kde_libs_safe - AC_SUBST(LIBRESOLV) - - KDE_CHECK_FUNC_EXT(res_init, - [ -#include <sys/types.h> -#include <netinet/in.h> -#include <arpa/nameser.h> -#include <resolv.h> - ], - [res_init()], - [int res_init(void)], - [RES_INIT]) -]) - -AC_DEFUN([AC_CHECK_STRLCPY], -[ - KDE_CHECK_FUNC_EXT(strlcpy, [ -#include <string.h> -], -[ char buf[20]; - strlcpy(buf, "KDE function test", sizeof(buf)); -], - [unsigned long strlcpy(char*, const char*, unsigned long)], - [STRLCPY]) -]) - -AC_DEFUN([AC_CHECK_STRLCAT], -[ - KDE_CHECK_FUNC_EXT(strlcat, [ -#include <string.h> -], -[ char buf[20]; - buf[0]='\0'; - strlcat(buf, "KDE function test", sizeof(buf)); -], - [unsigned long strlcat(char*, const char*, unsigned long)], - [STRLCAT]) -]) - -AC_DEFUN([AC_CHECK_RES_QUERY], -[ - KDE_CHECK_FUNC_EXT(res_query, [ -#include <sys/types.h> -#include <netinet/in.h> -#include <arpa/nameser.h> -#include <resolv.h> -#include <netdb.h> -], -[ -res_query(NULL, 0, 0, NULL, 0); -], - [int res_query(const char *, int, int, unsigned char *, int)], - [RES_QUERY]) -]) - -AC_DEFUN([AC_CHECK_DN_SKIPNAME], -[ - KDE_CHECK_FUNC_EXT(dn_skipname, [ -#include <sys/types.h> -#include <netinet/in.h> -#include <arpa/nameser.h> -#include <resolv.h> -], -[ -dn_skipname (NULL, NULL); -], - [int dn_skipname (unsigned char *, unsigned char *)], - [DN_SKIPNAME]) -]) - - -AC_DEFUN([AC_FIND_GIF], - [AC_MSG_CHECKING([for giflib]) -AC_CACHE_VAL(ac_cv_lib_gif, -[ac_save_LIBS="$LIBS" -if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then -LIBS="$all_libraries -lgif -lX11 $LIBSOCKET" -else -LIBS="$all_libraries -lgif" -fi -AC_TRY_LINK(dnl -[ -#ifdef __cplusplus -extern "C" { -#endif -int GifLastError(void); -#ifdef __cplusplus -} -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -], - [return GifLastError();], - eval "ac_cv_lib_gif=yes", - eval "ac_cv_lib_gif=no") -LIBS="$ac_save_LIBS" -])dnl -if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then - AC_MSG_RESULT(yes) - AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) -else - AC_MSG_ERROR(You need giflib30. Please install the tdesupport package) -fi -]) - -AC_DEFUN([KDE_FIND_JPEG_HELPER], -[ -AC_MSG_CHECKING([for libjpeg$2]) -AC_CACHE_VAL(ac_cv_lib_jpeg_$1, -[ -ac_save_LIBS="$LIBS" -LIBS="$all_libraries $USER_LDFLAGS -ljpeg$2 -lm" -ac_save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" -AC_TRY_LINK( -[ -#ifdef __cplusplus -extern "C" { -#endif -void jpeg_CreateDecompress(); -#ifdef __cplusplus -} -#endif -], -[jpeg_CreateDecompress();], - eval "ac_cv_lib_jpeg_$1=-ljpeg$2", - eval "ac_cv_lib_jpeg_$1=no") -LIBS="$ac_save_LIBS" -CFLAGS="$ac_save_CFLAGS" -]) - -if eval "test ! \"`echo $ac_cv_lib_jpeg_$1`\" = no"; then - LIBJPEG="$ac_cv_lib_jpeg_$1" - AC_MSG_RESULT($ac_cv_lib_jpeg_$1) -else - AC_MSG_RESULT(no) - $3 -fi - -]) - -AC_DEFUN([AC_FIND_JPEG], -[ -dnl first look for libraries -KDE_FIND_JPEG_HELPER(6b, 6b, - KDE_FIND_JPEG_HELPER(normal, [], - [ - LIBJPEG= - ] - ) -) - -dnl then search the headers (can't use simply AC_TRY_xxx, as jpeglib.h -dnl requires system dependent includes loaded before it) -jpeg_incdirs="$includedir /usr/include /usr/local/include $kde_extra_includes" -AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir) -test "x$jpeg_incdir" = xNO && jpeg_incdir= - -dnl if headers _and_ libraries are missing, this is no error, and we -dnl continue with a warning (the user will get no jpeg support in tdehtml) -dnl if only one is missing, it means a configuration error, but we still -dnl only warn -if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then - AC_DEFINE_UNQUOTED(HAVE_LIBJPEG, 1, [Define if you have libjpeg]) -else - if test -n "$jpeg_incdir" || test -n "$LIBJPEG" ; then - AC_MSG_WARN([ -There is an installation error in jpeg support. You seem to have only one -of either the headers _or_ the libraries installed. You may need to either -provide correct --with-extra-... options, or the development package of -libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/ -Disabling JPEG support. -]) - else - AC_MSG_WARN([libjpeg not found. disable JPEG support.]) - fi - jpeg_incdir= - LIBJPEG= -fi - -AC_SUBST(LIBJPEG) -AH_VERBATIM(_AC_CHECK_JPEG, -[/* - * jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system - * headers and I'm too lazy to write a configure test as long as only - * unixware is related - */ -#ifdef _UNIXWARE -#define HAVE_BOOLEAN -#endif -]) -]) - -AC_DEFUN([KDE_CHECK_QT_JPEG], -[ -if test -n "$LIBJPEG"; then -AC_MSG_CHECKING([if Qt needs $LIBJPEG]) -AC_CACHE_VAL(kde_cv_qt_jpeg, -[ -AC_LANG_SAVE -AC_LANG_CPLUSPLUS -ac_save_LIBS="$LIBS" -LIBS="$all_libraries $USER_LDFLAGS $LIBTQT" -LIBS=`echo $LIBS | sed "s/$LIBJPEG//"` -ac_save_CXXFLAGS="$CXXFLAGS" -CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES" -AC_TRY_LINK( -[#include <qapplication.h>], - [ - int argc; - char** argv; - QApplication app(argc, argv);], - eval "kde_cv_qt_jpeg=no", - eval "kde_cv_qt_jpeg=yes") -LIBS="$ac_save_LIBS" -CXXFLAGS="$ac_save_CXXFLAGS" -AC_LANG_RESTORE -fi -]) - -if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then - AC_MSG_RESULT(yes) - LIBJPEG_QT='$(LIBJPEG)' -else - AC_MSG_RESULT(no) - LIBJPEG_QT= -fi - -]) - -AC_DEFUN([AC_FIND_ZLIB], -[ -AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) -AC_MSG_CHECKING([for libz]) -AC_CACHE_VAL(ac_cv_lib_z, -[ -kde_save_LIBS="$LIBS" -LIBS="$all_libraries $USER_LDFLAGS -lz $LIBSOCKET" -kde_save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" -AC_TRY_LINK(dnl -[ -#include<zlib.h> -#include<string.h> -], -[ - char buf[42]; - gzFile f = (gzFile) 0; - /* this would segfault.. but we only link, don't run */ - (void) gzgets(f, buf, sizeof(buf)); - - return (strcmp(zlibVersion(), ZLIB_VERSION) == 0); -], - eval "ac_cv_lib_z='-lz'", - eval "ac_cv_lib_z=no") -LIBS="$kde_save_LIBS" -CFLAGS="$kde_save_CFLAGS" -])dnl -if test ! "$ac_cv_lib_z" = no; then - AC_DEFINE_UNQUOTED(HAVE_LIBZ, 1, [Define if you have libz]) - LIBZ="$ac_cv_lib_z" - AC_MSG_RESULT($ac_cv_lib_z) -else - AC_MSG_ERROR(not found. - Possibly configure picks up an outdated version - installed by XFree86. Remove it from your system. - - Check your installation and look into config.log) - LIBZ="" -fi -AC_SUBST(LIBZ) -]) - -AC_DEFUN([KDE_TRY_TIFFLIB], -[ -AC_MSG_CHECKING([for libtiff $1]) - -AC_CACHE_VAL(kde_cv_libtiff_$1, -[ -AC_LANG_SAVE -AC_LANG_CPLUSPLUS -kde_save_LIBS="$LIBS" -if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then -LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lX11 $LIBSOCKET -lm" -else -LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lm" -fi -kde_save_CXXFLAGS="$CXXFLAGS" -CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES" - -AC_TRY_LINK(dnl -[ -#include<tiffio.h> -], - [return (TIFFOpen( "", "r") == 0); ], -[ - kde_cv_libtiff_$1="-l$1 $LIBJPEG $LIBZ" -], [ - kde_cv_libtiff_$1=no -]) - -LIBS="$kde_save_LIBS" -CXXFLAGS="$kde_save_CXXFLAGS" -AC_LANG_RESTORE -]) - -if test "$kde_cv_libtiff_$1" = "no"; then - AC_MSG_RESULT(no) - LIBTIFF="" - $3 -else - LIBTIFF="$kde_cv_libtiff_$1" - AC_MSG_RESULT(yes) - AC_DEFINE_UNQUOTED(HAVE_LIBTIFF, 1, [Define if you have libtiff]) - $2 -fi - -]) - -AC_DEFUN([AC_FIND_TIFF], -[ -AC_REQUIRE([K_PATH_X]) -AC_REQUIRE([AC_FIND_ZLIB]) -AC_REQUIRE([AC_FIND_JPEG]) -AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) - -KDE_TRY_TIFFLIB(tiff, [], - KDE_TRY_TIFFLIB(tiff34)) - -AC_SUBST(LIBTIFF) -]) - -AC_DEFUN([KDE_FIND_LIBEXR], -[ -AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) -AC_REQUIRE([AC_FIND_ZLIB]) -AC_CACHE_VAL(ac_cv_libexr, -[ - if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - fi - - AC_MSG_CHECKING([for OpenEXR libraries]) - - if test "$PKG_CONFIG" = "no" ; then - AC_MSG_RESULT(no) - 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 - if ! $PKG_CONFIG --exists OpenEXR ; then - AC_MSG_RESULT(no) - EXRSTATUS=no - else - if ! $PKG_CONFIG --atleast-version="1.1.1" OpenEXR ; then - AC_MSG_RESULT(no) - EXRSTATUS=old - else - kde_save_LIBS="$LIBS" - LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ" - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - kde_save_CXXFLAGS="$CXXFLAGS" - EXR_FLAGS=`$PKG_CONFIG --cflags OpenEXR` - CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES $EXR_FLAGS" - - AC_TRY_LINK(dnl - [ - #include <ImfRgbaFile.h> - ], - [ - using namespace Imf; - RgbaInputFile file ("dummy"); - return 0; - ], - eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'", - eval "ac_cv_libexr=no" - ) - LIBS="$kde_save_LIBS" - CXXFLAGS="$kde_save_CXXFLAGS" - AC_LANG_RESTORE - ])dnl - if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then - AC_DEFINE_UNQUOTED(HAVE_EXR, 1, [Define if you have OpenEXR]) - LIB_EXR="$ac_cv_libexr" - AC_MSG_RESULT($ac_cv_libexr) - else - AC_MSG_RESULT(no) - LIB_EXR="" - fi - fi - fi - fi - AC_SUBST(LIB_EXR) - AC_SUBST(EXR_FLAGS) -]) - - - -AC_DEFUN([AC_FIND_PNG], -[ -AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) -AC_REQUIRE([AC_FIND_ZLIB]) -AC_MSG_CHECKING([for libpng]) -AC_CACHE_VAL(ac_cv_lib_png, -[ -kde_save_LIBS="$LIBS" -if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then -LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm -lX11 $LIBSOCKET" -else -LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm" -fi -kde_save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" - -AC_TRY_LINK(dnl - [ - #include<png.h> - ], - [ - png_structp png_ptr = png_create_read_struct( /* image ptr */ - PNG_LIBPNG_VER_STRING, 0, 0, 0 ); - return( png_ptr != 0 ); - ], - eval "ac_cv_lib_png='-lpng $LIBZ -lm'", - eval "ac_cv_lib_png=no" -) -LIBS="$kde_save_LIBS" -CFLAGS="$kde_save_CFLAGS" -])dnl -if eval "test ! \"`echo $ac_cv_lib_png`\" = no"; then - AC_DEFINE_UNQUOTED(HAVE_LIBPNG, 1, [Define if you have libpng]) - LIBPNG="$ac_cv_lib_png" - AC_SUBST(LIBPNG) - AC_MSG_RESULT($ac_cv_lib_png) -else - AC_MSG_RESULT(no) - LIBPNG="" - AC_SUBST(LIBPNG) -fi -]) - - -AC_DEFUN([AC_FIND_JASPER], -[ -AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) -AC_REQUIRE([AC_FIND_JPEG]) -AC_MSG_CHECKING([for jasper]) -AC_CACHE_VAL(ac_cv_jasper, -[ -kde_save_LIBS="$LIBS" -LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper $LIBJPEG -lm" -kde_save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" - -AC_TRY_LINK(dnl - [ - #include<jasper/jasper.h> - ], - [ - return( jas_init() ); - ], - eval "ac_cv_jasper='-ljasper $LIBJPEG -lm'", - eval "ac_cv_jasper=no" -) -LIBS="$kde_save_LIBS" -CFLAGS="$kde_save_CFLAGS" -])dnl -if eval "test ! \"`echo $ac_cv_jasper`\" = no"; then - AC_DEFINE_UNQUOTED(HAVE_JASPER, 1, [Define if you have jasper]) - LIB_JASPER="$ac_cv_jasper" - AC_MSG_RESULT($ac_cv_jasper) -else - AC_MSG_RESULT(no) - LIB_JASPER="" -fi -AC_SUBST(LIB_JASPER) -]) - -AC_DEFUN([AC_CHECK_BOOL], -[ - AC_DEFINE_UNQUOTED(HAVE_BOOL, 1, [You _must_ have bool]) -]) - -AC_DEFUN([KDE_CHECK_COMPILER_FLAG], -[ -AC_MSG_CHECKING([whether $CXX supports -$1]) -kde_cache=`echo $1 | sed 'y% .=/+-,%____p__%'` -AC_CACHE_VAL(kde_cv_prog_cxx_$kde_cache, -[ - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -$1" - AC_TRY_LINK([],[ return 0; ], [eval "kde_cv_prog_cxx_$kde_cache=yes"], []) - CXXFLAGS="$save_CXXFLAGS" - AC_LANG_RESTORE -]) -if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - AC_MSG_RESULT(yes) - : - $2 -else - AC_MSG_RESULT(no) - : - $3 -fi -]) - -AC_DEFUN([KDE_CHECK_C_COMPILER_FLAG], -[ -AC_MSG_CHECKING([whether $CC supports -$1]) -kde_cache=`echo $1 | sed 'y% .=/+-,%____p__%'` -AC_CACHE_VAL(kde_cv_prog_cc_$kde_cache, -[ - AC_LANG_SAVE - AC_LANG_C - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -$1" - AC_TRY_LINK([],[ return 0; ], [eval "kde_cv_prog_cc_$kde_cache=yes"], []) - CFLAGS="$save_CFLAGS" - AC_LANG_RESTORE -]) -if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then - AC_MSG_RESULT(yes) - : - $2 -else - AC_MSG_RESULT(no) - : - $3 -fi -]) - - -dnl AC_REMOVE_FORBIDDEN removes forbidden arguments from variables -dnl use: AC_REMOVE_FORBIDDEN(CC, [-forbid -bad-option whatever]) -dnl it's all white-space separated -AC_DEFUN([AC_REMOVE_FORBIDDEN], -[ __val=$$1 - __forbid=" $2 " - if test -n "$__val"; then - __new="" - ac_save_IFS=$IFS - IFS=" " - for i in $__val; do - case "$__forbid" in - *" $i "*) AC_MSG_WARN([found forbidden $i in $1, removing it]) ;; - *) # Careful to not add spaces, where there were none, because otherwise - # libtool gets confused, if we change e.g. CXX - if test -z "$__new" ; then __new=$i ; else __new="$__new $i" ; fi ;; - esac - done - IFS=$ac_save_IFS - $1=$__new - fi -]) - - -AC_DEFUN([KDE_CHECK_FOR_BAD_COMPILER], -[ - AC_MSG_CHECKING([whether $CC is blacklisted]) - - dnl In theory we have tu run this test against $CC and $CXX - dnl in C and in C++ mode, because its perfectly legal for - dnl the user to mix compiler versions, since C has a defined - dnl ABI. - dnl - dnl For now, we assume the user is not on crack. - - AC_TRY_COMPILE([ -#ifdef __GNUC__ -#if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0 -choke me -#endif -#endif -], , - kde_bad_compiler=no, - kde_bad_compiler=yes -) - - AC_MSG_RESULT($kde_bad_compiler) - -if test "$kde_bad_compiler" = "yes"; then - AC_MSG_ERROR([ - -This particular compiler version is blacklisted because it -is known to miscompile KDE. Please use a newer version, or -if that is not yet available, choose an older version. - -Please do not report a bug or bother us reporting this -configure error. We know about it, and we introduced -it by intention to avoid untraceable bugs or crashes in KDE. - -]) -fi - -]) - - -AC_DEFUN([KDE_CHECK_FOR_OPT_NOINLINE_MATCH], -[ - AC_CACHE_CHECK([whether system headers can cope with -O2 -fno-inline], - kde_cv_opt_noinline_match, - [ - kde_cv_opt_noinline_match=irrelevant - dnl if we don't use both -O2 and -fno-inline, this check is moot - if echo "$CFLAGS" | grep -e -O2 >/dev/null 2>/dev/null \ - && echo "$CFLAGS" | grep -e -fno-inline >/dev/null 2>/dev/null ; then - - ac_cflags_save="$CFLAGS" - CFLAGS="$CFLAGS -D_USE_GNU" - - AC_TRY_LINK([ - #include <string.h> -], [ const char *pt, *et; - et = __extension__ ({ char __a0, __a1, __a2; (__builtin_constant_p ( ";," ) && ((size_t)(const void *)(( ";," )+ 1) - (size_t)(const void *)( ";," ) == 1) ? ((__a0 =((__const char *) ( ";," ))[0], __a0 == '\0') ? ((void) ( pt ),((void *)0) ) : ((__a1 = ((__const char *) ( ";," ))[1], __a1== '\0') ? (__extension__ (__builtin_constant_p ( __a0 ) && ( __a0 ) == '\0' ? (char *) __rawmemchr ( pt , __a0) : strchr( pt , __a0 ))) : ((__a2 = ((__const char *) ( ";," ))[2], __a2 == '\0') ? __strpbrk_c2 ( pt , __a0, __a1) :(((__const char *) ( ";," ))[3] == '\0' ? __strpbrk_c3 ( pt ,__a0, __a1, __a2): strpbrk ( pt , ";," ))))) : strpbrk ( pt , ";," )); }) ; -], - kde_cv_opt_noinline_match=yes, - kde_cv_opt_noinline_match=no - ) - - CFLAGS="$ac_cflags_save" - fi - ]) -]) - - -dnl AC_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given -AC_DEFUN([AC_VALIDIFY_CXXFLAGS], -[dnl -if test "x$kde_use_qt_emb" != "xyes"; then - AC_REMOVE_FORBIDDEN(CXX, [-fno-rtti -rpath]) - AC_REMOVE_FORBIDDEN(CXXFLAGS, [-fno-rtti -rpath]) -else - AC_REMOVE_FORBIDDEN(CXX, [-rpath]) - AC_REMOVE_FORBIDDEN(CXXFLAGS, [-rpath]) -fi -]) - -AC_DEFUN([AC_CHECK_COMPILERS], -[ - AC_ARG_ENABLE(debug, - AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]), - [ - case $enableval in - yes) - kde_use_debug_code="yes" - kde_use_debug_define=no - ;; - full) - kde_use_debug_code="full" - kde_use_debug_define=no - ;; - *) - kde_use_debug_code="no" - kde_use_debug_define=yes - ;; - esac - ], - [kde_use_debug_code="no" - kde_use_debug_define=no - ]) - - dnl Just for configure --help - AC_ARG_ENABLE(dummyoption, - AC_HELP_STRING([--disable-debug], - [disables debug output and debug symbols [default=no]]), - [],[]) - - AC_ARG_ENABLE(strict, - AC_HELP_STRING([--enable-strict], - [compiles with strict compiler options (may not work!)]), - [ - if test $enableval = "no"; then - kde_use_strict_options="no" - else - kde_use_strict_options="yes" - fi - ], [kde_use_strict_options="no"]) - - AC_ARG_ENABLE(warnings,AC_HELP_STRING([--disable-warnings],[disables compilation with -Wall and similar]), - [ - if test $enableval = "no"; then - kde_use_warnings="no" - else - kde_use_warnings="yes" - fi - ], [kde_use_warnings="yes"]) - - dnl enable warnings for debug build - if test "$kde_use_debug_code" != "no"; then - kde_use_warnings=yes - fi - - AC_ARG_ENABLE(profile,AC_HELP_STRING([--enable-profile],[creates profiling infos [default=no]]), - [kde_use_profiling=$enableval], - [kde_use_profiling="no"] - ) - - dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS - CFLAGS=" $CFLAGS" - - AC_PROG_CC - - AC_PROG_CPP - - if test "$GCC" = "yes"; then - if test "$kde_use_debug_code" != "no"; then - if test $kde_use_debug_code = "full"; then - CFLAGS="-g3 -fno-inline $CFLAGS" - else - CFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CFLAGS" - fi - else - CFLAGS="-O2 $CFLAGS" - fi - fi - - if test "$kde_use_debug_define" = "yes"; then - CFLAGS="-DNDEBUG $CFLAGS" - fi - - - case "$host" in - *-*-sysv4.2uw*) CFLAGS="-D_UNIXWARE $CFLAGS";; - *-*-sysv5uw7*) CFLAGS="-D_UNIXWARE7 $CFLAGS";; - esac - - if test -z "$LDFLAGS" && test "$kde_use_debug_code" = "no" && test "$GCC" = "yes"; then - LDFLAGS="" - fi - - CXXFLAGS=" $CXXFLAGS" - - AC_PROG_CXX - - KDE_CHECK_FOR_BAD_COMPILER - - if test "$GXX" = "yes" || test "$CXX" = "KCC"; then - if test "$kde_use_debug_code" != "no"; then - if test "$CXX" = "KCC"; then - CXXFLAGS="+K0 -Wall -pedantic -W -Wpointer-arith -Wwrite-strings $CXXFLAGS" - else - if test "$kde_use_debug_code" = "full"; then - CXXFLAGS="-g3 -fno-inline $CXXFLAGS" - else - CXXFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CXXFLAGS" - fi - fi - KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"]) - - dnl convenience compiler flags - KDE_CHECK_COMPILER_FLAG(Woverloaded-virtual, [WOVERLOADED_VIRTUAL="-Woverloaded-virtual"], [WOVERLOADED_VRITUAL=""]) - AC_SUBST(WOVERLOADED_VIRTUAL) - else - if test "$CXX" = "KCC"; then - CXXFLAGS="+K3 $CXXFLAGS" - else - CXXFLAGS="-O2 $CXXFLAGS" - fi - fi - fi - - if test "$kde_use_debug_define" = "yes"; then - CXXFLAGS="-DNDEBUG -DNO_DEBUG $CXXFLAGS" - fi - - if test "$kde_use_profiling" = "yes"; then - KDE_CHECK_COMPILER_FLAG(pg, - [ - CFLAGS="-pg $CFLAGS" - CXXFLAGS="-pg $CXXFLAGS" - ]) - fi - - if test "$kde_use_warnings" = "yes"; then - if test "$GCC" = "yes"; then - CXXFLAGS="-Wall -W -Wpointer-arith $CXXFLAGS" - case $host in - *-*-linux-gnu) - CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE $CFLAGS" - CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE -Wcast-align -Wchar-subscripts $CXXFLAGS" - KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"]) - KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"]) - ;; - esac - KDE_CHECK_COMPILER_FLAG(Wundef,[CXXFLAGS="-Wundef $CXXFLAGS"]) - KDE_CHECK_COMPILER_FLAG(Wno-long-long,[CXXFLAGS="-Wno-long-long $CXXFLAGS"]) - dnl ### FIXME: revert for KDE 4 - KDE_CHECK_COMPILER_FLAG(Wno-non-virtual-dtor,[CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor"]) - fi - fi - - if test "$GXX" = "yes" && test "$kde_use_strict_options" = "yes"; then - CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS" - fi - - AC_ARG_ENABLE(pch, - AC_HELP_STRING([--enable-pch], - [enables precompiled header support (currently only KCC or gcc >=3.4+unsermake) [default=no]]), - [ kde_use_pch=$enableval ],[ kde_use_pch=no ]) - - HAVE_GCC_VISIBILITY=0 - AC_SUBST([HAVE_GCC_VISIBILITY]) - - if test "$GXX" = "yes"; then - gcc_no_reorder_blocks=NO - KDE_CHECK_COMPILER_FLAG(fno-reorder-blocks,[gcc_no_reorder_blocks=YES]) - if test $kde_use_debug_code != "no" && \ - test $kde_use_debug_code != "full" && \ - test "YES" = "$gcc_no_reorder_blocks" ; then - CXXFLAGS="$CXXFLAGS -fno-reorder-blocks" - CFLAGS="$CFLAGS -fno-reorder-blocks" - fi - KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"]) - KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"]) - KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"]) - KDE_CHECK_COMPILER_FLAG(fexceptions, [USE_EXCEPTIONS="-fexceptions"], USE_EXCEPTIONS= ) - ENABLE_PERMISSIVE_FLAG="-fpermissive" - - if test "$kde_use_pch" = "yes"; then - AC_MSG_CHECKING(whether gcc supports precompiling c header files) - echo >conftest.h - if $CC -x c-header conftest.h >/dev/null 2>/dev/null; then - kde_gcc_supports_pch=yes - AC_MSG_RESULT(yes) - else - kde_gcc_supports_pch=no - AC_MSG_RESULT(no) - fi - if test "$kde_gcc_supports_pch" = "yes"; then - AC_MSG_CHECKING(whether gcc supports precompiling c++ header files) - if $CXX -x c++-header conftest.h >/dev/null 2>/dev/null; then - kde_gcc_supports_pch=yes - AC_MSG_RESULT(yes) - else - kde_gcc_supports_pch=no - AC_MSG_RESULT(no) - fi - fi - rm -f conftest.h conftest.h.gch - fi - - KDE_CHECK_FOR_OPT_NOINLINE_MATCH - if test "x$kde_cv_opt_noinline_match" = "xno" ; then - CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`" - fi - fi - AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes") - if test "$CXX" = "KCC"; then - dnl unfortunately we currently cannot disable exception support in KCC - dnl because doing so is binary incompatible and Qt by default links with exceptions :-( - dnl KDE_CHECK_COMPILER_FLAG(-no_exceptions,[CXXFLAGS="$CXXFLAGS --no_exceptions"]) - dnl KDE_CHECK_COMPILER_FLAG(-exceptions, [USE_EXCEPTIONS="--exceptions"], USE_EXCEPTIONS= ) - - if test "$kde_use_pch" = "yes"; then - dnl TODO: support --pch-dir! - KDE_CHECK_COMPILER_FLAG(-pch,[CXXFLAGS="$CXXFLAGS --pch"]) - dnl the below works (but the dir must exist), but it's - dnl useless for a whole package. - dnl The are precompiled headers for each source file, so when compiling - dnl from scratch, it doesn't make a difference, and they take up - dnl around ~5Mb _per_ sourcefile. - dnl KDE_CHECK_COMPILER_FLAG(-pch_dir /tmp, - dnl [CXXFLAGS="$CXXFLAGS --pch_dir `pwd`/pcheaders"]) - fi - dnl this flag controls inlining. by default KCC inlines in optimisation mode - dnl all implementations that are defined inside the class {} declaration. - dnl because of templates-compatibility with broken gcc compilers, this - dnl can cause excessive inlining. This flag limits it to a sane level - KDE_CHECK_COMPILER_FLAG(-inline_keyword_space_time=6,[CXXFLAGS="$CXXFLAGS --inline_keyword_space_time=6"]) - KDE_CHECK_COMPILER_FLAG(-inline_auto_space_time=2,[CXXFLAGS="$CXXFLAGS --inline_auto_space_time=2"]) - KDE_CHECK_COMPILER_FLAG(-inline_implicit_space_time=2.0,[CXXFLAGS="$CXXFLAGS --inline_implicit_space_time=2.0"]) - KDE_CHECK_COMPILER_FLAG(-inline_generated_space_time=2.0,[CXXFLAGS="$CXXFLAGS --inline_generated_space_time=2.0"]) - dnl Some source files are shared between multiple executables - dnl (or libraries) and some of those need template instantiations. - dnl In that case KCC needs to compile those sources with - dnl --one_instantiation_per_object. To make it easy for us we compile - dnl _all_ objects with that flag (--one_per is a shorthand). - KDE_CHECK_COMPILER_FLAG(-one_per, [CXXFLAGS="$CXXFLAGS --one_per"]) - fi - AC_SUBST(USE_EXCEPTIONS) - dnl obsolete macro - provided to keep things going - USE_RTTI= - AC_SUBST(USE_RTTI) - - case "$host" in - *-*-irix*) test "$GXX" = yes && CXXFLAGS="-D_LANGUAGE_C_PLUS_PLUS -D__LANGUAGE_C_PLUS_PLUS $CXXFLAGS" ;; - *-*-sysv4.2uw*) CXXFLAGS="-D_UNIXWARE $CXXFLAGS";; - *-*-sysv5uw7*) CXXFLAGS="-D_UNIXWARE7 $CXXFLAGS";; - *-*-solaris*) - if test "$GXX" = yes; then - libstdcpp=`$CXX -print-file-name=libstdc++.so` - if test ! -f $libstdcpp; then - AC_MSG_ERROR([You've compiled gcc without --enable-shared. This doesn't work with KDE. Please recompile gcc with --enable-shared to receive a libstdc++.so]) - fi - fi - ;; - esac - - AC_VALIDIFY_CXXFLAGS - - AC_PROG_CXXCPP - - if test "$GCC" = yes; then - NOOPT_CFLAGS=-O0 - fi - KDE_CHECK_COMPILER_FLAG(O0,[NOOPT_CXXFLAGS=-O0]) - - AC_ARG_ENABLE(coverage, - AC_HELP_STRING([--enable-coverage],[use gcc coverage testing]), [ - if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then - ac_coverage_compiler="-fprofile-arcs -ftest-coverage" - ac_coverage_linker="-lgcc" - elif test "$am_cv_CC_dependencies_compiler_type" = "gcc"; then - ac_coverage_compiler="-fprofile-arcs -ftest-coverage" - ac_coverage_linker="" - else - AC_MSG_ERROR([coverage with your compiler is not supported]) - fi - CFLAGS="$CFLAGS $ac_coverage_compiler" - CXXFLAGS="$CXXFLAGS $ac_coverage_compiler" - LDFLAGS="$LDFLAGS $ac_coverage_linker" - ]) - - AC_SUBST(NOOPT_CXXFLAGS) - AC_SUBST(NOOPT_CFLAGS) - AC_SUBST(ENABLE_PERMISSIVE_FLAG) - - KDE_CHECK_NEW_LDFLAGS - KDE_CHECK_FINAL - KDE_CHECK_CLOSURE - KDE_CHECK_NMCHECK - - ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), []) -]) - -AC_DEFUN([KDE_CHECK_VISIBILITY_GCC_BUG], - [ - AC_CACHE_CHECK([for gcc -fvisibility-inlines-hidden bug], kde_cv_val_gcc_visibility_bug, - [ - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - - safe_CXXFLAGS=$CXXFLAGS - safe_LDFLAGS=$LDFLAGS - CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0" - LDFLAGS="$LDFLAGS -shared -fPIC" - - AC_TRY_LINK( - [ - /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */ - #include <string> - int some_function( void ) __attribute__ ((visibility("default"))); - int some_function( void ) - { - std::string s("blafasel"); - return 0; - } - ], [/* elvis is alive */], - kde_cv_val_gcc_visibility_bug=no, kde_cv_val_gcc_visibility_bug=yes) - - CXXFLAGS=$safe_CXXFLAGS - LDFLAGS=$safe_LDFLAGS - AC_LANG_RESTORE - ] - ) - - if test x$kde_cv_val_gcc_visibility_bug = xno; then - CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden" - fi - ] -) - -AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY], -[ - AC_BEFORE([AC_PATH_TQT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY]) - - AC_MSG_CHECKING([grepping for visibility push/pop in headers]) - - if test "x$GXX" = "xyes"; then - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_EGREP_CPP( - [GCC visibility push], - [ #include <exception> - ], - [ - AC_MSG_RESULT(yes) - kde_stdc_visibility_patched=yes ], - [ - AC_MSG_RESULT(no) - AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for - visibility support. Disabling -fvisibility=hidden]) - - kde_stdc_visibility_patched=no ]) - - AC_LANG_RESTORE - - kde_have_gcc_visibility=no - KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, - [ - kde_have_gcc_visibility=yes - dnl the whole toolchain is just a mess, gcc is just too buggy - dnl to handle STL with visibility enabled. Lets reconsider - dnl when gcc 4.2 is out or when things get fixed in the compiler. - dnl Contact mueller@kde.org for details. - AC_ARG_ENABLE(gcc-hidden-visibility, - AC_HELP_STRING([--enable-gcc-hidden-visibility],[toolchain hidden visibility [default=no]]), - [kde_have_gcc_visibility=$enableval], - [kde_have_gcc_visibility=no]) - - AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched, - [ - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - - safe_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CXXFLAGS $all_includes" - - AC_TRY_COMPILE( - [ -#include <qglobal.h> -#if Q_EXPORT - 0 != 0 -/* if this compiles, then Q_EXPORT is undefined */ -/* if Q_EXPORT is nonempty, this will break compilation */ -#endif - ], [/* elvis is alive */], - kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes) - - CXXFLAGS=$safe_CXXFLAGS - AC_LANG_RESTORE - ] - ) - - if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then - CXXFLAGS="$CXXFLAGS -fvisibility=hidden" - KDE_CHECK_VISIBILITY_GCC_BUG - HAVE_GCC_VISIBILITY=1 - AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported]) - fi - ]) - fi -]) - -AC_DEFUN([KDE_ADD_DEPENDENCIES], -[ - [A]M_DEPENDENCIES(CC) - [A]M_DEPENDENCIES(CXX) -]) - -dnl just a wrapper to clean up configure.in -AC_DEFUN([KDE_PROG_LIBTOOL], -[ -AC_REQUIRE([AC_CHECK_COMPILERS]) -AC_REQUIRE([AC_ENABLE_SHARED]) -AC_REQUIRE([AC_ENABLE_STATIC]) - -AC_REQUIRE([AC_LIBTOOL_DLOPEN]) -AC_REQUIRE([KDE_CHECK_LIB64]) - -AC_OBJEXT -AC_EXEEXT - -AM_PROG_LIBTOOL -AC_LIBTOOL_CXX - -LIBTOOL_SHELL="/bin/sh ./libtool" -# LIBTOOL="$LIBTOOL --silent" -KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" -AC_SUBST(KDE_PLUGIN) - -# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs. -KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" -AC_SUBST(KDE_CHECK_PLUGIN) - -# we patch configure quite some so we better keep that consistent for incremental runs -AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch configure') -]) - -AC_DEFUN([KDE_CHECK_LIB64], -[ - AC_ARG_ENABLE(libsuffix, - AC_HELP_STRING([--enable-libsuffix], - [/lib directory suffix (64,32,none,auto[=default])]), - tdelibsuff=$enableval, tdelibsuff="auto") - - if test "$tdelibsuff" = "auto"; then - -cat > conftest.c << EOF -#include <stdio.h> -int main() { - return 0; -} -EOF - tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ - s,.*/lib\([[^\/]]*\)/.*,\1, - p -}'` - rm -rf conftest.* - fi - - if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then - tdelibsuff= - fi - if test -z "$tdelibsuff"; then - AC_MSG_RESULT([not using lib directory suffix]) - AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) - else - if test "$libdir" = '${exec_prefix}/lib'; then - libdir="$libdir${tdelibsuff}" - AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms - fi - AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories) - AC_MSG_RESULT([using lib directory suffix $tdelibsuff]) - fi -]) - -AC_DEFUN([KDE_CHECK_TYPES], -[ AC_CHECK_SIZEOF(int, 4)dnl - AC_CHECK_SIZEOF(short)dnl - AC_CHECK_SIZEOF(long, 4)dnl - AC_CHECK_SIZEOF(char *, 4)dnl -])dnl - -dnl Not used - kept for compat only? -AC_DEFUN([KDE_DO_IT_ALL], -[ -AC_CANONICAL_SYSTEM -AC_ARG_PROGRAM -AM_INIT_AUTOMAKE($1, $2) -AM_DISABLE_LIBRARIES -AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) -AC_CHECK_COMPILERS -KDE_PROG_LIBTOOL -AM_KDE_WITH_NLS -AC_PATH_KDE -]) - -AC_DEFUN([AC_CHECK_RPATH], -[ -AC_MSG_CHECKING(for rpath) -AC_ARG_ENABLE(rpath, - AC_HELP_STRING([--disable-rpath],[do not use the rpath feature of ld]), - USE_RPATH=$enableval, USE_RPATH=yes) - -if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then - - KDE_RPATH="-R \$(libdir)" - - if test "$kde_libraries" != "$libdir"; then - KDE_RPATH="$KDE_RPATH -R \$(kde_libraries)" - fi - - if test -n "$qt_libraries"; then - KDE_RPATH="$KDE_RPATH -R \$(qt_libraries)" - fi - dnl $x_libraries is set to /usr/lib in case - if test -n "$X_LDFLAGS"; then - X_RPATH="-R \$(x_libraries)" - KDE_RPATH="$KDE_RPATH $X_RPATH" - fi - if test -n "$KDE_EXTRA_RPATH"; then - KDE_RPATH="$KDE_RPATH \$(KDE_EXTRA_RPATH)" - fi -fi -AC_SUBST(KDE_EXTRA_RPATH) -AC_SUBST(KDE_RPATH) -AC_SUBST(X_RPATH) -AC_MSG_RESULT($USE_RPATH) -]) - -dnl Check for the type of the third argument of getsockname -AC_DEFUN([AC_CHECK_SOCKLEN_T], -[ - AC_MSG_CHECKING(for socklen_t) - AC_CACHE_VAL(kde_cv_socklen_t, - [ - AC_LANG_PUSH(C++) - kde_cv_socklen_t=no - AC_TRY_COMPILE([ - #include <sys/types.h> - #include <sys/socket.h> - ], - [ - socklen_t len; - getpeername(0,0,&len); - ], - [ - kde_cv_socklen_t=yes - kde_cv_socklen_t_equiv=socklen_t - ]) - AC_LANG_POP(C++) - ]) - AC_MSG_RESULT($kde_cv_socklen_t) - if test $kde_cv_socklen_t = no; then - AC_MSG_CHECKING([for socklen_t equivalent for socket functions]) - AC_CACHE_VAL(kde_cv_socklen_t_equiv, - [ - kde_cv_socklen_t_equiv=int - AC_LANG_PUSH(C++) - for t in int size_t unsigned long "unsigned long"; do - AC_TRY_COMPILE([ - #include <sys/types.h> - #include <sys/socket.h> - ], - [ - $t len; - getpeername(0,0,&len); - ], - [ - kde_cv_socklen_t_equiv="$t" - break - ]) - done - AC_LANG_POP(C++) - ]) - AC_MSG_RESULT($kde_cv_socklen_t_equiv) - fi - AC_DEFINE_UNQUOTED(kde_socklen_t, $kde_cv_socklen_t_equiv, - [type to use in place of socklen_t if not defined]) - AC_DEFINE_UNQUOTED(ksize_t, $kde_cv_socklen_t_equiv, - [type to use in place of socklen_t if not defined (deprecated, use kde_socklen_t)]) -]) - -dnl This is a merge of some macros out of the gettext aclocal.m4 -dnl since we don't need anything, I took the things we need -dnl the copyright for them is: -dnl > -dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -dnl This Makefile.in is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without -dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A -dnl PARTICULAR PURPOSE. -dnl > -dnl for this file it is relicensed under LGPL - -AC_DEFUN([AM_KDE_WITH_NLS], - [ - dnl If we use NLS figure out what method - - AM_PATH_PROG_WITH_TEST_KDE(MSGFMT, msgfmt, - [test -n "`$ac_dir/$ac_word --version 2>&1 | grep 'GNU gettext'`"], msgfmt) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - - if test -z "`$GMSGFMT --version 2>&1 | grep 'GNU gettext'`"; then - AC_MSG_RESULT([found msgfmt program is not GNU msgfmt; ignore it]) - GMSGFMT=":" - fi - MSGFMT=$GMSGFMT - AC_SUBST(GMSGFMT) - AC_SUBST(MSGFMT) - - AM_PATH_PROG_WITH_TEST_KDE(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is no 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 programs is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi - fi - AC_SUBST(XGETTEXT) - - ]) - -# Search path for a program which passes the given test. -# Ulrich Drepper <drepper@cygnus.com>, 1996. - -# serial 1 -# Stephan Kulow: I appended a _KDE against name conflicts - -dnl AM_PATH_PROG_WITH_TEST_KDE(VARIABLE, PROG-TO-CHECK-FOR, -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -AC_DEFUN([AM_PATH_PROG_WITH_TEST_KDE], -[# 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 - 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 -n "[$]$1"; then - AC_MSG_RESULT([$]$1) -else - AC_MSG_RESULT(no) -fi -AC_SUBST($1)dnl -]) - - -# Check whether LC_MESSAGES is available in <locale.h>. -# Ulrich Drepper <drepper@cygnus.com>, 1995. - -# serial 1 - -AC_DEFUN([AM_LC_MESSAGES], - [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 contains LC_MESSAGES]) - fi - fi]) - -dnl From Jim Meyering. -dnl FIXME: migrate into libit. - -AC_DEFUN([AM_FUNC_OBSTACK], -[AC_CACHE_CHECK([for obstacks], am_cv_func_obstack, - [AC_TRY_LINK([#include "obstack.h"], - [struct obstack *mem;obstack_free(mem,(char *) 0)], - am_cv_func_obstack=yes, - am_cv_func_obstack=no)]) - if test $am_cv_func_obstack = yes; then - AC_DEFINE(HAVE_OBSTACK) - else - LIBOBJS="$LIBOBJS obstack.o" - fi -]) - -dnl From Jim Meyering. Use this if you use the GNU error.[ch]. -dnl FIXME: Migrate into libit - -AC_DEFUN([AM_FUNC_ERROR_AT_LINE], -[AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line, - [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");], - am_cv_lib_error_at_line=yes, - am_cv_lib_error_at_line=no)]) - if test $am_cv_lib_error_at_line = no; then - LIBOBJS="$LIBOBJS error.o" - fi - AC_SUBST(LIBOBJS)dnl -]) - -# Macro to add for using GNU gettext. -# Ulrich Drepper <drepper@cygnus.com>, 1995. - -# serial 1 -# Stephan Kulow: I put a KDE in it to avoid name conflicts - -AC_DEFUN([AM_KDE_GNU_GETTEXT], - [AC_REQUIRE([AC_PROG_MAKE_SET])dnl - AC_REQUIRE([AC_PROG_RANLIB])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl - AC_REQUIRE([AC_TYPE_OFF_T])dnl - AC_REQUIRE([AC_TYPE_SIZE_T])dnl - AC_REQUIRE([AC_FUNC_ALLOCA])dnl - AC_REQUIRE([AC_FUNC_MMAP])dnl - AC_REQUIRE([AM_KDE_WITH_NLS])dnl - AC_CHECK_HEADERS([limits.h locale.h nl_types.h string.h values.h alloca.h]) - AC_CHECK_FUNCS([getcwd munmap putenv setlocale strchr strcasecmp \ -__argz_count __argz_stringify __argz_next]) - - AC_MSG_CHECKING(for stpcpy) - AC_CACHE_VAL(kde_cv_func_stpcpy, - [ - kde_safe_cxxflags=$CXXFLAGS - CXXFLAGS="-Werror" - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([ - #include <string.h> - ], - [ - char buffer[200]; - stpcpy(buffer, buffer); - ], - kde_cv_func_stpcpy=yes, - kde_cv_func_stpcpy=no) - AC_LANG_RESTORE - CXXFLAGS=$kde_safe_cxxflags - ]) - AC_MSG_RESULT($kde_cv_func_stpcpy) - if eval "test \"`echo $kde_cv_func_stpcpy`\" = yes"; then - AC_DEFINE(HAVE_STPCPY, 1, [Define if you have stpcpy]) - fi - - AM_LC_MESSAGES - - if test "x$CATOBJEXT" != "x"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - AC_MSG_CHECKING(for catalogs to be installed) - NEW_LINGUAS= - for lang in ${LINGUAS=$ALL_LINGUAS}; do - case "$ALL_LINGUAS" in - *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; - esac - done - LINGUAS=$NEW_LINGUAS - AC_MSG_RESULT($LINGUAS) - fi - - 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 - - ]) - -AC_DEFUN([AC_HAVE_XPM], - [AC_REQUIRE_CPP()dnl - AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) - - test -z "$XPM_LDFLAGS" && XPM_LDFLAGS= - test -z "$XPM_INCLUDE" && XPM_INCLUDE= - - AC_ARG_WITH(xpm,AC_HELP_STRING([--without-xpm],[disable color pixmap XPM tests]), - xpm_test=$withval, xpm_test="yes") - if test "x$xpm_test" = xno; then - ac_cv_have_xpm=no - else - AC_MSG_CHECKING(for XPM) - AC_CACHE_VAL(ac_cv_have_xpm, - [ - ac_save_ldflags="$LDFLAGS" - ac_save_cflags="$CFLAGS" - if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then - LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm -lX11 -lXext $LIBZ $LIBSOCKET" - else - LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm $LIBZ $LIBSOCKET" - fi - CFLAGS="$CFLAGS $X_INCLUDES $USER_INCLUDES" - test -n "$XPM_INCLUDE" && CFLAGS="-I$XPM_INCLUDE $CFLAGS" - AC_TRY_LINK([#include <X11/xpm.h>],[], - ac_cv_have_xpm="yes",ac_cv_have_xpm="no") - LDFLAGS="$ac_save_ldflags" - CFLAGS="$ac_save_cflags" - ])dnl - - if test "$ac_cv_have_xpm" = no; then - AC_MSG_RESULT(no) - XPM_LDFLAGS="" - XPMINC="" - $2 - else - AC_DEFINE(HAVE_XPM, 1, [Define if you have XPM support]) - if test "$XPM_LDFLAGS" = ""; then - XPMLIB='-lXpm $(LIB_X11)' - else - XPMLIB="-L$XPM_LDFLAGS -lXpm "'$(LIB_X11)' - fi - if test "$XPM_INCLUDE" = ""; then - XPMINC="" - else - XPMINC="-I$XPM_INCLUDE" - fi - AC_MSG_RESULT(yes) - $1 - fi - fi - AC_SUBST(XPMINC) - AC_SUBST(XPMLIB) -]) - -AC_DEFUN([AC_HAVE_DPMS], - [AC_REQUIRE_CPP()dnl - AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) - - test -z "$DPMS_LDFLAGS" && DPMS_LDFLAGS= - test -z "$DPMS_INCLUDE" && DPMS_INCLUDE= - DPMS_LIB= - - AC_ARG_WITH(dpms,AC_HELP_STRING([--without-dpms],[disable DPMS power saving]), - dpms_test=$withval, dpms_test="yes") - if test "x$dpms_test" = xno; then - ac_cv_have_dpms=no - else - AC_MSG_CHECKING(for DPMS) - dnl Note: ac_cv_have_dpms can be no, yes, or -lXdpms. - dnl 'yes' means DPMS_LIB="", '-lXdpms' means DPMS_LIB="-lXdpms". - AC_CACHE_VAL(ac_cv_have_dpms, - [ - if test "x$kde_use_qt_emb" = "xyes" || test "x$kde_use_qt_mac" = "xyes"; then - AC_MSG_RESULT(no) - ac_cv_have_dpms="no" - else - ac_save_ldflags="$LDFLAGS" - ac_save_cflags="$CFLAGS" - ac_save_libs="$LIBS" - LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries" - LIBS="-lX11 -lXext $LIBSOCKET" - CFLAGS="$CFLAGS $X_INCLUDES" - test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS" - AC_TRY_LINK([ - #include <X11/Xproto.h> - #include <X11/X.h> - #include <X11/Xlib.h> - #include <X11/extensions/dpms.h> - int foo_test_dpms() - { return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[], - ac_cv_have_dpms="yes", [ - LIBS="-lXdpms $LIBS" - AC_TRY_LINK([ - #include <X11/Xproto.h> - #include <X11/X.h> - #include <X11/Xlib.h> - #include <X11/extensions/dpms.h> - int foo_test_dpms() - { return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[], - [ - ac_cv_have_dpms="-lXdpms" - ],ac_cv_have_dpms="no") - ]) - LDFLAGS="$ac_save_ldflags" - CFLAGS="$ac_save_cflags" - LIBS="$ac_save_libs" - fi - ])dnl - - if test "$ac_cv_have_dpms" = no; then - AC_MSG_RESULT(no) - DPMS_LDFLAGS="" - DPMSINC="" - $2 - else - AC_DEFINE(HAVE_DPMS, 1, [Define if you have DPMS support]) - if test "$ac_cv_have_dpms" = "-lXdpms"; then - DPMS_LIB="-lXdpms" - fi - if test "$DPMS_LDFLAGS" = ""; then - DPMSLIB="$DPMS_LIB "'$(LIB_X11)' - else - DPMSLIB="$DPMS_LDFLAGS $DPMS_LIB "'$(LIB_X11)' - fi - if test "$DPMS_INCLUDE" = ""; then - DPMSINC="" - else - DPMSINC="-I$DPMS_INCLUDE" - fi - AC_MSG_RESULT(yes) - $1 - fi - fi - ac_save_cflags="$CFLAGS" - CFLAGS="$CFLAGS $X_INCLUDES" - test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS" - AH_TEMPLATE(HAVE_DPMSCAPABLE_PROTO, - [Define if you have the DPMSCapable prototype in <X11/extensions/dpms.h>]) - AC_CHECK_DECL(DPMSCapable, - AC_DEFINE(HAVE_DPMSCAPABLE_PROTO),, - [#include <X11/Xlib.h> - #include <X11/extensions/dpms.h>]) - AH_TEMPLATE(HAVE_DPMSINFO_PROTO, - [Define if you have the DPMSInfo prototype in <X11/extensions/dpms.h>]) - AC_CHECK_DECL(DPMSInfo, - AC_DEFINE(HAVE_DPMSINFO_PROTO),, - [#include <X11/Xlib.h> - #include <X11/extensions/dpms.h>]) - CFLAGS="$ac_save_cflags" - AC_SUBST(DPMSINC) - AC_SUBST(DPMSLIB) -]) - -AC_DEFUN([AC_HAVE_GL], - [AC_REQUIRE_CPP()dnl - AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) - - test -z "$GL_LDFLAGS" && GL_LDFLAGS= - test -z "$GL_INCLUDE" && GL_INCLUDE= - - AC_ARG_WITH(gl,AC_HELP_STRING([--without-gl],[disable 3D GL modes]), - gl_test=$withval, gl_test="yes") - if test "x$kde_use_qt_emb" = "xyes"; then - # GL and Qt Embedded is a no-go for now. - ac_cv_have_gl=no - elif test "x$gl_test" = xno; then - ac_cv_have_gl=no - else - AC_MSG_CHECKING(for GL) - AC_CACHE_VAL(ac_cv_have_gl, - [ - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - ac_save_ldflags=$LDFLAGS - ac_save_cxxflags=$CXXFLAGS - ac_save_libs=$LIBS - LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries" - LIBS="$LIBS -lGL -lGLU" - test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LIBS="$LIBS -lX11" - LIBS="$LIBS $LIB_XEXT -lm $LIBSOCKET" - CXXFLAGS="$CFLAGS $X_INCLUDES" - test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS" - AC_TRY_LINK([#include <GL/gl.h> -#include <GL/glu.h> -], [], - ac_cv_have_gl="yes", ac_cv_have_gl="no") - AC_LANG_RESTORE - LDFLAGS=$ac_save_ldflags - CXXFLAGS=$ac_save_cxxflags - LIBS=$ac_save_libs - ])dnl - - if test "$ac_cv_have_gl" = "no"; then - AC_MSG_RESULT(no) - GL_LDFLAGS="" - GLINC="" - $2 - else - AC_DEFINE(HAVE_GL, 1, [Defines if you have GL (Mesa, OpenGL, ...)]) - if test "$GL_LDFLAGS" = ""; then - GLLIB='-lGLU -lGL $(LIB_X11)' - else - GLLIB="$GL_LDFLAGS -lGLU -lGL "'$(LIB_X11)' - fi - if test "$GL_INCLUDE" = ""; then - GLINC="" - else - GLINC="-I$GL_INCLUDE" - fi - AC_MSG_RESULT($ac_cv_have_gl) - $1 - fi - fi - AC_SUBST(GLINC) - AC_SUBST(GLLIB) -]) - - - dnl shadow password and PAM magic - maintained by ossi@kde.org - -AC_DEFUN([KDE_PAM], [ - AC_REQUIRE([KDE_CHECK_LIBDL]) - - want_pam= - AC_ARG_WITH(pam, - AC_HELP_STRING([--with-pam[=ARG]],[enable support for PAM: ARG=[yes|no|service name]]), - [ if test "x$withval" = "xyes"; then - want_pam=yes - pam_service=kde - elif test "x$withval" = "xno"; then - want_pam=no - else - want_pam=yes - pam_service=$withval - fi - ], [ pam_service=kde ]) - - use_pam= - PAMLIBS= - if test "x$want_pam" != xno; then - AC_CHECK_LIB(pam, pam_start, [ - AC_CHECK_HEADER(security/pam_appl.h, - [ pam_header=security/pam_appl.h ], - [ AC_CHECK_HEADER(pam/pam_appl.h, - [ pam_header=pam/pam_appl.h ], - [ - AC_MSG_WARN([PAM detected, but no headers found! -Make sure you have the necessary development packages installed.]) - ] - ) - ] - ) - ], , $LIBDL) - if test -z "$pam_header"; then - if test "x$want_pam" = xyes; then - AC_MSG_ERROR([--with-pam was specified, but cannot compile with PAM!]) - fi - else - AC_DEFINE(HAVE_PAM, 1, [Defines if you have PAM (Pluggable Authentication Modules)]) - PAMLIBS="$PAM_MISC_LIB -lpam $LIBDL" - use_pam=yes - - dnl darwin claims to be something special - if test "$pam_header" = "pam/pam_appl.h"; then - AC_DEFINE(HAVE_PAM_PAM_APPL_H, 1, [Define if your PAM headers are in pam/ instead of security/]) - fi - - dnl test whether struct pam_message is const (Linux) or not (Sun) - AC_MSG_CHECKING(for const pam_message) - AC_EGREP_HEADER([struct pam_message], $pam_header, - [ AC_EGREP_HEADER([const struct pam_message], $pam_header, - [AC_MSG_RESULT([const: Linux-type PAM])], - [AC_MSG_RESULT([nonconst: Sun-type PAM]) - AC_DEFINE(PAM_MESSAGE_NONCONST, 1, [Define if your PAM support takes non-const arguments (Solaris)])] - )], - [AC_MSG_RESULT([not found - assume const, Linux-type PAM])]) - fi - fi - - AC_SUBST(PAMLIBS) -]) - -dnl DEF_PAM_SERVICE(arg name, full name, define name) -AC_DEFUN([DEF_PAM_SERVICE], [ - AC_ARG_WITH($1-pam, - AC_HELP_STRING([--with-$1-pam=[val]],[override PAM service from --with-pam for $2]), - [ if test "x$use_pam" = xyes; then - $3_PAM_SERVICE=$withval - else - AC_MSG_ERROR([Cannot use use --with-$1-pam, as no PAM was detected. -You may want to enforce it by using --with-pam.]) - fi - ], - [ if test "x$use_pam" = xyes; then - $3_PAM_SERVICE="$pam_service" - fi - ]) - if test -n "$$3_PAM_SERVICE"; then - AC_MSG_RESULT([The PAM service used by $2 will be $$3_PAM_SERVICE]) - AC_DEFINE_UNQUOTED($3_PAM_SERVICE, "$$3_PAM_SERVICE", [The PAM service to be used by $2]) - fi - AC_SUBST($3_PAM_SERVICE) -]) - -AC_DEFUN([KDE_SHADOWPASSWD], [ - AC_REQUIRE([KDE_PAM]) - - AC_CHECK_LIB(shadow, getspent, - [ LIBSHADOW="-lshadow" - ac_use_shadow=yes - ], - [ dnl for UnixWare - AC_CHECK_LIB(gen, getspent, - [ LIBGEN="-lgen" - ac_use_shadow=yes - ], - [ AC_CHECK_FUNC(getspent, - [ ac_use_shadow=yes ], - [ ac_use_shadow=no ]) - ]) - ]) - AC_SUBST(LIBSHADOW) - AC_SUBST(LIBGEN) - - AC_MSG_CHECKING([for shadow passwords]) - - AC_ARG_WITH(shadow, - AC_HELP_STRING([--with-shadow],[If you want shadow password support]), - [ if test "x$withval" != "xno"; then - use_shadow=yes - else - use_shadow=no - fi - ], [ - use_shadow="$ac_use_shadow" - ]) - - if test "x$use_shadow" = xyes; then - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SHADOW, 1, [Define if you use shadow passwords]) - else - AC_MSG_RESULT(no) - LIBSHADOW= - LIBGEN= - fi - - dnl finally make the relevant binaries setuid root, if we have shadow passwds. - dnl this still applies, if we could use it indirectly through pam. - if test "x$use_shadow" = xyes || - ( test "x$use_pam" = xyes && test "x$ac_use_shadow" = xyes ); then - case $host in - *-*-freebsd* | *-*-netbsd* | *-*-openbsd*) - SETUIDFLAGS="-m 4755 -o root";; - *) - SETUIDFLAGS="-m 4755";; - esac - fi - AC_SUBST(SETUIDFLAGS) - -]) - -AC_DEFUN([KDE_PASSWDLIBS], [ - AC_REQUIRE([KDE_MISC_TESTS]) dnl for LIBCRYPT - AC_REQUIRE([KDE_PAM]) - AC_REQUIRE([KDE_SHADOWPASSWD]) - - if test "x$use_pam" = "xyes"; then - PASSWDLIBS="$PAMLIBS" - else - PASSWDLIBS="$LIBCRYPT $LIBSHADOW $LIBGEN" - fi - - dnl FreeBSD uses a shadow-like setup, where /etc/passwd holds the users, but - dnl /etc/master.passwd holds the actual passwords. /etc/master.passwd requires - dnl root to read, so kcheckpass needs to be root (even when using pam, since pam - dnl may need to read /etc/master.passwd). - case $host in - *-*-freebsd*) - SETUIDFLAGS="-m 4755 -o root" - ;; - *) - ;; - esac - - AC_SUBST(PASSWDLIBS) -]) - -AC_DEFUN([KDE_CHECK_LIBDL], -[ -AC_CHECK_LIB(dl, dlopen, [ -LIBDL="-ldl" -ac_cv_have_dlfcn=yes -]) - -AC_CHECK_LIB(dld, shl_unload, [ -LIBDL="-ldld" -ac_cv_have_shload=yes -]) - -AC_SUBST(LIBDL) -]) - -AC_DEFUN([KDE_CHECK_DLOPEN], -[ -KDE_CHECK_LIBDL -AC_CHECK_HEADERS(dlfcn.h dl.h) -if test "$ac_cv_header_dlfcn_h" = "no"; then - ac_cv_have_dlfcn=no -fi - -if test "$ac_cv_header_dl_h" = "no"; then - ac_cv_have_shload=no -fi - -dnl XXX why change enable_dlopen? its already set by autoconf's AC_ARG_ENABLE -dnl (MM) -AC_ARG_ENABLE(dlopen, -AC_HELP_STRING([--disable-dlopen],[link statically [default=no]]), -enable_dlopen=$enableval, -enable_dlopen=yes) - -# override the user's opinion, if we know it better ;) -if test "$ac_cv_have_dlfcn" = "no" && test "$ac_cv_have_shload" = "no"; then - enable_dlopen=no -fi - -if test "$ac_cv_have_dlfcn" = "yes"; then - AC_DEFINE_UNQUOTED(HAVE_DLFCN, 1, [Define if you have dlfcn]) -fi - -if test "$ac_cv_have_shload" = "yes"; then - AC_DEFINE_UNQUOTED(HAVE_SHLOAD, 1, [Define if you have shload]) -fi - -if test "$enable_dlopen" = no ; then - test -n "$1" && eval $1 -else - test -n "$2" && eval $2 -fi - -]) - -AC_DEFUN([KDE_CHECK_DYNAMIC_LOADING], -[ -KDE_CHECK_DLOPEN(libtool_enable_shared=yes, libtool_enable_static=no) -KDE_PROG_LIBTOOL -AC_MSG_CHECKING([dynamic loading]) -eval "`egrep '^build_libtool_libs=' libtool`" -if test "$build_libtool_libs" = "yes" && test "$enable_dlopen" = "yes"; then - dynamic_loading=yes - AC_DEFINE_UNQUOTED(HAVE_DYNAMIC_LOADING) -else - dynamic_loading=no -fi -AC_MSG_RESULT($dynamic_loading) -if test "$dynamic_loading" = "yes"; then - $1 -else - $2 -fi -]) - -AC_DEFUN([KDE_ADD_INCLUDES], -[ -if test -z "$1"; then - test_include="Pix.h" -else - test_include="$1" -fi - -AC_MSG_CHECKING([for libg++ ($test_include)]) - -AC_CACHE_VAL(kde_cv_libgpp_includes, -[ -kde_cv_libgpp_includes=no - - for ac_dir in \ - \ - /usr/include/g++ \ - /usr/include \ - /usr/unsupported/include \ - /opt/include \ - $extra_include \ - ; \ - do - if test -r "$ac_dir/$test_include"; then - kde_cv_libgpp_includes=$ac_dir - break - fi - done -]) - -AC_MSG_RESULT($kde_cv_libgpp_includes) -if test "$kde_cv_libgpp_includes" != "no"; then - all_includes="-I$kde_cv_libgpp_includes $all_includes $USER_INCLUDES" -fi -]) -]) - -AC_DEFUN([KDE_CHECK_LIBPTHREAD], -[ - dnl This code is here specifically to handle the - dnl various flavors of threading library on FreeBSD - dnl 4-, 5-, and 6-, and the (weird) rules around it. - dnl There may be an environment PTHREAD_LIBS that - dnl specifies what to use; otherwise, search for it. - dnl -pthread is special cased and unsets LIBPTHREAD - dnl below if found. - LIBPTHREAD="" - - if test -n "$PTHREAD_LIBS"; then - if test "x$PTHREAD_LIBS" = "x-pthread" ; then - LIBPTHREAD="PTHREAD" - else - PTHREAD_LIBS_save="$PTHREAD_LIBS" - PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'` - AC_MSG_CHECKING([for pthread_create in $PTHREAD_LIBS]) - KDE_CHECK_LIB($PTHREAD_LIBS, pthread_create, [ - LIBPTHREAD="$PTHREAD_LIBS_save"]) - PTHREAD_LIBS="$PTHREAD_LIBS_save" - fi - fi - - dnl Is this test really needed, in the face of the Tru64 test below? - if test -z "$LIBPTHREAD"; then - AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"]) - fi - - dnl This is a special Tru64 check, see BR 76171 issue #18. - if test -z "$LIBPTHREAD" ; then - AC_MSG_CHECKING([for pthread_create in -lpthread]) - kde_safe_libs=$LIBS - LIBS="$LIBS -lpthread" - AC_TRY_LINK([#include <pthread.h>],[(void)pthread_create(0,0,0,0);],[ - AC_MSG_RESULT(yes) - LIBPTHREAD="-lpthread"],[ - AC_MSG_RESULT(no)]) - LIBS=$kde_safe_libs - fi - - dnl Un-special-case for FreeBSD. - if test "x$LIBPTHREAD" = "xPTHREAD" ; then - LIBPTHREAD="" - fi - - AC_SUBST(LIBPTHREAD) -]) - -AC_DEFUN([KDE_CHECK_PTHREAD_OPTION], -[ - USE_THREADS="" - if test -z "$LIBPTHREAD"; then - KDE_CHECK_COMPILER_FLAG(pthread, [USE_THREADS="-D_THREAD_SAFE -pthread"]) - fi - - AH_VERBATIM(__svr_define, [ -#if defined(__SVR4) && !defined(__svr4__) -#define __svr4__ 1 -#endif -]) - case $host_os in - solaris*) - KDE_CHECK_COMPILER_FLAG(mt, [USE_THREADS="-mt"]) - CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_SOLARIS -DSVR4" - ;; - freebsd*) - CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE $PTHREAD_CFLAGS" - ;; - aix*) - CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" - LIBPTHREAD="$LIBPTHREAD -lc_r" - ;; - linux*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" - if test "$CXX" = "KCC"; then - CXXFLAGS="$CXXFLAGS --thread_safe" - NOOPT_CXXFLAGS="$NOOPT_CXXFLAGS --thread_safe" - fi - ;; - *) - ;; - esac - AC_SUBST(USE_THREADS) - AC_SUBST(LIBPTHREAD) -]) - -AC_DEFUN([KDE_CHECK_THREADING], -[ - AC_REQUIRE([KDE_CHECK_LIBPTHREAD]) - AC_REQUIRE([KDE_CHECK_PTHREAD_OPTION]) - dnl default is yes if libpthread is found and no if no libpthread is available - if test -z "$LIBPTHREAD"; then - if test -z "$USE_THREADS"; then - kde_check_threading_default=no - else - kde_check_threading_default=yes - fi - else - kde_check_threading_default=yes - fi - AC_ARG_ENABLE(threading,AC_HELP_STRING([--disable-threading],[disables threading even if libpthread found]), - kde_use_threading=$enableval, kde_use_threading=$kde_check_threading_default) - if test "x$kde_use_threading" = "xyes"; then - AC_DEFINE(HAVE_LIBPTHREAD, 1, [Define if you have a working libpthread (will enable threaded code)]) - fi -]) - -AC_DEFUN([KDE_TRY_LINK_PYTHON], -[ -if test "$kde_python_link_found" = no; then - -if test "$1" = normal; then - AC_MSG_CHECKING(if a Python application links) -else - AC_MSG_CHECKING(if Python depends on $2) -fi - -AC_CACHE_VAL(kde_cv_try_link_python_$1, -[ -kde_save_cflags="$CFLAGS" -CFLAGS="$CFLAGS $PYTHONINC" -kde_save_libs="$LIBS" -LIBS="$LIBS $LIBPYTHON $2 $LIBDL $LIBSOCKET" -kde_save_ldflags="$LDFLAGS" -LDFLAGS="$LDFLAGS $PYTHONLIB" - -AC_TRY_LINK( -[ -#include <Python.h> -],[ - PySys_SetArgv(1, 0); -], - [kde_cv_try_link_python_$1=yes], - [kde_cv_try_link_python_$1=no] -) -CFLAGS="$kde_save_cflags" -LIBS="$kde_save_libs" -LDFLAGS="$kde_save_ldflags" -]) - -if test "$kde_cv_try_link_python_$1" = "yes"; then - AC_MSG_RESULT(yes) - kde_python_link_found=yes - if test ! "$1" = normal; then - LIBPYTHON="$LIBPYTHON $2" - fi - $3 -else - AC_MSG_RESULT(no) - $4 -fi - -fi - -]) - -AC_DEFUN([KDE_CHECK_PYTHON_DIR], -[ -AC_MSG_CHECKING([for Python directory]) - -AC_CACHE_VAL(kde_cv_pythondir, -[ - if test -z "$PYTHONDIR"; then - kde_cv_pythondir=/usr/local - else - kde_cv_pythondir="$PYTHONDIR" - fi -]) - -AC_ARG_WITH(pythondir, -AC_HELP_STRING([--with-pythondir=pythondir],[use python installed in pythondir]), -[ - ac_python_dir=$withval -], ac_python_dir=$kde_cv_pythondir -) - -AC_MSG_RESULT($ac_python_dir) -]) - -AC_DEFUN([KDE_CHECK_PYTHON_INTERN], -[ -AC_REQUIRE([KDE_CHECK_LIBDL]) -AC_REQUIRE([KDE_CHECK_LIBPTHREAD]) -AC_REQUIRE([KDE_CHECK_PYTHON_DIR]) - -if test -z "$1"; then - version="1.5" -else - version="$1" -fi - -AC_MSG_CHECKING([for Python$version]) - -python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes" -AC_FIND_FILE(Python.h, $python_incdirs, python_incdir) -if test ! -r $python_incdir/Python.h; then - AC_FIND_FILE(python$version/Python.h, $python_incdirs, python_incdir) - python_incdir=$python_incdir/python$version - if test ! -r $python_incdir/Python.h; then - python_incdir=no - fi -fi - -PYTHONINC=-I$python_incdir - -python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs" -AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir) -if test ! -r $python_libdir/libpython$version.so; then - AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) - if test ! -r $python_libdir/libpython$version.a; then - AC_FIND_FILE(python$version/config/libpython$version.a, $python_libdirs, python_libdir) - python_libdir=$python_libdir/python$version/config - if test ! -r $python_libdir/libpython$version.a; then - python_libdir=no - fi - fi -fi - -PYTHONLIB=-L$python_libdir -kde_orig_LIBPYTHON=$LIBPYTHON -if test -z "$LIBPYTHON"; then - LIBPYTHON=-lpython$version -fi - -AC_FIND_FILE(python$version/copy.py, $python_libdirs, python_moddir) -python_moddir=$python_moddir/python$version -if test ! -r $python_moddir/copy.py; then - python_moddir=no -fi - -PYTHONMODDIR=$python_moddir - -AC_MSG_RESULT(header $python_incdir library $python_libdir modules $python_moddir) - -if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then - LIBPYTHON=$kde_orig_LIBPYTHON - test "x$PYTHONLIB" = "x-Lno" && PYTHONLIB="" - test "x$PYTHONINC" = "x-Ino" && PYTHONINC="" - $2 -else - dnl Note: this test is very weak - kde_python_link_found=no - KDE_TRY_LINK_PYTHON(normal) - KDE_TRY_LINK_PYTHON(m, -lm) - KDE_TRY_LINK_PYTHON(pthread, $LIBPTHREAD) - KDE_TRY_LINK_PYTHON(tcl, -ltcl) - KDE_TRY_LINK_PYTHON(db2, -ldb2) - KDE_TRY_LINK_PYTHON(m_and_thread, [$LIBPTHREAD -lm]) - KDE_TRY_LINK_PYTHON(m_and_thread_and_util, [$LIBPTHREAD -lm -lutil]) - KDE_TRY_LINK_PYTHON(m_and_thread_and_db3, [$LIBPTHREAD -lm -ldb-3 -lutil]) - KDE_TRY_LINK_PYTHON(pthread_and_db3, [$LIBPTHREAD -ldb-3]) - KDE_TRY_LINK_PYTHON(m_and_thread_and_db, [$LIBPTHREAD -lm -ldb -ltermcap -lutil]) - KDE_TRY_LINK_PYTHON(pthread_and_dl, [$LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm]) - KDE_TRY_LINK_PYTHON(pthread_and_panel_curses, [$LIBPTHREAD $LIBDL -lm -lpanel -lcurses]) - KDE_TRY_LINK_PYTHON(m_and_thread_and_db_special, [$LIBPTHREAD -lm -ldb -lutil], [], - [AC_MSG_WARN([it seems, Python depends on another library. - Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this - and contact the authors to let them know about this problem]) - ]) - - LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET" - AC_SUBST(PYTHONINC) - AC_SUBST(PYTHONLIB) - AC_SUBST(LIBPYTHON) - AC_SUBST(PYTHONMODDIR) - AC_DEFINE(HAVE_PYTHON, 1, [Define if you have the development files for python]) -fi - -]) - - -AC_DEFUN([KDE_CHECK_PYTHON], -[ - KDE_CHECK_PYTHON_INTERN("2.6", - [KDE_CHECK_PYTHON_INTERN("2.5", - [KDE_CHECK_PYTHON_INTERN("2.4", - [KDE_CHECK_PYTHON_INTERN("2.3", - [KDE_CHECK_PYTHON_INTERN("2.2", - [KDE_CHECK_PYTHON_INTERN("2.1", - [KDE_CHECK_PYTHON_INTERN("2.0", - [KDE_CHECK_PYTHON_INTERN($1, $2) ]) - ]) - ]) - ]) - ]) - ]) - ]) -]) - -AC_DEFUN([KDE_CHECK_STL], -[ - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`" - - AC_MSG_CHECKING([if C++ programs can be compiled]) - AC_CACHE_VAL(kde_cv_stl_works, - [ - AC_TRY_COMPILE([ -#include <string> -using namespace std; -],[ - string astring="Hallo Welt."; - astring.erase(0, 6); // now astring is "Welt" - return 0; -], kde_cv_stl_works=yes, - kde_cv_stl_works=no) -]) - - AC_MSG_RESULT($kde_cv_stl_works) - - if test "$kde_cv_stl_works" = "yes"; then - # back compatible - AC_DEFINE_UNQUOTED(HAVE_SGI_STL, 1, [Define if you have a STL implementation by SGI]) - else - AC_MSG_ERROR([Your Installation isn't able to compile simple C++ programs. -Check config.log for details - if you're using a Linux distribution you might miss -a package named similar to libstdc++-dev.]) - fi - - CXXFLAGS="$ac_save_CXXFLAGS" - AC_LANG_RESTORE -]) - -AC_DEFUN([AC_FIND_QIMGIO], - [AC_REQUIRE([AC_FIND_JPEG]) -AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) -AC_MSG_CHECKING([for qimgio]) -AC_CACHE_VAL(ac_cv_lib_qimgio, -[ -AC_LANG_SAVE -AC_LANG_CPLUSPLUS -ac_save_LIBS="$LIBS" -ac_save_CXXFLAGS="$CXXFLAGS" -LIBS="$all_libraries -lqimgio -lpng -lz $LIBJPEG $LIBTQT" -CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes" -AC_TRY_RUN(dnl -[ -#include <qimageio.h> -#include <qstring.h> -int main() { - QString t = "hallo"; - t.fill('t'); - qInitImageIO(); -} -], - ac_cv_lib_qimgio=yes, - ac_cv_lib_qimgio=no, - ac_cv_lib_qimgio=no) -LIBS="$ac_save_LIBS" -CXXFLAGS="$ac_save_CXXFLAGS" -AC_LANG_RESTORE -])dnl -if eval "test \"`echo $ac_cv_lib_qimgio`\" = yes"; then - LIBQIMGIO="-lqimgio -lpng -lz $LIBJPEG" - AC_MSG_RESULT(yes) - AC_DEFINE_UNQUOTED(HAVE_QIMGIO, 1, [Define if you have the Qt extension qimgio available]) - AC_SUBST(LIBQIMGIO) -else - AC_MSG_RESULT(not found) -fi -]) - -AC_DEFUN([AM_DISABLE_LIBRARIES], -[ - AC_PROVIDE([AM_ENABLE_STATIC]) - AC_PROVIDE([AM_ENABLE_SHARED]) - enable_static=no - enable_shared=yes -]) - - -AC_DEFUN([AC_CHECK_UTMP_FILE], -[ - AC_MSG_CHECKING([for utmp file]) - - AC_CACHE_VAL(kde_cv_utmp_file, - [ - kde_cv_utmp_file=no - - for ac_file in \ - \ - /var/run/utmp \ - /var/adm/utmp \ - /etc/utmp \ - ; \ - do - if test -r "$ac_file"; then - kde_cv_utmp_file=$ac_file - break - fi - done - ]) - - if test "$kde_cv_utmp_file" != "no"; then - AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries]) - $1 - AC_MSG_RESULT($kde_cv_utmp_file) - else - $2 - AC_MSG_RESULT([non found]) - fi -]) - - -AC_DEFUN([KDE_CREATE_SUBDIRSLIST], -[ - -DO_NOT_COMPILE="$DO_NOT_COMPILE CVS debian bsd-port admin" -TOPSUBDIRS="" - -if test ! -s $srcdir/subdirs; then - dnl Note: Makefile.common creates subdirs, so this is just a fallback - files=`cd $srcdir && ls -1` - dirs=`for i in $files; do if test -d $i; then echo $i; fi; done` - for i in $dirs; do - echo $i >> $srcdir/subdirs - done -fi - -ac_topsubdirs= -if test -s $srcdir/inst-apps; then - ac_topsubdirs="`cat $srcdir/inst-apps`" -elif test -s $srcdir/subdirs; then - ac_topsubdirs="`cat $srcdir/subdirs`" -fi - -for i in $ac_topsubdirs; do - AC_MSG_CHECKING([if $i should be compiled]) - if test -d $srcdir/$i; then - install_it="yes" - for j in $DO_NOT_COMPILE; do - if test $i = $j; then - install_it="no" - fi - done - else - install_it="no" - fi - AC_MSG_RESULT($install_it) - vari=`echo $i | sed -e 's,[[-+.@]],_,g'` - if test $install_it = "yes"; then - TOPSUBDIRS="$TOPSUBDIRS $i" - eval "$vari""_SUBDIR_included=yes" - else - eval "$vari""_SUBDIR_included=no" - fi -done - -AC_SUBST(TOPSUBDIRS) -]) - -AC_DEFUN([KDE_CHECK_NAMESPACES], -[ -AC_MSG_CHECKING(whether C++ compiler supports namespaces) -AC_LANG_SAVE -AC_LANG_CPLUSPLUS -AC_TRY_COMPILE([ -], -[ -namespace Foo { - extern int i; - namespace Bar { - extern int i; - } -} - -int Foo::i = 0; -int Foo::Bar::i = 1; -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_NAMESPACES) -], [ -AC_MSG_RESULT(no) -]) -AC_LANG_RESTORE -]) - -dnl ------------------------------------------------------------------------ -dnl Check for S_ISSOCK macro. Doesn't exist on Unix SCO. faure@kde.org -dnl ------------------------------------------------------------------------ -dnl -AC_DEFUN([AC_CHECK_S_ISSOCK], -[ -AC_MSG_CHECKING(for S_ISSOCK) -AC_CACHE_VAL(ac_cv_have_s_issock, -[ -AC_TRY_LINK( -[ -#include <sys/stat.h> -], -[ -struct stat buff; -int b = S_ISSOCK( buff.st_mode ); -], -ac_cv_have_s_issock=yes, -ac_cv_have_s_issock=no) -]) -AC_MSG_RESULT($ac_cv_have_s_issock) -if test "$ac_cv_have_s_issock" = "yes"; then - AC_DEFINE_UNQUOTED(HAVE_S_ISSOCK, 1, [Define if sys/stat.h declares S_ISSOCK.]) -fi - -AH_VERBATIM(_ISSOCK, -[ -#ifndef HAVE_S_ISSOCK -#define HAVE_S_ISSOCK -#define S_ISSOCK(mode) (1==0) -#endif -]) - -]) - -dnl ------------------------------------------------------------------------ -dnl Check for MAXPATHLEN macro, defines KDEMAXPATHLEN. faure@kde.org -dnl ------------------------------------------------------------------------ -dnl -AC_DEFUN([AC_CHECK_KDEMAXPATHLEN], -[ -AC_MSG_CHECKING(for MAXPATHLEN) -AC_CACHE_VAL(ac_cv_maxpathlen, -[ -cat > conftest.$ac_ext <<EOF -#ifdef STDC_HEADERS -# include <stdlib.h> -#endif -#include <stdio.h> -#include <sys/param.h> -#ifndef MAXPATHLEN -#define MAXPATHLEN 1024 -#endif - -KDE_HELLO MAXPATHLEN - -EOF - -ac_try="$ac_cpp conftest.$ac_ext 2>/dev/null | grep '^KDE_HELLO' >conftest.out" - -if AC_TRY_EVAL(ac_try) && test -s conftest.out; then - ac_cv_maxpathlen=`sed 's#KDE_HELLO ##' conftest.out` -else - ac_cv_maxpathlen=1024 -fi - -rm conftest.* - -]) -AC_MSG_RESULT($ac_cv_maxpathlen) -AC_DEFINE_UNQUOTED(KDEMAXPATHLEN,$ac_cv_maxpathlen, [Define a safe value for MAXPATHLEN] ) -]) - -AC_DEFUN([KDE_CHECK_HEADER], -[ - kde_safe_cppflags=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $all_includes" - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_CHECK_HEADER([$1], [$2], [$3], [$4]) - AC_LANG_RESTORE - CPPFLAGS=$kde_safe_cppflags -]) - -AC_DEFUN([KDE_CHECK_HEADERS], -[ - AH_CHECK_HEADERS([$1]) - AC_LANG_SAVE - kde_safe_cppflags=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $all_includes" - AC_LANG_CPLUSPLUS - AC_CHECK_HEADERS([$1], [$2], [$3], [$4]) - CPPFLAGS=$kde_safe_cppflags - AC_LANG_RESTORE -]) - -AC_DEFUN([KDE_FAST_CONFIGURE], -[ - dnl makes configure fast (needs perl) - AC_ARG_ENABLE(fast-perl, AC_HELP_STRING([--disable-fast-perl],[disable fast Makefile generation (needs perl)]), - with_fast_perl=$enableval, with_fast_perl=yes) -]) - -AC_DEFUN([KDE_CONF_FILES], -[ - val= - if test -f $srcdir/configure.files ; then - val=`sed -e 's%^%\$(top_srcdir)/%' $srcdir/configure.files` - fi - CONF_FILES= - if test -n "$val" ; then - for i in $val ; do - CONF_FILES="$CONF_FILES $i" - done - fi - AC_SUBST(CONF_FILES) -])dnl - -dnl This sets the prefix, for arts and tdelibs -dnl Do NOT use in any other module. -dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde -AC_DEFUN([KDE_SET_PREFIX_CORE], -[ - unset CDPATH - dnl make $TDEDIR the default for the installation - AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) - - if test "x$prefix" = "xNONE"; then - prefix=$ac_default_prefix - ac_configure_args="$ac_configure_args --prefix=$prefix" - fi - # And delete superfluous '/' to make compares easier - prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'` - exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'` - - kde_libs_prefix='$(prefix)' - kde_libs_htmldir='$(kde_htmldir)' - AC_SUBST(kde_libs_prefix) - AC_SUBST(kde_libs_htmldir) - KDE_FAST_CONFIGURE - KDE_CONF_FILES -]) - - -AC_DEFUN([KDE_SET_PREFIX], -[ - unset CDPATH - dnl We can't give real code to that macro, only a value. - dnl It only matters for --help, since we set the prefix in this function anyway. - AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix}) - - KDE_SET_DEFAULT_BINDIRS - if test "x$prefix" = "xNONE"; then - dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it - KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend) - else - dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH - kde_save_PATH="$PATH" - PATH="$exec_prefix/bin:$prefix/bin:$PATH" - KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend) - PATH="$kde_save_PATH" - fi - - kde_libs_prefix=`$KDECONFIG --prefix` - if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then - AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs. - This means it has been moved since you installed it. - This won't work. Please recompile tdelibs for the new prefix. - ]) - fi - kde_libs_htmldir=`$KDECONFIG --install html --expandvars` - - AC_MSG_CHECKING([where to install]) - if test "x$prefix" = "xNONE"; then - prefix=$kde_libs_prefix - AC_MSG_RESULT([$prefix (as returned by tde-config)]) - else - dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different - given_prefix=$prefix - AC_MSG_RESULT([$prefix (as requested)]) - fi - - # And delete superfluous '/' to make compares easier - prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'` - exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'` - given_prefix=`echo "$given_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'` - - AC_SUBST(KDECONFIG) - AC_SUBST(kde_libs_prefix) - AC_SUBST(kde_libs_htmldir) - - KDE_FAST_CONFIGURE - KDE_CONF_FILES -]) - -pushdef([AC_PROG_INSTALL], -[ - dnl our own version, testing for a -p flag - popdef([AC_PROG_INSTALL]) - dnl as AC_PROG_INSTALL works as it works we first have - dnl to save if the user didn't specify INSTALL, as the - dnl autoconf one overwrites INSTALL and we have no chance to find - dnl out afterwards - test -n "$INSTALL" && kde_save_INSTALL_given=$INSTALL - test -n "$INSTALL_PROGRAM" && kde_save_INSTALL_PROGRAM_given=$INSTALL_PROGRAM - test -n "$INSTALL_SCRIPT" && kde_save_INSTALL_SCRIPT_given=$INSTALL_SCRIPT - AC_PROG_INSTALL - - if test -z "$kde_save_INSTALL_given" ; then - # OK, user hasn't given any INSTALL, autoconf found one for us - # now we test, if it supports the -p flag - AC_MSG_CHECKING(for -p flag to install) - rm -f confinst.$$.* > /dev/null 2>&1 - echo "Testtest" > confinst.$$.orig - ac_res=no - if ${INSTALL} -p confinst.$$.orig confinst.$$.new > /dev/null 2>&1 ; then - if test -f confinst.$$.new ; then - # OK, -p seems to do no harm to install - INSTALL="${INSTALL} -p" - ac_res=yes - fi - fi - rm -f confinst.$$.* - AC_MSG_RESULT($ac_res) - fi - dnl the following tries to resolve some signs and wonders coming up - dnl with different autoconf/automake versions - dnl e.g.: - dnl *automake 1.4 install-strip sets A_M_INSTALL_PROGRAM_FLAGS to -s - dnl and has INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(A_M_INSTALL_PROGRAM_FLAGS) - dnl it header-vars.am, so there the actual INSTALL_PROGRAM gets the -s - dnl *automake 1.4a (and above) use INSTALL_STRIP_FLAG and only has - dnl INSTALL_PROGRAM = @INSTALL_PROGRAM@ there, but changes the - dnl install-@DIR@PROGRAMS targets to explicitly use that flag - dnl *autoconf 2.13 is dumb, and thinks it can use INSTALL_PROGRAM as - dnl INSTALL_SCRIPT, which breaks with automake <= 1.4 - dnl *autoconf >2.13 (since 10.Apr 1999) has not that failure - dnl *sometimes KDE does not use the install-@DIR@PROGRAM targets from - dnl automake (due to broken Makefile.am or whatever) to install programs, - dnl and so does not see the -s flag in automake > 1.4 - dnl to clean up that mess we: - dnl +set INSTALL_PROGRAM to use INSTALL_STRIP_FLAG - dnl which cleans KDE's program with automake > 1.4; - dnl +set INSTALL_SCRIPT to only use INSTALL, to clean up autoconf's problems - dnl with automake<=1.4 - dnl note that dues to this sometimes two '-s' flags are used (if KDE - dnl properly uses install-@DIR@PROGRAMS, but I don't care - dnl - dnl And to all this comes, that I even can't write in comments variable - dnl names used by automake, because it is so stupid to think I wanted to - dnl _use_ them, therefor I have written A_M_... instead of AM_ - dnl hmm, I wanted to say something ... ahh yes: Arghhh. - - if test -z "$kde_save_INSTALL_PROGRAM_given" ; then - INSTALL_PROGRAM='${INSTALL} $(INSTALL_STRIP_FLAG)' - fi - if test -z "$kde_save_INSTALL_SCRIPT_given" ; then - INSTALL_SCRIPT='${INSTALL}' - fi -])dnl - -AC_DEFUN([KDE_LANG_CPLUSPLUS], -[AC_LANG_CPLUSPLUS -ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC' -pushdef([AC_LANG_CPLUSPLUS], [popdef([AC_LANG_CPLUSPLUS]) KDE_LANG_CPLUSPLUS]) -]) - -pushdef([AC_LANG_CPLUSPLUS], -[popdef([AC_LANG_CPLUSPLUS]) -KDE_LANG_CPLUSPLUS -]) - -AC_DEFUN([KDE_CHECK_LONG_LONG], -[ -AC_MSG_CHECKING(for long long) -AC_CACHE_VAL(kde_cv_c_long_long, -[ - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_LINK([], [ - long long foo = 0; - foo = foo+1; - ], - kde_cv_c_long_long=yes, kde_cv_c_long_long=no) - AC_LANG_RESTORE -]) -AC_MSG_RESULT($kde_cv_c_long_long) -if test "$kde_cv_c_long_long" = yes; then - AC_DEFINE(HAVE_LONG_LONG, 1, [Define if you have long long as datatype]) -fi -]) - -AC_DEFUN([KDE_CHECK_LIB], -[ - kde_save_LDFLAGS="$LDFLAGS" - dnl AC_CHECK_LIB modifies LIBS, so save it here - kde_save_LIBS="$LIBS" - LDFLAGS="$LDFLAGS $all_libraries" - case $host_os in - aix*) LDFLAGS="-brtl $LDFLAGS" - test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS" - ;; - esac - AC_CHECK_LIB($1, $2, $3, $4, $5) - LDFLAGS="$kde_save_LDFLAGS" - LIBS="$kde_save_LIBS" -]) - -AC_DEFUN([KDE_JAVA_PREFIX], -[ - dir=`dirname "$1"` - base=`basename "$1"` - list=`ls -1 $dir 2> /dev/null` - for entry in $list; do - if test -d $dir/$entry/bin; then - case $entry in - $base) - javadirs="$javadirs $dir/$entry/bin" - ;; - esac - elif test -d $dir/$entry/jre/bin; then - case $entry in - $base) - javadirs="$javadirs $dir/$entry/jre/bin" - ;; - esac - fi - done -]) - -dnl KDE_CHEC_JAVA_DIR(onlyjre) -AC_DEFUN([KDE_CHECK_JAVA_DIR], -[ - -AC_ARG_WITH(java, -AC_HELP_STRING([--with-java=javadir],[use java installed in javadir, --without-java disables]), -[ ac_java_dir=$withval -], ac_java_dir="" -) - -AC_MSG_CHECKING([for Java]) - -dnl at this point ac_java_dir is either a dir, 'no' to disable, or '' to say look in $PATH -if test "x$ac_java_dir" = "xno"; then - kde_java_bindir=no - kde_java_includedir=no - kde_java_libjvmdir=no - kde_java_libgcjdir=no - kde_java_libhpidir=no -else - if test "x$ac_java_dir" = "x"; then - - - dnl No option set -> collect list of candidate paths - if test -n "$JAVA_HOME"; then - KDE_JAVA_PREFIX($JAVA_HOME) - fi - KDE_JAVA_PREFIX(/usr/j2se) - KDE_JAVA_PREFIX(/usr/lib/j2se) - KDE_JAVA_PREFIX(/usr/j*dk*) - KDE_JAVA_PREFIX(/usr/lib/j*dk*) - KDE_JAVA_PREFIX(/opt/j*sdk*) - KDE_JAVA_PREFIX(/usr/lib/java*) - KDE_JAVA_PREFIX(/usr/java*) - KDE_JAVA_PREFIX(/usr/java/j*dk*) - KDE_JAVA_PREFIX(/usr/java/j*re*) - KDE_JAVA_PREFIX(/usr/lib/SunJava2*) - KDE_JAVA_PREFIX(/usr/lib/SunJava*) - KDE_JAVA_PREFIX(/usr/lib/IBMJava2*) - KDE_JAVA_PREFIX(/usr/lib/IBMJava*) - KDE_JAVA_PREFIX(/opt/java*) - - kde_cv_path="NONE" - kde_save_IFS=$IFS - IFS=':' - for dir in $PATH; do - if test -d "$dir"; then - javadirs="$javadirs $dir" - fi - done - IFS=$kde_save_IFS - jredirs= - - dnl Now javadirs contains a list of paths that exist, all ending with bin/ - for dir in $javadirs; do - dnl Check for the java executable - if test -x "$dir/java"; then - sane_path=$(cd $dir; /bin/pwd) - dnl And also check for a libjvm.so somewhere under there - dnl Since we have to go to the parent dir, /usr/bin is excluded, /usr is too big. - if test "$sane_path" != "/usr/bin"; then - libjvmdir=`find $dir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1` - if test ! -f $libjvmdir/libjvm.so; then continue; fi - jredirs="$jredirs $dir" - fi - fi - done - - dnl Now jredirs contains a reduced list, of paths where both java and ../**/libjvm.so was found - JAVAC= - JAVA= - kde_java_bindir=no - for dir in $jredirs; do - JAVA="$dir/java" - kde_java_bindir=$dir - if test -x "$dir/javac"; then - JAVAC="$dir/javac" - break - fi - done - - if test -n "$JAVAC"; then - dnl this substitution might not work - well, we test for jni.h below - kde_java_includedir=`echo $JAVAC | sed -e 's,bin/javac$,include/,'` - else - kde_java_includedir=no - fi - else - dnl config option set - kde_java_bindir=$ac_java_dir/bin - if test -x $ac_java_dir/bin/java && test ! -x $ac_java_dir/bin/javac; then - kde_java_includedir=no - else - kde_java_includedir=$ac_java_dir/include - fi - fi -fi - -dnl At this point kde_java_bindir and kde_java_includedir are either set or "no" -if test "x$kde_java_bindir" != "xno"; then - - dnl Look for libjvm.so - kde_java_libjvmdir=`find $kde_java_bindir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1` - dnl Look for libgcj.so - kde_java_libgcjdir=`find $kde_java_bindir/.. -name libgcj.so | sed 's,libgcj.so,,'|head -n 1` - dnl Look for libhpi.so and avoid green threads - kde_java_libhpidir=`find $kde_java_bindir/.. -name libhpi.so | grep -v green | sed 's,libhpi.so,,' | head -n 1` - - dnl Now check everything's fine under there - dnl the include dir is our flag for having the JDK - if test -d "$kde_java_includedir"; then - if test ! -x "$kde_java_bindir/javac"; then - AC_MSG_ERROR([javac not found under $kde_java_bindir - it seems you passed a wrong --with-java.]) - fi - if test ! -x "$kde_java_bindir/javah"; then - AC_MSG_ERROR([javah not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.]) - fi - if test ! -x "$kde_java_bindir/jar"; then - AC_MSG_ERROR([jar not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.]) - fi - if test ! -r "$kde_java_includedir/jni.h"; then - AC_MSG_ERROR([jni.h not found under $kde_java_includedir. Use --with-java or --without-java.]) - fi - - jni_includes="-I$kde_java_includedir" - dnl Strange thing, jni.h requires jni_md.h which is under genunix here.. - dnl and under linux here.. - - dnl not needed for gcj - - if test "x$kde_java_libgcjdir" = "x"; then - test -d "$kde_java_includedir/linux" && jni_includes="$jni_includes -I$kde_java_includedir/linux" - test -d "$kde_java_includedir/solaris" && jni_includes="$jni_includes -I$kde_java_includedir/solaris" - test -d "$kde_java_includedir/genunix" && jni_includes="$jni_includes -I$kde_java_includedir/genunix" - fi - - else - JAVAC= - jni_includes= - fi - - if test "x$kde_java_libgcjdir" = "x"; then - if test ! -r "$kde_java_libjvmdir/libjvm.so"; then - AC_MSG_ERROR([libjvm.so not found under $kde_java_libjvmdir. Use --without-java.]) - fi - else - if test ! -r "$kde_java_libgcjdir/libgcj.so"; then - AC_MSG_ERROR([libgcj.so not found under $kde_java_libgcjdir. Use --without-java.]) - fi - fi - - if test ! -x "$kde_java_bindir/java"; then - AC_MSG_ERROR([java not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.]) - fi - - dnl not needed for gcj compile - - if test "x$kde_java_libgcjdir" = "x"; then - if test ! -r "$kde_java_libhpidir/libhpi.so"; then - AC_MSG_ERROR([libhpi.so not found under $kde_java_libhpidir. Use --without-java.]) - fi - fi - - if test -n "$jni_includes"; then - dnl Check for JNI version - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - ac_cxxflags_safe="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS $all_includes $jni_includes" - - AC_TRY_COMPILE([ - #include <jni.h> - ], - [ - #ifndef JNI_VERSION_1_2 - Syntax Error - #endif - ],[ kde_jni_works=yes ], - [ kde_jni_works=no ]) - - if test $kde_jni_works = no; then - AC_MSG_ERROR([Incorrect version of $kde_java_includedir/jni.h. - You need to have Java Development Kit (JDK) version 1.2. - - Use --with-java to specify another location. - Use --without-java to configure without java support. - Or download a newer JDK and try again. - See e.g. http://java.sun.com/products/jdk/1.2 ]) - fi - - CXXFLAGS="$ac_cxxflags_safe" - AC_LANG_RESTORE - - dnl All tests ok, inform and subst the variables - - JAVAC=$kde_java_bindir/javac - JAVAH=$kde_java_bindir/javah - JAR=$kde_java_bindir/jar - AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) - if test "x$kde_java_libgcjdir" = "x"; then - JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi" - else - JVMLIBS="-L$kde_java_libgcjdir -lgcj" - fi - AC_MSG_RESULT([java JDK in $kde_java_bindir]) - - else - AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) - AC_MSG_RESULT([java JRE in $kde_java_bindir]) - fi -elif test -d "/Library/Java/Home"; then - kde_java_bindir="/Library/Java/Home/bin" - jni_includes="-I/Library/Java/Home/include" - - JAVAC=$kde_java_bindir/javac - JAVAH=$kde_java_bindir/javah - JAR=$kde_java_bindir/jar - JVMLIBS="-Wl,-framework,JavaVM" - - AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) - AC_MSG_RESULT([Apple Java Framework]) -else - AC_MSG_RESULT([none found]) -fi - -AC_SUBST(JAVAC) -AC_SUBST(JAVAH) -AC_SUBST(JAR) -AC_SUBST(JVMLIBS) -AC_SUBST(jni_includes) - -# for backward compat -kde_cv_java_includedir=$kde_java_includedir -kde_cv_java_bindir=$kde_java_bindir -]) - -dnl this is a redefinition of autoconf 2.5x's AC_FOREACH. -dnl When the argument list becomes big, as in KDE for AC_OUTPUT in -dnl big packages, m4_foreach is dog-slow. So use our own version of -dnl it. (matz@kde.org) -m4_define([mm_foreach], -[m4_pushdef([$1])_mm_foreach($@)m4_popdef([$1])]) -m4_define([mm_car], [[$1]]) -m4_define([mm_car2], [[$@]]) -m4_define([_mm_foreach], -[m4_if(m4_quote($2), [], [], - [m4_define([$1], mm_car($2))$3[]_mm_foreach([$1], - mm_car2(m4_shift($2)), - [$3])])]) -m4_define([AC_FOREACH], -[mm_foreach([$1], m4_split(m4_normalize([$2])), [$3])]) - -AC_DEFUN([KDE_NEED_FLEX], -[ -kde_libs_safe=$LIBS -LIBS="$LIBS $USER_LDFLAGS" -AM_PROG_LEX -LIBS=$kde_libs_safe -if test -z "$LEXLIB"; then - AC_MSG_ERROR([You need to have flex installed.]) -fi -AC_SUBST(LEXLIB) -]) - -AC_DEFUN([AC_PATH_TQTOPIA], -[ - dnl TODO: use AC_CACHE_VAL - - if test -z "$1"; then - qtopia_minver_maj=1 - qtopia_minver_min=5 - qtopia_minver_pat=0 - else - qtopia_minver_maj=`echo "$1" | sed -e "s/^\(.*\)\..*\..*$/\1/"` - qtopia_minver_min=`echo "$1" | sed -e "s/^.*\.\(.*\)\..*$/\1/"` - qtopia_minver_pat=`echo "$1" | sed -e "s/^.*\..*\.\(.*\)$/\1/"` - fi - - qtopia_minver="$qtopia_minver_maj$qtopia_minver_min$qtopia_minver_pat" - qtopia_minverstr="$qtopia_minver_maj.$qtopia_minver_min.$qtopia_minver_pat" - - AC_REQUIRE([AC_PATH_TQT]) - - AC_MSG_CHECKING([for Qtopia]) - - LIB_TQTOPIA="-lqpe" - AC_SUBST(LIB_TQTOPIA) - - kde_qtopia_dirs="$QPEDIR /opt/Qtopia" - - ac_qtopia_incdir=NO - - AC_ARG_WITH(qtopia-dir, - AC_HELP_STRING([--with-qtopia-dir=DIR],[where the root of Qtopia is installed]), - [ ac_qtopia_incdir="$withval"/include] ) - - qtopia_incdirs="" - for dir in $kde_qtopia_dirs; do - qtopia_incdirs="$qtopia_incdirs $dir/include" - done - - if test ! "$ac_qtopia_incdir" = "NO"; then - qtopia_incdirs="$ac_qtopia_incdir $qtopia_incdirs" - fi - - qtopia_incdir="" - AC_FIND_FILE(qpe/qpeapplication.h, $qtopia_incdirs, qtopia_incdir) - ac_qtopia_incdir="$qtopia_incdir" - - if test -z "$qtopia_incdir"; then - AC_MSG_ERROR([Cannot find Qtopia headers. Please check your installation.]) - fi - - qtopia_ver_maj=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION "\(.*\)\..*\..*".*,\1,p'`; - qtopia_ver_min=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION ".*\.\(.*\)\..*".*,\1,p'`; - qtopia_ver_pat=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION ".*\..*\.\(.*\)".*,\1,p'`; - - qtopia_ver="$qtopia_ver_maj$qtopia_ver_min$qtopia_ver_pat" - qtopia_verstr="$qtopia_ver_maj.$qtopia_ver_min.$qtopia_ver_pat" - if test "$qtopia_ver" -lt "$qtopia_minver"; then - AC_MSG_ERROR([found Qtopia version $qtopia_verstr but version $qtopia_minverstr -is required.]) - fi - - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - - ac_cxxflags_safe="$CXXFLAGS" - ac_ldflags_safe="$LDFLAGS" - ac_libs_safe="$LIBS" - - CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes" - LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" - LIBS="$LIBS $LIB_TQTOPIA $LIBTQT" - - cat > conftest.$ac_ext <<EOF -#include "confdefs.h" -#include <qpe/qpeapplication.h> -#include <qpe/version.h> - -int main( int argc, char **argv ) -{ - QPEApplication app( argc, argv ); - return 0; -} -EOF - - if AC_TRY_EVAL(ac_link) && test -s conftest; then - rm -f conftest* - else - rm -f conftest* - AC_MSG_ERROR([Cannot link small Qtopia Application. For more details look at -the end of config.log]) - fi - - CXXFLAGS="$ac_cxxflags_safe" - LDFLAGS="$ac_ldflags_safe" - LIBS="$ac_libs_safe" - - AC_LANG_RESTORE - - QTOPIA_INCLUDES="-I$qtopia_incdir" - AC_SUBST(QTOPIA_INCLUDES) - - AC_MSG_RESULT([found version $qtopia_verstr with headers at $qtopia_incdir]) -]) - - -AC_DEFUN([KDE_INIT_DOXYGEN], -[ -AC_MSG_CHECKING([for Qt docs]) -kde_qtdir= -if test "${with_qt_dir+set}" = set; then - kde_qtdir="$with_qt_dir" -fi - -AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $TQTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], TQTDOCDIR) -AC_MSG_RESULT($TQTDOCDIR) - -AC_SUBST(TQTDOCDIR) - -KDE_FIND_PATH(dot, DOT, [], []) -if test -n "$DOT"; then - KDE_HAVE_DOT="YES" -else - KDE_HAVE_DOT="NO" -fi -AC_SUBST(KDE_HAVE_DOT) -KDE_FIND_PATH(doxygen, DOXYGEN, [], []) -AC_SUBST(DOXYGEN) - -DOXYGEN_PROJECT_NAME="$1" -DOXYGEN_PROJECT_NUMBER="$2" -AC_SUBST(DOXYGEN_PROJECT_NAME) -AC_SUBST(DOXYGEN_PROJECT_NUMBER) - -KDE_HAS_DOXYGEN=no -if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $TQTDOCDIR/qsql.html; then - KDE_HAS_DOXYGEN=yes -fi -AC_SUBST(KDE_HAS_DOXYGEN) - -]) - - -AC_DEFUN([AC_FIND_BZIP2], -[ -AC_MSG_CHECKING([for bzDecompress in libbz2]) -AC_CACHE_VAL(ac_cv_lib_bzip2, -[ -AC_LANG_SAVE -AC_LANG_CPLUSPLUS -kde_save_LIBS="$LIBS" -LIBS="$all_libraries $USER_LDFLAGS -lbz2 $LIBSOCKET" -kde_save_CXXFLAGS="$CXXFLAGS" -CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES" -AC_TRY_LINK(dnl -[ -#define BZ_NO_STDIO -#include<bzlib.h> -], - [ bz_stream s; (void) bzDecompress(&s); ], - eval "ac_cv_lib_bzip2='-lbz2'", - eval "ac_cv_lib_bzip2=no") -LIBS="$kde_save_LIBS" -CXXFLAGS="$kde_save_CXXFLAGS" -AC_LANG_RESTORE -])dnl -AC_MSG_RESULT($ac_cv_lib_bzip2) - -if test ! "$ac_cv_lib_bzip2" = no; then - BZIP2DIR=bzip2 - - LIBBZ2="$ac_cv_lib_bzip2" - AC_SUBST(LIBBZ2) - -else - - cxx_shared_flag= - ld_shared_flag= - KDE_CHECK_COMPILER_FLAG(shared, [ - ld_shared_flag="-shared" - ]) - KDE_CHECK_COMPILER_FLAG(fPIC, [ - cxx_shared_flag="-fPIC" - ]) - - AC_MSG_CHECKING([for BZ2_bzDecompress in (shared) libbz2]) - AC_CACHE_VAL(ac_cv_lib_bzip2_prefix, - [ - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - kde_save_LIBS="$LIBS" - LIBS="$all_libraries $USER_LDFLAGS $ld_shared_flag -lbz2 $LIBSOCKET" - kde_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CFLAGS $cxx_shared_flag $all_includes $USER_INCLUDES" - - AC_TRY_LINK(dnl - [ - #define BZ_NO_STDIO - #include<bzlib.h> - ], - [ bz_stream s; (void) BZ2_bzDecompress(&s); ], - eval "ac_cv_lib_bzip2_prefix='-lbz2'", - eval "ac_cv_lib_bzip2_prefix=no") - LIBS="$kde_save_LIBS" - CXXFLAGS="$kde_save_CXXFLAGS" - AC_LANG_RESTORE - ])dnl - - AC_MSG_RESULT($ac_cv_lib_bzip2_prefix) - - if test ! "$ac_cv_lib_bzip2_prefix" = no; then - BZIP2DIR=bzip2 - - LIBBZ2="$ac_cv_lib_bzip2_prefix" - AC_SUBST(LIBBZ2) - - AC_DEFINE(NEED_BZ2_PREFIX, 1, [Define if the libbz2 functions need the BZ2_ prefix]) - dnl else, we just ignore this - fi - -fi -AM_CONDITIONAL(include_BZIP2, test -n "$BZIP2DIR") -]) - -dnl ------------------------------------------------------------------------ -dnl Try to find the SSL headers and libraries. -dnl $(SSL_LDFLAGS) will be -Lsslliblocation (if needed) -dnl and $(SSL_INCLUDES) will be -Isslhdrlocation (if needed) -dnl ------------------------------------------------------------------------ -dnl -AC_DEFUN([KDE_CHECK_SSL], -[ -LIBSSL="-lssl -lcrypto" -AC_REQUIRE([KDE_CHECK_LIB64]) - -ac_ssl_includes=NO ac_ssl_libraries=NO -ssl_libraries="" -ssl_includes="" -AC_ARG_WITH(ssl-dir, - AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]), - [ ac_ssl_includes="$withval"/include - ac_ssl_libraries="$withval"/lib$tdelibsuff - ]) - -want_ssl=yes -AC_ARG_WITH(ssl, - AC_HELP_STRING([--without-ssl],[disable SSL checks]), - [want_ssl=$withval]) - -if test $want_ssl = yes; then - -AC_MSG_CHECKING(for OpenSSL) - -AC_CACHE_VAL(ac_cv_have_ssl, -[#try to guess OpenSSL locations - - ssl_incdirs="/usr/include /usr/local/include /usr/ssl/include /usr/local/ssl/include $prefix/include $kde_extra_includes" - ssl_incdirs="$ac_ssl_includes $ssl_incdirs" - AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir) - ac_ssl_includes="$ssl_incdir" - - ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs" - if test ! "$ac_ssl_libraries" = "NO"; then - ssl_libdirs="$ac_ssl_libraries $ssl_libdirs" - fi - - test=NONE - ssl_libdir=NONE - for dir in $ssl_libdirs; do - try="ls -1 $dir/libssl*" - if test=`eval $try 2> /dev/null`; then ssl_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi - done - - ac_ssl_libraries="$ssl_libdir" - - ac_ldflags_safe="$LDFLAGS" - ac_libs_safe="$LIBS" - - LDFLAGS="$LDFLAGS -L$ssl_libdir $all_libraries" - LIBS="$LIBS $LIBSSL -lRSAglue -lrsaref" - - AC_TRY_LINK(,void RSAPrivateEncrypt(void);RSAPrivateEncrypt();, - ac_ssl_rsaref="yes" - , - ac_ssl_rsaref="no" - ) - - LDFLAGS="$ac_ldflags_safe" - LIBS="$ac_libs_safe" - - if test "$ac_ssl_includes" = NO || test "$ac_ssl_libraries" = NO; then - have_ssl=no - else - have_ssl=yes; - fi - - ]) - - eval "$ac_cv_have_ssl" - - AC_MSG_RESULT([libraries $ac_ssl_libraries, headers $ac_ssl_includes]) - - AC_MSG_CHECKING([whether OpenSSL uses rsaref]) - AC_MSG_RESULT($ac_ssl_rsaref) - - AC_MSG_CHECKING([for easter eggs]) - AC_MSG_RESULT([none found]) - -else - have_ssl=no -fi - -if test "$have_ssl" = yes; then - AC_MSG_CHECKING(for OpenSSL version) - dnl Check for SSL version - AC_CACHE_VAL(ac_cv_ssl_version, - [ - - cat >conftest.$ac_ext <<EOF -#include <openssl/opensslv.h> -#include <stdio.h> - int main() { - -#ifndef OPENSSL_VERSION_NUMBER - printf("ssl_version=\\"error\\"\n"); -#else - if (OPENSSL_VERSION_NUMBER < 0x00906000) - printf("ssl_version=\\"old\\"\n"); - else - printf("ssl_version=\\"ok\\"\n"); -#endif - return (0); - } -EOF - - ac_save_CPPFLAGS=$CPPFLAGS - if test "$ac_ssl_includes" != "/usr/include"; then - CPPFLAGS="$CPPFLAGS -I$ac_ssl_includes" - fi - - if AC_TRY_EVAL(ac_link); then - - if eval `./conftest 2>&5`; then - if test $ssl_version = error; then - AC_MSG_ERROR([$ssl_incdir/openssl/opensslv.h doesn't define OPENSSL_VERSION_NUMBER !]) - else - if test $ssl_version = old; then - AC_MSG_WARN([OpenSSL version too old. Upgrade to 0.9.6 at least, see http://www.openssl.org. SSL support disabled.]) - have_ssl=no - fi - fi - ac_cv_ssl_version="ssl_version=$ssl_version" - else - AC_MSG_ERROR([Your system couldn't run a small SSL test program. - Check config.log, and if you can't figure it out, send a mail to - David Faure <faure@kde.org>, attaching your config.log]) - fi - - else - AC_MSG_ERROR([Your system couldn't link a small SSL test program. - Check config.log, and if you can't figure it out, send a mail to - David Faure <faure@kde.org>, attaching your config.log]) - fi - CPPFLAGS=$ac_save_CPPFLAGS - - ]) - - eval "$ac_cv_ssl_version" - AC_MSG_RESULT($ssl_version) -fi - -if test "$have_ssl" != yes; then - LIBSSL=""; -else - AC_DEFINE(HAVE_SSL, 1, [If we are going to use OpenSSL]) - ac_cv_have_ssl="have_ssl=yes \ - ac_ssl_includes=$ac_ssl_includes ac_ssl_libraries=$ac_ssl_libraries ac_ssl_rsaref=$ac_ssl_rsaref" - - - ssl_libraries="$ac_ssl_libraries" - ssl_includes="$ac_ssl_includes" - - if test "$ac_ssl_rsaref" = yes; then - LIBSSL="-lssl -lcrypto -lRSAglue -lrsaref" - fi - - if test $ssl_version = "old"; then - AC_DEFINE(HAVE_OLD_SSL_API, 1, [Define if you have OpenSSL < 0.9.6]) - fi -fi - -SSL_INCLUDES= - -if test "$ssl_includes" = "/usr/include"; then - if test -f /usr/kerberos/include/krb5.h; then - SSL_INCLUDES="-I/usr/kerberos/include" - fi -elif test "$ssl_includes" != "/usr/local/include" && test -n "$ssl_includes"; then - SSL_INCLUDES="-I$ssl_includes" -fi - -if test "$ssl_libraries" = "/usr/lib" || test "$ssl_libraries" = "/usr/local/lib" || test -z "$ssl_libraries" || test "$ssl_libraries" = "NONE"; then - SSL_LDFLAGS="" -else - SSL_LDFLAGS="-L$ssl_libraries -R$ssl_libraries" -fi - -AC_SUBST(SSL_INCLUDES) -AC_SUBST(SSL_LDFLAGS) -AC_SUBST(LIBSSL) -]) - -AC_DEFUN([KDE_CHECK_STRLCPY], -[ - AC_REQUIRE([AC_CHECK_STRLCAT]) - AC_REQUIRE([AC_CHECK_STRLCPY]) - AC_CHECK_SIZEOF(size_t) - AC_CHECK_SIZEOF(unsigned long) - - AC_MSG_CHECKING([sizeof size_t == sizeof unsigned long]) - AC_TRY_COMPILE(,[ - #if SIZEOF_SIZE_T != SIZEOF_UNSIGNED_LONG - choke me - #endif - ],AC_MSG_RESULT([yes]),[ - AC_MSG_RESULT(no) - AC_MSG_ERROR([ - Apparently on your system our assumption sizeof size_t == sizeof unsigned long - does not apply. Please mail kde-devel@kde.org with a description of your system! - ]) - ]) -]) - -AC_DEFUN([KDE_CHECK_BINUTILS], -[ - AC_MSG_CHECKING([if ld supports unversioned version maps]) - - kde_save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map" - echo "{ local: extern \"C++\" { foo }; };" > conftest.map - AC_TRY_LINK([int foo;], -[ -#ifdef __INTEL_COMPILER -icc apparently does not support libtools version-info and version-script -at the same time. Dunno where the bug is, but until somebody figured out, -better disable the optional version scripts. -#endif - - foo = 42; -], kde_supports_versionmaps=yes, kde_supports_versionmaps=no) - LDFLAGS="$kde_save_LDFLAGS" - rm -f conftest.map - AM_CONDITIONAL(include_VERSION_SCRIPT, - [test "$kde_supports_versionmaps" = "yes" && test "$kde_use_debug_code" = "no"]) - - AC_MSG_RESULT($kde_supports_versionmaps) -]) - -AC_DEFUN([AM_PROG_OBJC],[ -AC_CHECK_PROGS(OBJC, gcc, gcc) -test -z "$OBJC" && AC_MSG_ERROR([no acceptable objective-c gcc found in \$PATH]) -if test "x${OBJCFLAGS-unset}" = xunset; then - OBJCFLAGS="-g -O2" -fi -AC_SUBST(OBJCFLAGS) -_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES(OBJC)]) -]) - -AC_DEFUN([KDE_CHECK_PERL], -[ - KDE_FIND_PATH(perl, PERL, [$bindir $exec_prefix/bin $prefix/bin], [ - AC_MSG_ERROR([No Perl found in your $PATH. -We need perl to generate some code.]) - ]) - AC_SUBST(PERL) -]) - -AC_DEFUN([KDE_CHECK_LARGEFILE], -[ -AC_SYS_LARGEFILE -if test "$ac_cv_sys_file_offset_bits" != no; then - CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits" -fi - -if test "x$ac_cv_sys_large_files" != "xno"; then - CPPFLAGS="$CPPFLAGS -D_LARGE_FILES=1" -fi - -]) - -dnl A small extension to PKG_CHECK_MODULES (defined in pkg.m4.in) -dnl which allows to search for libs that get installed into the KDE prefix. -dnl -dnl Syntax: KDE_PKG_CHECK_MODULES(KSTUFF, libkexif >= 0.2 glib = 1.3.4, action-if, action-not) -dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page -dnl also defines KSTUFF_PKG_ERRORS on error -AC_DEFUN([KDE_PKG_CHECK_MODULES], [ - - PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" - if test "$prefix" != "$kde_libs_prefix"; then - PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" - fi - export PKG_CONFIG_PATH - PKG_CHECK_MODULES([$1],[$2],[$3],[$4]) -]) - - -dnl Check for PIE support in the compiler and linker -AC_DEFUN([KDE_CHECK_PIE_SUPPORT], -[ - AC_CACHE_CHECK([for PIE support], kde_cv_val_pie_support, - [ - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - safe_CXXFLAGS=$CXXFLAGS - safe_LDFLAGS=$LDFLAGS - CXXFLAGS="$CXXFLAGS -fPIE" - LDFLAGS="$LDFLAGS -pie" - - AC_TRY_LINK([int foo;], [], [kde_cv_val_pie_support=yes], [kde_cv_val_pie_support=no]) - - CXXFLAGS=$safe_CXXFLAGS - LDFLAGS=$safe_LDFLAGS - AC_LANG_RESTORE - ]) - - AC_MSG_CHECKING(if enabling -pie/fPIE support) - - AC_ARG_ENABLE(pie, - AC_HELP_STRING([--enable-pie],[platform supports PIE linking [default=detect]]), - [kde_has_pie_support=$enableval], - [kde_has_pie_support=detect]) - - if test "$kde_has_pie_support" = "detect"; then - kde_has_pie_support=$kde_cv_val_pie_support - fi - - AC_MSG_RESULT([$kde_has_pie_support]) - - KDE_USE_FPIE="" - KDE_USE_PIE="" - - AC_SUBST([KDE_USE_FPIE]) - AC_SUBST([KDE_USE_PIE]) - - if test "$kde_has_pie_support" = "yes"; then - KDE_USE_FPIE="-fPIE" - KDE_USE_PIE="-pie" - fi -]) -# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- - -# serial 47 AC_PROG_LIBTOOL - - -# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -# ----------------------------------------------------------- -# If this macro is not defined by Autoconf, define it here. -m4_ifdef([AC_PROVIDE_IFELSE], - [], - [m4_define([AC_PROVIDE_IFELSE], - [m4_ifdef([AC_PROVIDE_$1], - [$2], [$3])])]) - - -# AC_PROG_LIBTOOL -# --------------- -AC_DEFUN([AC_PROG_LIBTOOL], -[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl -dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX -dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. - AC_PROVIDE_IFELSE([AC_PROG_CXX], - [AC_LIBTOOL_CXX], - [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX - ])]) -dnl And a similar setup for Fortran 77 support - AC_PROVIDE_IFELSE([AC_PROG_F77], - [AC_LIBTOOL_F77], - [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 -])]) - -dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. -dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run -dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. - AC_PROVIDE_IFELSE([AC_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [ifdef([AC_PROG_GCJ], - [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) - ifdef([A][M_PROG_GCJ], - [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) - ifdef([LT_AC_PROG_GCJ], - [define([LT_AC_PROG_GCJ], - defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) -])])# AC_PROG_LIBTOOL - - -# _AC_PROG_LIBTOOL -# ---------------- -AC_DEFUN([_AC_PROG_LIBTOOL], -[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl -AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl -AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl -AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent' -AC_SUBST(LIBTOOL)dnl - -# Prevent multiple expansion -define([AC_PROG_LIBTOOL], []) -])# _AC_PROG_LIBTOOL - - -# AC_LIBTOOL_SETUP -# ---------------- -AC_DEFUN([AC_LIBTOOL_SETUP], -[AC_PREREQ(2.50)dnl -AC_REQUIRE([AC_ENABLE_SHARED])dnl -AC_REQUIRE([AC_ENABLE_STATIC])dnl -AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_LD])dnl -AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl -AC_REQUIRE([AC_PROG_NM])dnl - -AC_REQUIRE([AC_PROG_LN_S])dnl -AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl -# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! -AC_REQUIRE([AC_OBJEXT])dnl -AC_REQUIRE([AC_EXEEXT])dnl -dnl - -AC_LIBTOOL_SYS_MAX_CMD_LEN -AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -AC_LIBTOOL_OBJDIR - -AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -_LT_AC_PROG_ECHO_BACKSLASH - -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed='sed -e s/^X//' -[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] - -# Same as above, but do not quote variable references. -[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - -# Constants: -rm="rm -f" - -# Global variables: -default_ofile=libtool -can_build_shared=yes - -# All known linkers require a `.a' archive for static linking (except M$VC, -# which needs '.lib'). -libext=a -ltmain="$ac_aux_dir/ltmain.sh" -ofile="$default_ofile" -with_gnu_ld="$lt_cv_prog_gnu_ld" - -AC_CHECK_TOOL(AR, ar, false) -AC_CHECK_TOOL(RANLIB, ranlib, :) -AC_CHECK_TOOL(STRIP, strip, :) - -old_CC="$CC" -old_CFLAGS="$CFLAGS" - -# Set sane defaults for various variables -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru -test -z "$AS" && AS=as -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$DLLTOOL" && DLLTOOL=dlltool -test -z "$LD" && LD=ld -test -z "$LN_S" && LN_S="ln -s" -test -z "$MAGIC_CMD" && MAGIC_CMD=file -test -z "$NM" && NM=nm -test -z "$SED" && SED=sed -test -z "$OBJDUMP" && OBJDUMP=objdump -test -z "$RANLIB" && RANLIB=: -test -z "$STRIP" && STRIP=: -test -z "$ac_objext" && ac_objext=o - -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" - ;; - *) - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -fi - -# Only perform the check for file, if the check method requires it -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - AC_PATH_MAGIC - fi - ;; -esac - -AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) -AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], -enable_win32_dll=yes, enable_win32_dll=no) - -AC_ARG_ENABLE([libtool-lock], - [AC_HELP_STRING([--disable-libtool-lock], - [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -AC_ARG_WITH([pic], - [AC_HELP_STRING([--with-pic], - [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], - [pic_mode=default]) -test -z "$pic_mode" && pic_mode=default - -# Use C for the default configuration in the libtool script -tagname= -AC_LIBTOOL_LANG_C_CONFIG -_LT_AC_TAGCONFIG -])# AC_LIBTOOL_SETUP - - -# _LT_AC_SYS_COMPILER -# ------------------- -AC_DEFUN([_LT_AC_SYS_COMPILER], -[AC_REQUIRE([AC_PROG_CC])dnl - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# Allow CC to be a program name with arguments. -compiler=$CC -])# _LT_AC_SYS_COMPILER - - -# _LT_AC_SYS_LIBPATH_AIX -# ---------------------- -# Links a minimal program and checks the executable -# for the system default hardcoded library path. In most cases, -# this is /usr/lib:/lib, but when the MPI compilers are used -# the location of the communication and MPI libs are included too. -# If we don't find anything, use the default library path according -# to the aix ld manual. -AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], -[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi],[]) -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -])# _LT_AC_SYS_LIBPATH_AIX - - -# _LT_AC_SHELL_INIT(ARG) -# ---------------------- -AC_DEFUN([_LT_AC_SHELL_INIT], -[ifdef([AC_DIVERSION_NOTICE], - [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], - [AC_DIVERT_PUSH(NOTICE)]) -$1 -AC_DIVERT_POP -])# _LT_AC_SHELL_INIT - - -# _LT_AC_PROG_ECHO_BACKSLASH -# -------------------------- -# Add some code to the start of the generated configure script which -# will find an echo command which doesn't interpret backslashes. -AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], -[_LT_AC_SHELL_INIT([ -# Check that we are running under the correct shell. -SHELL=${CONFIG_SHELL-/bin/sh} - -case X$ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` - ;; -esac - -echo=${ECHO-echo} -if test "X[$]1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X[$]1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then - # Yippee, $echo works! - : -else - # Restart under the correct shell. - exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} -fi - -if test "X[$]1" = X--fallback-echo; then - # used as fallback echo - shift - cat <<EOF -[$]* -EOF - exit 0 -fi - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi - -if test -z "$ECHO"; then -if test "X${echo_test_string+set}" != Xset; then -# find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if (echo_test_string="`eval $cmd`") 2>/dev/null && - echo_test_string="`eval $cmd`" && - (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null - then - break - fi - done -fi - -if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : -else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. - - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do - IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - echo="$dir/echo" - break - fi - done - IFS="$lt_save_ifs" - - if test "X$echo" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - echo='print -r' - elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} - else - # Try using printf. - echo='printf %s\n' - if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - echo="$CONFIG_SHELL [$]0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - echo="$CONFIG_SHELL [$]0 --fallback-echo" - else - # maybe with a smaller string... - prev=: - - for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do - if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null - then - break - fi - prev="$cmd" - done - - if test "$prev" != 'sed 50q "[$]0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} - else - # Oops. We lost completely, so just stick with echo. - echo=echo - fi - fi - fi - fi -fi -fi - -# Copy echo and quote the copy suitably for passing to libtool from -# the Makefile, instead of quoting the original, which is used later. -ECHO=$echo -if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then - ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" -fi - -AC_SUBST(ECHO) -])])# _LT_AC_PROG_ECHO_BACKSLASH - - -# _LT_AC_LOCK -# ----------- -AC_DEFUN([_LT_AC_LOCK], -[AC_ARG_ENABLE([libtool-lock], - [AC_HELP_STRING([--disable-libtool-lock], - [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; - esac - fi - rm -rf conftest* - ;; -*-*-irix6*) - # Find out which ABI we are using. - echo '[#]line __oline__ "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - fi - rm -rf conftest* - ;; - -x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case "`/usr/bin/file conftest.o`" in - *32-bit*) - LINUX_64_MODE="32" - case $host in - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - LINUX_64_MODE="64" - case $host in - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - ppc*-*linux*|powerpc*-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, - [AC_LANG_PUSH(C) - AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) - AC_LANG_POP]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; -AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], -[*-*-cygwin* | *-*-mingw* | *-*-pw32*) - AC_CHECK_TOOL(DLLTOOL, dlltool, false) - AC_CHECK_TOOL(AS, as, false) - AC_CHECK_TOOL(OBJDUMP, objdump, false) - ;; - ]) -esac - -need_locks="$enable_libtool_lock" - -])# _LT_AC_LOCK - - -# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) -# ---------------------------------------------------------------- -# Check whether the given compiler option works -AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], -[AC_REQUIRE([LT_AC_PROG_SED]) -AC_CACHE_CHECK([$1], [$2], - [$2=no - ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) - printf "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - 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 - if test ! -s conftest.err; then - $2=yes - fi - fi - $rm conftest* -]) - -if test x"[$]$2" = xyes; then - ifelse([$5], , :, [$5]) -else - ifelse([$6], , :, [$6]) -fi -])# AC_LIBTOOL_COMPILER_OPTION - - -# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [ACTION-SUCCESS], [ACTION-FAILURE]) -# ------------------------------------------------------------ -# Check whether the given compiler option works -AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], -[AC_CACHE_CHECK([$1], [$2], - [$2=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $3" - printf "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&AS_MESSAGE_LOG_FD - else - $2=yes - fi - fi - $rm conftest* - LDFLAGS="$save_LDFLAGS" -]) - -if test x"[$]$2" = xyes; then - ifelse([$4], , :, [$4]) -else - ifelse([$5], , :, [$5]) -fi -])# AC_LIBTOOL_LINKER_OPTION - - -# AC_LIBTOOL_SYS_MAX_CMD_LEN -# -------------------------- -AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], -[# find the maximum length of command line arguments -AC_MSG_CHECKING([the maximum length of command line arguments]) -AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl - i=0 - testring="ABCD" - - case $build_os in - msdosdjgpp*) - # On DJGPP, this test can blow up pretty badly due to problems in libc - # (any single argument exceeding 2000 bytes causes a buffer overrun - # during glob expansion). Even if it were fixed, the result of this - # check would be larger than it should be. - lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; - - gnu*) - # Under GNU Hurd, this test is not required because there is - # no limit to the length of command line arguments. - # Libtool will interpret -1 as no limit whatsoever - lt_cv_sys_max_cmd_len=-1; - ;; - - cygwin* | mingw*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, - # you end up with a "frozen" computer, even though with patience - # the test eventually succeeds (with a max line length of 256k). - # Instead, let's just punt: use the minimum linelength reported by - # all of the supported platforms: 8192 (on NT/2K/XP). - lt_cv_sys_max_cmd_len=8192; - ;; - - *) - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \ - = "XX$testring") >/dev/null 2>&1 && - new_result=`expr "X$testring" : ".*" 2>&1` && - lt_cv_sys_max_cmd_len=$new_result && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - testring=$testring$testring - done - testring= - # Add a significant safety factor because C++ compilers can tack on massive - # amounts of additional arguments before passing them to the linker. - # It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` - ;; - esac -]) -if test -n $lt_cv_sys_max_cmd_len ; then - AC_MSG_RESULT($lt_cv_sys_max_cmd_len) -else - AC_MSG_RESULT(none) -fi -])# AC_LIBTOOL_SYS_MAX_CMD_LEN - - -# _LT_AC_CHECK_DLFCN -# -------------------- -AC_DEFUN([_LT_AC_CHECK_DLFCN], -[AC_CHECK_HEADERS(dlfcn.h)dnl -])# _LT_AC_CHECK_DLFCN - - -# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, -# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -# ------------------------------------------------------------------ -AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], -[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl -if test "$cross_compiling" = yes; then : - [$4] -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF -[#line __oline__ "configure" -#include "confdefs.h" - -#if HAVE_DLFCN_H -#include <dlfcn.h> -#endif - -#include <stdio.h> - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -#ifdef __cplusplus -extern "C" void exit (int); -#endif - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - - exit (status); -}] -EOF - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) $1 ;; - x$lt_dlneed_uscore) $2 ;; - x$lt_unknown|x*) $3 ;; - esac - else : - # compilation failed - $3 - fi -fi -rm -fr conftest* -])# _LT_AC_TRY_DLOPEN_SELF - - -# AC_LIBTOOL_DLOPEN_SELF -# ------------------- -AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], -[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl -if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - - mingw* | pw32*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; - - darwin*) - # if libdl is installed we need to link against it - AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ]) - ;; - - *) - AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], - [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], - [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], - [AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], - [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], - [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) - ]) - ]) - ]) - ]) - ]) - ;; - esac - - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" - eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - - AC_CACHE_CHECK([whether a program can dlopen itself], - lt_cv_dlopen_self, [dnl - _LT_AC_TRY_DLOPEN_SELF( - lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, - lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) - ]) - - if test "x$lt_cv_dlopen_self" = xyes; then - LDFLAGS="$LDFLAGS $link_static_flag" - AC_CACHE_CHECK([whether a statically linked program can dlopen itself], - lt_cv_dlopen_self_static, [dnl - _LT_AC_TRY_DLOPEN_SELF( - lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, - lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) - ]) - fi - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi -])# AC_LIBTOOL_DLOPEN_SELF - - -# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) -# --------------------------------- -# Check to see if options -c and -o are simultaneously supported by compiler -AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], - [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], - [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no - $rm -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - printf "$lt_simple_compile_test_code" > conftest.$ac_ext - - # According to Tom Tromey, Ian Lance Taylor reported there are C compilers - # that will create temporary files in the current directory regardless of - # the output directory. Thus, making CWD read-only will cause this test - # to fail, enabling locking or at least warning the user not to do parallel - # builds. - chmod -w . - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - if test ! -s out/conftest.err; then - _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - fi - fi - chmod u+w . - $rm conftest* out/* - rmdir out - cd .. - rmdir conftest - $rm conftest* -]) -])# AC_LIBTOOL_PROG_CC_C_O - - -# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) -# ----------------------------------------- -# Check to see if we can do hard links to lock some files if needed -AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], -[AC_REQUIRE([_LT_AC_LOCK])dnl - -hard_links="nottested" -if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - AC_MSG_CHECKING([if we can lock with hard links]) - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - AC_MSG_RESULT([$hard_links]) - if test "$hard_links" = no; then - AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) - need_locks=warn - fi -else - need_locks=no -fi -])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS - - -# AC_LIBTOOL_OBJDIR -# ----------------- -AC_DEFUN([AC_LIBTOOL_OBJDIR], -[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], -[rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - lt_cv_objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - lt_cv_objdir=_libs -fi -rmdir .libs 2>/dev/null]) -objdir=$lt_cv_objdir -])# AC_LIBTOOL_OBJDIR - - -# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) -# ---------------------------------------------- -# Check hardcoding attributes. -AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], -[AC_MSG_CHECKING([how to hardcode library paths into programs]) -_LT_AC_TAGVAR(hardcode_action, $1)= -if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ - test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \ - test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then - - # We can hardcode non-existant directories. - if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && - test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then - # Linking always hardcodes the temporary library directory. - _LT_AC_TAGVAR(hardcode_action, $1)=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - _LT_AC_TAGVAR(hardcode_action, $1)=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - _LT_AC_TAGVAR(hardcode_action, $1)=unsupported -fi -AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) - -if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi -])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH - - -# AC_LIBTOOL_SYS_LIB_STRIP -# ------------------------ -AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], -[striplib= -old_striplib= -AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) -fi - ;; - *) - AC_MSG_RESULT([no]) - ;; - esac -fi -])# AC_LIBTOOL_SYS_LIB_STRIP - - -# AC_LIBTOOL_SYS_DYNAMIC_LINKER -# ----------------------------- -# PORTME Fill in your ld.so characteristics -AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], -[AC_MSG_CHECKING([dynamic linker characteristics]) -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix4* | aix5*) - version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[[01]] | aix4.[[01]].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib<name>.so - # instead of lib<name>.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi4*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32*) - version_type=windows - shrext=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; - mingw*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - ;; - - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext='$(test .$module = .yes && echo .so || echo .dylib)' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -freebsd1*) - dynamic_linker=no - ;; - -kfreebsd*-gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - -freebsd*) - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - *) # from 3.2 on - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - esac - ;; - -gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; - -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case "$host_cpu" in - ia64*) - shrext='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - -# This must be Linux ELF. -linux*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - libsuff= - if test "x$LINUX_64_MODE" = x64; then - # Some platforms are per default 64-bit, so there's no /lib64 - if test -d /lib64 -a ! -h /lib64; then - libsuff=64 - fi - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # 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' - ;; - -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - -newsos6) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -nto-qnx*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -openbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[[89]] | openbsd2.[[89]].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; - -os2*) - libname_spec='$name' - shrext=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -sco3.2v5*) - version_type=osf - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - ;; - -solaris*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; - -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; - -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - export_dynamic_flag_spec='${wl}-Blargedynsym' - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -uts4*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -*) - dynamic_linker=no - ;; -esac -AC_MSG_RESULT([$dynamic_linker]) -test "$dynamic_linker" = no && can_build_shared=no -])# AC_LIBTOOL_SYS_DYNAMIC_LINKER - - -# _LT_AC_TAGCONFIG -# ---------------- -AC_DEFUN([_LT_AC_TAGCONFIG], -[AC_ARG_WITH([tags], - [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], - [include additional configurations @<:@automatic@:>@])], - [tagnames="$withval"]) - -if test -f "$ltmain" && test -n "$tagnames"; then - if test ! -f "${ofile}"; then - AC_MSG_WARN([output file `$ofile' does not exist]) - fi - - if test -z "$LTCC"; then - eval "`$SHELL ${ofile} --config | grep '^LTCC='`" - if test -z "$LTCC"; then - AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) - else - AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) - fi - fi - - # Extract list of available tagged configurations in $ofile. - # Note that this assumes the entire list is on one line. - available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` - - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for tagname in $tagnames; do - IFS="$lt_save_ifs" - # Check whether tagname contains only valid characters - case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in - "") ;; - *) AC_MSG_ERROR([invalid tag name: $tagname]) - ;; - esac - - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null - then - AC_MSG_ERROR([tag name \"$tagname\" already exists]) - fi - - # Update the list of available tags. - if test -n "$tagname"; then - echo appending configuration tag \"$tagname\" to $ofile - - case $tagname in - CXX) - if test -n "$CXX" && test "X$CXX" != "Xno"; then - AC_LIBTOOL_LANG_CXX_CONFIG - else - tagname="" - fi - ;; - - F77) - if test -n "$F77" && test "X$F77" != "Xno"; then - AC_LIBTOOL_LANG_F77_CONFIG - else - tagname="" - fi - ;; - - GCJ) - if test -n "$GCJ" && test "X$GCJ" != "Xno"; then - AC_LIBTOOL_LANG_GCJ_CONFIG - else - tagname="" - fi - ;; - - RC) - AC_LIBTOOL_LANG_RC_CONFIG - ;; - - *) - AC_MSG_ERROR([Unsupported tag name: $tagname]) - ;; - esac - - # Append the new tag name to the list of available tags. - if test -n "$tagname" ; then - available_tags="$available_tags $tagname" - fi - fi - done - IFS="$lt_save_ifs" - - # Now substitute the updated list of available tags. - if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then - mv "${ofile}T" "$ofile" - chmod +x "$ofile" - else - rm -f "${ofile}T" - AC_MSG_ERROR([unable to update list of available tagged configurations.]) - fi -fi -])# _LT_AC_TAGCONFIG - - -# AC_LIBTOOL_DLOPEN -# ----------------- -# enable checks for dlopen support -AC_DEFUN([AC_LIBTOOL_DLOPEN], - [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) -])# AC_LIBTOOL_DLOPEN - - -# AC_LIBTOOL_WIN32_DLL -# -------------------- -# declare package support for building win32 dll's -AC_DEFUN([AC_LIBTOOL_WIN32_DLL], -[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) -])# AC_LIBTOOL_WIN32_DLL - - -# AC_ENABLE_SHARED([DEFAULT]) -# --------------------------- -# implement the --enable-shared flag -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -AC_DEFUN([AC_ENABLE_SHARED], -[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE([shared], - [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], - [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_shared=]AC_ENABLE_SHARED_DEFAULT) -])# AC_ENABLE_SHARED - - -# AC_DISABLE_SHARED -# ----------------- -#- set the default shared flag to --disable-shared -AC_DEFUN([AC_DISABLE_SHARED], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_SHARED(no) -])# AC_DISABLE_SHARED - - -# AC_ENABLE_STATIC([DEFAULT]) -# --------------------------- -# implement the --enable-static flag -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -AC_DEFUN([AC_ENABLE_STATIC], -[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE([static], - [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], - [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_static=]AC_ENABLE_STATIC_DEFAULT) -])# AC_ENABLE_STATIC - - -# AC_DISABLE_STATIC -# ----------------- -# set the default static flag to --disable-static -AC_DEFUN([AC_DISABLE_STATIC], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_STATIC(no) -])# AC_DISABLE_STATIC - - -# AC_ENABLE_FAST_INSTALL([DEFAULT]) -# --------------------------------- -# implement the --enable-fast-install flag -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -AC_DEFUN([AC_ENABLE_FAST_INSTALL], -[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE([fast-install], - [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], - [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) -])# AC_ENABLE_FAST_INSTALL - - -# AC_DISABLE_FAST_INSTALL -# ----------------------- -# set the default to --disable-fast-install -AC_DEFUN([AC_DISABLE_FAST_INSTALL], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_FAST_INSTALL(no) -])# AC_DISABLE_FAST_INSTALL - - -# AC_LIBTOOL_PICMODE([MODE]) -# -------------------------- -# implement the --with-pic flag -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. -AC_DEFUN([AC_LIBTOOL_PICMODE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -pic_mode=ifelse($#,1,$1,default) -])# AC_LIBTOOL_PICMODE - - -# AC_PROG_EGREP -# ------------- -# This is predefined starting with Autoconf 2.54, so this conditional -# definition can be removed once we require Autoconf 2.54 or later. -m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], -[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], - [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' - fi]) - EGREP=$ac_cv_prog_egrep - AC_SUBST([EGREP]) -])]) - - -# AC_PATH_TOOL_PREFIX -# ------------------- -# find a file program which can recognise shared library -AC_DEFUN([AC_PATH_TOOL_PREFIX], -[AC_REQUIRE([AC_PROG_EGREP])dnl -AC_MSG_CHECKING([for $1]) -AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, -[case $MAGIC_CMD in -[[\\/*] | ?:[\\/]*]) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -dnl $ac_dummy forces splitting on constant user-supplied paths. -dnl POSIX.2 word splitting is done only on the output of word expansions, -dnl not every word. This closes a longstanding sh security hole. - ac_dummy="ifelse([$2], , $PATH, [$2])" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$1; then - lt_cv_path_MAGIC_CMD="$ac_dir/$1" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <<EOF 1>&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - AC_MSG_RESULT($MAGIC_CMD) -else - AC_MSG_RESULT(no) -fi -])# AC_PATH_TOOL_PREFIX - - -# AC_PATH_MAGIC -# ------------- -# find a file program which can recognise a shared library -AC_DEFUN([AC_PATH_MAGIC], -[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) - else - MAGIC_CMD=: - fi -fi -])# AC_PATH_MAGIC - - -# AC_PROG_LD -# ---------- -# find the pathname to the GNU or non-GNU linker -AC_DEFUN([AC_PROG_LD], -[AC_ARG_WITH([gnu-ld], - [AC_HELP_STRING([--with-gnu-ld], - [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test "$withval" = no || with_gnu_ld=yes], - [with_gnu_ld=no]) -AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by $CC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]]* | ?:[[\\/]]*) - re_direlt='/[[^/]][[^/]]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL(lt_cv_path_LD, -[if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in - *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break - ;; - *) - test "$with_gnu_ld" != yes && break - ;; - esac - fi - done - IFS="$lt_save_ifs" -else - lt_cv_path_LD="$LD" # Let the user override the test with a path. -fi]) -LD="$lt_cv_path_LD" -if test -n "$LD"; then - AC_MSG_RESULT($LD) -else - AC_MSG_RESULT(no) -fi -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) -AC_PROG_LD_GNU -])# AC_PROG_LD - - -# AC_PROG_LD_GNU -# -------------- -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 -*GNU* | *'with BFD'*) - lt_cv_prog_gnu_ld=yes - ;; -*) - lt_cv_prog_gnu_ld=no - ;; -esac]) -with_gnu_ld=$lt_cv_prog_gnu_ld -])# AC_PROG_LD_GNU - - -# AC_PROG_LD_RELOAD_FLAG -# ---------------------- -# find reload flag for linker -# -- PORTME Some linkers may need a different reload flag. -AC_DEFUN([AC_PROG_LD_RELOAD_FLAG], -[AC_CACHE_CHECK([for $LD option to reload object files], - lt_cv_ld_reload_flag, - [lt_cv_ld_reload_flag='-r']) -reload_flag=$lt_cv_ld_reload_flag -case $reload_flag in -"" | " "*) ;; -*) reload_flag=" $reload_flag" ;; -esac -reload_cmds='$LD$reload_flag -o $output$reload_objs' -])# AC_PROG_LD_RELOAD_FLAG - - -# AC_DEPLIBS_CHECK_METHOD -# ----------------------- -# how to check for library dependencies -# -- PORTME fill in with the dynamic library characteristics -AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], -[AC_CACHE_CHECK([how to recognise dependent libraries], -lt_cv_deplibs_check_method, -[lt_cv_file_magic_cmd='$MAGIC_CMD' -lt_cv_file_magic_test_file= -lt_cv_deplibs_check_method='unknown' -# Need to set the preceding variable on all platforms that support -# interlibrary dependencies. -# 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. -# 'pass_all' -- all dependencies passed with no checks. -# 'test_compile' -- check by making test program. -# 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. - -case $host_os in -aix4* | aix5*) - lt_cv_deplibs_check_method=pass_all - ;; - -beos*) - lt_cv_deplibs_check_method=pass_all - ;; - -bsdi4*) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' - lt_cv_file_magic_test_file=/shlib/libc.so - ;; - -cygwin*) - lt_cv_deplibs_check_method=pass_all - ;; - -mingw* | pw32*) - # win32_libid is a shell function defined in ltmain.sh - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='win32_libid' - ;; - -darwin* | rhapsody*) - # this will be overwritten by pass_all, but leave it in just in case - lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' - lt_cv_file_magic_cmd='/usr/bin/file -L' - case "$host_os" in - rhapsody* | darwin1.[[012]]) - lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System` - ;; - *) # Darwin 1.3 on - lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' - ;; - esac - lt_cv_deplibs_check_method=pass_all - ;; - -freebsd* | kfreebsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; - esac - else - lt_cv_deplibs_check_method=pass_all - fi - ;; - -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file - case "$host_cpu" in - ia64*) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - hppa*64*) - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - irix5* | nonstopux*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" - ;; - *) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1" - ;; - esac - lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` - lt_cv_deplibs_check_method=pass_all - ;; - -# This must be Linux ELF. -linux*) - case $host_cpu in - alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* ) - lt_cv_deplibs_check_method=pass_all ;; - # the debian people say, arm and glibc 2.3.1 works for them with pass_all - arm* ) - lt_cv_deplibs_check_method=pass_all ;; - *) - # glibc up to 2.1.1 does not perform some relocations on ARM - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;; - esac - lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` - ;; - -netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' - fi - ;; - -newos6*) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - -nto-qnx*) - lt_cv_deplibs_check_method=unknown - ;; - -openbsd*) - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object' - else - lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' - fi - ;; - -osf3* | osf4* | osf5*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' - lt_cv_file_magic_test_file=/shlib/libc.so - lt_cv_deplibs_check_method=pass_all - ;; - -sco3.2v5*) - lt_cv_deplibs_check_method=pass_all - ;; - -solaris*) - lt_cv_deplibs_check_method=pass_all - lt_cv_file_magic_test_file=/lib/libc.so - ;; - -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' - ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so - ;; - siemens) - lt_cv_deplibs_check_method=pass_all - ;; - esac - ;; - -sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; -esac -]) -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method -test -z "$deplibs_check_method" && deplibs_check_method=unknown -])# AC_DEPLIBS_CHECK_METHOD - - -# AC_PROG_NM -# ---------- -# find the pathname to a BSD-compatible name lister -AC_DEFUN([AC_PROG_NM], -[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM, -[if test -n "$NM"; then - # Let the user override the test. - lt_cv_path_NM="$NM" -else - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/${ac_tool_prefix}nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - ;; - esac - esac - fi - done - IFS="$lt_save_ifs" - test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm -fi]) -NM="$lt_cv_path_NM" -])# AC_PROG_NM - - -# AC_CHECK_LIBM -# ------------- -# check for math library -AC_DEFUN([AC_CHECK_LIBM], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -LIBM= -case $host in -*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) - # These system don't have libm, or don't need it - ;; -*-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") - AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") - ;; -*) - AC_CHECK_LIB(m, cos, LIBM="-lm") - ;; -esac -])# AC_CHECK_LIBM - - -# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) -# ----------------------------------- -# sets LIBLTDL to the link flags for the libltdl convenience library and -# LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-convenience to the configure arguments. Note that LIBLTDL -# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If -# DIRECTORY is not provided, it is assumed to be `libltdl'. LIBLTDL will -# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with -# '${top_srcdir}/' (note the single quotes!). If your package is not -# flat and you're not using automake, define top_builddir and -# top_srcdir appropriately in the Makefiles. -AC_DEFUN([AC_LIBLTDL_CONVENIENCE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl - case $enable_ltdl_convenience in - no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; - "") enable_ltdl_convenience=yes - ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; - esac - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la - LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) - # For backwards non-gettext consistent compatibility... - INCLTDL="$LTDLINCL" -])# AC_LIBLTDL_CONVENIENCE - - -# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) -# ----------------------------------- -# sets LIBLTDL to the link flags for the libltdl installable library and -# LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-install to the configure arguments. Note that LIBLTDL -# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If -# DIRECTORY is not provided and an installed libltdl is not found, it is -# assumed to be `libltdl'. LIBLTDL will be prefixed with '${top_builddir}/' -# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single -# quotes!). If your package is not flat and you're not using automake, -# define top_builddir and top_srcdir appropriately in the Makefiles. -# In the future, this macro may have to be called after AC_PROG_LIBTOOL. -AC_DEFUN([AC_LIBLTDL_INSTALLABLE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl - AC_CHECK_LIB(ltdl, lt_dlinit, - [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], - [if test x"$enable_ltdl_install" = xno; then - AC_MSG_WARN([libltdl not installed, but installation disabled]) - else - enable_ltdl_install=yes - fi - ]) - if test x"$enable_ltdl_install" = x"yes"; then - ac_configure_args="$ac_configure_args --enable-ltdl-install" - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la - LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) - else - ac_configure_args="$ac_configure_args --enable-ltdl-install=no" - LIBLTDL="-lltdl" - LTDLINCL= - fi - # For backwards non-gettext consistent compatibility... - INCLTDL="$LTDLINCL" -])# AC_LIBLTDL_INSTALLABLE - - -# AC_LIBTOOL_CXX -# -------------- -# enable support for C++ libraries -AC_DEFUN([AC_LIBTOOL_CXX], -[AC_REQUIRE([_LT_AC_LANG_CXX]) -])# AC_LIBTOOL_CXX - - -# _LT_AC_LANG_CXX -# --------------- -AC_DEFUN([_LT_AC_LANG_CXX], -[AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([AC_PROG_CXXCPP]) -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) -])# _LT_AC_LANG_CXX - - -# AC_LIBTOOL_F77 -# -------------- -# enable support for Fortran 77 libraries -AC_DEFUN([AC_LIBTOOL_F77], -[AC_REQUIRE([_LT_AC_LANG_F77]) -])# AC_LIBTOOL_F77 - - -# _LT_AC_LANG_F77 -# --------------- -AC_DEFUN([_LT_AC_LANG_F77], -[AC_REQUIRE([AC_PROG_F77]) -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) -])# _LT_AC_LANG_F77 - - -# AC_LIBTOOL_GCJ -# -------------- -# enable support for GCJ libraries -AC_DEFUN([AC_LIBTOOL_GCJ], -[AC_REQUIRE([_LT_AC_LANG_GCJ]) -])# AC_LIBTOOL_GCJ - - -# _LT_AC_LANG_GCJ -# --------------- -AC_DEFUN([_LT_AC_LANG_GCJ], -[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], - [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], - [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], - [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) -])# _LT_AC_LANG_GCJ - - -# AC_LIBTOOL_RC -# -------------- -# enable support for Windows resource files -AC_DEFUN([AC_LIBTOOL_RC], -[AC_REQUIRE([LT_AC_PROG_RC]) -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC]) -])# AC_LIBTOOL_RC - - -# AC_LIBTOOL_LANG_C_CONFIG -# ------------------------ -# Ensure that the configuration vars for the C compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) -AC_DEFUN([_LT_AC_LANG_C_CONFIG], -[lt_save_CC="$CC" -AC_LANG_PUSH(C) - -# Source file extension for C test sources. -ac_ext=c - -# Object file extension for compiled C test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;\n" - -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}\n' - -_LT_AC_SYS_COMPILER - -# -# Check for any special shared library compilation flags. -# -_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)= -if test "$GCC" = no; then - case $host_os in - sco3.2v5*) - _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf' - ;; - esac -fi -if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then - AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries]) - if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ ]]" >/dev/null; then : - else - AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure]) - _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no - fi -fi - - -# -# Check to make sure the static flag actually works. -# -AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works], - _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), - $_LT_AC_TAGVAR(lt_prog_compiler_static, $1), - [], - [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) - - -AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) -AC_LIBTOOL_PROG_COMPILER_PIC($1) -AC_LIBTOOL_PROG_CC_C_O($1) -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -AC_LIBTOOL_PROG_LD_SHLIBS($1) -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -AC_LIBTOOL_SYS_LIB_STRIP -AC_LIBTOOL_DLOPEN_SELF($1) - -# Report which librarie types wil actually be built -AC_MSG_CHECKING([if libtool supports shared libraries]) -AC_MSG_RESULT([$can_build_shared]) - -AC_MSG_CHECKING([whether to build shared libraries]) -test "$can_build_shared" = "no" && enable_shared=no - -# On AIX, shared libraries and static libraries use the same namespace, and -# are all built from PIC. -case "$host_os" in -aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - -aix4*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - darwin* | rhapsody*) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - case "$host_os" in - rhapsody* | darwin1.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - ;; - 10.*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup' - ;; - esac - fi - ;; - esac - output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; -esac -AC_MSG_RESULT([$enable_shared]) - -AC_MSG_CHECKING([whether to build static libraries]) -# Make sure either enable_shared or enable_static is yes. -test "$enable_shared" = yes || enable_static=yes -AC_MSG_RESULT([$enable_static]) - -AC_LIBTOOL_CONFIG($1) - -AC_LANG_POP -CC="$lt_save_CC" -])# AC_LIBTOOL_LANG_C_CONFIG - - -# AC_LIBTOOL_LANG_CXX_CONFIG -# -------------------------- -# Ensure that the configuration vars for the C compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) -AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], -[AC_LANG_PUSH(C++) -AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([AC_PROG_CXXCPP]) - -_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_AC_TAGVAR(allow_undefined_flag, $1)= -_LT_AC_TAGVAR(always_export_symbols, $1)=no -_LT_AC_TAGVAR(archive_expsym_cmds, $1)= -_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_AC_TAGVAR(hardcode_direct, $1)=no -_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -_LT_AC_TAGVAR(hardcode_minus_L, $1)=no -_LT_AC_TAGVAR(hardcode_automatic, $1)=no -_LT_AC_TAGVAR(module_cmds, $1)= -_LT_AC_TAGVAR(module_expsym_cmds, $1)= -_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown -_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_AC_TAGVAR(no_undefined_flag, $1)= -_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Dependencies to place before and after the object being linked: -_LT_AC_TAGVAR(predep_objects, $1)= -_LT_AC_TAGVAR(postdep_objects, $1)= -_LT_AC_TAGVAR(predeps, $1)= -_LT_AC_TAGVAR(postdeps, $1)= -_LT_AC_TAGVAR(compiler_lib_search_path, $1)= - -# Source file extension for C++ test sources. -ac_ext=cc - -# Object file extension for compiled C++ test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;\n" - -# Code to be used in simple link tests -lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n' - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_AC_SYS_COMPILER - -# Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_LD=$LD -lt_save_GCC=$GCC -GCC=$GXX -lt_save_with_gnu_ld=$with_gnu_ld -lt_save_path_LD=$lt_cv_path_LD -if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx -else - unset lt_cv_prog_gnu_ld -fi -if test -n "${lt_cv_path_LDCXX+set}"; then - lt_cv_path_LD=$lt_cv_path_LDCXX -else - unset lt_cv_path_LD -fi -test -z "${LDCXX+set}" || LD=$LDCXX -CC=${CXX-"c++"} -compiler=$CC -_LT_AC_TAGVAR(compiler, $1)=$CC -cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` - -# We don't want -fno-exception wen compiling C++ code, so set the -# no_builtin_flag separately -if test "$GXX" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' -else - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -fi - -if test "$GXX" = yes; then - # Set up default GNU C++ configuration - - AC_PROG_LD - - # Check if GNU C++ uses GNU ld as the underlying linker, since the - # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - - # If archive_cmds runs LD, not CC, wlarc should be empty - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to - # investigate it a little bit more. (MM) - wlarc='${wl}' - - # ancient GNU ld didn't support --whole-archive et. al. - if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ - grep 'no-whole-archive' > /dev/null; then - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - with_gnu_ld=no - wlarc= - - # A generic and very simple default shared library creation - # command for GNU C++ for the case where it uses the native - # 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 -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib' - fi - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - -else - GXX=no - with_gnu_ld=no - wlarc= -fi - -# PORTME: fill in a description of your system's C++ link characteristics -AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -_LT_AC_TAGVAR(ld_shlibs, $1)=yes -case $host_os in - aix3*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - aix4* | aix5*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # KDE requires run time linking. Make it the default. - aix_use_runtimelinking=yes - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_AC_TAGVAR(archive_cmds, $1)='' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - - if test "$GXX" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - else - # We have old collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= - fi - esac - shared_flag='-shared' - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='-qmkshrobj ${wl}-G' - else - shared_flag='-qmkshrobj' - fi - fi - fi - - # Let the compiler handle the export list. - _LT_AC_TAGVAR(always_export_symbols, $1)=no - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - - _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' - _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # -bexpall does not export symbols beginning with underscore (_) - _LT_AC_TAGVAR(always_export_symbols, $1)=yes - # Exported symbols can be pulled into shared objects from archives - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds it's shared libraries. - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=no - _LT_AC_TAGVAR(always_export_symbols, $1)=no - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - darwin* | rhapsody*) - if test "$GXX" = yes; then - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - case "$host_os" in - rhapsody* | darwin1.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - ;; - 10.*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup' - ;; - esac - fi - ;; - esac - lt_int_apple_cc_single_mod=no - output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes - fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring' - fi - _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' - - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - dgux*) - case $cc_basename in - ec++) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - ghcx) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - freebsd[12]*) - # C++ shared libraries reported to be fairly broken before switch to ELF - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - freebsd-elf*) - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - ;; - freebsd* | kfreebsd*-gnu) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - _LT_AC_TAGVAR(ld_shlibs, $1)=yes - ;; - gnu*) - ;; - hpux9*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - - case $cc_basename in - CC) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - aCC) - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - hpux10*|hpux11*) - if test $with_gnu_ld = no; then - case "$host_cpu" in - hppa*64*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - ia64*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - ;; - *) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - esac - fi - case "$host_cpu" in - hppa*64*) - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - ia64*) - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; - *) - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; - esac - - case $cc_basename in - CC) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - aCC) - case "$host_cpu" in - hppa*64*|ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects' - ;; - esac - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then - case "$host_cpu" in - ia64*|hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects' - ;; - esac - fi - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - irix5* | irix6*) - case $cc_basename in - CC) - # SGI C++ - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' - ;; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' - fi - fi - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - ;; - esac - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - linux*) - case $cc_basename in - KCC) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - ;; - icpc) - # Intel C++ - with_gnu_ld=yes - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; - cxx) - # Compaq C++ - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - - runpath_var=LD_RUN_PATH - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - esac - ;; - lynxos*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - m88k*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - mvs*) - case $cc_basename in - cxx) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - fi - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' - ;; - osf3*) - case $cc_basename in - KCC) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - - ;; - RCC) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - cxx) - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - osf4* | osf5*) - case $cc_basename in - KCC) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' - ;; - RCC) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - cxx) - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ - $rm $lib.exp' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - psos*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - sco*) - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - case $cc_basename in - CC) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - lcc) - # Lucid - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - solaris*) - case $cc_basename in - CC) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The C++ compiler is used as linker so we must use $wl - # flag to pass the commands to the underlying system - # linker. - # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - ;; - esac - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - gcx) - # Green Hills C++ Compiler - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' - - # The C++ compiler must be used to create the archive. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' - ;; - *) - # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' - if $CC --version | grep -v '^2\.7' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" - fi - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' - fi - ;; - esac - ;; - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - ;; - tandem*) - case $cc_basename in - NCC) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - vxworks*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -esac -AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - -_LT_AC_TAGVAR(GCC, $1)="$GXX" -_LT_AC_TAGVAR(LD, $1)="$LD" - -AC_LIBTOOL_POSTDEP_PREDEP($1) -AC_LIBTOOL_PROG_COMPILER_PIC($1) -AC_LIBTOOL_PROG_CC_C_O($1) -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -AC_LIBTOOL_PROG_LD_SHLIBS($1) -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -AC_LIBTOOL_SYS_LIB_STRIP -AC_LIBTOOL_DLOPEN_SELF($1) - -AC_LIBTOOL_CONFIG($1) - -AC_LANG_POP -CC=$lt_save_CC -LDCXX=$LD -LD=$lt_save_LD -GCC=$lt_save_GCC -with_gnu_ldcxx=$with_gnu_ld -with_gnu_ld=$lt_save_with_gnu_ld -lt_cv_path_LDCXX=$lt_cv_path_LD -lt_cv_path_LD=$lt_save_path_LD -lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld -lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -])# AC_LIBTOOL_LANG_CXX_CONFIG - -# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) -# ------------------------ -# Figure out "hidden" library dependencies from verbose -# compiler output when linking a shared library. -# Parse the compiler output and extract the necessary -# objects, libraries and library flags. -AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ -dnl we can't use the lt_simple_compile_test_code here, -dnl because it contains code intended for an executable, -dnl not a library. It's possible we should let each -dnl tag define a new lt_????_link_test_code variable, -dnl but it's only used here... -ifelse([$1],[],[cat > conftest.$ac_ext <<EOF -int a; -void foo (void) { a = 0; } -EOF -],[$1],[CXX],[cat > conftest.$ac_ext <<EOF -class Foo -{ -public: - Foo (void) { a = 0; } -private: - int a; -}; -EOF -],[$1],[F77],[cat > conftest.$ac_ext <<EOF - subroutine foo - implicit none - integer*4 a - a=0 - return - end -EOF -],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF -public class foo { - private int a; - public void bar (void) { - a = 0; - } -}; -EOF -]) -dnl Parse the compiler output and extract the necessary -dnl objects, libraries and library flags. -if AC_TRY_EVAL(ac_compile); then - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. - - # Sentinel used to keep track of whether or not we are before - # the conftest object file. - pre_test_object_deps_done=no - - # The `*' in the case matches for architectures that use `case' in - # $output_verbose_cmd can trigger glob expansion during the loop - # eval without this substitution. - output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`" - - for p in `eval $output_verbose_link_cmd`; do - case $p in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. - # Remove the space. - if test $p = "-L" \ - || test $p = "-R"; then - prev=$p - continue - else - prev= - fi - - if test "$pre_test_object_deps_done" = no; then - case $p in - -L* | -R*) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. - if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then - _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" - else - _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" - fi - ;; - # The "-l" case would never come before the object being - # linked, so don't bother handling this case. - esac - else - if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then - _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}" - else - _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}" - fi - fi - ;; - - *.$objext|*.$libext) - # This assumes that the test object file only shows up - # once in the compiler output. - if test "$p" = "conftest.$objext"; then - pre_test_object_deps_done=yes - continue - fi - - if test "$pre_test_object_deps_done" = no; then - if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then - _LT_AC_TAGVAR(predep_objects, $1)="$p" - else - _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p" - fi - else - if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then - _LT_AC_TAGVAR(postdep_objects, $1)="$p" - else - _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p" - fi - fi - ;; - - *) ;; # Ignore the rest. - - esac - done - - # Clean up. - rm -f a.out a.exe -else - echo "libtool.m4: error: problem compiling $1 test program" -fi - -$rm -f confest.$objext - -case " $_LT_AC_TAGVAR(postdeps, $1) " in -*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; -esac -])# AC_LIBTOOL_POSTDEP_PREDEP - -# AC_LIBTOOL_LANG_F77_CONFIG -# ------------------------ -# Ensure that the configuration vars for the C compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)]) -AC_DEFUN([_LT_AC_LANG_F77_CONFIG], -[AC_REQUIRE([AC_PROG_F77]) -AC_LANG_PUSH(Fortran 77) - -_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_AC_TAGVAR(allow_undefined_flag, $1)= -_LT_AC_TAGVAR(always_export_symbols, $1)=no -_LT_AC_TAGVAR(archive_expsym_cmds, $1)= -_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_AC_TAGVAR(hardcode_direct, $1)=no -_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -_LT_AC_TAGVAR(hardcode_minus_L, $1)=no -_LT_AC_TAGVAR(hardcode_automatic, $1)=no -_LT_AC_TAGVAR(module_cmds, $1)= -_LT_AC_TAGVAR(module_expsym_cmds, $1)= -_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown -_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_AC_TAGVAR(no_undefined_flag, $1)= -_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for f77 test sources. -ac_ext=f - -# Object file extension for compiled f77 test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code=" subroutine t\n return\n end\n" - -# Code to be used in simple link tests -lt_simple_link_test_code=" program t\n end\n" - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_AC_SYS_COMPILER - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -CC=${F77-"f77"} -compiler=$CC -_LT_AC_TAGVAR(compiler, $1)=$CC -cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` - -AC_MSG_CHECKING([if libtool supports shared libraries]) -AC_MSG_RESULT([$can_build_shared]) - -AC_MSG_CHECKING([whether to build shared libraries]) -test "$can_build_shared" = "no" && enable_shared=no - -# On AIX, shared libraries and static libraries use the same namespace, and -# are all built from PIC. -case "$host_os" in -aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; -aix4*) - test "$enable_shared" = yes && enable_static=no - ;; -esac -AC_MSG_RESULT([$enable_shared]) - -AC_MSG_CHECKING([whether to build static libraries]) -# Make sure either enable_shared or enable_static is yes. -test "$enable_shared" = yes || enable_static=yes -AC_MSG_RESULT([$enable_static]) - -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - -_LT_AC_TAGVAR(GCC, $1)="$G77" -_LT_AC_TAGVAR(LD, $1)="$LD" - -AC_LIBTOOL_PROG_COMPILER_PIC($1) -AC_LIBTOOL_PROG_CC_C_O($1) -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -AC_LIBTOOL_PROG_LD_SHLIBS($1) -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -AC_LIBTOOL_SYS_LIB_STRIP - - -AC_LIBTOOL_CONFIG($1) - -AC_LANG_POP -CC="$lt_save_CC" -])# AC_LIBTOOL_LANG_F77_CONFIG - - -# AC_LIBTOOL_LANG_GCJ_CONFIG -# -------------------------- -# Ensure that the configuration vars for the C compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)]) -AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG], -[AC_LANG_SAVE - -# Source file extension for Java test sources. -ac_ext=java - -# Object file extension for compiled Java test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}\n" - -# Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_AC_SYS_COMPILER - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -CC=${GCJ-"gcj"} -compiler=$CC -_LT_AC_TAGVAR(compiler, $1)=$CC - -# GCJ did not exist at the time GCC didn't implicitly link libc in. -_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - -AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) -AC_LIBTOOL_PROG_COMPILER_PIC($1) -AC_LIBTOOL_PROG_CC_C_O($1) -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -AC_LIBTOOL_PROG_LD_SHLIBS($1) -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -AC_LIBTOOL_SYS_LIB_STRIP -AC_LIBTOOL_DLOPEN_SELF($1) - -AC_LIBTOOL_CONFIG($1) - -AC_LANG_RESTORE -CC="$lt_save_CC" -])# AC_LIBTOOL_LANG_GCJ_CONFIG - - -# AC_LIBTOOL_LANG_RC_CONFIG -# -------------------------- -# Ensure that the configuration vars for the Windows resource compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)]) -AC_DEFUN([_LT_AC_LANG_RC_CONFIG], -[AC_LANG_SAVE - -# Source file extension for RC test sources. -ac_ext=rc - -# Object file extension for compiled RC test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' - -# Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_AC_SYS_COMPILER - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -CC=${RC-"windres"} -compiler=$CC -_LT_AC_TAGVAR(compiler, $1)=$CC -_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - -AC_LIBTOOL_CONFIG($1) - -AC_LANG_RESTORE -CC="$lt_save_CC" -])# AC_LIBTOOL_LANG_RC_CONFIG - - -# AC_LIBTOOL_CONFIG([TAGNAME]) -# ---------------------------- -# If TAGNAME is not passed, then create an initial libtool script -# with a default configuration from the untagged config vars. Otherwise -# add code to config.status for appending the configuration named by -# TAGNAME from the matching tagged config vars. -AC_DEFUN([AC_LIBTOOL_CONFIG], -[# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # See if we are running on zsh, and set the options which allow our commands through - # without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ - libname_spec library_names_spec soname_spec extract_expsyms_cmds \ - old_striplib striplib file_magic_cmd finish_cmds finish_eval \ - deplibs_check_method reload_flag reload_cmds need_locks \ - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - old_postinstall_cmds old_postuninstall_cmds \ - _LT_AC_TAGVAR(compiler, $1) \ - _LT_AC_TAGVAR(CC, $1) \ - _LT_AC_TAGVAR(LD, $1) \ - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \ - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \ - _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \ - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \ - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \ - _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \ - _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \ - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \ - _LT_AC_TAGVAR(old_archive_cmds, $1) \ - _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \ - _LT_AC_TAGVAR(predep_objects, $1) \ - _LT_AC_TAGVAR(postdep_objects, $1) \ - _LT_AC_TAGVAR(predeps, $1) \ - _LT_AC_TAGVAR(postdeps, $1) \ - _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ - _LT_AC_TAGVAR(archive_cmds, $1) \ - _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ - _LT_AC_TAGVAR(postinstall_cmds, $1) \ - _LT_AC_TAGVAR(postuninstall_cmds, $1) \ - _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \ - _LT_AC_TAGVAR(allow_undefined_flag, $1) \ - _LT_AC_TAGVAR(no_undefined_flag, $1) \ - _LT_AC_TAGVAR(export_symbols_cmds, $1) \ - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \ - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \ - _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \ - _LT_AC_TAGVAR(hardcode_automatic, $1) \ - _LT_AC_TAGVAR(module_cmds, $1) \ - _LT_AC_TAGVAR(module_expsym_cmds, $1) \ - _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \ - _LT_AC_TAGVAR(exclude_expsyms, $1) \ - _LT_AC_TAGVAR(include_expsyms, $1); do - - case $var in - _LT_AC_TAGVAR(old_archive_cmds, $1) | \ - _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \ - _LT_AC_TAGVAR(archive_cmds, $1) | \ - _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \ - _LT_AC_TAGVAR(module_cmds, $1) | \ - _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ - _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \ - _LT_AC_TAGVAR(export_symbols_cmds, $1) | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; - esac - done - - case $lt_echo in - *'\[$]0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'` - ;; - esac - -ifelse([$1], [], - [cfgfile="${ofile}T" - trap "$rm \"$cfgfile\"; exit 1" 1 2 15 - $rm -f "$cfgfile" - AC_MSG_NOTICE([creating $ofile])], - [cfgfile="$ofile"]) - - cat <<__EOF__ >> "$cfgfile" -ifelse([$1], [], -[#! $SHELL - -# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 -# Free Software Foundation, Inc. -# -# This file is part of GNU Libtool: -# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 -# -# 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# A sed program that does not truncate output. -SED=$lt_SED - -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="$SED -e s/^X//" - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi - -# The names of the tagged configurations supported by this script. -available_tags= - -# ### BEGIN LIBTOOL CONFIG], -[# ### BEGIN LIBTOOL TAG CONFIG: $tagname]) - -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared - -# Whether or not to build static libraries. -build_old_libs=$enable_static - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) - -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install - -# The host system. -host_alias=$host_alias -host=$host - -# An echo program that does not interpret backslashes. -echo=$lt_echo - -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS - -# A C compiler. -LTCC=$lt_LTCC - -# A language-specific compiler. -CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) - -# Is the compiler the GNU C compiler? -with_gcc=$_LT_AC_TAGVAR(GCC, $1) - -# An ERE matcher. -EGREP=$lt_EGREP - -# The linker used to build libraries. -LD=$lt_[]_LT_AC_TAGVAR(LD, $1) - -# Whether we need hard or soft links. -LN_S=$lt_LN_S - -# A BSD-compatible nm program. -NM=$lt_NM - -# A symbol stripping program -STRIP=$STRIP - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD - -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" - -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" - -# Used on cygwin: assembler. -AS="$AS" - -# The name of the directory that contains temporary libtool files. -objdir=$objdir - -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - -# How to pass a linker flag through the compiler. -wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) - -# Object file suffix (normally "o"). -objext="$ac_objext" - -# Old archive suffix (normally "a"). -libext="$libext" - -# Shared library suffix (normally ".so"). -shrext='$shrext' - -# Executable file suffix (normally ""). -exeext="$exeext" - -# Additional compiler flags for building library objects. -pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) -pic_mode=$pic_mode - -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) - -# Must we lock files when doing compilation ? -need_locks=$lt_need_locks - -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix - -# Do we need a version for libraries? -need_version=$need_version - -# Whether dlopen is supported. -dlopen_support=$enable_dlopen - -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1) - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1) - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1) - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1) - -# Library versioning type. -version_type=$version_type - -# Format of library name prefix. -libname_spec=$lt_libname_spec - -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec=$lt_library_names_spec - -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec - -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1) -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1) - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) - -# Commands used to build and install a shared archive. -archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1) -archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1) -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1) -module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1) - -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1) - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1) - -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1) - -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - -# This is the shared library runtime path variable. -runpath_var=$runpath_var - -# This is the shared library path variable. -shlibpath_var=$shlibpath_var - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath - -# How to hardcode a shared library path into an executable. -hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1) - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) - -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) - -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1) - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1) - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1) - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1) - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) - -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)" - -# Set to yes if exported symbols are required. -always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) - -# The commands to list exported symbols. -export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1) - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1) - -# Symbols that must always be exported. -include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1) - -ifelse([$1],[], -[# ### END LIBTOOL CONFIG], -[# ### END LIBTOOL TAG CONFIG: $tagname]) - -__EOF__ - -ifelse([$1],[], [ - case $host_os in - aix3*) - cat <<\EOF >> "$cfgfile" - -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -EOF - ;; - esac - - # We use sed instead of cat because bash on DJGPP gets confused if - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) - - mv -f "$cfgfile" "$ofile" || \ - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" -]) -else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - test -f Makefile && make "$ltmain" -fi -])# AC_LIBTOOL_CONFIG - - -# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) -# ------------------------------------------- -AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl - -_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - -if test "$GCC" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' - - AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], - lt_cv_prog_compiler_rtti_exceptions, - [-fno-rtti -fno-exceptions], [], - [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) -fi -])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI - - -# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -# --------------------------------- -AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], -[AC_REQUIRE([AC_CANONICAL_HOST]) -AC_REQUIRE([AC_PROG_NM]) -AC_REQUIRE([AC_OBJEXT]) -# Check for command to grab the raw symbol name followed by C symbol from nm. -AC_MSG_CHECKING([command to parse $NM output from $compiler object]) -AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], -[ -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] - -# Character class describing NM global symbol codes. -symcode='[[BCDEGRST]]' - -# Regexp to match symbols that can be accessed directly from C. -sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' - -# Transform the above into a raw symbol and a C symbol. -symxfrm='\1 \2\3 \3' - -# Transform an extracted symbol line into a proper C declaration -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" - -# Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - -# Define system-specific variables. -case $host_os in -aix*) - symcode='[[BCDT]]' - ;; -cygwin* | mingw* | pw32*) - symcode='[[ABCDGISTW]]' - ;; -hpux*) # Its linker distinguishes data from code symbols - if test "$host_cpu" = ia64; then - symcode='[[ABCDEGRST]]' - fi - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - ;; -irix* | nonstopux*) - symcode='[[BCDEGRST]]' - ;; -osf*) - symcode='[[BCDEGQRST]]' - ;; -solaris* | sysv5*) - symcode='[[BDT]]' - ;; -sysv4) - symcode='[[DFNSTU]]' - ;; -esac - -# Handle CRLF in mingw tool chain -opt_cr= -case $build_os in -mingw*) - opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp - ;; -esac - -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[[ABCDGISTW]]' ;; -esac - -# Try without a prefix undercore, then with it. -for ac_symprfx in "" "_"; do - - # Write the raw and C identifiers. - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" - - # Check to see that the pipe works correctly. - pipe_works=no - - rm -f conftest* - cat > conftest.$ac_ext <<EOF -#ifdef __cplusplus -extern "C" { -#endif -char nm_test_var; -void nm_test_func(){} -#ifdef __cplusplus -} -#endif -int main(){nm_test_var='a';nm_test_func();return(0);} -EOF - - if AC_TRY_EVAL(ac_compile); then - # Now try to grab the symbols. - nlist=conftest.nm - if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - else - rm -f "$nlist"T - fi - - # Make sure that we snagged all the symbols we need. - if grep ' nm_test_var$' "$nlist" >/dev/null; then - if grep ' nm_test_func$' "$nlist" >/dev/null; then - cat <<EOF > conftest.$ac_ext -#ifdef __cplusplus -extern "C" { -#endif - -EOF - # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' - - cat <<EOF >> conftest.$ac_ext -#if defined (__STDC__) && __STDC__ -# define lt_ptr_t void * -#else -# define lt_ptr_t char * -# define const -#endif - -/* The mapping between symbol names and symbols. */ -const struct { - const char *name; - lt_ptr_t address; -} -lt_preloaded_symbols[[]] = -{ -EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext - cat <<\EOF >> conftest.$ac_ext - {0, (lt_ptr_t) 0} -}; - -#ifdef __cplusplus -} -#endif -EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then - pipe_works=yes - fi - LIBS="$lt_save_LIBS" - CFLAGS="$lt_save_CFLAGS" - else - echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD - fi - else - echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD - cat conftest.$ac_ext >&5 - fi - rm -f conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then - break - else - lt_cv_sys_global_symbol_pipe= - fi -done -]) -if test -z "$lt_cv_sys_global_symbol_pipe"; then - lt_cv_sys_global_symbol_to_cdecl= -fi -if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - AC_MSG_RESULT(failed) -else - AC_MSG_RESULT(ok) -fi -]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE - - -# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) -# --------------------------------------- -AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], -[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)= -_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -_LT_AC_TAGVAR(lt_prog_compiler_static, $1)= - -AC_MSG_CHECKING([for $compiler option to produce PIC]) - ifelse([$1],[CXX],[ - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | os2* | pw32*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - *djgpp*) - # DJGPP does not support shared libraries at all - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - sysv4*MP*) - if test -d /usr/nec; then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case "$host_cpu" in - hppa*64*|ia64*) - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - else - case $host_os in - aix4* | aix5*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - chorus*) - case $cc_basename in - cxch68) - # Green Hills C++ Compiler - # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac - ;; - dgux*) - case $cc_basename in - ec++) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - ghcx) - # Green Hills C++ Compiler - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | kfreebsd*-gnu) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in - CC) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" - if test "$host_cpu" != ia64; then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - fi - ;; - aCC) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" - case "$host_cpu" in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - ;; - *) - ;; - esac - ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux*) - case $cc_basename in - KCC) - # KAI C++ Compiler - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - icpc) - # Intel C++ - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - cxx) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - ;; - esac - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd*) - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - ;; - RCC) - # Rational C++ 2.4.1 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - cxx) - # Digital/Compaq C++ - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - sco*) - case $cc_basename in - CC) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - *) - ;; - esac - ;; - solaris*) - case $cc_basename in - CC) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - gcx) - # Green Hills C++ Compiler - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC) - # Sun C++ 4.x - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - lcc) - # Lucid - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC) - # NonStop-UX NCC 3.20 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - *) - ;; - esac - ;; - unixware*) - ;; - vxworks*) - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -], -[ - if test "$GCC" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - - mingw* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' - ;; - - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - enable_shared=no - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case "$host_cpu" in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - - mingw* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' - ;; - - hpux9* | hpux10* | hpux11*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case "$host_cpu" in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - ;; - - irix5* | irix6* | nonstopux*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC (with -KPIC) is the default. - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - newsos6) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - linux*) - case $CC in - icc* | ecc*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - ccc*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All Alpha code is PIC. - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - esac - ;; - - osf3* | osf4* | osf5*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All OSF/1 code is PIC. - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - sco3.2v5*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn' - ;; - - solaris*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - sunos4*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - uts4*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - *) - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -]) -AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then - AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], - _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), - [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], - [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in - "" | " "*) ;; - *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; - esac], - [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) -fi -case "$host_os" in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" - ;; -esac -]) - - -# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) -# ------------------------------------ -# See if the linker supports building shared libraries. -AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], -[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -ifelse([$1],[CXX],[ - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - case $host_os in - aix4* | aix5*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' - else - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) - _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" - ;; - cygwin* | mingw*) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' - ;; - *) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac -],[ - runpath_var= - _LT_AC_TAGVAR(allow_undefined_flag, $1)= - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no - _LT_AC_TAGVAR(archive_cmds, $1)= - _LT_AC_TAGVAR(archive_expsym_cmds, $1)= - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= - _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= - _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_minus_L, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown - _LT_AC_TAGVAR(hardcode_automatic, $1)=no - _LT_AC_TAGVAR(module_cmds, $1)= - _LT_AC_TAGVAR(module_expsym_cmds, $1)= - _LT_AC_TAGVAR(always_export_symbols, $1)=no - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - _LT_AC_TAGVAR(include_expsyms, $1)= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - extract_expsyms_cmds= - - case $host_os in - cygwin* | mingw* | pw32*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - openbsd*) - with_gnu_ld=no - ;; - esac - - _LT_AC_TAGVAR(ld_shlibs, $1)=yes - if test "$with_gnu_ld" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - - # See if GNU ld supports shared libraries. - case $host_os in - aix3* | aix4* | aix5*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - _LT_AC_TAGVAR(ld_shlibs, $1)=no - cat <<EOF 1>&2 - -*** Warning: the GNU linker, at least up to release 2.9.1, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. - -EOF - fi - ;; - - amigaos*) - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - - # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach <jrb3@best.com> says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=no - _LT_AC_TAGVAR(always_export_symbols, $1)=no - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' - else - ld_shlibs=no - fi - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - - solaris* | sysv5*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - _LT_AC_TAGVAR(ld_shlibs, $1)=no - cat <<EOF 1>&2 - -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -EOF - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - sunos4*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - - if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then - runpath_var=LD_RUN_PATH - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= - fi - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(always_export_symbols, $1)=yes - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$link_static_flag"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported - fi - ;; - - aix4* | aix5*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' - else - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' - fi - - # KDE requires run time linking. Make it the default. - aix_use_runtimelinking=yes - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_AC_TAGVAR(archive_cmds, $1)='' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - - if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - else - # We have old collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= - fi - esac - shared_flag='-shared' - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='-qmkshrobj ${wl}-G' - else - shared_flag='-qmkshrobj' - fi - fi - fi - - # Let the compiler handle the export list. - _LT_AC_TAGVAR(always_export_symbols, $1)=no - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' - _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # -bexpall does not export symbols beginning with underscore (_) - _LT_AC_TAGVAR(always_export_symbols, $1)=yes - # Exported symbols can be pulled into shared objects from archives - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds it's shared libraries. - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - amigaos*) - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - # see comment about different semantics on the GNU ld section - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - - bsdi4*) - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic - ;; - - cygwin* | mingw* | pw32*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=no - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' - # FIXME: Should let the user specify the lib program. - _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; - - darwin* | rhapsody*) - if test "$GXX" = yes ; then - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - case "$host_os" in - rhapsody* | darwin1.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - ;; - 10.*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup' - ;; - esac - fi - ;; - esac - lt_int_apple_cc_single_mod=no - output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes - fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring' - fi - _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - dgux*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - freebsd1*) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - hpux9*) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - - hpux10* | hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case "$host_cpu" in - hppa*64*|ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs' - ;; - esac - else - case "$host_cpu" in - hppa*64*|ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - ;; - esac - fi - if test "$with_gnu_ld" = no; then - case "$host_cpu" in - hppa*64*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - ia64*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - ;; - *) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - fi - ;; - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - newsos6) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - openbsd*) - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac - fi - ;; - - os2*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def' - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - else - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' - - # Both c and cxx compiler support -rpath directly - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - fi - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - sco3.2v5*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ;; - - solaris*) - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; - esac - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4) - case $host_vendor in - sni) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' - _LT_AC_TAGVAR(hardcode_direct, $1)=no - ;; - motorola) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4.3*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - _LT_AC_TAGVAR(ld_shlibs, $1)=yes - fi - ;; - - sysv4.2uw2*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - hardcode_runpath_var=yes - runpath_var=LD_RUN_PATH - ;; - - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text' - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' - fi - runpath_var='LD_RUN_PATH' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv5*) - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' - # $CC -shared without GNU ld will not create a library from C++ - # object files and a static libstdc++, better avoid it by now - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - ;; - - uts4*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - fi -]) -AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - -# -# Do we need to explicitly link libc? -# -case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in -x|xyes) - # Assume -lc should be added - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $_LT_AC_TAGVAR(archive_cmds, $1) in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - AC_MSG_CHECKING([whether -lc should be explicitly linked in]) - $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext - - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) - _LT_AC_TAGVAR(allow_undefined_flag, $1)= - if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) - then - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - else - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - fi - _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $rm conftest* - AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) - ;; - esac - fi - ;; -esac -])# AC_LIBTOOL_PROG_LD_SHLIBS - - -# _LT_AC_FILE_LTDLL_C -# ------------------- -# Be careful that the start marker always follows a newline. -AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ -# /* ltdll.c starts here */ -# #define WIN32_LEAN_AND_MEAN -# #include <windows.h> -# #undef WIN32_LEAN_AND_MEAN -# #include <stdio.h> -# -# #ifndef __CYGWIN__ -# # ifdef __CYGWIN32__ -# # define __CYGWIN__ __CYGWIN32__ -# # endif -# #endif -# -# #ifdef __cplusplus -# extern "C" { -# #endif -# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); -# #ifdef __cplusplus -# } -# #endif -# -# #ifdef __CYGWIN__ -# #include <cygwin/cygwin_dll.h> -# DECLARE_CYGWIN_DLL( DllMain ); -# #endif -# HINSTANCE __hDllInstance_base; -# -# BOOL APIENTRY -# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) -# { -# __hDllInstance_base = hInst; -# return TRUE; -# } -# /* ltdll.c ends here */ -])# _LT_AC_FILE_LTDLL_C - - -# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) -# --------------------------------- -AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) - - -# old names -AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) -AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) -AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) -AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) -AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) -AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) - -# This is just to silence aclocal about the macro not being used -ifelse([AC_DISABLE_FAST_INSTALL]) - -AC_DEFUN([LT_AC_PROG_GCJ], -[AC_CHECK_TOOL(GCJ, gcj, no) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" - AC_SUBST(GCJFLAGS) -]) - -AC_DEFUN([LT_AC_PROG_RC], -[AC_CHECK_TOOL(RC, windres, no) -]) - -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_SED. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # -# LT_AC_PROG_SED -# -------------- -# Check for a fully-functional sed program, that truncates -# as few characters as possible. Prefer GNU sed if found. -AC_DEFUN([LT_AC_PROG_SED], -[AC_MSG_CHECKING([for a sed that does not truncate output]) -AC_CACHE_VAL(lt_cv_path_SED, -[# Loop through the user's path and test for sed and gsed. -# Then use that list of sed's as ones to test for truncation. -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi - done - done -done -lt_ac_max=0 -lt_ac_count=0 -# Add /usr/xpg4/bin/sed as it is typically found on Solaris -# along with /bin/sed that truncates output. -for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && break - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in - # Check for GNU sed and select it if it is found. - if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then - lt_cv_path_SED=$lt_ac_sed - break - fi - while true; do - cat conftest.in conftest.in >conftest.tmp - mv conftest.tmp conftest.in - cp conftest.in conftest.nl - echo >>conftest.nl - $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break - cmp -s conftest.out conftest.nl || break - # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break - lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then - lt_ac_max=$lt_ac_count - lt_cv_path_SED=$lt_ac_sed - fi - done -done -]) -SED=$lt_cv_path_SED -AC_MSG_RESULT([$SED]) -]) - -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 - - 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) - - if $PKG_CONFIG --exists "$2" ; then - AC_MSG_RESULT(yes) - succeeded=yes - - AC_MSG_CHECKING($1_CFLAGS) - $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` - AC_MSG_RESULT($$1_CFLAGS) - - 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 -]) - - - -# 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 - -AC_PREREQ(2.52) - -# 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='#' -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])]) - -# 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.9])]) - -# 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 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/../..'. -# -# 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. -# -# $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 -# -# 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. -# -# 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. -# -# 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... - - - -# _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=]) - -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 - - 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 - - cd .. - rm -rf conftest.dir -else - am_cv_$1_dependencies_compiler_type=none -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]) -]) - - -# 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 -]) - - -# 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]) -]) - -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright 1999, 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 - -# _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 - - -# 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"]) -]) - -# 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 - -# 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 -]) - - -# Copyright 1998, 1999, 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 3 - -AC_PREREQ(2.50) - -# AM_PROG_LEX -# ----------- -# Autoconf leaves LEX=: if lex or flex can't be found. Change that to a -# "missing" invocation, for better error output. -AC_DEFUN([AM_PROG_LEX], -[AC_REQUIRE([AM_MISSING_HAS_RUN])dnl -AC_REQUIRE([AC_PROG_LEX])dnl -if test "$LEX" = :; then - LEX=${am_missing_run}flex -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($@)]) - -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# -# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. -# -# 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 of the License, 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. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi - -fi[]dnl -])# PKG_PROG_PKG_CONFIG - -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# -# Similar to PKG_CHECK_MODULES, make sure that the first instance of -# this or PKG_CHECK_MODULES is called, or make sure to call -# PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_ifval([$2], [$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) - - -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -m4_define([_PKG_CONFIG], -[if test -n "$PKG_CONFIG"; then - if test -n "$$1"; then - pkg_cv_[]$1="$$1" - else - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - fi -else - pkg_failed=untried -fi[]dnl -])# _PKG_CONFIG - -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED - - -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl - -pkg_failed=no -AC_MSG_CHECKING([for $1]) - -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) - -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) - -if test $pkg_failed = yes; then - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - - ifelse([$4], , [AC_MSG_ERROR(dnl -[Package requirements ($2) were not met: - -$$1_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -_PKG_TEXT -])], - [AC_MSG_RESULT([no]) - $4]) -elif test $pkg_failed = untried; then - ifelse([$4], , [AC_MSG_FAILURE(dnl -[The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -_PKG_TEXT - -To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], - [$4]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - ifelse([$3], , :, [$3]) -fi[]dnl -])# PKG_CHECK_MODULES - diff --git a/admin b/admin deleted file mode 160000 -Subproject a7f75ac0ff587d5b8694a1b78557597161f8104 diff --git a/apps/Makefile.am b/apps/Makefile.am deleted file mode 100644 index 09a6602..0000000 --- a/apps/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = ktorrent ktcachecheck kttorinfo ktupnptest diff --git a/apps/ktcachecheck/Makefile.am b/apps/ktcachecheck/Makefile.am deleted file mode 100644 index a9f5d3e..0000000 --- a/apps/ktcachecheck/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libktorrent $(all_includes) -METASOURCES = AUTO - -bin_PROGRAMS = ktcachecheck - -ktcachecheck_SOURCES = cachecheck.cpp cachechecker.cpp singlecachechecker.cpp \ - multicachechecker.cpp -ktcachecheck_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ktcachecheck_LDADD = $(LIB_TDEPARTS) ../../libktorrent/libktorrent.la \ - $(LIB_TDEFILE) $(LIB_TDEIO) -noinst_HEADERS = cachechecker.h singlecachechecker.h multicachechecker.h -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/apps/ktorrent/Makefile.am b/apps/ktorrent/Makefile.am deleted file mode 100644 index 6a6d309..0000000 --- a/apps/ktorrent/Makefile.am +++ /dev/null @@ -1,65 +0,0 @@ -## Makefile.am for ktorrent -SUBDIRS = groups newui -# this is the program that gets installed. it's name is used for all -# of the other Makefile.am variables -bin_PROGRAMS = ktorrent - - - -# set the include path for X, qt and KDE -INCLUDES = -I$(top_builddir)/ktorrent/libktorrent -I$(top_builddir)/libktorrent/ -I$(srcdir)/../../libktorrent \ - $(all_includes) - -# the library search path. -ktorrent_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor - -# the libraries to link against. -ktorrent_LDADD = ../../apps/ktorrent/newui/libnewui.la $(LIB_TDEFILE) \ - $(LIB_TDEIO) $(LIB_TDEPARTS) ../../apps/ktorrent/groups/libgroups.la \ - ../../libktorrent/libktorrent.la - -# which sources should be compiled for ktorrent -ktorrent_SOURCES = addpeerwidget.cpp addpeerwidget.h addpeerwidgetbase.ui \ - advancedpref.ui dcopinterface.skel downloadpref.ui fileselectdlg.cpp \ - fileselectdlgbase.ui generalpref.ui ipfilterwidget.cpp ipfilterwidgetbase.ui ktorrent.cpp \ - ktorrentapp.cpp ktorrentcore.cpp ktorrentdcop.cpp ktorrentview.cpp ktorrentviewitem.cpp \ - ktorrentviewmenu.cpp leaktrace.cpp main.cpp pastedialog.cpp pastedlgbase.ui pref.cpp \ - queuedialog.cpp queuedialog.h queuedlg.ui scandialog.cpp scandlgbase.ui \ - speedlimitsdlg.cpp speedlimitsdlgbase.ui torrentcreatordlg.cpp torrentcreatordlg.h \ - torrentcreatordlgbase.ui trayhoverpopup.cpp trayicon.cpp viewmanager.cpp filterbar.cpp - -xdg_apps_DATA = ktorrent.desktop - - -# these are the headers for your project -noinst_HEADERS = dcopinterface.h fileselectdlg.h ipfilterwidget.h ktorrent.h \ - ktorrentcore.h ktorrentdcop.h ktorrentview.h ktorrentviewitem.h ktorrentviewmenu.h \ - pastedialog.h pref.h scandialog.h speedlimitsdlg.h trayhoverpopup.h trayicon.h \ - viewmanager.h - -# client stuff - -# let automoc handle all of the meta source files (moc) -METASOURCES = AUTO - -messages: rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/ktorrent.pot - -# this is where the XML-GUI resource file goes -rcdir = $(kde_datadir)/ktorrent -rc_DATA = ktorrentui.rc - -KDE_ICON= torrent ktorrent - -appicondir = $(kde_datadir)/ktorrent/icons -appicon_ICON = ktencrypted ktremove ktstart_all ktstart ktstop_all ktstop ktplugins ktinfowidget ktqueuemanager ktupnp ktprefdownloads - -kde_servicetypes_DATA = ktorrentplugin.desktop -EXTRA_DIST = ktorrentplugin.desktop - -if ENABLE_TORRENT_MIMETYPE -mimedir = $(kde_mimedir)/application -mime_DATA = x-bittorrent.desktop -endif - -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/apps/ktorrent/groups/Makefile.am b/apps/ktorrent/groups/Makefile.am deleted file mode 100644 index c1c3308..0000000 --- a/apps/ktorrent/groups/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDES = -I$(srcdir)/../../../libktorrent $(all_includes) -METASOURCES = AUTO -libgroups_la_LDFLAGS = $(all_libraries) -noinst_LTLIBRARIES = libgroups.la -noinst_HEADERS = activedownloadsgroup.h activegroup.h activeuploadsgroup.h \ - allgroup.h downloadgroup.h group.h groupmanager.h groupview.h \ - inactivedownloadsgroup.h inactivegroup.h inactiveuploadsgroup.h queueddownloadsgroup.h \ - queueduploadsgroup.h torrentdrag.h torrentgroup.h uploadgroup.h userdownloadsgroup.h \ - useruploadsgroup.h -libgroups_la_SOURCES = activedownloadsgroup.cpp activegroup.cpp \ - activeuploadsgroup.cpp allgroup.cpp downloadgroup.cpp group.cpp groupmanager.cpp groupview.cpp \ - inactivedownloadsgroup.cpp inactivegroup.cpp inactiveuploadsgroup.cpp queueddownloadsgroup.cpp \ - queueduploadsgroup.cpp torrentdrag.cpp torrentgroup.cpp uploadgroup.cpp userdownloadsgroup.cpp \ - useruploadsgroup.cpp -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/apps/ktorrent/ktorrent.desktop b/apps/ktorrent/ktorrent.desktop deleted file mode 100644 index 3e9bdaa..0000000 --- a/apps/ktorrent/ktorrent.desktop +++ /dev/null @@ -1,85 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=KTorrent -Name[sv]=Ktorrent -Name[xx]=xxKTorrentxx -GenericName=BitTorrent Client -GenericName[ar]=زبون BitTorrent -GenericName[bg]=Бит Торент клиент -GenericName[br]=Kliant BitTorrent -GenericName[ca]=Client de BitTorrent -GenericName[cs]=BitTorrent klient -GenericName[da]=BitTorrent klient -GenericName[de]=BitTorrent-Programm -GenericName[el]=Πελάτης BitTorrent -GenericName[es]=Cliente de BitTorrent -GenericName[et]=BitTorrenti klient -GenericName[fa]=کارخواه BitTorrent -GenericName[fr]=Client BitTorrent -GenericName[gl]=Cliente BitTorrent -GenericName[it]=Client BitTorrent -GenericName[ja]=BitTorrent クライアント -GenericName[ka]=BitTorrent-ის კლიენტი -GenericName[lt]=BitTorrent klientas -GenericName[ms]=Klien BitTorrent -GenericName[nb]=BitTorrent-klient -GenericName[nds]=Bittorrent-Programm -GenericName[nl]=BitTorrent-cliënt -GenericName[pa]=BitTorrent ਕਲਾਂਇਟ -GenericName[pl]=Klient BitTorrenta -GenericName[pt]=Cliente de BitTorrent -GenericName[pt_BR]=Cliente BitTorrent -GenericName[ru]=Клиент BitTorrent -GenericName[sk]=BitTorrent Klient -GenericName[sr]=BitTorrent клијент -GenericName[sr@Latn]=BitTorrent klijent -GenericName[sv]=BitTorrent-klient -GenericName[tr]=BitTorrent İstemcisi -GenericName[uk]=Клієнт BitTorrent -GenericName[xx]=xxBitTorrent Clientxx -GenericName[zh_CN]=BitTorrent 客户端 -GenericName[zh_TW]=BitTorrent 客戶端程式 -Exec=ktorrent %i %m -caption "%c" %u -Icon=ktorrent -Type=Application -X-DocPath=ktorrent/index.html -MimeType=application/x-bittorrent;application/x-torrent; -X-DCOP-ServiceType=Unique -Comment=A BitTorrent program for TDE -Comment[ar]=برنامِج BitTorrent لِــ TDE -Comment[bg]=Бит Торент клиент за TDE -Comment[br]=Ur programm BitTorrent evit TDE -Comment[ca]=Un programa de BitTorrent per TDE -Comment[cs]=BitTorrent pro TDE -Comment[da]=Et BitTorrent program for TDE -Comment[de]=Ein BitTorrent-Programm für TDE -Comment[el]=Μία εφαρμογή BitTorrent για το TDE -Comment[es]=Un programa de BitTorrent para TDE -Comment[et]=TDE BitTorrenti rakendus -Comment[fa]=یک برنامۀ BitTorrent برای TDE -Comment[fr]=Un programme BitTorrent pour TDE -Comment[gl]=Programa de BitTorrent para TDE -Comment[it]=Un programma BitTorrent per TDE -Comment[ja]=TDE のための BitTorrent プログラム -Comment[ka]=BitTorrent-ის პროგრამა TDE-თვის -Comment[lt]=BitTorrent programa skirta TDE aplinkai -Comment[ms]=Program BitTorrent untuk TDE -Comment[nb]=Et BitTorrent-program for TDE -Comment[nds]=En Bittorrent-Programm för TDE -Comment[nl]=Een BitTorrent-programma voor TDE -Comment[pa]=TDE ਲਈ BitTorrent ਕਾਰਜ -Comment[pl]=Program BitTorrent dla TDE -Comment[pt]=Um programa de BitTorrent para o TDE -Comment[pt_BR]=Um programa BitTorrent para o TDE -Comment[ru]=Клиент BitTorrent для TDE -Comment[sk]=BitTorrent klient pre TDE -Comment[sr]=BitTorrent програм за TDE -Comment[sr@Latn]=BitTorrent program za TDE -Comment[sv]=Ett BitTorrent-program för TDE -Comment[tr]=TDE için BitTorrent uygulaması -Comment[uk]=Програма BitTorrent для TDE -Comment[xx]=xxA BitTorrent program for TDExx -Comment[zh_CN]=一个 TDE 的 BitTorrent 程序 -Comment[zh_TW]=TDE 的 BitTorrent 程式 -Terminal=false -Categories=Qt;TDE;Network;FileTransfer; diff --git a/apps/ktorrent/ktorrentplugin.desktop b/apps/ktorrent/ktorrentplugin.desktop deleted file mode 100644 index 29436c8..0000000 --- a/apps/ktorrent/ktorrentplugin.desktop +++ /dev/null @@ -1,33 +0,0 @@ -[Desktop Entry] -Type=ServiceType -X-TDE-ServiceType=KTorrent/Plugin -Name=KTorrent Plugin -Name[ar]=قابس KTorrent -Name[bg]=Приставка за KTorrent -Name[br]=Lugent KTorrent -Name[ca]=Connector KTorrent -Name[cs]=KTorrent modul -Name[da]=KTorrent-plugin -Name[de]=KTorrent-Modul -Name[el]=Πρόσθετο KTorrent -Name[es]=Complemento de KTorrent -Name[et]=KTorrenti plugin -Name[fa]=وصلۀ KTorrent -Name[gl]=Plugin KTorrent -Name[it]=Plugin KTorrent -Name[ja]=KTorrent プラグイン -Name[ka]=KTorrent-ის მოდული -Name[nb]=KTorrent-modul -Name[nds]=KTorrent-Moduul -Name[nl]=KTorrent-plugin -Name[pl]=Wtyczka KTorrent -Name[pt]='Plugin' do KTorrent -Name[pt_BR]=Plugin KTorrent -Name[sr]=KTorrent прикључак -Name[sr@Latn]=KTorrent priključak -Name[sv]=Ktorrent-insticksprogram -Name[tr]=KTorrent Eklentisi -Name[uk]=Втулок KTorrent -Name[xx]=xxKTorrent Pluginxx -Name[zh_CN]=KTorrent 插件 -Name[zh_TW]=KTorrent 外掛程式 diff --git a/apps/ktorrent/newui/Makefile.am b/apps/ktorrent/newui/Makefile.am deleted file mode 100644 index bd136f3..0000000 --- a/apps/ktorrent/newui/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libktorrent -I$(top_builddir)/ktorrent/libktorrent \ - -I$(top_builddir)/libktorrent/ $(all_includes) -METASOURCES = AUTO -noinst_LTLIBRARIES = libnewui.la -libnewui_la_LDFLAGS = $(all_libraries) -libnewui_la_SOURCES = button.cpp button.h buttonbar.cpp buttonbar.h comdefs.h \ - ddockwindow.cpp ddockwindow.h dmainwindow.cpp dmainwindow.h docksplitter.cpp \ - docksplitter.h dtabwidget.cpp dtabwidget.h diff --git a/apps/ktorrent/x-bittorrent.desktop b/apps/ktorrent/x-bittorrent.desktop deleted file mode 100644 index 7fba36f..0000000 --- a/apps/ktorrent/x-bittorrent.desktop +++ /dev/null @@ -1,39 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Comment=BitTorrent Download -Comment[ar]=تنزيل BitTorrent -Comment[bg]=Сваляне на Бит Торент -Comment[ca]=Una baixada BitTorrent -Comment[cs]=Stažení BitTorrent -Comment[cy]=Lawrlwythiad BitTorrent -Comment[da]=BitTorrent-download -Comment[de]=BitTorrent-Herunterladevorgang -Comment[el]=Λήψη BitTorrent -Comment[es]=Descarga de BitTorrent -Comment[et]=BitTorrenti allalaadimine -Comment[fa]=بارگیری BitTorrent -Comment[gl]=Descarga de BitTorrent -Comment[it]=Scaricamento BitTorrent -Comment[ja]=BitTorrent ダウンロード -Comment[ka]=BitTorrent-ით ჩამოტვირვა -Comment[nb]=BitTorrent-nedlasting -Comment[nds]=Bittorrent-Daalladen -Comment[nl]=BitTorrent-download -Comment[pl]=Pobieranie plików BitTorrent -Comment[pt]=Transferência do BitTorrent -Comment[pt_BR]=Um programa BitTorrent para download -Comment[sk]=Sťahovanie BitTorrent -Comment[sr]=BitTorrent преузимање -Comment[sr@Latn]=BitTorrent preuzimanje -Comment[sv]=BitTorrent-nerladdning -Comment[tr]=BitTorrent İndirme -Comment[uk]=Звантаження BitTorrent -Comment[xx]=xxBitTorrent Downloadxx -Comment[zh_CN]=BitTorrent 下载 -Comment[zh_TW]=BitTorrent 下載 -Hidden=false -MimeType=application/x-bittorrent -Icon=torrent -Type=MimeType -Patterns=*.torrent;*.tor -X-TDE-AutoEmbed=false diff --git a/apps/kttorinfo/Makefile.am b/apps/kttorinfo/Makefile.am deleted file mode 100644 index 0736208..0000000 --- a/apps/kttorinfo/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libktorrent $(all_includes) -METASOURCES = AUTO - -bin_PROGRAMS = kttorinfo -kttorinfo_SOURCES = main.cpp -kttorinfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -kttorinfo_LDADD = ../../libktorrent/libktorrent.la $(LIB_TDEPARTS) $(LIB_TDEFILE) \ - $(LIB_TDEIO) - -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/apps/ktupnptest/Makefile.am b/apps/ktupnptest/Makefile.am deleted file mode 100644 index 9920c54..0000000 --- a/apps/ktupnptest/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libktorrent -I$(srcdir)/../.. $(all_includes) -METASOURCES = AUTO -bin_PROGRAMS = ktupnptest - -ktupnptest_SOURCES = main.cpp upnptestapp.cpp mainwidget.ui -ktupnptest_LDADD = ../../plugins/upnp/libktupnp.la \ - ../../libktorrent/libktorrent.la $(LIB_TDEIO) -ktupnptest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -noinst_HEADERS = upnptestapp.h -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/config.h.cmake b/config.h.cmake new file mode 100644 index 0000000..17f5660 --- /dev/null +++ b/config.h.cmake @@ -0,0 +1,53 @@ +#define VERSION "@VERSION@" + +// Defined if you have fvisibility and fvisibility-inlines-hidden support. +#cmakedefine __TDE_HAVE_GCC_VISIBILITY 1 + +// Define WORDS_BIGENDIAN to 1 if your processor stores words with the most +// significant byte first (like Motorola and SPARC, unlike Intel). +#cmakedefine WORDS_BIGENDIAN @WORDS_BIGENDIAN@ + +// Defined if we have system-wide geoip +#cmakedefine USE_SYSTEM_GEOIP 1 + +// Defined if we have posix fallocate +#cmakedefine HAVE_POSIX_FALLOCATE 1 + +// Defined if we have posix fallocate64 +#cmakedefine HAVE_POSIX_FALLOCATE64 1 + +// Defined if we have fopen64 +#cmakedefine HAVE_FOPEN64 1 + +// Defined if we have fseeko64 +#cmakedefine HAVE_FSEEKO64 1 + +// Defined if we have ftruncate64 +#cmakedefine HAVE_FTRUNCATE64 1 + +// Defined if we have lseek64 +#cmakedefine HAVE_LSEEK64 1 + +// Defined if we have mmap64 +#cmakedefine HAVE_MMAP64 1 + +// Defined if we have munmap64 +#cmakedefine HAVE_MUNMAP64 1 + +// Defined if we have stat64 +#cmakedefine HAVE_STAT64 1 + +// Defined if we have statvfs +#cmakedefine HAVE_STATVFS 1 + +// Defined if we have statvfs64 +#cmakedefine HAVE_STATVFS64 1 + +// Defined if we have xfs/xfs.h +#cmakedefine HAVE_XFS_XFS_H 1 + +// Defined if we have __s64 +#cmakedefine HAVE___S64 1 + +// Defined if we have __u64 +#cmakedefine HAVE___U64 1 diff --git a/config.h.in b/config.h.in deleted file mode 100644 index d48d310..0000000 --- a/config.h.in +++ /dev/null @@ -1,300 +0,0 @@ -/* config.h.in. Generated from configure.in by autoheader. */ - -/* Define to 1 if you have the <Carbon/Carbon.h> header file. */ -#undef HAVE_CARBON_CARBON_H - -/* Define if you have the CoreAudio API */ -#undef HAVE_COREAUDIO - -/* Define to 1 if you have the <crt_externs.h> header file. */ -#undef HAVE_CRT_EXTERNS_H - -/* Defines if your system has the crypt function */ -#undef HAVE_CRYPT - -/* Define to 1 if you have the <dlfcn.h> header file. */ -#undef HAVE_DLFCN_H - -/* Define to 1 if you have the `fopen64' function. */ -#undef HAVE_FOPEN64 - -/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ -#undef HAVE_FSEEKO - -/* Define to 1 if you have the `fseeko64' function. */ -#undef HAVE_FSEEKO64 - -/* Define to 1 if you have the `fstat64' function. */ -#undef HAVE_FSTAT64 - -/* Define to 1 if you have the `ftello64' function. */ -#undef HAVE_FTELLO64 - -/* Define to 1 if you have the `ftruncate64' function. */ -#undef HAVE_FTRUNCATE64 - -/* Define to 1 if you have the <inttypes.h> header file. */ -#undef HAVE_INTTYPES_H - -/* Define if you have libjpeg */ -#undef HAVE_LIBJPEG - -/* Define if you have libpng */ -#undef HAVE_LIBPNG - -/* Define if you have a working libpthread (will enable threaded code) */ -#undef HAVE_LIBPTHREAD - -/* Define if you have libz */ -#undef HAVE_LIBZ - -/* Define to 1 if you have the `lseek64' function. */ -#undef HAVE_LSEEK64 - -/* Define to 1 if you have the <memory.h> header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the `mmap64' function. */ -#undef HAVE_MMAP64 - -/* Define to 1 if you have the `munmap64' function. */ -#undef HAVE_MUNMAP64 - -/* Define if your system needs _NSGetEnviron to set up the environment */ -#undef HAVE_NSGETENVIRON - -/* Define to 1 if you have the `posix_fallocate' function. */ -#undef HAVE_POSIX_FALLOCATE - -/* Define to 1 if you have the `posix_fallocate64' function. */ -#undef HAVE_POSIX_FALLOCATE64 - -/* Define if you have res_init */ -#undef HAVE_RES_INIT - -/* Define if you have the res_init prototype */ -#undef HAVE_RES_INIT_PROTO - -/* Define if you have a STL implementation by SGI */ -#undef HAVE_SGI_STL - -/* Define to 1 if you have the `snprintf' function. */ -#undef HAVE_SNPRINTF - -/* Define to 1 if you have the `stat64' function. */ -#undef HAVE_STAT64 - -/* Define to 1 if you have the `statvfs' function. */ -#undef HAVE_STATVFS - -/* Define to 1 if you have the `statvfs64' function. */ -#undef HAVE_STATVFS64 - -/* Define to 1 if you have the <stdint.h> header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the <stdlib.h> header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the <strings.h> header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the <string.h> header file. */ -#undef HAVE_STRING_H - -/* Define if you have strlcat */ -#undef HAVE_STRLCAT - -/* Define if you have the strlcat prototype */ -#undef HAVE_STRLCAT_PROTO - -/* Define if you have strlcpy */ -#undef HAVE_STRLCPY - -/* Define if you have the strlcpy prototype */ -#undef HAVE_STRLCPY_PROTO - -/* Define to 1 if you have the <sys/bitypes.h> header file. */ -#undef HAVE_SYS_BITYPES_H - -/* Define to 1 if you have the <sys/stat.h> header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the <sys/types.h> header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the <unistd.h> header file. */ -#undef HAVE_UNISTD_H - -/* Define to 1 if you have the `vsnprintf' function. */ -#undef HAVE_VSNPRINTF - -/* Define to 1 if you have the <xfs/xfs.h> header file. */ -#undef HAVE_XFS_XFS_H - -/* Define to 1 if the system has the type `__s64'. */ -#undef HAVE___S64 - -/* Define to 1 if the system has the type `__u64'. */ -#undef HAVE___U64 - -/* Suffix for lib directories */ -#undef KDELIBSUFF - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* The size of `char *', as computed by sizeof. */ -#undef SIZEOF_CHAR_P - -/* The size of `int', as computed by sizeof. */ -#undef SIZEOF_INT - -/* The size of `long', as computed by sizeof. */ -#undef SIZEOF_LONG - -/* The size of `short', as computed by sizeof. */ -#undef SIZEOF_SHORT - -/* The size of `size_t', as computed by sizeof. */ -#undef SIZEOF_SIZE_T - -/* The size of `unsigned long', as computed by sizeof. */ -#undef SIZEOF_UNSIGNED_LONG - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Use system geoip */ -#undef USE_SYSTEM_GEOIP - -/* Version number of package */ -#undef VERSION - -/* Defined if compiling without arts */ -#undef WITHOUT_ARTS - -/* - * jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system - * headers and I'm too lazy to write a configure test as long as only - * unixware is related - */ -#ifdef _UNIXWARE -#define HAVE_BOOLEAN -#endif - - - -/* - * AIX defines FD_SET in terms of bzero, but fails to include <strings.h> - * that defines bzero. - */ - -#if defined(_AIX) -#include <strings.h> -#endif - - - -#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H) -# include <sys/time.h> -# include <crt_externs.h> -# define environ (*_NSGetEnviron()) -#endif - - -/* Number of bits in a file offset, on hosts where this is settable. */ -#undef _FILE_OFFSET_BITS - - -#if !defined(HAVE_RES_INIT_PROTO) -#ifdef __cplusplus -extern "C" { -#endif -int res_init(void); -#ifdef __cplusplus -} -#endif -#endif - - - -#if !defined(HAVE_STRLCAT_PROTO) -#ifdef __cplusplus -extern "C" { -#endif -unsigned long strlcat(char*, const char*, unsigned long); -#ifdef __cplusplus -} -#endif -#endif - - - -#if !defined(HAVE_STRLCPY_PROTO) -#ifdef __cplusplus -extern "C" { -#endif -unsigned long strlcpy(char*, const char*, unsigned long); -#ifdef __cplusplus -} -#endif -#endif - - -/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ -#undef _LARGEFILE_SOURCE - -/* Define for large files, on AIX-style hosts. */ -#undef _LARGE_FILES - - -/* - * On HP-UX, the declaration of vsnprintf() is needed every time ! - */ - -#if !defined(HAVE_VSNPRINTF) || defined(hpux) -#if __STDC__ -#include <stdarg.h> -#include <stdlib.h> -#else -#include <varargs.h> -#endif -#ifdef __cplusplus -extern "C" -#endif -int vsnprintf(char *str, size_t n, char const *fmt, va_list ap); -#ifdef __cplusplus -extern "C" -#endif -int snprintf(char *str, size_t n, char const *fmt, ...); -#endif - - - -#if defined(__SVR4) && !defined(__svr4__) -#define __svr4__ 1 -#endif - - -/* type to use in place of socklen_t if not defined */ -#undef kde_socklen_t - -/* type to use in place of socklen_t if not defined (deprecated, use - kde_socklen_t) */ -#undef ksize_t diff --git a/configure.files b/configure.files deleted file mode 100644 index 97d9bce..0000000 --- a/configure.files +++ /dev/null @@ -1,3 +0,0 @@ -./admin/configure.in.min -configure.in.in -configure.in.bot diff --git a/configure.in b/configure.in deleted file mode 100644 index 96166d7..0000000 --- a/configure.in +++ /dev/null @@ -1,476 +0,0 @@ -dnl ======================================================= -dnl FILE: ./admin/configure.in.min -dnl ======================================================= - -dnl This file is part of the KDE libraries/packages -dnl Copyright (C) 2001 Stephan Kulow (coolo@kde.org) - -dnl This file is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Library General Public -dnl License as published by the Free Software Foundation; either -dnl version 2 of the License, or (at your option) any later version. - -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Library General Public License for more details. - -dnl You should have received a copy of the GNU Library General Public License -dnl along with this library; see the file COPYING.LIB. If not, write to -dnl the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -dnl Boston, MA 02110-1301, USA. - -# Original Author was Kalle@kde.org -# I lifted it in some mater. (Stephan Kulow) -# I used much code from Janos Farkas - -dnl Process this file with autoconf to produce a configure script. - -AC_INIT(acinclude.m4) dnl a source file from your sub dir - -dnl This is so we can use kde-common -AC_CONFIG_AUX_DIR(admin) - -dnl This ksh/zsh feature conflicts with `cd blah ; pwd` -unset CDPATH - -dnl Checking host/target/build systems, for make, install etc. -AC_CANONICAL_SYSTEM -dnl Perform program name transformation -AC_ARG_PROGRAM - -dnl Automake doc recommends to do this only here. (Janos) -AM_INIT_AUTOMAKE(ktorrent, 2.2.8) dnl searches for some needed programs - -KDE_SET_PREFIX - -dnl generate the config header -AM_CONFIG_HEADER(config.h) dnl at the distribution this done - -dnl Checks for programs. -AC_CHECK_COMPILERS -AC_ENABLE_SHARED(yes) -AC_ENABLE_STATIC(no) -KDE_PROG_LIBTOOL - -dnl for NLS support. Call them in this order! -dnl WITH_NLS is for the po files -AM_KDE_WITH_NLS - -KDE_USE_TQT(3.3) -AC_PATH_KDE -dnl ======================================================= -dnl FILE: configure.in.in -dnl ======================================================= - -#MIN_CONFIG(3.3) - -dnl PACKAGE set before - -dnl #### Check for FSEEK variants -AC_SYS_LARGEFILE -AC_FUNC_FSEEKO -AC_CHECK_FUNCS(fopen64, ktorrent_cv_func_fopen64=yes, ktorrent_cv_func_fopen64=no) -AC_CHECK_FUNCS(fseeko64, ktorrent_cv_func_fseek64=yes, ktorrent_cv_func_fseek64=no) -AC_CHECK_FUNCS(ftello64, ktorrent_cv_func_ftell64=yes, ktorrent_cv_func_ftell64=no) -AC_CHECK_FUNCS(fstat64, ktorrent_cv_func_fstat64=yes, ktorrent_cv_func_fstat64=no) -AC_CHECK_FUNCS(stat64, ktorrent_cv_func_stat64=yes, ktorrent_cv_func_stat64=no) -AC_CHECK_FUNCS(ftruncate64, ktorrent_cv_func_ftruncate64=yes, ktorrent_cv_func_ftruncate64=no) -AC_CHECK_FUNCS(lseek64, ktorrent_cv_func_lseek64=yes, ktorrent_cv_func_lseek64=no) -AC_CHECK_FUNCS(mmap64, ktorrent_cv_func_mmap64=yes, ktorrent_cv_func_mmap64=no) -AC_CHECK_FUNCS(munmap64, ktorrent_cv_func_munmap64=yes, ktorrent_cv_func_munmap64=no) -AC_CHECK_FUNCS(posix_fallocate, ktorrent_cv_func_posix_fallocate=yes,ktorrent_cv_func_posix_fallocate=no) -AC_CHECK_FUNCS(posix_fallocate64, ktorrent_cv_func_posix_fallocate64=yes,ktorrent_cv_func_posix_fallocate64=no) -AC_CHECK_FUNCS(statvfs, ktorrent_cv_func_statvfs=yes,ktorrent_cv_func_statvfs=no) -AC_CHECK_FUNCS(statvfs64, ktorrent_cv_func_statvfs64=yes,ktorrent_cv_func_statvfs64=no) - -AC_LANG_PUSH([C++]) -AC_CHECK_HEADERS([xfs/xfs.h]) -AC_CHECK_TYPES([__u64, __s64], [], [], [#include <xfs/xfs.h>]) -AC_LANG_POP - -if test "$ktorrent_cv_func_posix_fallocate" = yes ; then - AC_DEFINE(HAVE_POSIX_FALLOCATE, 1) -else - AC_DEFINE(HAVE_POSIX_FALLOCATE, 0) -fi - -if test "$ktorrent_cv_func_posix_fallocate64" = yes ; then - AC_DEFINE(HAVE_POSIX_FALLOCATE64, 1) -else - AC_DEFINE(HAVE_POSIX_FALLOCATE64, 0) -fi - -if test "$ktorrent_cv_func_fopen64" = yes ; then - AC_DEFINE(HAVE_FOPEN64, 1) -else - AC_DEFINE(HAVE_FOPEN64, 0) -fi - -if test "$ktorrent_cv_func_fseek64" = yes -a "$ktorrent_cv_func_ftell64" = yes; then - AC_DEFINE(HAVE_FSEEKO64, 1) -else - AC_DEFINE(HAVE_FSEEKO64, 0) -fi - -if test "$ktorrent_cv_func_fstat64" = yes -a "$ktorrent_cv_func_stat64" = yes ; then - AC_DEFINE(HAVE_STAT64,1) -else - AC_DEFINE(HAVE_STAT64,0) -fi - -if test "$ktorrent_cv_func_ftruncate64" = yes ; then - AC_DEFINE(HAVE_FTRUNCATE64,1) -else - AC_DEFINE(HAVE_FTRUNCATE64,0) -fi - -if test "$ktorrent_cv_func_lseek64" = yes ; then - AC_DEFINE(HAVE_LSEEK64,1) -else - AC_DEFINE(HAVE_LSEEK64,0) -fi - -if test "$ktorrent_cv_func_mmap64" = yes ; then - AC_DEFINE(HAVE_MMAP64, 1) -else - AC_DEFINE(HAVE_MMAP64, 0) -fi - -if test "$ktorrent_cv_func_munmap64" = yes ; then - AC_DEFINE(HAVE_MUNMAP64, 1) -else - AC_DEFINE(HAVE_MUNMAP64, 0) -fi - -if test "$ktorrent_cv_func_statvfs" = yes ; then - AC_DEFINE(HAVE_STATVFS, 1) -else - AC_DEFINE(HAVE_STATVFS, 0) -fi - -if test "$ktorrent_cv_func_statvfs64" = yes ; then - AC_DEFINE(HAVE_STATVFS64, 1) -else - AC_DEFINE(HAVE_STATVFS64, 0) -fi - -KDE_CHECK_LIB(gmp, __gmpz_init, [have_gmp=yes], - [ - have_gmp=no - AC_MSG_ERROR(libgmp is required to install this program) - ]) - -KDE_CHECK_HEADER(gmp.h, [have_gmp=yes], - [ - have_gmp=no - AC_MSG_ERROR(libgmp is required to install this program) - ]) - -KDE_CHECK_HEADER(GeoIP.h, [have_system_geoip=yes], [have_system_geoip=no]) - -KDE_INIT_DOXYGEN([The API Reference], [Version $VERSION]) - -AC_ARG_ENABLE( - memleak-check, - [AS_HELP_STRING(--enable-memleak-check,[Enable memory leak checking])], - [CXXFLAGS="$CXXFLAGS -DKT_LEAKTRACE"]) - -AC_ARG_ENABLE( - profile, - [AS_HELP_STRING(--enable-profile,[Enable profiling])], - [CXXFLAGS="$CXXFLAGS -DKT_PROFILE"]) - - -AC_ARG_ENABLE(geoip, - [AS_HELP_STRING(--enable-geoip,[Enables builtin GeoIP database installation])], - [case "${enableval}" in - yes) geoip=true ;; - no) geoip=false ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-geoip) ;; - esac],[geoip=true]) - -AC_ARG_ENABLE(system-geoip, - [AS_HELP_STRING(--enable-system-geoip,[Enables use of system-wide GeoIP database (implies --disable-geoip) (auto by default)])], - [case "${enableval}" in - yes) if test "$have_system_geoip" = yes; then - system_geoip=true - geoip=false - else - AC_MSG_ERROR(cannot enable system geoip. GeoIP library headers were not found on your system) - fi ;; - no) system_geoip=false ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-system-geoip) ;; - esac],[system_geoip=auto]) - -if test x$system_geoip = xauto; then - if test "$have_system_geoip" = yes; then - system_geoip=true - geoip=false - else - system_geoip=false - fi -fi - -AM_CONDITIONAL(ENABLE_GEOIP, test x$geoip = xtrue) -AM_CONDITIONAL(USE_SYSTEM_GEOIP, test x$system_geoip = xtrue) - -if test x$system_geoip = xtrue; then - AC_DEFINE(USE_SYSTEM_GEOIP, 1, [Use system geoip]) -fi - - -AC_ARG_ENABLE(builtin-country-flags, - [AS_HELP_STRING(--enable-builtin-country-flags,[Install and prefer builtin country flags to the ones provided by KDE (auto by default)])], - [case "${enableval}" in - yes) builtin_country_flags=true ;; - no) builtin_country_flags=false ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-builtin-country-flags) ;; - esac],[builtin_country_flags=auto]) - -if test x$builtin_country_flags = xauto; then - if test x$geoip = xtrue; then - builtin_country_flags=true - else - builtin_country_flags=false - fi -fi - -AM_CONDITIONAL(ENABLE_BUILTIN_COUNTRY_FLAGS, test x$builtin_country_flags = xtrue) - -AC_ARG_ENABLE(torrent-mimetype, - [ --enable-torrent-mimetype Enables the installation of the torrent mimetype which uses a KTorrent based icon], - [case "${enableval}" in - yes) mimetype_install=true ;; - no) mimetype_install=false ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-torrent-mimetype) ;; - esac],[mimetype_install=false]) - -AM_CONDITIONAL(ENABLE_TORRENT_MIMETYPE, test x$mimetype_install = xtrue) - -## -- BEGIN -- ADDED BY Kevin --- - -# Check for pkg-config manually first, as if its not installed the -# PKG_PROG_PKG_CONFIG macro won't be defined. -AC_CHECK_PROG(have_pkg_config, pkg-config, yes, no) - -if test x"$have_pkg_config" = "xno"; then - AC_MSG_ERROR(pkg-config is required to install this program) -fi - -m4_pattern_allow(PKG_CONFIG_MIN_VERSION) -PKG_PROG_PKG_CONFIG - -PKG_CHECK_MODULES( AVAHI, avahi-client >= 0.6.10, -[ - AC_SUBST(AVAHI_CFLAGS) - AC_SUBST(AVAHI_LIBS) - avahi=true -], -[ - missing_avahi_warning=yes - avahi=false -]) - -PKG_CHECK_MODULES( AVAHI_TQT, avahi-tqt >= 0.6.10, -[ - AC_SUBST(AVAHI_TQT_CFLAGS) - AC_SUBST(AVAHI_TQT_LIBS) - avahi=true -], -[ - missing_avahi_warning=yes - avahi=false -]) - -AM_CONDITIONAL(COMPILE_ZEROCONF, test x$avahi = xtrue) -KDE_CREATE_SUBDIRSLIST -AC_CONFIG_FILES([ Makefile ]) -AC_CONFIG_FILES([ apps/Makefile ]) -AC_CONFIG_FILES([ apps/ktcachecheck/Makefile ]) -AC_CONFIG_FILES([ apps/ktorrent/Makefile ]) -AC_CONFIG_FILES([ apps/ktorrent/groups/Makefile ]) -AC_CONFIG_FILES([ apps/ktorrent/newui/Makefile ]) -AC_CONFIG_FILES([ apps/kttorinfo/Makefile ]) -AC_CONFIG_FILES([ apps/ktupnptest/Makefile ]) -AC_CONFIG_FILES([ doc/Makefile ]) -AC_CONFIG_FILES([ doc/en/Makefile ]) -AC_CONFIG_FILES([ libktorrent/Makefile ]) -AC_CONFIG_FILES([ libktorrent/datachecker/Makefile ]) -AC_CONFIG_FILES([ libktorrent/interfaces/Makefile ]) -AC_CONFIG_FILES([ libktorrent/kademlia/Makefile ]) -AC_CONFIG_FILES([ libktorrent/migrate/Makefile ]) -AC_CONFIG_FILES([ libktorrent/mse/Makefile ]) -AC_CONFIG_FILES([ libktorrent/net/Makefile ]) -AC_CONFIG_FILES([ libktorrent/torrent/Makefile ]) -AC_CONFIG_FILES([ libktorrent/util/Makefile ]) -AC_CONFIG_FILES([ plugins/Makefile ]) -AC_CONFIG_FILES([ plugins/infowidget/Makefile ]) -AC_CONFIG_FILES([ plugins/infowidget/geoip/Makefile ]) -AC_CONFIG_FILES([ plugins/ipfilter/Makefile ]) -AC_CONFIG_FILES([ plugins/logviewer/Makefile ]) -AC_CONFIG_FILES([ plugins/partfileimport/Makefile ]) -AC_CONFIG_FILES([ plugins/rssfeed/Makefile ]) -AC_CONFIG_FILES([ plugins/rssfeed/rss/Makefile ]) -AC_CONFIG_FILES([ plugins/scanfolder/Makefile ]) -AC_CONFIG_FILES([ plugins/scheduler/Makefile ]) -AC_CONFIG_FILES([ plugins/search/Makefile ]) -AC_CONFIG_FILES([ plugins/stats/Makefile ]) -AC_CONFIG_FILES([ plugins/upnp/Makefile ]) -AC_CONFIG_FILES([ plugins/webinterface/Makefile ]) -AC_CONFIG_FILES([ plugins/webinterface/www/Makefile ]) -AC_CONFIG_FILES([ plugins/webinterface/www/coldmilk/Makefile ]) -AC_CONFIG_FILES([ plugins/webinterface/www/coldmilk/icons/Makefile ]) -AC_CONFIG_FILES([ plugins/webinterface/www/coldmilk/icons/16x16/Makefile ]) -AC_CONFIG_FILES([ plugins/webinterface/www/coldmilk/icons/22x22/Makefile ]) -AC_CONFIG_FILES([ plugins/webinterface/www/coldmilk/icons/32x32/Makefile ]) -AC_CONFIG_FILES([ plugins/webinterface/www/coldmilk/icons/48x48/Makefile ]) -AC_CONFIG_FILES([ plugins/webinterface/www/coldmilk/icons/64x64/Makefile ]) -AC_CONFIG_FILES([ plugins/webinterface/www/default/Makefile ]) -AC_CONFIG_FILES([ plugins/webinterface/www/mobile/Makefile ]) -AC_CONFIG_FILES([ plugins/zeroconf/Makefile ]) -AC_CONFIG_FILES([ scripts/Makefile ]) -AC_CONFIG_FILES([ translations/Makefile ]) -AC_CONFIG_FILES([ translations/ar/Makefile ]) -AC_CONFIG_FILES([ translations/ar/messages/Makefile ]) -AC_CONFIG_FILES([ translations/bg/Makefile ]) -AC_CONFIG_FILES([ translations/bg/messages/Makefile ]) -AC_CONFIG_FILES([ translations/br/Makefile ]) -AC_CONFIG_FILES([ translations/br/messages/Makefile ]) -AC_CONFIG_FILES([ translations/ca/Makefile ]) -AC_CONFIG_FILES([ translations/ca/messages/Makefile ]) -AC_CONFIG_FILES([ translations/cs/Makefile ]) -AC_CONFIG_FILES([ translations/cs/messages/Makefile ]) -AC_CONFIG_FILES([ translations/cy/Makefile ]) -AC_CONFIG_FILES([ translations/cy/messages/Makefile ]) -AC_CONFIG_FILES([ translations/da/Makefile ]) -AC_CONFIG_FILES([ translations/da/messages/Makefile ]) -AC_CONFIG_FILES([ translations/de/Makefile ]) -AC_CONFIG_FILES([ translations/de/messages/Makefile ]) -AC_CONFIG_FILES([ translations/el/Makefile ]) -AC_CONFIG_FILES([ translations/el/messages/Makefile ]) -AC_CONFIG_FILES([ translations/en_GB/Makefile ]) -AC_CONFIG_FILES([ translations/en_GB/messages/Makefile ]) -AC_CONFIG_FILES([ translations/es/Makefile ]) -AC_CONFIG_FILES([ translations/es/messages/Makefile ]) -AC_CONFIG_FILES([ translations/et/Makefile ]) -AC_CONFIG_FILES([ translations/et/messages/Makefile ]) -AC_CONFIG_FILES([ translations/fa/Makefile ]) -AC_CONFIG_FILES([ translations/fa/messages/Makefile ]) -AC_CONFIG_FILES([ translations/fr/Makefile ]) -AC_CONFIG_FILES([ translations/fr/messages/Makefile ]) -AC_CONFIG_FILES([ translations/gl/Makefile ]) -AC_CONFIG_FILES([ translations/gl/messages/Makefile ]) -AC_CONFIG_FILES([ translations/hu/Makefile ]) -AC_CONFIG_FILES([ translations/hu/messages/Makefile ]) -AC_CONFIG_FILES([ translations/it/Makefile ]) -AC_CONFIG_FILES([ translations/it/messages/Makefile ]) -AC_CONFIG_FILES([ translations/ja/Makefile ]) -AC_CONFIG_FILES([ translations/ja/messages/Makefile ]) -AC_CONFIG_FILES([ translations/ka/Makefile ]) -AC_CONFIG_FILES([ translations/ka/messages/Makefile ]) -AC_CONFIG_FILES([ translations/lt/Makefile ]) -AC_CONFIG_FILES([ translations/lt/messages/Makefile ]) -AC_CONFIG_FILES([ translations/ms/Makefile ]) -AC_CONFIG_FILES([ translations/ms/messages/Makefile ]) -AC_CONFIG_FILES([ translations/nb/Makefile ]) -AC_CONFIG_FILES([ translations/nb/messages/Makefile ]) -AC_CONFIG_FILES([ translations/nds/Makefile ]) -AC_CONFIG_FILES([ translations/nds/messages/Makefile ]) -AC_CONFIG_FILES([ translations/nl/Makefile ]) -AC_CONFIG_FILES([ translations/nl/messages/Makefile ]) -AC_CONFIG_FILES([ translations/pa/Makefile ]) -AC_CONFIG_FILES([ translations/pa/messages/Makefile ]) -AC_CONFIG_FILES([ translations/pl/Makefile ]) -AC_CONFIG_FILES([ translations/pl/messages/Makefile ]) -AC_CONFIG_FILES([ translations/pt/Makefile ]) -AC_CONFIG_FILES([ translations/pt/messages/Makefile ]) -AC_CONFIG_FILES([ translations/pt_BR/Makefile ]) -AC_CONFIG_FILES([ translations/pt_BR/messages/Makefile ]) -AC_CONFIG_FILES([ translations/ru/Makefile ]) -AC_CONFIG_FILES([ translations/ru/messages/Makefile ]) -AC_CONFIG_FILES([ translations/rw/Makefile ]) -AC_CONFIG_FILES([ translations/rw/messages/Makefile ]) -AC_CONFIG_FILES([ translations/sk/Makefile ]) -AC_CONFIG_FILES([ translations/sk/messages/Makefile ]) -AC_CONFIG_FILES([ translations/sr/Makefile ]) -AC_CONFIG_FILES([ translations/sr/messages/Makefile ]) -AC_CONFIG_FILES([ translations/sr@Latn/Makefile ]) -AC_CONFIG_FILES([ translations/sr@Latn/messages/Makefile ]) -AC_CONFIG_FILES([ translations/sv/Makefile ]) -AC_CONFIG_FILES([ translations/sv/messages/Makefile ]) -AC_CONFIG_FILES([ translations/tr/Makefile ]) -AC_CONFIG_FILES([ translations/tr/messages/Makefile ]) -AC_CONFIG_FILES([ translations/uk/Makefile ]) -AC_CONFIG_FILES([ translations/uk/messages/Makefile ]) -AC_CONFIG_FILES([ translations/zh_CN/Makefile ]) -AC_CONFIG_FILES([ translations/zh_CN/messages/Makefile ]) -AC_CONFIG_FILES([ translations/zh_TW/Makefile ]) -AC_CONFIG_FILES([ translations/zh_TW/messages/Makefile ]) -AC_OUTPUT -if test x$have_gmp = xno; then - echo "" - echo "----------------------------------------------------------" - echo "KTorrent ERROR:" - echo "KTorrent requires gmp (http://www.swox.com/gmp)" - echo "----------------------------------------------------------" - echo "" -fi - - -if test x$missing_avahi_warning = xyes; then - echo "" - echo "----------------------------------------------------------" - echo "KTorrent WARNING:" - echo "Cannot find avahi-client with version 0.6.10 or later or" - echo "cannot find avahi-tqt." - echo "The zeroconf plugin will not be installed because of this." - echo "----------------------------------------------------------" - echo "" -fi - -# Check if KDE_SET_PREFIX was called, and --prefix was passed to configure -if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then - # And if so, warn when they don't match - if test "$kde_libs_prefix" != "$given_prefix"; then - # And if kde doesn't know about the prefix yet - echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null - if test $? -ne 0; then - echo "" - echo "Warning: you chose to install this package in $given_prefix," - echo "but KDE was found in $kde_libs_prefix." - echo "For this to work, you will need to tell KDE about the new prefix, by ensuring" - echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix" - echo "Then restart KDE." - echo "" - fi - fi -fi - -if test x$GXX = "xyes" -a x$kde_have_gcc_visibility = "xyes" -a x$kde_cv_val_qt_gcc_visibility_patched = "xno"; then - echo "" - echo "Your GCC supports symbol visibility, but the patch for Qt supporting visibility" - echo "was not included. Therefore, GCC symbol visibility support remains disabled." - echo "" - echo "For better performance, consider including the Qt visibility supporting patch" - echo "located at:" - echo "" - echo "http://bugs.kde.org/show_bug.cgi?id=109386" - echo "" - echo "and recompile all of Qt and KDE. Note, this is entirely optional and" - echo "everything will continue to work just fine without it." - echo "" -fi - -if test "$all_tests" = "bad"; then - if test ! "$cache_file" = "/dev/null"; then - echo "" - echo "Please remove the file $cache_file after changing your setup" - echo "so that configure will find the changes next time." - echo "" - fi -else - echo "" - echo "Good - your configure finished. Start make now" - echo "" -fi diff --git a/configure.in.bot b/configure.in.bot deleted file mode 100644 index 15c2c8c..0000000 --- a/configure.in.bot +++ /dev/null @@ -1,21 +0,0 @@ -if test x$have_gmp = xno; then - echo "" - echo "----------------------------------------------------------" - echo "KTorrent ERROR:" - echo "KTorrent requires gmp (http://www.swox.com/gmp)" - echo "----------------------------------------------------------" - echo "" -fi - - -if test x$missing_avahi_warning = xyes; then - echo "" - echo "----------------------------------------------------------" - echo "KTorrent WARNING:" - echo "Cannot find avahi-client with version 0.6.10 or later or" - echo "cannot find avahi-tqt." - echo "The zeroconf plugin will not be installed because of this." - echo "----------------------------------------------------------" - echo "" -fi - diff --git a/configure.in.in b/configure.in.in deleted file mode 100644 index 1cab8c0..0000000 --- a/configure.in.in +++ /dev/null @@ -1,228 +0,0 @@ -#MIN_CONFIG(3.3) - -AM_INIT_AUTOMAKE(ktorrent,2.2.8) - -dnl #### Check for FSEEK variants -AC_SYS_LARGEFILE -AC_FUNC_FSEEKO -AC_CHECK_FUNCS(fopen64, ktorrent_cv_func_fopen64=yes, ktorrent_cv_func_fopen64=no) -AC_CHECK_FUNCS(fseeko64, ktorrent_cv_func_fseek64=yes, ktorrent_cv_func_fseek64=no) -AC_CHECK_FUNCS(ftello64, ktorrent_cv_func_ftell64=yes, ktorrent_cv_func_ftell64=no) -AC_CHECK_FUNCS(fstat64, ktorrent_cv_func_fstat64=yes, ktorrent_cv_func_fstat64=no) -AC_CHECK_FUNCS(stat64, ktorrent_cv_func_stat64=yes, ktorrent_cv_func_stat64=no) -AC_CHECK_FUNCS(ftruncate64, ktorrent_cv_func_ftruncate64=yes, ktorrent_cv_func_ftruncate64=no) -AC_CHECK_FUNCS(lseek64, ktorrent_cv_func_lseek64=yes, ktorrent_cv_func_lseek64=no) -AC_CHECK_FUNCS(mmap64, ktorrent_cv_func_mmap64=yes, ktorrent_cv_func_mmap64=no) -AC_CHECK_FUNCS(munmap64, ktorrent_cv_func_munmap64=yes, ktorrent_cv_func_munmap64=no) -AC_CHECK_FUNCS(posix_fallocate, ktorrent_cv_func_posix_fallocate=yes,ktorrent_cv_func_posix_fallocate=no) -AC_CHECK_FUNCS(posix_fallocate64, ktorrent_cv_func_posix_fallocate64=yes,ktorrent_cv_func_posix_fallocate64=no) -AC_CHECK_FUNCS(statvfs, ktorrent_cv_func_statvfs=yes,ktorrent_cv_func_statvfs=no) -AC_CHECK_FUNCS(statvfs64, ktorrent_cv_func_statvfs64=yes,ktorrent_cv_func_statvfs64=no) - -AC_LANG_PUSH([C++]) -AC_CHECK_HEADERS([xfs/xfs.h]) -AC_CHECK_TYPES([__u64, __s64], [], [], [#include <xfs/xfs.h>]) -AC_LANG_POP - -if test "$ktorrent_cv_func_posix_fallocate" = yes ; then - AC_DEFINE(HAVE_POSIX_FALLOCATE, 1) -else - AC_DEFINE(HAVE_POSIX_FALLOCATE, 0) -fi - -if test "$ktorrent_cv_func_posix_fallocate64" = yes ; then - AC_DEFINE(HAVE_POSIX_FALLOCATE64, 1) -else - AC_DEFINE(HAVE_POSIX_FALLOCATE64, 0) -fi - -if test "$ktorrent_cv_func_fopen64" = yes ; then - AC_DEFINE(HAVE_FOPEN64, 1) -else - AC_DEFINE(HAVE_FOPEN64, 0) -fi - -if test "$ktorrent_cv_func_fseek64" = yes -a "$ktorrent_cv_func_ftell64" = yes; then - AC_DEFINE(HAVE_FSEEKO64, 1) -else - AC_DEFINE(HAVE_FSEEKO64, 0) -fi - -if test "$ktorrent_cv_func_fstat64" = yes -a "$ktorrent_cv_func_stat64" = yes ; then - AC_DEFINE(HAVE_STAT64,1) -else - AC_DEFINE(HAVE_STAT64,0) -fi - -if test "$ktorrent_cv_func_ftruncate64" = yes ; then - AC_DEFINE(HAVE_FTRUNCATE64,1) -else - AC_DEFINE(HAVE_FTRUNCATE64,0) -fi - -if test "$ktorrent_cv_func_lseek64" = yes ; then - AC_DEFINE(HAVE_LSEEK64,1) -else - AC_DEFINE(HAVE_LSEEK64,0) -fi - -if test "$ktorrent_cv_func_mmap64" = yes ; then - AC_DEFINE(HAVE_MMAP64, 1) -else - AC_DEFINE(HAVE_MMAP64, 0) -fi - -if test "$ktorrent_cv_func_munmap64" = yes ; then - AC_DEFINE(HAVE_MUNMAP64, 1) -else - AC_DEFINE(HAVE_MUNMAP64, 0) -fi - -if test "$ktorrent_cv_func_statvfs" = yes ; then - AC_DEFINE(HAVE_STATVFS, 1) -else - AC_DEFINE(HAVE_STATVFS, 0) -fi - -if test "$ktorrent_cv_func_statvfs64" = yes ; then - AC_DEFINE(HAVE_STATVFS64, 1) -else - AC_DEFINE(HAVE_STATVFS64, 0) -fi - -KDE_ENABLE_HIDDEN_VISIBILITY - -KDE_CHECK_LIB(gmp, __gmpz_init, [have_gmp=yes], - [ - have_gmp=no - AC_MSG_ERROR(libgmp is required to install this program) - ]) - -KDE_CHECK_HEADER(gmp.h, [have_gmp=yes], - [ - have_gmp=no - AC_MSG_ERROR(libgmp is required to install this program) - ]) - -KDE_CHECK_HEADER(GeoIP.h, [have_system_geoip=yes], [have_system_geoip=no]) - -KDE_INIT_DOXYGEN([The API Reference], [Version $VERSION]) - -AC_ARG_ENABLE( - memleak-check, - [AS_HELP_STRING(--enable-memleak-check,[Enable memory leak checking])], - [CXXFLAGS="$CXXFLAGS -DKT_LEAKTRACE"]) - -AC_ARG_ENABLE( - profile, - [AS_HELP_STRING(--enable-profile,[Enable profiling])], - [CXXFLAGS="$CXXFLAGS -DKT_PROFILE"]) - - -AC_ARG_ENABLE(geoip, - [AS_HELP_STRING(--enable-geoip,[Enables builtin GeoIP database installation])], - [case "${enableval}" in - yes) geoip=true ;; - no) geoip=false ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-geoip) ;; - esac],[geoip=true]) - -AC_ARG_ENABLE(system-geoip, - [AS_HELP_STRING(--enable-system-geoip,[Enables use of system-wide GeoIP database (implies --disable-geoip) (auto by default)])], - [case "${enableval}" in - yes) if test "$have_system_geoip" = yes; then - system_geoip=true - geoip=false - else - AC_MSG_ERROR(cannot enable system geoip. GeoIP library headers were not found on your system) - fi ;; - no) system_geoip=false ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-system-geoip) ;; - esac],[system_geoip=auto]) - -if test x$system_geoip = xauto; then - if test "$have_system_geoip" = yes; then - system_geoip=true - geoip=false - else - system_geoip=false - fi -fi - -AM_CONDITIONAL(ENABLE_GEOIP, test x$geoip = xtrue) -AM_CONDITIONAL(USE_SYSTEM_GEOIP, test x$system_geoip = xtrue) - -if test x$system_geoip = xtrue; then - AC_DEFINE(USE_SYSTEM_GEOIP, 1, [Use system geoip]) -fi - - -AC_ARG_ENABLE(builtin-country-flags, - [AS_HELP_STRING(--enable-builtin-country-flags,[Install and prefer builtin country flags to the ones provided by KDE (auto by default)])], - [case "${enableval}" in - yes) builtin_country_flags=true ;; - no) builtin_country_flags=false ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-builtin-country-flags) ;; - esac],[builtin_country_flags=auto]) - -if test x$builtin_country_flags = xauto; then - if test x$geoip = xtrue; then - builtin_country_flags=true - else - builtin_country_flags=false - fi -fi - -AM_CONDITIONAL(ENABLE_BUILTIN_COUNTRY_FLAGS, test x$builtin_country_flags = xtrue) - -AC_ARG_ENABLE(torrent-mimetype, - [ --enable-torrent-mimetype Enables the installation of the torrent mimetype which uses a KTorrent based icon], - [case "${enableval}" in - yes) mimetype_install=true ;; - no) mimetype_install=false ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-torrent-mimetype) ;; - esac],[mimetype_install=false]) - -AM_CONDITIONAL(ENABLE_TORRENT_MIMETYPE, test x$mimetype_install = xtrue) - -## -- BEGIN -- ADDED BY Kevin --- - -# Check for pkg-config manually first, as if its not installed the -# PKG_PROG_PKG_CONFIG macro won't be defined. -AC_CHECK_PROG(have_pkg_config, pkg-config, yes, no) - -if test x"$have_pkg_config" = "xno"; then - AC_MSG_ERROR(pkg-config is required to install this program) -fi - -m4_pattern_allow(PKG_CONFIG_MIN_VERSION) -PKG_PROG_PKG_CONFIG - -AC_ARG_WITH([avahi], AS_HELP_STRING([--without-avahi], [Build without avahi/ZeroConf support (default: test)])) - -avahi=false -if test "x$with_avahi" != "xno"; then - PKG_CHECK_MODULES( AVAHI, avahi-client >= 0.6.10, - [ - AC_SUBST(AVAHI_CFLAGS) - AC_SUBST(AVAHI_LIBS) - avahi=true - ], - [ - missing_avahi_warning=yes - avahi=false - ]) - - PKG_CHECK_MODULES( AVAHI_TQT, avahi-tqt >= 0.6.10, - [ - AC_SUBST(AVAHI_TQT_CFLAGS) - AC_SUBST(AVAHI_TQT_LIBS) - avahi=true - ], - [ - missing_avahi_warning=yes - avahi=false - ]) -fi - -AM_CONDITIONAL(COMPILE_ZEROCONF, test x$avahi = xtrue) diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index 5c0b20e..0000000 --- a/doc/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = en -KDE_DOCS = AUTO -SUBDIRS = $(AUTODIRS) diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am deleted file mode 100644 index 67788de..0000000 --- a/doc/en/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -KDE_LANG = en -KDE_DOCS = ktorrent diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am deleted file mode 100644 index 701cd64..0000000 --- a/doc/man/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -tmpdir = $(mandir)/man1 -tmp_DATA= ktorrent.1 -EXTRA_DIST=$(tmp_DATA) diff --git a/ktorrent.tdevelop b/ktorrent.tdevelop deleted file mode 100644 index a032acb..0000000 --- a/ktorrent.tdevelop +++ /dev/null @@ -1,314 +0,0 @@ -<?xml version = '1.0'?> -<tdevelop> - <general> - <author>Joris Guisson</author> - <email>joris.guisson@gmail.com</email> - <version>0.1</version> - <projectmanagement>KDevKDEAutoProject</projectmanagement> - <primarylanguage>C++</primarylanguage> - <keywords> - <keyword>C++</keyword> - <keyword>Code</keyword> - <keyword>Qt</keyword> - <keyword>KDE</keyword> - </keywords> - <projectdirectory>.</projectdirectory> - <absoluteprojectpath>false</absoluteprojectpath> - <description/> - <ignoreparts/> - <versioncontrol>kdevsubversion</versioncontrol> - <projectname>ktorrent</projectname> - <defaultencoding/> - </general> - <kdevautoproject> - <general> - <activetarget>apps/ktorrent/ktorrent</activetarget> - <useconfiguration>debug</useconfiguration> - <useactivetarget>true</useactivetarget> - </general> - <run> - <mainprogram>/home/joris/ktorrent/trunk-trinity/debug/apps/ktorrent/ktorrent</mainprogram> - <terminal>false</terminal> - <directoryradio>executable</directoryradio> - <customdirectory>/</customdirectory> - <programargs>--nofork</programargs> - <autocompile>true</autocompile> - <envvars/> - <runarguments> - <ktorrent/> - <kttorinfo/> - <cachecheck/> - <ktcachecheck/> - <ktupnptest/> - <ktutester/> - </runarguments> - <debugarguments> - <ktorrent>--nofork</ktorrent> - </debugarguments> - <cwd> - <ktorrent>/home/joris/ktorrent/newstuff/debug/./plugins/infowidget</ktorrent> - </cwd> - <globaldebugarguments>--nofork</globaldebugarguments> - <globalcwd>/home/joris</globalcwd> - <useglobalprogram>true</useglobalprogram> - <autoinstall>false</autoinstall> - <autotdesu>false</autotdesu> - </run> - <make> - <envvars> - <envvar value="1" name="WANT_AUTOCONF_2_5" /> - <envvar value="1" name="WANT_AUTOMAKE_1_6" /> - </envvars> - <abortonerror>true</abortonerror> - <numberofjobs>1</numberofjobs> - <dontact>false</dontact> - <makebin/> - <prio>0</prio> - <runmultiplejobs>false</runmultiplejobs> - </make> - <configurations> - <optimized> - <builddir>optimized</builddir> - <ccompiler>kdevgccoptions</ccompiler> - <cxxcompiler>kdevgppoptions</cxxcompiler> - <f77compiler>kdevg77options</f77compiler> - <cxxflags>-O2 -g0</cxxflags> - <envvars/> - <configargs/> - <topsourcedir/> - <cppflags/> - <ldflags/> - <ccompilerbinary/> - <cxxcompilerbinary/> - <f77compilerbinary/> - <cflags/> - <f77flags/> - </optimized> - <debug> - <configargs>--enable-debug=full</configargs> - <builddir>debug</builddir> - <ccompiler>kdevgccoptions</ccompiler> - <cxxcompiler>kdevgppoptions</cxxcompiler> - <f77compiler>kdevg77options</f77compiler> - <cxxflags>-O0 -g3</cxxflags> - <envvars/> - <topsourcedir/> - <cppflags/> - <ldflags/> - <ccompilerbinary/> - <cxxcompilerbinary/> - <f77compilerbinary/> - <cflags/> - <f77flags/> - </debug> - </configurations> - <subclassing> - <subclass uifile="/src/infowidgetbase.ui" sourcefile="/src/infowidget.cpp" /> - <subclass uifile="/src/infowidgetbase.ui" sourcefile="/src/infowidget.h" /> - <subclass uifile="/src/fileselectdlgbase.ui" sourcefile="/src/fileselectdlg.cpp" /> - <subclass uifile="/src/fileselectdlgbase.ui" sourcefile="/src/fileselectdlg.h" /> - <subclass uifile="/plugins/upnp/upnpwidget.ui" sourcefile="/plugins/upnp/upnpprefwidget.cpp" /> - <subclass uifile="/plugins/upnp/upnpwidget.ui" sourcefile="/plugins/upnp/upnpprefwidget.h" /> - <subclass uifile="/plugins/partfileimport/importdlgbase.ui" sourcefile="/plugins/partfileimport/importdialog.cpp" /> - <subclass uifile="/plugins/partfileimport/importdlgbase.ui" sourcefile="/plugins/partfileimport/importdialog.h" /> - <subclass uifile="/apps/ktorrent/scandlgbase.ui" sourcefile="/apps/ktorrent/scandialog.cpp" /> - <subclass uifile="/apps/ktorrent/scandlgbase.ui" sourcefile="/apps/ktorrent/scandialog.h" /> - <subclass uifile="/plugins/infowidget/statustabbase.ui" sourcefile="/plugins/infowidget/statustab.cpp" /> - <subclass uifile="/plugins/infowidget/statustabbase.ui" sourcefile="/plugins/infowidget/statustab.h" /> - <subclass uifile="/apps/ktorrent/speedlimitsdlgbase.ui" sourcefile="/apps/ktorrent/speedlimitsdlg.cpp" /> - <subclass uifile="/apps/ktorrent/speedlimitsdlgbase.ui" sourcefile="/apps/ktorrent/speedlimitsdlg.h" /> - </subclassing> - </kdevautoproject> - <kdevfileview> - <groups> - <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> - <group pattern="*.ui" name="User Interface" /> - <group pattern="*.png" name="Icons" /> - <group pattern="*.po;*.ts" name="Translations" /> - <group pattern="*" name="Others" /> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidenonlocation>false</hidenonlocation> - </groups> - <tree> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidepatterns>*.o,*.lo,CVS</hidepatterns> - <showvcsfields>true</showvcsfields> - </tree> - </kdevfileview> - <kdevdoctreeview> - <ignoretocs> - <toc>ada</toc> - <toc>ada_bugs_gcc</toc> - <toc>bash</toc> - <toc>bash_bugs</toc> - <toc>clanlib</toc> - <toc>w3c-dom-level2-html</toc> - <toc>fortran_bugs_gcc</toc> - <toc>gnome1</toc> - <toc>gnustep</toc> - <toc>gtk</toc> - <toc>gtk_bugs</toc> - <toc>haskell</toc> - <toc>haskell_bugs_ghc</toc> - <toc>java_bugs_gcc</toc> - <toc>java_bugs_sun</toc> - <toc>pascal_bugs_fp</toc> - <toc>php</toc> - <toc>php_bugs</toc> - <toc>perl</toc> - <toc>perl_bugs</toc> - <toc>python</toc> - <toc>python_bugs</toc> - <toc>ruby</toc> - <toc>ruby_bugs</toc> - <toc>sdl</toc> - <toc>w3c-svg</toc> - <toc>sw</toc> - <toc>w3c-uaag10</toc> - <toc>wxwidgets_bugs</toc> - </ignoretocs> - <ignoreqt_xml> - <toc>qmake User Guide</toc> - </ignoreqt_xml> - </kdevdoctreeview> - <kdevdebugger> - <general> - <dbgshell>libtool</dbgshell> - <programargs>--nofork</programargs> - <gdbpath/> - <breakonloadinglibs>false</breakonloadinglibs> - <separatetty>false</separatetty> - <floatingtoolbar>false</floatingtoolbar> - <runappinappdirectory>true</runappinappdirectory> - <configGdbScript/> - <runShellScript/> - <runGdbScript/> - <raiseGDBOnStart>false</raiseGDBOnStart> - </general> - <display> - <staticmembers>true</staticmembers> - <demanglenames>true</demanglenames> - <outputradix>10</outputradix> - </display> - </kdevdebugger> - <kdevfilecreate> - <filetypes/> - <useglobaltypes> - <type ext="ui" /> - <type ext="cpp" /> - <type ext="h" /> - </useglobaltypes> - </kdevfilecreate> - <kdevcvs> - <cvsoptions>-f</cvsoptions> - <commitoptions/> - <updateoptions>-dP</updateoptions> - <addoptions/> - <removeoptions>-f</removeoptions> - <diffoptions>-u3 -p</diffoptions> - <logoptions/> - <rshoptions/> - </kdevcvs> - <cppsupportpart> - <codecompletion/> - <filetemplates> - <choosefiles>false</choosefiles> - <interfaceURL/> - <implementationURL/> - <interfacesuffix>.h</interfacesuffix> - <implementationsuffix>.cpp</implementationsuffix> - <lowercasefilenames>true</lowercasefilenames> - </filetemplates> - </cppsupportpart> - <kdevclassview> - <folderhierarchy>true</folderhierarchy> - <depthoffolders>2</depthoffolders> - </kdevclassview> - <kdevdocumentation> - <projectdoc> - <docsystem>Doxygen Documentation Collection</docsystem> - <docurl>ktorrent.tag</docurl> - <usermanualurl/> - </projectdoc> - </kdevdocumentation> - <substmap> - <APPNAME>ktorrent</APPNAME> - <APPNAMELC>ktorrent</APPNAMELC> - <APPNAMESC>Ktorrent</APPNAMESC> - <APPNAMEUC>KTORRENT</APPNAMEUC> - <AUTHOR>Joris Guisson</AUTHOR> - <EMAIL>joris.guisson@gmail.com</EMAIL> - <LICENSE>GPL</LICENSE> - <LICENSEFILE>COPYING</LICENSEFILE> - <VERSION>0.1</VERSION> - <YEAR>2005</YEAR> - <dest>/home/joris/ktorrent/code</dest> - </substmap> - <kdevcppsupport> - <references/> - <codecompletion> - <includeGlobalFunctions>true</includeGlobalFunctions> - <includeTypes>true</includeTypes> - <includeEnums>true</includeEnums> - <includeTypedefs>false</includeTypedefs> - <automaticCodeCompletion>true</automaticCodeCompletion> - <automaticArgumentsHint>true</automaticArgumentsHint> - <automaticHeaderCompletion>true</automaticHeaderCompletion> - <codeCompletionDelay>250</codeCompletionDelay> - <argumentsHintDelay>400</argumentsHintDelay> - <headerCompletionDelay>250</headerCompletionDelay> - <showOnlyAccessibleItems>false</showOnlyAccessibleItems> - <completionBoxItemOrder>0</completionBoxItemOrder> - <howEvaluationContextMenu>true</howEvaluationContextMenu> - <showCommentWithArgumentHint>true</showCommentWithArgumentHint> - <statusBarTypeEvaluation>false</statusBarTypeEvaluation> - <namespaceAliases>std=_GLIBCXX_STD;__gnu_cxx=std</namespaceAliases> - <processPrimaryTypes>true</processPrimaryTypes> - <processFunctionArguments>false</processFunctionArguments> - <preProcessAllHeaders>false</preProcessAllHeaders> - <parseMissingHeaders>false</parseMissingHeaders> - <resolveIncludePaths>true</resolveIncludePaths> - <alwaysParseInBackground>true</alwaysParseInBackground> - <usePermanentCaching>true</usePermanentCaching> - <alwaysIncludeNamespaces>false</alwaysIncludeNamespaces> - <includePaths>.;</includePaths> - <parseMissingHeadersExperimental>false</parseMissingHeadersExperimental> - <resolveIncludePathsUsingMakeExperimental>false</resolveIncludePathsUsingMakeExperimental> - </codecompletion> - <creategettersetter> - <prefixGet/> - <prefixSet>set</prefixSet> - <prefixVariable>m_,_</prefixVariable> - <parameterName>theValue</parameterName> - <inlineGet>true</inlineGet> - <inlineSet>true</inlineSet> - </creategettersetter> - <designerintegration> - <tqtdesigner/> - </designerintegration> - <qt> - <used>true</used> - <version>3</version> - <root>/usr/share/qt3</root> - <includestyle>3</includestyle> - <designerintegration>EmbeddedKDevDesigner</designerintegration> - <qmake>/usr/bin/qmake</qmake> - <designer>/usr/bin/designer</designer> - <designerpluginpaths/> - </qt> - <splitheadersource> - <enabled>false</enabled> - <synchronize>true</synchronize> - <orientation>Vertical</orientation> - </splitheadersource> - </kdevcppsupport> - <kdevvisualadvance> - <emulator>VisualBoyAdvance</emulator> - <binary/> - <addOptions/> - <terminal>false</terminal> - <fullscreen>false</fullscreen> - <graphicFilter>-f0</graphicFilter> - <scaling>-1</scaling> - </kdevvisualadvance> -</tdevelop> diff --git a/libktorrent/Makefile.am b/libktorrent/Makefile.am deleted file mode 100644 index d5537c5..0000000 --- a/libktorrent/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -INCLUDES = -I$(srcdir)/. $(all_includes) -SUBDIRS = util torrent kademlia interfaces migrate mse datachecker net -METASOURCES = AUTO - -lib_LTLIBRARIES = libktorrent.la -libktorrent_la_LDFLAGS = ${KDE_RPATH} $(all_libraries) -release $(VERSION) - -kde_kcfg_DATA = ktorrent.kcfg - -# make sure settings.h is built before anything else -BUILT_SOURCES=settings.h - -noinst_HEADERS = expandablewidget.h functions.h ktversion.h labelview.h \ - pluginmanager.h pluginmanagerprefpage.h -libktorrent_la_SOURCES = expandablewidget.cpp functions.cpp labelview.cpp \ - labelviewitembase.ui pluginmanager.cpp pluginmanagerprefpage.cpp pluginmanagerwidget.ui \ - settings.kcfgc -libktorrent_la_LIBADD = ../libktorrent/net/libnet.la \ - ../libktorrent/datachecker/libdatachecker.la ../libktorrent/mse/libmse.la ../libktorrent/migrate/libmigrate.la \ - ../libktorrent/util/libutil.la ../libktorrent/torrent/libtorrent.la \ - ../libktorrent/kademlia/libkademlia.la ../libktorrent/interfaces/libinterfaces.la $(LIB_TDEPARTS) $(LIB_TDEIO) $(LIB_TDECORE) $(LIB_TQT) $(LIB_TDEUI) -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/libktorrent/datachecker/Makefile.am b/libktorrent/datachecker/Makefile.am deleted file mode 100644 index b5e9ee0..0000000 --- a/libktorrent/datachecker/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDES = -I$(srcdir)/.. -I$(srcdir)/. $(all_includes) -METASOURCES = AUTO -libdatachecker_la_LDFLAGS = $(all_libraries) -noinst_LTLIBRARIES = libdatachecker.la -libdatachecker_la_SOURCES = datachecker.cpp multidatachecker.cpp \ - singledatachecker.cpp datacheckerlistener.cpp datacheckerthread.cpp -noinst_HEADERS = datacheckerlistener.h datacheckerthread.h -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/libktorrent/interfaces/Makefile.am b/libktorrent/interfaces/Makefile.am deleted file mode 100644 index dca1a4a..0000000 --- a/libktorrent/interfaces/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDES = -I$(srcdir)/.. $(all_includes) -METASOURCES = AUTO -libinterfaces_la_LDFLAGS = $(all_libraries) -noinst_LTLIBRARIES = libinterfaces.la -noinst_HEADERS = plugin.h coreinterface.h guiinterface.h torrentinterface.h \ - monitorinterface.h chunkdownloadinterface.h peerinterface.h torrentfileinterface.h \ - filetreeitem.h filetreediritem.h logmonitorinterface.h ipblockinginterface.h \ - trackerslist.h peersource.h exitoperation.h -libinterfaces_la_SOURCES = plugin.cpp coreinterface.cpp guiinterface.cpp \ - prefpageinterface.cpp torrentinterface.cpp monitorinterface.cpp chunkdownloadinterface.cpp \ - peerinterface.cpp torrentfileinterface.cpp filetreeitem.cpp filetreediritem.cpp \ - functions.cpp logmonitorinterface.cpp ipblockinginterface.cpp trackerslist.cpp \ - peersource.cpp exitoperation.cpp - -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/libktorrent/kademlia/Makefile.am b/libktorrent/kademlia/Makefile.am deleted file mode 100644 index 1b567b2..0000000 --- a/libktorrent/kademlia/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -INCLUDES = -I$(srcdir)/.. $(all_includes) -METASOURCES = AUTO -libkademlia_la_LDFLAGS = $(all_libraries) -noinst_LTLIBRARIES = libkademlia.la -noinst_HEADERS = key.h node.h kbucket.h rpccall.h rpcserver.h database.h dht.h \ - rpcmsg.h kclosestnodessearch.h nodelookup.h task.h pack.h \ - taskmanager.h announcetask.h dhttrackerbackend.h dhtbase.h -libkademlia_la_SOURCES = key.cpp node.cpp kbucket.cpp rpccall.cpp rpcserver.cpp \ - database.cpp dht.cpp rpcmsg.cpp kclosestnodessearch.cpp nodelookup.cpp task.cpp \ - pack.cpp taskmanager.cpp announcetask.cpp \ - dhttrackerbackend.cpp dhtbase.cpp -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/libktorrent/migrate/Makefile.am b/libktorrent/migrate/Makefile.am deleted file mode 100644 index 9bb5528..0000000 --- a/libktorrent/migrate/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -INCLUDES = -I$(srcdir)/.. $(all_includes) -METASOURCES = AUTO -libmigrate_la_LDFLAGS = $(all_libraries) -noinst_LTLIBRARIES = libmigrate.la -noinst_HEADERS = migrate.h ccmigrate.h cachemigrate.h -libmigrate_la_SOURCES = migrate.cpp ccmigrate.cpp cachemigrate.cpp -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/libktorrent/mse/Makefile.am b/libktorrent/mse/Makefile.am deleted file mode 100644 index d6a8ac5..0000000 --- a/libktorrent/mse/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -INCLUDES = -I$(srcdir)/.. $(all_includes) -METASOURCES = AUTO -libmse_la_LDFLAGS = -lgmp $(all_libraries) -noinst_LTLIBRARIES = libmse.la -noinst_HEADERS = bigint.h rc4encryptor.h streamsocket.h encryptedauthenticate.h \ - encryptedserverauthenticate.h functions.h -libmse_la_SOURCES = bigint.cpp rc4encryptor.cpp streamsocket.cpp \ - encryptedauthenticate.cpp encryptedserverauthenticate.cpp functions.cpp -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/libktorrent/net/Makefile.am b/libktorrent/net/Makefile.am deleted file mode 100644 index e67354c..0000000 --- a/libktorrent/net/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -INCLUDES = -I$(srcdir)/.. -I$(srcdir)/. $(all_includes) -METASOURCES = AUTO -libnet_la_LDFLAGS = $(all_libraries) -noinst_LTLIBRARIES = libnet.la -noinst_HEADERS = address.h bufferedsocket.h circularbuffer.h downloadthread.h \ - networkthread.h portlist.h socket.h socketmonitor.h speed.h uploadthread.h -libnet_la_SOURCES = address.cpp bufferedsocket.cpp circularbuffer.cpp \ - downloadthread.cpp networkthread.cpp portlist.cpp socket.cpp socketgroup.cpp \ - socketmonitor.cpp speed.cpp uploadthread.cpp -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/libktorrent/torrent/Makefile.am b/libktorrent/torrent/Makefile.am deleted file mode 100644 index d546228..0000000 --- a/libktorrent/torrent/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -INCLUDES = -I$(top_builddir)/ktorrent/libktorrent -I$(top_builddir)/libktorrent \ - -I$(srcdir)/.. $(all_includes) - -METASOURCES = AUTO - -noinst_LTLIBRARIES = libtorrent.la -libtorrent_la_LDFLAGS = $(all_libraries) -noinst_HEADERS = advancedchokealgorithm.h announcelist.h authenticate.h \ - authenticatebase.h authenticationmonitor.h bdecoder.h bencoder.h bnode.h cache.h \ - cachefile.h cap.h choker.h chunk.h chunkcounter.h chunkdownload.h chunkmanager.h \ - chunkselector.h dndfile.h downloadcap.h downloader.h globals.h httptracker.h \ - ipblocklist.h movedatafilesjob.h multifilecache.h newchokealgorithm.h \ - oldchokealgorithm.h packet.h packetreader.h packetwriter.h peer.h peerdownloader.h peerid.h \ - peermanager.h peersourcemanager.h peeruploader.h piece.h preallocationthread.h \ - queuemanager.h request.h server.h serverauthenticate.h singlefilecache.h \ - speedestimater.h statsfile.h timeestimator.h torrent.h torrentcontrol.h torrentcreator.h \ - torrentfile.h tracker.h udptracker.h udptrackersocket.h uploadcap.h uploader.h \ - upspeedestimater.h utpex.h value.h - -libtorrent_la_SOURCES = advancedchokealgorithm.cpp announcelist.cpp \ - authenticate.cpp authenticatebase.cpp authenticationmonitor.cpp bdecoder.cpp \ - bencoder.cpp bnode.cpp cache.cpp cachefile.cpp cap.cpp choker.cpp chunk.cpp \ - chunkcounter.cpp chunkdownload.cpp chunkmanager.cpp chunkselector.cpp dndfile.cpp \ - downloadcap.cpp downloader.cpp globals.cpp httptracker.cpp ipblocklist.cpp \ - movedatafilesjob.cpp multifilecache.cpp newchokealgorithm.cpp packet.cpp packetreader.cpp \ - packetwriter.cpp peer.cpp peerdownloader.cpp peerid.cpp peermanager.cpp \ - peersourcemanager.cpp peeruploader.cpp piece.cpp preallocationthread.cpp queuemanager.cpp \ - request.cpp server.cpp serverauthenticate.cpp singlefilecache.cpp \ - speedestimater.cpp statsfile.cpp timeestimator.cpp torrent.cpp torrentcontrol.cpp \ - torrentcreator.cpp torrentfile.cpp tracker.cpp udptracker.cpp udptrackersocket.cpp \ - uploadcap.cpp uploader.cpp upspeedestimater.cpp utpex.cpp value.cpp - -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/libktorrent/util/Makefile.am b/libktorrent/util/Makefile.am deleted file mode 100644 index c7f46ae..0000000 --- a/libktorrent/util/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libktorrent $(all_includes) - -METASOURCES = AUTO - -noinst_LTLIBRARIES = libutil.la -libutil_la_LDFLAGS = $(all_libraries) - - -libutil_la_SOURCES = array.cpp autorotatelogjob.cpp bitset.cpp error.cpp \ - file.cpp fileops.cpp functions.cpp httprequest.cpp log.cpp mmapfile.cpp \ - profiler.cpp ptrmap.cpp sha1hash.cpp sha1hashgen.cpp timer.cpp urlencoder.cpp \ - waitjob.cpp - - - - -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) -noinst_HEADERS = autorotatelogjob.h profiler.h diff --git a/plugins/Makefile.am b/plugins/Makefile.am deleted file mode 100644 index ad2e28c..0000000 --- a/plugins/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -INCLUDES = -METASOURCES = AUTO -SUBDIRS = search infowidget ipfilter logviewer upnp partfileimport scheduler \ - scanfolder rssfeed webinterface zeroconf stats diff --git a/plugins/infowidget/Makefile.am b/plugins/infowidget/Makefile.am deleted file mode 100644 index ace5e0d..0000000 --- a/plugins/infowidget/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libktorrent $(all_includes) -METASOURCES = AUTO - -if USE_SYSTEM_GEOIP -libgeoip_system = -lGeoIP -else -libgeoip_builtin = libgeoip_builtin.la -endif - -noinst_LTLIBRARIES = $(libgeoip_builtin) - -kde_module_LTLIBRARIES = ktinfowidgetplugin.la -noinst_HEADERS = infowidgetplugin.h infowidgetprefpage.h trackerview.h GeoIP.h \ - statustab.h fileview.h -ktinfowidgetplugin_la_SOURCES = infowidgetplugin.cpp availabilitychunkbar.cpp \ - chunkbar.cpp chunkdownloadview.cpp downloadedchunkbar.cpp flagdb.cpp peerview.cpp \ - ktorrentmonitor.cpp iwfiletreediritem.cpp iwfiletreeitem.cpp infowidgetprefpage.cpp \ - infowidgetpluginsettings.kcfgc iwpref.ui trackerviewbase.ui trackerview.cpp floatspinbox.cpp \ - localefloatvalidator.cpp chunkdownloadviewbase.ui statustabbase.ui statustab.cpp fileview.cpp - -libgeoip_builtin_la_SOURCES = GeoIP.c - -# Libs needed by the plugin -ktinfowidgetplugin_la_LIBADD = ../../libktorrent/libktorrent.la \ - $(LIB_TDEHTML) $(LIB_TDEPARTS) $(LIB_TQT) \ - $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) - $(libgeoip_builtin) - - -# LD flags for the plugin -# -module says: this is a module, i.e. something you're going to dlopen -# so e.g. it has no version number like a normal shared lib would have. -ktinfowidgetplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(libgeoip_system) - -# rc file containing the GUI for the plugin -# pluginsdir = $(kde_datadir)/ktsearchplugin -# plugins_DATA = ktsearchpluginui.rc - -# Install the desktop file needed to detect the plugin -kde_services_DATA = ktinfowidgetplugin.desktop - -kde_kcfg_DATA = ktinfowidgetplugin.kcfg - -ktdatadir = $(kde_datadir)/ktorrent/geoip - -SUBDIRS = geoip -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/plugins/infowidget/geoip/Makefile.am b/plugins/infowidget/geoip/Makefile.am deleted file mode 100644 index 1a7d6c4..0000000 --- a/plugins/infowidget/geoip/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libktorrent $(all_includes) -METASOURCES = AUTO - -ktdatadir = $(kde_datadir)/ktorrent/geoip - -if ENABLE_GEOIP -GEOIP_FILES = geoip.dat GeoIP-LICENSE.txt -else -GEOIP_FILES = -endif - -if ENABLE_BUILTIN_COUNTRY_FLAGS -FLAG_FILES = ad.png ae.png af.png ag.png ai.png al.png am.png an.png ao.png \ - aq.png ar.png as.png at.png au.png aw.png az.png ba.png bb.png bd.png be.png \ - bf.png bg.png bh.png bi.png bj.png bm.png bn.png bo.png br.png bs.png bt.png \ - bv.png bw.png by.png bz.png ca.png cc.png cd.png cf.png cg.png ch.png ci.png \ - ck.png cl.png cm.png cn.png co.png cr.png cs.png cu.png cv.png cx.png cy.png \ - cz.png de.png dj.png dk.png dm.png do.png dz.png ec.png ee.png eg.png eh.png \ - er.png es.png et.png eu.png fi.png fj.png fk.png fm.png fo.png fr.png ga.png \ - gb.png gd.png ge.png gf.png gh.png gi.png gl.png gm.png gn.png gp.png gq.png \ - gr.png gs.png gt.png gu.png gw.png gy.png hk.png hm.png hn.png hr.png ht.png \ - hu.png id.png ie.png il.png in.png io.png iq.png ir.png is.png it.png jm.png \ - jo.png jp.png ke.png kg.png kh.png ki.png km.png kn.png kp.png kr.png kw.png \ - ky.png kz.png la.png lb.png lc.png li.png lk.png lr.png ls.png lt.png lu.png \ - lv.png ly.png ma.png mc.png md.png mg.png mh.png mk.png ml.png mm.png mn.png \ - mo.png mp.png mq.png mr.png ms.png mt.png mu.png mv.png mw.png mx.png my.png \ - mz.png na.png nc.png ne.png nf.png ng.png ni.png nl.png no.png np.png nr.png \ - nu.png nz.png om.png pa.png pe.png pf.png pg.png ph.png pk.png pl.png pm.png \ - pn.png pr.png ps.png pt.png pw.png py.png qa.png re.png ro.png ru.png rw.png \ - sa.png sb.png sc.png sd.png se.png sg.png sh.png si.png sj.png sk.png sl.png \ - sm.png sn.png so.png sr.png st.png sv.png sy.png sz.png tc.png td.png tf.png \ - tg.png th.png tj.png tk.png tl.png tm.png tn.png to.png tp.png tr.png tt.png \ - tv.png tw.png tz.png ua.png ug.png um.png us.png uy.png uz.png va.png vc.png \ - ve.png vg.png vi.png vn.png vu.png wf.png ws.png ye.png yt.png yu.png za.png \ - zm.png zw.png FLAGS_LICENCE -else -FLAG_FILES = -endif - -ktdata_DATA = $(FLAG_FILES) $(GEOIP_FILES) - diff --git a/plugins/infowidget/ktinfowidgetplugin.desktop b/plugins/infowidget/ktinfowidgetplugin.desktop deleted file mode 100644 index 8ea5368..0000000 --- a/plugins/infowidget/ktinfowidgetplugin.desktop +++ /dev/null @@ -1,29 +0,0 @@ -[Desktop Entry] -Name=SearchPlugin -Name[bg]=Приставка за търсене -Name[br]=Lugent klask -Name[da]=SøgePlugin -Name[de]=Suche-Modul -Name[el]=Πρόσθετο αναζήτησης -Name[es]=Complemento de búsqueda -Name[et]=Otsimisplugin -Name[fa]=وصلۀ جستجو -Name[it]=Plugin di ricerca -Name[nb]=Søkemodul -Name[nds]=Söök-Moduul -Name[nl]=Zoekplugin -Name[pl]=Wtyczka wyszukiwania -Name[pt]='Plugin' de Procura -Name[pt_BR]=Plugin de Busca -Name[sk]=Vyhľadávací Plugin -Name[sr]=Прикључак претраге -Name[sr@Latn]=Priključak pretrage -Name[sv]=Sökinsticksprogram -Name[tr]=Arama Eklentisi -Name[uk]=Втулок пошуку -Name[xx]=xxSearchPluginxx -Name[zh_CN]=搜索插件 -Name[zh_TW]=搜尋外掛程式 -X-TDE-ServiceTypes=KTorrent/Plugin -Type=Service -X-TDE-Library=ktinfowidgetplugin diff --git a/plugins/ipfilter/Makefile.am b/plugins/ipfilter/Makefile.am deleted file mode 100644 index c2395b0..0000000 --- a/plugins/ipfilter/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libktorrent $(all_includes) -METASOURCES = AUTO -kde_module_LTLIBRARIES = ktipfilterplugin.la -noinst_HEADERS = ipfilterplugin.h ipblockingprefpage.h antip2p.h \ - convertdialog.h -ktipfilterplugin_la_SOURCES = ipfilterplugin.cpp ipblockingpref.ui \ - ipblockingprefpage.cpp ipfilterpluginsettings.kcfgc antip2p.cpp convert_dlg.ui \ - convertdialog.cpp - -# Libs needed by the plugin -ktipfilterplugin_la_LIBADD = $(LIB_TDEHTML) $(LIB_TDEPARTS) \ - ../../libktorrent/libktorrent.la $(LIB_TQT) \ - $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) - - - -# LD flags for the plugin -# -module says: this is a module, i.e. something you're going to dlopen -# so e.g. it has no version number like a normal shared lib would have. -ktipfilterplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) - -# rc file containing the GUI for the plugin -# pluginsdir = $(kde_datadir)/ktsearchplugin -# plugins_DATA = ktsearchpluginui.rc - -# Install the desktop file needed to detect the plugin -kde_services_DATA = ktipfilterplugin.desktop - -kde_kcfg_DATA = ktipfilterplugin.kcfg - -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/plugins/ipfilter/ktipfilterplugin.desktop b/plugins/ipfilter/ktipfilterplugin.desktop deleted file mode 100644 index 4435c28..0000000 --- a/plugins/ipfilter/ktipfilterplugin.desktop +++ /dev/null @@ -1,56 +0,0 @@ -[Desktop Entry] -Name=IPFilterPlugin -Name[bg]=Приставка за IP-филтриране -Name[br]=Lugent Sil IP -Name[de]=IP-Filter-Modul -Name[el]=Πρόσθετο φίλτρου IP -Name[es]=Filtro de IP -Name[et]=IP-filtri plugin -Name[it]=Plugin filtro ip -Name[nb]=IP-filtermodul -Name[nds]="IP-Filter"-Moduul -Name[nl]=IPFilter-plugin -Name[pl]=Wtyczka filtru IP -Name[pt]=Filtro de IPs -Name[pt_BR]=Plugin de Filtro de IP -Name[sk]=IPFilter Plugin -Name[sr]=Прикључак IP филтера -Name[sr@Latn]=Priključak IP filtera -Name[sv]=IP-filterinsticksprogram -Name[tr]=IP Filtre Eklentisi -Name[xx]=xxIPFilterPluginxx -Name[zh_CN]=IP 过滤器插件 -Name[zh_TW]=IPFilter外掛程式 -Comment=IP filter plugin for KTorrent -Comment[ar]=قابس مرشح IP لِــ KTorrent -Comment[bg]=Приставка за IP-филтриране (KTorrent) -Comment[br]=Lugent sil IP evit KTorrentt -Comment[ca]=Connector de filtres d'IP per a Ktorrent -Comment[cs]=IP filtr modul pro KTorrent -Comment[de]=IP-Filter-Modul für KTorrent -Comment[el]=Πρόσθετο φίλτρου IP για το KTorrent -Comment[es]=Complemento de filtro de IP de KTorrent -Comment[et]=KTorrenti IP-filtri plugin -Comment[fa]=وصلۀ پالایۀ IP برای KTorrent -Comment[gl]=Plugin de filtrado de IPs para KTorrent -Comment[it]=Plugin filtro ip per KTorrent -Comment[ja]=KTorrent のための IP フィルタプラグイン -Comment[ka]=KTorrent-ის IP ფილტრაციის მოდული -Comment[nb]=IP-filtermodul for KTorrent -Comment[nds]="IP-Filter"-Moduul för KTorrent -Comment[nl]=Plugin om op IP-adressen te filteren in KTorrent -Comment[pl]=Wtyczka filtru IP dla KTorrent -Comment[pt]='Plugin' de filtragem de IPs do KTorrent -Comment[pt_BR]=Plugin de Filtro de IP para o KTorrent -Comment[sk]=IP filter plugin pre KTorrent -Comment[sr]=Прикључак IP филтера за KTorrent -Comment[sr@Latn]=Priključak IP filtera za KTorrent -Comment[sv]=IP-filterinsticksprogram för Ktorrent -Comment[tr]=KTorrent için IP filtre eklentisi -Comment[uk]=Втулок фільтрування IP для KTorrent -Comment[xx]=xxIP filter plugin for KTorrentxx -Comment[zh_CN]=KTorrent 的 IP 过滤器插件 -Comment[zh_TW]=KTorrent IP 過濾器外掛程式 -X-TDE-ServiceTypes=KTorrent/Plugin -Type=Service -X-TDE-Library=ktipfilterplugin diff --git a/plugins/logviewer/Makefile.am b/plugins/logviewer/Makefile.am deleted file mode 100644 index e11e126..0000000 --- a/plugins/logviewer/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libktorrent $(all_includes) - -METASOURCES = AUTO -kde_module_LTLIBRARIES = ktlogviewerplugin.la - - -# Libs needed by the plugin -ktlogviewerplugin_la_LIBADD = $(LIB_TDEHTML) $(LIB_TDEPARTS) \ - ../../libktorrent/libktorrent.la $(LIB_TQT) \ - $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) - - - -# LD flags for the plugin -# -module says: this is a module, i.e. something you're going to dlopen -# so e.g. it has no version number like a normal shared lib would have. -ktlogviewerplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) - -# rc file containing the GUI for the plugin -# pluginsdir = $(kde_datadir)/ktsearchplugin -# plugins_DATA = ktsearchpluginui.rc - -# Install the desktop file needed to detect the plugin -kde_services_DATA = ktlogviewerplugin.desktop - -kde_kcfg_DATA = ktlogviewerplugin.kcfg - -noinst_HEADERS = logviewerplugin.h logviewer.h logprefpage.h logprefwidget.h \ - logflags.h -ktlogviewerplugin_la_SOURCES = logviewerplugin.cpp logviewer.cpp \ - logprefpage.cpp logprefwidgetbase.ui logprefwidget.cpp logviewerpluginsettings.kcfgc \ - logflags.cpp -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/plugins/logviewer/ktlogviewerplugin.desktop b/plugins/logviewer/ktlogviewerplugin.desktop deleted file mode 100644 index 4d7c9ad..0000000 --- a/plugins/logviewer/ktlogviewerplugin.desktop +++ /dev/null @@ -1,26 +0,0 @@ -[Desktop Entry] -Name=LogViewerPlugin -Name[bg]=Приставка за преглед на журнални файлове -Name[de]=Modul zur Anzeige von Protokolldateien -Name[el]=Πρόσθετο προβολής καταγραφής -Name[es]=Visualizador del registro -Name[et]=Loginäitaja plugin -Name[it]=Plugin visore registro -Name[nb]=Logvisningsmodul -Name[nds]=Logbookkieker-Moduul -Name[nl]=Logweergaveplugin -Name[pl]=Wtyczka wyświetlania dziennika -Name[pt]=Visualizador do Registo -Name[pt_BR]=Plugin de Vizualização de Log -Name[sk]=LogViewer Plugin -Name[sr]=Прикључак приказа дневника -Name[sr@Latn]=Priključak prikaza dnevnika -Name[sv]=Loggvisningsinsticksprogram -Name[tr]=Kayıt Görüntü Eklentisi -Name[uk]=Втулок перегляду журналу -Name[xx]=xxLogViewerPluginxx -Name[zh_CN]=日志查看器插件 -Name[zh_TW]=紀錄檢視器外掛程式 -X-TDE-ServiceTypes=KTorrent/Plugin -Type=Service -X-TDE-Library=ktlogviewerplugin diff --git a/plugins/partfileimport/Makefile.am b/plugins/partfileimport/Makefile.am deleted file mode 100644 index 263f8a0..0000000 --- a/plugins/partfileimport/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -INCLUDES = -I$(top_builddir)/apps/ktorrent -I$(srcdir)/../../libktorrent \ - $(all_includes) -METASOURCES = AUTO -kde_module_LTLIBRARIES = ktpartfileimportplugin.la -noinst_HEADERS = partfileimportplugin.h importdialog.h -ktpartfileimportplugin_la_SOURCES = partfileimportplugin.cpp importdlgbase.ui importdialog.cpp - -# Libs needed by the plugin -ktpartfileimportplugin_la_LIBADD = $(LIB_TDEHTML) $(LIB_TDEPARTS) \ - ../../libktorrent/libktorrent.la \ - $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) - -# LD flags for the plugin -# -module says: this is a module, i.e. something you're going to dlopen -# so e.g. it has no version number like a normal shared lib would have. -ktpartfileimportplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) - -# rc file containing the GUI for the plugin -rcdir = $(kde_datadir)/ktorrent -rc_DATA = ktpartfileimportpluginui.rc - -# Install the desktop file needed to detect the plugin -kde_services_DATA = ktpartfileimportplugin.desktop - -# kde_kcfg_DATA = ktpartfileimportplugin.kcfg - -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/plugins/partfileimport/ktpartfileimportplugin.desktop b/plugins/partfileimport/ktpartfileimportplugin.desktop deleted file mode 100644 index e84cbaf..0000000 --- a/plugins/partfileimport/ktpartfileimportplugin.desktop +++ /dev/null @@ -1,25 +0,0 @@ -[Desktop Entry] -Name=PartialFileImportPlugin -Name[bg]=Приставка за частично импортиране на файлове -Name[de]=Teildatei-Import-Modul -Name[el]=Πρόσθετο εισαγωγής μερικής λήψης -Name[es]=Importación de ficheros parciales -Name[et]=Osalise faili impordi plugin -Name[it]=Plugin importazione file parziali -Name[nb]=Filimportmodul -Name[nds]=Importmoduul för Deeldateien -Name[nl]=Import gedeeltelijke bestanden -Name[pl]=Wtyczka importu części plików -Name[pt]=Importação de Ficheiros Parciais -Name[pt_BR]=Plugin de Importação Parcial de Arquivo -Name[sk]=PartialFileImport Plugin -Name[sr]=Прикључак за увоз недовршених фајлова -Name[sr@Latn]=Priključak za uvoz nedovršenih fajlova -Name[sv]=Insticksprogram för partiell filimport -Name[tr]=Tamamlanmamış Dosya Alma Eklentisi -Name[xx]=xxPartialFileImportPluginxx -Name[zh_CN]=部分文件导入插件 -Name[zh_TW]=PartialFileImport外掛程式 -X-TDE-ServiceTypes=KTorrent/Plugin -Type=Service -X-TDE-Library=ktpartfileimportplugin diff --git a/plugins/rssfeed/Makefile.am b/plugins/rssfeed/Makefile.am deleted file mode 100644 index e5fa2ed..0000000 --- a/plugins/rssfeed/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libktorrent $(all_includes) -METASOURCES = AUTO -kde_module_LTLIBRARIES = ktrssfeedplugin.la - - -# LD flags for the plugin -# -module says: this is a module, i.e. something you're going to dlopen -# so e.g. it has no version number like a normal shared lib would have. -ktrssfeedplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) - -# rc file containing the GUI for the plugin -# pluginsdir = $(kde_datadir)/ktrssfeedplugin -# plugins_DATA = ktrssfeedpluginui.rc - -# Install the desktop file needed to detect the plugin - -rcdir = $(kde_datadir)/ktorrent - -kde_kcfg_DATA = ktrssfeedplugin.kcfg -kde_services_DATA = ktrssfeedplugin.desktop - -noinst_HEADERS = rssfeedplugin.h rssfeedmanager.h rssfeed.h rssfilter.h \ - rssarticle.h rsslinkdownloader.h -ktrssfeedplugin_la_SOURCES = rssfeedplugin.cpp rssfeedmanager.cpp \ - rssfeedwidget.ui rssfeed.cpp rssfilter.cpp rssarticle.cpp rsslinkdownloader.cpp -ktrssfeedplugin_la_LIBADD = $(LIB_TDEIO) $(LIB_TQT) rss/librsslocal.la \ - ../../libktorrent/libktorrent.la $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEHTML) $(LIB_TDEPARTS) - -SUBDIRS = rss -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/plugins/rssfeed/ktrssfeedplugin.desktop b/plugins/rssfeed/ktrssfeedplugin.desktop deleted file mode 100644 index 99f6fb3..0000000 --- a/plugins/rssfeed/ktrssfeedplugin.desktop +++ /dev/null @@ -1,22 +0,0 @@ -[Desktop Entry] -Name=RssFeedPlugin -Name[bg]=Приставка за RssFeed -Name[de]=RSS-Nachrichtenquellen-Modul -Name[el]=Πρόσθετο ροών Rss -Name[et]=RSS-kanali plugin -Name[it]=Plugin Fonti notizie -Name[nb]=RSS-modul -Name[nds]=RSS-Moduul -Name[pl]=Wtyczka kanały RSS -Name[pt_BR]=Plugin de RssFeed -Name[sk]=RssFeed Plugin -Name[sr]=Прикључак Rss довода -Name[sr@Latn]=Priključak Rss dovoda -Name[sv]=RSS-kanalinsticksprogram -Name[tr]=RSS Besleme Eklentisi -Name[uk]=Втулок подач RSS -Name[xx]=xxRssFeedPluginxx -Name[zh_CN]=RSS 种子插件 -X-TDE-ServiceTypes=KTorrent/Plugin -Type=Service -X-TDE-Library=ktrssfeedplugin diff --git a/plugins/rssfeed/rss/Makefile.am b/plugins/rssfeed/rss/Makefile.am deleted file mode 100644 index 8053f92..0000000 --- a/plugins/rssfeed/rss/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDES = \ - -I$(top_srcdir)/src \ - $(all_includes) - -noinst_LTLIBRARIES = \ - librsslocal.la - -noinst_HEADERS = article.h document.h global.h image.h textinput.h \ - loader.h librss.h - -librsslocal_la_SOURCES = article.cpp document.cpp image.cpp textinput.cpp \ - tools_p.cpp loader.cpp - -librsslocal_la_METASOURCES = AUTO - -check_PROGRAMS = testlibrss -testlibrss_SOURCES = testlibrss.cpp -testlibrss_LDFLAGS = $(all_libraries) -testlibrss_LDADD = librsslocal.la $(LIB_TDEIO) -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/plugins/scanfolder/Makefile.am b/plugins/scanfolder/Makefile.am deleted file mode 100644 index 49ba5a7..0000000 --- a/plugins/scanfolder/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libktorrent $(all_includes) -METASOURCES = AUTO -kde_module_LTLIBRARIES = ktscanfolderplugin.la - - -# LD flags for the plugin -# -module says: this is a module, i.e. something you're going to dlopen -# so e.g. it has no version number like a normal shared lib would have. -ktscanfolderplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) - -# rc file containing the GUI for the plugin -# pluginsdir = $(kde_datadir)/ktscanfolderplugin -# plugins_DATA = ktscanfolderpluginui.rc - -# Install the desktop file needed to detect the plugin - -rcdir = $(kde_datadir)/ktorrent - -kde_kcfg_DATA = ktscanfolderplugin.kcfg -kde_services_DATA = ktscanfolderplugin.desktop - -noinst_HEADERS = scanfolderplugin.h scanfolderprefpage.h \ - scanfolderprefpagewidget.h scanfolder.h -ktscanfolderplugin_la_SOURCES = scanfolderplugin.cpp \ - scanfolderpluginsettings.kcfgc scanfolderprefpage.cpp sfprefwidgetbase.ui scanfolderprefpagewidget.cpp \ - scanfolder.cpp -ktscanfolderplugin_la_LIBADD = $(LIB_TDEPARTS) ../../libktorrent/libktorrent.la \ - $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) - - -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/plugins/scanfolder/ktscanfolderplugin.desktop b/plugins/scanfolder/ktscanfolderplugin.desktop deleted file mode 100644 index 53c7a6c..0000000 --- a/plugins/scanfolder/ktscanfolderplugin.desktop +++ /dev/null @@ -1,26 +0,0 @@ -[Desktop Entry] -Name=ScanFolderPlugin -Name[bg]=Приставка за сканиране -Name[cs]=Modul prohledávání složek -Name[da]=Plugin for mappesøgning -Name[de]=Ordner-Durchsuchen-Modul -Name[el]=Πρόσθετο σάρωσης φακέλων -Name[et]=Kataloogi uurimise plugin -Name[it]=Plugin scansione cartella -Name[nb]=Katalogundersøkingsmdoul -Name[nds]=Moduul för't Dörkieken vun Ornern -Name[nl]=Mapscanplugin -Name[pl]=Wtyczka przeszukiwania katalogów -Name[pt_BR]=Plugins de Busca -Name[sk]=ScanFolder Plugin -Name[sr]=Прикључак прегледа фасцикле -Name[sr@Latn]=Priključak pregleda fascikle -Name[sv]=Insticksprogram för katalogsökning -Name[tr]=Dizin Tarama Eklentisi -Name[uk]=Втулок сканування тек -Name[xx]=xxScanFolderPluginxx -Name[zh_CN]=扫描文件夹插件 -Name[zh_TW]=掃描資料夾外掛程式 -X-TDE-ServiceTypes=KTorrent/Plugin -Type=Service -X-TDE-Library=ktscanfolderplugin diff --git a/plugins/scheduler/Makefile.am b/plugins/scheduler/Makefile.am deleted file mode 100644 index 5b388eb..0000000 --- a/plugins/scheduler/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libktorrent $(all_includes) -METASOURCES = AUTO -kde_module_LTLIBRARIES = ktschedulerplugin.la -noinst_HEADERS = schedulerplugin.h bwscheduler.h schedulerprefpagewidget.h \ - bwsprefpagewidget.h bwswidget.h schedulerprefpage.h -ktschedulerplugin_la_SOURCES = schedulerplugin.cpp \ - schedulerpluginsettings.kcfgc bwscheduler.cpp schedulerprefpagewidget.cpp schedulerpage.ui bwspage.ui \ - bwsprefpagewidget.cpp bwswidget.cpp schedulerprefpage.cpp - -# Libs needed by the plugin -ktschedulerplugin_la_LIBADD = $(LIB_TDEHTML) $(LIB_TDEPARTS) \ - ../../libktorrent/libktorrent.la \ - $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) - -# LD flags for the plugin -# -module says: this is a module, i.e. something you're going to dlopen -# so e.g. it has no version number like a normal shared lib would have. -ktschedulerplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) - -# rc file containing the GUI for the plugin -# pluginsdir = $(kde_datadir)/ktschedulerplugin -# plugins_DATA = ktschedulerpluginui.rc - -# Install the desktop file needed to detect the plugin -kde_services_DATA = ktschedulerplugin.desktop - -kde_kcfg_DATA = ktschedulerplugin.kcfg - -kticonsdir = $(kde_datadir)/ktorrent/icons - -kticons_DATA = cell-a-0000.png cell-a-0001.png cell-a-0002.png cell-a-0003.png\ - cell-a-0004.png cell-b-0000.png cell-b-0001.png cell-b-0002.png\ - cell-b-0003.png cell-b-0004.png -rcdir = $(kde_datadir)/ktorrent -rc_DATA = ktschedulerpluginui.rc -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/plugins/scheduler/bwsprefpage.cpp b/plugins/scheduler/bwsprefpage.cpp deleted file mode 100644 index e69de29..0000000 --- a/plugins/scheduler/bwsprefpage.cpp +++ /dev/null diff --git a/plugins/scheduler/bwsprefpage.h b/plugins/scheduler/bwsprefpage.h deleted file mode 100644 index e69de29..0000000 --- a/plugins/scheduler/bwsprefpage.h +++ /dev/null diff --git a/plugins/scheduler/ktschedulerplugin.desktop b/plugins/scheduler/ktschedulerplugin.desktop deleted file mode 100644 index ea35426..0000000 --- a/plugins/scheduler/ktschedulerplugin.desktop +++ /dev/null @@ -1,26 +0,0 @@ -[Desktop Entry] -Name=SchedulerPlugin -Name[bg]=Приставка за график -Name[cs]=Modul plánování -Name[da]=Skemalægger-Plugin -Name[de]=Planer-Modul -Name[el]=Πρόσθετο προγραμματισμού -Name[et]=Ajastamisplugin -Name[it]=Plugin pianificatore -Name[nb]=Planleggermodul -Name[nds]=Planer-Moduul -Name[nl]=Plannerplugin -Name[pl]=Wtyczka planowanie transferu -Name[pt_BR]=Plugin de agendamento -Name[sk]=Scheduler Plugin -Name[sr]=Прикључак распоређивања -Name[sr@Latn]=Priključak raspoređivanja -Name[sv]=Insticksprogram för schemaläggning -Name[tr]=Zamanlayıcı Eklentisi -Name[uk]=Втулок розкладу -Name[xx]=xxSchedulerPluginxx -Name[zh_CN]=带宽规划器插件 -Name[zh_TW]=排程器外掛程式 -X-TDE-ServiceTypes=KTorrent/Plugin -Type=Service -X-TDE-Library=ktschedulerplugin diff --git a/plugins/search/Makefile.am b/plugins/search/Makefile.am deleted file mode 100644 index 9e5b312..0000000 --- a/plugins/search/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libktorrent $(all_includes) -METASOURCES = AUTO -kde_module_LTLIBRARIES = ktsearchplugin.la -noinst_HEADERS = searchplugin.h searchprefpage.h searchtab.h searchenginelist.h -ktsearchplugin_la_SOURCES = searchplugin.cpp htmlpart.cpp searchbar.ui \ - searchpref.ui searchwidget.cpp searchprefpage.cpp searchpluginsettings.kcfgc \ - searchtab.cpp searchenginelist.cpp - -# Libs needed by the plugin -ktsearchplugin_la_LIBADD = ../../libktorrent/libktorrent.la \ - $(LIB_TDEHTML) $(LIB_TDEPARTS) $(LIB_TQT) \ - $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) - -# LD flags for the plugin -# -module says: this is a module, i.e. something you're going to dlopen -# so e.g. it has no version number like a normal shared lib would have. -ktsearchplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) - -# rc file containing the GUI for the plugin -# pluginsdir = $(kde_datadir)/ktsearchplugin -# plugins_DATA = ktsearchpluginui.rc - -# Install the desktop file needed to detect the plugin -kde_services_DATA = ktsearchplugin.desktop - -kde_kcfg_DATA = ktsearchplugin.kcfg - -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/plugins/search/ktsearchplugin.desktop b/plugins/search/ktsearchplugin.desktop deleted file mode 100644 index 9feabe0..0000000 --- a/plugins/search/ktsearchplugin.desktop +++ /dev/null @@ -1,60 +0,0 @@ -[Desktop Entry] -Name=SearchPlugin -Name[bg]=Приставка за търсене -Name[br]=Lugent klask -Name[da]=SøgePlugin -Name[de]=Suche-Modul -Name[el]=Πρόσθετο αναζήτησης -Name[es]=Complemento de búsqueda -Name[et]=Otsimisplugin -Name[fa]=وصلۀ جستجو -Name[it]=Plugin di ricerca -Name[nb]=Søkemodul -Name[nds]=Söök-Moduul -Name[nl]=Zoekplugin -Name[pl]=Wtyczka wyszukiwania -Name[pt]='Plugin' de Procura -Name[pt_BR]=Plugin de Busca -Name[sk]=Vyhľadávací Plugin -Name[sr]=Прикључак претраге -Name[sr@Latn]=Priključak pretrage -Name[sv]=Sökinsticksprogram -Name[tr]=Arama Eklentisi -Name[uk]=Втулок пошуку -Name[xx]=xxSearchPluginxx -Name[zh_CN]=搜索插件 -Name[zh_TW]=搜尋外掛程式 -Comment=Search plugin for KTorrent -Comment[ar]=قابس البحث لِــ KTorrent -Comment[bg]=Приставка за търсене (KTorrent) -Comment[br]=Lugent klask evit KTorrent -Comment[ca]=Connector de cerca per a KTorrent -Comment[cs]=Vyhledávací modul pro KTorrent -Comment[da]=Søge-plugin for KTorrent -Comment[de]=Suche-Modul für KTorrent -Comment[el]=Πρόσθετο αναζήτησης για το KTorrent -Comment[es]=Complemento de búsqueda para KTorrent -Comment[et]=KTorrenti otsimisplugin -Comment[fa]=وصلۀ جستجو برای KTorrent -Comment[gl]=Plugin de procuras para KTorrent -Comment[it]=Plugin di ricerca per KTorrent -Comment[ja]=KTorrent のための検索プラグイン -Comment[ka]=ძებნის მოდული KTorrent-თვის -Comment[nb]=Søkemodul for KTorrent -Comment[nds]=Söök-Moduul för KTorrent -Comment[nl]=Zoekplugin voor KTorrent -Comment[pl]=Wtyczka wyszukiwania dla KTorrent -Comment[pt]='Plugin' de procura para o KTorrent -Comment[pt_BR]=Busca de plug-in para o KTorrent -Comment[sk]=Vyhľadávací plugin pre KTorrent -Comment[sr]=Прикључак претраге за KTorrent -Comment[sr@Latn]=Priključak pretrage za KTorrent -Comment[sv]=Sökinsticksprogram för Ktorrent -Comment[tr]=KTorrent için arama eklentisi -Comment[uk]=Втулок пошуку для KTorrent -Comment[xx]=xxSearch plugin for KTorrentxx -Comment[zh_CN]=KTorrent 的搜索插件 -Comment[zh_TW]=KTorrent 搜尋外掛程式 -X-TDE-ServiceTypes=KTorrent/Plugin -Type=Service -X-TDE-Library=ktsearchplugin diff --git a/plugins/stats/Makefile.am b/plugins/stats/Makefile.am deleted file mode 100644 index 5e73e62..0000000 --- a/plugins/stats/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDES = -I$(top_builddir)/libktorrent -I$(top_builddir)/ktorrent/libktorrent \ - -I$(srcdir)/../../libktorrent $(all_includes) - -METASOURCES = AUTO - -kde_module_LTLIBRARIES = ktstatsplugin.la - -ktstatsplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(all_libraries) -ktstatsplugin_la_SOURCES = ChartDrawerData.cpp ChartDrawer.cpp statsspdwgt.ui statsconwgt.ui StatsSpd.cpp StatsCon.cpp sprefwgt.ui statspluginsettings.kcfgc \ - StatsPluginPrefsPage.cpp StatsPluginPrefs.cpp statsplugin.cpp - -ktstatsplugin_la_LIBADD = $(LIB_TQT) ../../libktorrent/libktorrent.la - -noinst_HEADERS = ChartDrawerData.h ChartDrawer.h StatsSpd.h StatsCon.h StatsPluginPrefsPage.h StatsPluginPrefs.h statsplugin.h - -kde_services_DATA = ktstatsplugin.desktop -kde_kcfg_DATA = ktstatsplugin.kcfg -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/plugins/stats/ktstatsplugin.desktop b/plugins/stats/ktstatsplugin.desktop deleted file mode 100644 index 21a2901..0000000 --- a/plugins/stats/ktstatsplugin.desktop +++ /dev/null @@ -1,24 +0,0 @@ -[Desktop Entry] -Type=Service -Name=StatsPlugin -Name[bg]=Приставка за статистика -Name[de]=Statistik-Modul -Name[es]=Complemento de estadísticas -Name[et]=Statistikaplugin -Name[it]=Plugin statistiche -Name[nds]=Statistik-Moduul -Name[nl]=Statistiekenplugin -Name[pl]=Wtyczka statystyk -Name[pt]='Plugin' de Estatísticas -Name[pt_BR]=Plugin de Estatísticas -Name[sr]=Прикључак за статистику -Name[sr@Latn]=Priključak za statistiku -Name[sv]=Statistikinsticksprogram -Name[tr]=Arama Eklentisi -Name[uk]=Втулок статистики -Name[xx]=xxStatsPluginxx -Name[zh_CN]=统计插件 -Comment= -Comment[xx]=xxxx -X-TDE-ServiceTypes=KTorrent/Plugin -X-TDE-Library=ktstatsplugin diff --git a/plugins/upnp/Makefile.am b/plugins/upnp/Makefile.am deleted file mode 100644 index 467ebc4..0000000 --- a/plugins/upnp/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libktorrent $(all_includes) -METASOURCES = AUTO - -libktupnp_la_LDFLAGS = $(all_libraries) -noinst_LTLIBRARIES = libktupnp.la -libktupnp_la_SOURCES = soap.cpp upnpdescriptionparser.cpp upnpmcastsocket.cpp\ - upnprouter.cpp - -kde_module_LTLIBRARIES = ktupnpplugin.la -noinst_HEADERS = upnpplugin.h upnpmcastsocket.h upnprouter.h upnpprefpage.h \ - upnpprefwidget.h upnpdescriptionparser.h soap.h -ktupnpplugin_la_SOURCES = upnpplugin.cpp upnpprefpage.cpp upnpwidget.ui \ - upnpprefwidget.cpp upnppluginsettings.kcfgc - -# Libs needed by the plugin -ktupnpplugin_la_LIBADD = libktupnp.la \ - $(LIB_TDEPARTS) ../../libktorrent/libktorrent.la \ - $(LIB_TQT) \ - $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) - - - -# LD flags for the plugin -# -module says: this is a module, i.e. something you're going to dlopen -# so e.g. it has no version number like a normal shared lib would have. -ktupnpplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) - -# rc file containing the GUI for the plugin -# pluginsdir = $(kde_datadir)/ktsearchplugin -# plugins_DATA = ktsearchpluginui.rc - -# Install the desktop file needed to detect the plugin -kde_services_DATA = ktupnpplugin.desktop - -kde_kcfg_DATA = ktupnpplugin.kcfg - - -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/plugins/upnp/ktupnpplugin.desktop b/plugins/upnp/ktupnpplugin.desktop deleted file mode 100644 index ea17434..0000000 --- a/plugins/upnp/ktupnpplugin.desktop +++ /dev/null @@ -1,26 +0,0 @@ -[Desktop Entry] -Name=UPnPPlugin -Name[bg]=Приставка UPnP -Name[br]=Lugent UPnP -Name[de]=UPnP-Modul -Name[el]=Πρόσθετο UPnP -Name[es]=Complemento UPnP -Name[et]=UPnP plugin -Name[it]=Plugin UPnP -Name[nb]=UPnP-modul -Name[nds]=UPnP-Moduul -Name[nl]=UPnP-plugin -Name[pl]=Wtyczka UPnP -Name[pt]='Plugin' UPnP -Name[pt_BR]=Plugin UPnP -Name[sk]=UPnP Plugin -Name[sr]=Прикључак за UPnP -Name[sr@Latn]=Priključak za UPnP -Name[sv]=UPnP-insticksprogram -Name[tr]=UPnP Eklentisi -Name[xx]=xxUPnPPluginxx -Name[zh_CN]=UPnP 插件 -Name[zh_TW]=UPnP外掛程式 -X-TDE-ServiceTypes=KTorrent/Plugin -Type=Service -X-TDE-Library=ktupnpplugin diff --git a/plugins/webinterface/Makefile.am b/plugins/webinterface/Makefile.am deleted file mode 100644 index 1c2bf39..0000000 --- a/plugins/webinterface/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -INCLUDES = -I$(top_builddir)/libktorrent -I$(top_builddir)/ktorrent/libktorrent \ - -I$(srcdir)/../../libktorrent $(all_includes) -METASOURCES = AUTO -kde_module_LTLIBRARIES = ktwebinterfaceplugin.la -noinst_HEADERS = webinterfaceplugin.h httpserver.h php_handler.h \ - php_interface.h webinterfaceprefwidget.h webinterfaceprefpage.h httpclienthandler.h \ - httpresponseheader.h -ktwebinterfaceplugin_la_SOURCES = webinterfaceplugin.cpp httpserver.cpp \ - php_handler.cpp php_interface.cpp webinterfacepref.ui \ - webinterfacepluginsettings.kcfgc webinterfaceprefwidget.cpp webinterfaceprefpage.cpp \ - httpclienthandler.cpp httpresponseheader.cpp -# Libs needed by the plugin -ktwebinterfaceplugin_la_LIBADD = ../../libktorrent/libktorrent.la \ - $(LIB_TDEHTML) $(LIB_TDEPARTS) $(LIB_TQT) \ - $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) - -# LD flags for the plugin -# -module says: this is a module, i.e. something you're going to dlopen -# so e.g. it has no version number like a normal shared lib would have. -ktwebinterfaceplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) - -# rc file containing the GUI for the plugin -# pluginsdir = $(kde_datadir)/ktsearchplugin -# plugins_DATA = ktsearchpluginui.rc - -# Install the desktop file needed to detect the plugin -kde_services_DATA = ktwebinterfaceplugin.desktop - -kde_kcfg_DATA = ktwebinterfaceplugin.kcfg - -ktdatadir = $(kde_datadir)/ktorrent/www - -SUBDIRS = www -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/plugins/webinterface/ktwebinterfaceplugin.desktop b/plugins/webinterface/ktwebinterfaceplugin.desktop deleted file mode 100644 index aa2dfa5..0000000 --- a/plugins/webinterface/ktwebinterfaceplugin.desktop +++ /dev/null @@ -1,22 +0,0 @@ -[Desktop Entry] -Name=WebInterface -Name[bg]=Уеб интерфейс -Name[da]=Web-grænseflade -Name[de]=Web-Schnittstelle -Name[et]=Veebiliides -Name[it]=Interfaccia Web -Name[nb]=Internettgrensesnitt -Name[nds]=Nettkoppelsteed -Name[nl]=Webinterface -Name[pl]=Interfejs WWW -Name[pt]=Interface Web -Name[sr]=Веб интерфејс -Name[sr@Latn]=Veb interfejs -Name[sv]=Webb-gränssnitt -Name[tr]=Ağ Arayüzü -Name[uk]=Веб-інтерфейс -Name[xx]=xxWebInterfacexx -Name[zh_CN]=Web 界面 -X-TDE-ServiceTypes=KTorrent/Plugin -Type=Service -X-TDE-Library=ktwebinterfaceplugin diff --git a/plugins/webinterface/www/Makefile.am b/plugins/webinterface/www/Makefile.am deleted file mode 100644 index 8a92573..0000000 --- a/plugins/webinterface/www/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -METASOURCES = AUTO -SUBDIRS = default mobile coldmilk - - - diff --git a/plugins/webinterface/www/coldmilk/Makefile.am b/plugins/webinterface/www/coldmilk/Makefile.am deleted file mode 100644 index d6a5f08..0000000 --- a/plugins/webinterface/www/coldmilk/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libktorrent $(all_includes) -METASOURCES = AUTO - -ktdatadir = $(kde_datadir)/ktorrent/www/coldmilk - -ktdata_DATA = favicon.ico icon.png interface.js interface.php login.html page_update.js rest.php shutdown.php style.css - -SUBDIRS= icons diff --git a/plugins/webinterface/www/coldmilk/icons/16x16/Makefile.am b/plugins/webinterface/www/coldmilk/icons/16x16/Makefile.am deleted file mode 100644 index 7380c25..0000000 --- a/plugins/webinterface/www/coldmilk/icons/16x16/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -METASOURCES = AUTO - -ktdatadir = $(kde_datadir)/ktorrent/www/coldmilk/icons/16x16/ - -ktdata_DATA = edit_user.png high_priority.png low_priority.png normal_priority.png only_seed.png - diff --git a/plugins/webinterface/www/coldmilk/icons/22x22/Makefile.am b/plugins/webinterface/www/coldmilk/icons/22x22/Makefile.am deleted file mode 100644 index 2bd411f..0000000 --- a/plugins/webinterface/www/coldmilk/icons/22x22/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -METASOURCES = AUTO - -ktdatadir = $(kde_datadir)/ktorrent/www/coldmilk/icons/22x22/ - -ktdata_DATA = exit.png ktstart_all.png ktstop_all.png remove.png start.png stop.png - diff --git a/plugins/webinterface/www/coldmilk/icons/32x32/Makefile.am b/plugins/webinterface/www/coldmilk/icons/32x32/Makefile.am deleted file mode 100644 index a2b93df..0000000 --- a/plugins/webinterface/www/coldmilk/icons/32x32/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -METASOURCES = AUTO - -ktdatadir = $(kde_datadir)/ktorrent/www/coldmilk/icons/32x32/ - -ktdata_DATA = configure.png extender_opened.png fileopen.png folder1.png - diff --git a/plugins/webinterface/www/coldmilk/icons/48x48/Makefile.am b/plugins/webinterface/www/coldmilk/icons/48x48/Makefile.am deleted file mode 100644 index 9318a0c..0000000 --- a/plugins/webinterface/www/coldmilk/icons/48x48/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -METASOURCES = AUTO - -ktdatadir = $(kde_datadir)/ktorrent/www/coldmilk/icons/48x48/ - -ktdata_DATA = exit.png switchuser.png - diff --git a/plugins/webinterface/www/coldmilk/icons/64x64/Makefile.am b/plugins/webinterface/www/coldmilk/icons/64x64/Makefile.am deleted file mode 100644 index 3ff3ae0..0000000 --- a/plugins/webinterface/www/coldmilk/icons/64x64/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -METASOURCES = AUTO - -ktdatadir = $(kde_datadir)/ktorrent/www/coldmilk/icons/64x64/ - -ktdata_DATA = down.png folder1_man.png looknfeel.png - diff --git a/plugins/webinterface/www/coldmilk/icons/Makefile.am b/plugins/webinterface/www/coldmilk/icons/Makefile.am deleted file mode 100644 index cbe7db5..0000000 --- a/plugins/webinterface/www/coldmilk/icons/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= 16x16 22x22 32x32 48x48 64x64 diff --git a/plugins/webinterface/www/default/Makefile.am b/plugins/webinterface/www/default/Makefile.am deleted file mode 100644 index 01f09df..0000000 --- a/plugins/webinterface/www/default/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libktorrent $(all_includes) -METASOURCES = AUTO - -ktdatadir = $(kde_datadir)/ktorrent/www/default - -ktdata_DATA = details.php only_seed.png favicon.ico grad1.jpg grad2.jpg menu_bg.png \ - header_tile.png high_priority.png icon.png interface.php ktorrentwebinterfacelogo.png \ - login.html low_priority.png normal_priority.png remove.png shutdown.php start.png \ - stop.png style.css stylen.css wz_tooltip.js diff --git a/plugins/webinterface/www/mobile/Makefile.am b/plugins/webinterface/www/mobile/Makefile.am deleted file mode 100644 index 3aae8b4..0000000 --- a/plugins/webinterface/www/mobile/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libktorrent $(all_includes) -METASOURCES = AUTO - -ktdatadir = $(kde_datadir)/ktorrent/www/mobile - - - -ktdata_DATA = favicon.ico interface.php ktorrentwebinterfacelogo.png login.html remove.png start.png stop.png settings.php torrent.php diff --git a/plugins/zeroconf/Makefile.am b/plugins/zeroconf/Makefile.am deleted file mode 100644 index ba959bc..0000000 --- a/plugins/zeroconf/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -INCLUDES = -I$(top_builddir)/libktorrent -I$(top_builddir)/ktorrent/libktorrent \ - -I$(srcdir)/../../libktorrent $(all_includes) - -METASOURCES = AUTO - -if COMPILE_ZEROCONF -kde_module_LTLIBRARIES = ktzeroconfplugin.la -endif - -ktzeroconfplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(AVAHI_LIBS) $(AVAHI_TQT_LIBS) -ktzeroconfplugin_la_SOURCES = localbrowser.cpp avahiservice.cpp \ - zeroconfplugin.cpp - -ktzeroconfplugin_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_TDEUI)\ - $(LIB_TQT) ../../libktorrent/libktorrent.la - -noinst_HEADERS = zeroconfplugin.h - -kde_services_DATA = ktzeroconfplugin.desktop -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) - - diff --git a/plugins/zeroconf/ktzeroconfplugin.desktop b/plugins/zeroconf/ktzeroconfplugin.desktop deleted file mode 100644 index 2cabcc7..0000000 --- a/plugins/zeroconf/ktzeroconfplugin.desktop +++ /dev/null @@ -1,22 +0,0 @@ -[Desktop Entry] -Name=ZeroConfPlugin -Name[bg]=Приставка ZeroConf -Name[de]=ZeroConf-Modul -Name[es]=Complemento de ZeroConf -Name[et]=ZeroConfi plugin -Name[it]=Plugin ZeroConf -Name[nb]=ZeroConf-modul -Name[nds]=ZeroConf-Moduul -Name[pl]=Wtyczka ZeroConf -Name[pt]='Plugin' do ZeroConf -Name[pt_BR]=Plugin ZeroConf -Name[sr]=ZeroConf прикључак -Name[sr@Latn]=ZeroConf priključak -Name[sv]=Zeroconf-insticksprogram -Name[tr]=ZeroConf Eklentisi -Name[uk]=Втулок ZeroConf -Name[xx]=xxZeroConfPluginxx -Name[zh_CN]=ZeroConf 插件 -X-TDE-ServiceTypes=KTorrent/Plugin -Type=Service -X-TDE-Library=ktzeroconfplugin diff --git a/scripts/Makefile.am b/scripts/Makefile.am deleted file mode 100644 index 2c6a020..0000000 --- a/scripts/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -bin_SCRIPTS=ktshell diff --git a/src/CMakeL10n.txt b/src/CMakeL10n.txt new file mode 100644 index 0000000..02343e1 --- /dev/null +++ b/src/CMakeL10n.txt @@ -0,0 +1,8 @@ +##### create translation templates ############## + +tde_l10n_create_template( "messages/ktorrent" ) + +tde_l10n_create_template( + CATALOG "desktop_files/ktorrent-desktops" + SOURCES *.desktop +) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..8987cae --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,20 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${TQT_INCLUDE_DIRS} + ${TDE_INCLUDE_DIR} +) + + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### subfolders + +add_subdirectory( libktorrent ) +add_subdirectory( plugins ) +add_subdirectory( apps ) +add_subdirectory( scripts ) +add_subdirectory( utests ) diff --git a/src/apps/CMakeLists.txt b/src/apps/CMakeLists.txt new file mode 100644 index 0000000..414640a --- /dev/null +++ b/src/apps/CMakeLists.txt @@ -0,0 +1,7 @@ + +##### subfolders + +add_subdirectory( ktcachecheck ) +add_subdirectory( ktorrent ) +add_subdirectory( kttorinfo ) +add_subdirectory( ktupnptest ) diff --git a/src/apps/ktcachecheck/CMakeLists.txt b/src/apps/ktcachecheck/CMakeLists.txt new file mode 100644 index 0000000..e1f5b13 --- /dev/null +++ b/src/apps/ktcachecheck/CMakeLists.txt @@ -0,0 +1,16 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/src/libktorrent + ${CMAKE_CURRENT_BINARY_DIR} +) + + +##### ktcachecheck (executable) + +tde_add_executable( ktcachecheck AUTOMOC + SOURCES + cachecheck.cpp cachechecker.cpp singlecachechecker.cpp multicachechecker.cpp + LINK + ktorrent-shared tdecore-shared tdeui-shared tdeio-shared DCOP-shared + DESTINATION ${BIN_INSTALL_DIR} +) diff --git a/apps/ktcachecheck/cachecheck.cpp b/src/apps/ktcachecheck/cachecheck.cpp index 191ed7a..191ed7a 100644 --- a/apps/ktcachecheck/cachecheck.cpp +++ b/src/apps/ktcachecheck/cachecheck.cpp diff --git a/apps/ktcachecheck/cachechecker.cpp b/src/apps/ktcachecheck/cachechecker.cpp index 3c3b35e..3c3b35e 100644 --- a/apps/ktcachecheck/cachechecker.cpp +++ b/src/apps/ktcachecheck/cachechecker.cpp diff --git a/apps/ktcachecheck/cachechecker.h b/src/apps/ktcachecheck/cachechecker.h index 27d58ac..27d58ac 100644 --- a/apps/ktcachecheck/cachechecker.h +++ b/src/apps/ktcachecheck/cachechecker.h diff --git a/apps/ktcachecheck/multicachechecker.cpp b/src/apps/ktcachecheck/multicachechecker.cpp index 53e8fee..53e8fee 100644 --- a/apps/ktcachecheck/multicachechecker.cpp +++ b/src/apps/ktcachecheck/multicachechecker.cpp diff --git a/apps/ktcachecheck/multicachechecker.h b/src/apps/ktcachecheck/multicachechecker.h index fc57792..fc57792 100644 --- a/apps/ktcachecheck/multicachechecker.h +++ b/src/apps/ktcachecheck/multicachechecker.h diff --git a/apps/ktcachecheck/singlecachechecker.cpp b/src/apps/ktcachecheck/singlecachechecker.cpp index ab64fc3..ab64fc3 100644 --- a/apps/ktcachecheck/singlecachechecker.cpp +++ b/src/apps/ktcachecheck/singlecachechecker.cpp diff --git a/apps/ktcachecheck/singlecachechecker.h b/src/apps/ktcachecheck/singlecachechecker.h index fdec69d..fdec69d 100644 --- a/apps/ktcachecheck/singlecachechecker.h +++ b/src/apps/ktcachecheck/singlecachechecker.h diff --git a/src/apps/ktorrent/CMakeLists.txt b/src/apps/ktorrent/CMakeLists.txt new file mode 100644 index 0000000..0966c29 --- /dev/null +++ b/src/apps/ktorrent/CMakeLists.txt @@ -0,0 +1,73 @@ + +##### subfolders + +add_subdirectory( groups ) +add_subdirectory( newui ) + + +##### current folder + +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/src/libktorrent + ${CMAKE_BINARY_DIR}/src/libktorrent +) + + +##### check for memory leakage tracing + +if( WITH_MEMLEAK_TRACING ) + add_definitions(-DKT_LEAKTRACE ) +endif( ) + + +##### ktorrent (executable) + +tde_add_executable( ktorrent AUTOMOC + SOURCES + addpeerwidget.cpp addpeerwidget.h addpeerwidgetbase.ui + advancedpref.ui dcopinterface.skel downloadpref.ui fileselectdlg.cpp + fileselectdlgbase.ui generalpref.ui ipfilterwidget.cpp ipfilterwidgetbase.ui ktorrent.cpp + ktorrentapp.cpp ktorrentcore.cpp ktorrentdcop.cpp ktorrentview.cpp ktorrentviewitem.cpp + ktorrentviewmenu.cpp leaktrace.cpp main.cpp pastedialog.cpp pastedlgbase.ui pref.cpp + queuedialog.cpp queuedialog.h queuedlg.ui scandialog.cpp scandlgbase.ui + speedlimitsdlg.cpp speedlimitsdlgbase.ui torrentcreatordlg.cpp torrentcreatordlg.h + torrentcreatordlgbase.ui trayhoverpopup.cpp trayicon.cpp viewmanager.cpp filterbar.cpp + LINK + groups-static newui-static + ktorrent-shared tdecore-shared tdeui-shared tdeio-shared DCOP-shared + DESTINATION ${BIN_INSTALL_DIR} +) + + +##### other files + +install( + FILES ktorrentui.rc + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME} +) + +tde_create_translated_desktop( + SOURCE ktorrentplugin.desktop + DESTINATION ${SERVICETYPES_INSTALL_DIR} +) + +tde_create_translated_desktop( + SOURCE ktorrent.desktop + DESTINATION ${XDG_APPS_INSTALL_DIR} +) + +if( WITH_TORRENT_MIMETYPE ) + tde_create_translated_desktop( + SOURCE x-bittorrent.desktop + DESTINATION ${MIME_INSTALL_DIR}/application + ) +endif() + +tde_install_icons( ktorrent torrent DESTINATION ${SHARE_INSTALL_PREFIX}/icons ) +tde_install_icons( + ktencrypted ktinfowidget ktplugins ktprefdownloads ktqueuemanager + ktremove ktstart ktstart_all ktstop ktstop_all ktupnp + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/icons +) diff --git a/apps/ktorrent/README b/src/apps/ktorrent/README index 39de8b2..39de8b2 100644 --- a/apps/ktorrent/README +++ b/src/apps/ktorrent/README diff --git a/apps/ktorrent/addpeerwidget.cpp b/src/apps/ktorrent/addpeerwidget.cpp index 063a6a9..063a6a9 100644 --- a/apps/ktorrent/addpeerwidget.cpp +++ b/src/apps/ktorrent/addpeerwidget.cpp diff --git a/apps/ktorrent/addpeerwidget.h b/src/apps/ktorrent/addpeerwidget.h index 4ca8db8..ed394a8 100644 --- a/apps/ktorrent/addpeerwidget.h +++ b/src/apps/ktorrent/addpeerwidget.h @@ -43,7 +43,7 @@ namespace bt */ class ManualPeerSource: public kt::PeerSource { - Q_OBJECT + TQ_OBJECT public: @@ -78,7 +78,7 @@ class ManualPeerSource: public kt::PeerSource */ class AddPeerWidget: public AddPeerWidgetBase { - Q_OBJECT + TQ_OBJECT public: AddPeerWidget(kt::TorrentInterface* tc, TQWidget *parent = 0, const char *name = 0); diff --git a/apps/ktorrent/addpeerwidgetbase.ui b/src/apps/ktorrent/addpeerwidgetbase.ui index 369fabe..fbd148b 100644 --- a/apps/ktorrent/addpeerwidgetbase.ui +++ b/src/apps/ktorrent/addpeerwidgetbase.ui @@ -146,9 +146,9 @@ <tabstop>m_port</tabstop> <tabstop>btnAdd</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>btnAdd_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/apps/ktorrent/advancedpref.ui b/src/apps/ktorrent/advancedpref.ui index 0d8c387..0d8c387 100644 --- a/apps/ktorrent/advancedpref.ui +++ b/src/apps/ktorrent/advancedpref.ui diff --git a/apps/ktorrent/custom_widgets.cw b/src/apps/ktorrent/custom_widgets.cw index 9e8426d..9e8426d 100644 --- a/apps/ktorrent/custom_widgets.cw +++ b/src/apps/ktorrent/custom_widgets.cw diff --git a/apps/ktorrent/dcopinterface.h b/src/apps/ktorrent/dcopinterface.h index af00593..af00593 100644 --- a/apps/ktorrent/dcopinterface.h +++ b/src/apps/ktorrent/dcopinterface.h diff --git a/apps/ktorrent/downloadpref.ui b/src/apps/ktorrent/downloadpref.ui index 091aa6d..091aa6d 100644 --- a/apps/ktorrent/downloadpref.ui +++ b/src/apps/ktorrent/downloadpref.ui diff --git a/apps/ktorrent/fileselectdlg.cpp b/src/apps/ktorrent/fileselectdlg.cpp index 1dc1f1f..a6dec27 100644 --- a/apps/ktorrent/fileselectdlg.cpp +++ b/src/apps/ktorrent/fileselectdlg.cpp @@ -53,12 +53,12 @@ FileSelectDlg::FileSelectDlg(GroupManager* gm, bool* user, bool* start, TQWidget : FileSelectDlgBase(parent, name, modal, fl), m_gman(gm), m_user(user), m_start(start) { root = 0; - connect(m_select_all, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectAll())); - connect(m_select_none, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectNone())); - connect(m_invert_selection, TQT_SIGNAL(clicked()), this, TQT_SLOT(invertSelection())); - connect(m_ok, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); - connect(m_cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); - connect(m_downloadLocation, TQT_SIGNAL(textChanged (const TQString &)), this, TQT_SLOT(updateSizeLabels())); + connect(m_select_all, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectAll())); + connect(m_select_none, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectNone())); + connect(m_invert_selection, TQ_SIGNAL(clicked()), this, TQ_SLOT(invertSelection())); + connect(m_ok, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept())); + connect(m_cancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject())); + connect(m_downloadLocation, TQ_SIGNAL(textChanged (const TQString &)), this, TQ_SLOT(updateSizeLabels())); m_downloadLocation->setMode(KFile::Directory); } diff --git a/apps/ktorrent/fileselectdlg.h b/src/apps/ktorrent/fileselectdlg.h index 9a67482..3a941c2 100644 --- a/apps/ktorrent/fileselectdlg.h +++ b/src/apps/ktorrent/fileselectdlg.h @@ -42,7 +42,7 @@ namespace kt class FileSelectDlg : public FileSelectDlgBase, public kt::FileTreeRootListener { - Q_OBJECT + TQ_OBJECT kt::TorrentInterface* tc; diff --git a/apps/ktorrent/fileselectdlgbase.ui b/src/apps/ktorrent/fileselectdlgbase.ui index 9c27cd7..9c27cd7 100644 --- a/apps/ktorrent/fileselectdlgbase.ui +++ b/src/apps/ktorrent/fileselectdlgbase.ui diff --git a/apps/ktorrent/filterbar.cpp b/src/apps/ktorrent/filterbar.cpp index 79bf686..d83895b 100644 --- a/apps/ktorrent/filterbar.cpp +++ b/src/apps/ktorrent/filterbar.cpp @@ -46,7 +46,7 @@ FilterBar::FilterBar(TQWidget *parent, const char *name) : layout->addSpacing(gap); m_close = new TDEToolBarButton("window-close",0,this); - connect(m_close,TQT_SIGNAL(clicked()),this,TQT_SLOT(hide())); + connect(m_close,TQ_SIGNAL(clicked()),this,TQ_SLOT(hide())); layout->addWidget(m_close); m_filter = new TQLabel(i18n("Find:"), this); @@ -67,9 +67,9 @@ FilterBar::FilterBar(TQWidget *parent, const char *name) : layout->addWidget(m_case_sensitive); layout->addItem(new TQSpacerItem(10,10,TQSizePolicy::Expanding)); - connect(m_filterInput, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotChangeFilter(const TQString&))); - connect(m_clear, TQT_SIGNAL(clicked()), m_filterInput, TQT_SLOT(clear())); + connect(m_filterInput, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotChangeFilter(const TQString&))); + connect(m_clear, TQ_SIGNAL(clicked()), m_filterInput, TQ_SLOT(clear())); } FilterBar::~FilterBar() diff --git a/apps/ktorrent/filterbar.h b/src/apps/ktorrent/filterbar.h index 5164587..151fa73 100644 --- a/apps/ktorrent/filterbar.h +++ b/src/apps/ktorrent/filterbar.h @@ -41,7 +41,7 @@ namespace kt */ class FilterBar : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/apps/ktorrent/generalpref.ui b/src/apps/ktorrent/generalpref.ui index 452c1df..452c1df 100644 --- a/apps/ktorrent/generalpref.ui +++ b/src/apps/ktorrent/generalpref.ui diff --git a/src/apps/ktorrent/groups/CMakeLists.txt b/src/apps/ktorrent/groups/CMakeLists.txt new file mode 100644 index 0000000..9f7b273 --- /dev/null +++ b/src/apps/ktorrent/groups/CMakeLists.txt @@ -0,0 +1,16 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/src/libktorrent + ${CMAKE_CURRENT_BINARY_DIR} +) + + +##### groups library (static) + +tde_add_library( groups STATIC_PIC AUTOMOC + SOURCES + activedownloadsgroup.cpp activegroup.cpp groupview.cpp useruploadsgroup.cpp + activeuploadsgroup.cpp allgroup.cpp downloadgroup.cpp group.cpp groupmanager.cpp + inactivedownloadsgroup.cpp inactivegroup.cpp inactiveuploadsgroup.cpp queueddownloadsgroup.cpp + queueduploadsgroup.cpp torrentdrag.cpp torrentgroup.cpp uploadgroup.cpp userdownloadsgroup.cpp +) diff --git a/apps/ktorrent/groups/activedownloadsgroup.cpp b/src/apps/ktorrent/groups/activedownloadsgroup.cpp index a260f5a..a260f5a 100644 --- a/apps/ktorrent/groups/activedownloadsgroup.cpp +++ b/src/apps/ktorrent/groups/activedownloadsgroup.cpp diff --git a/apps/ktorrent/groups/activedownloadsgroup.h b/src/apps/ktorrent/groups/activedownloadsgroup.h index de62493..de62493 100644 --- a/apps/ktorrent/groups/activedownloadsgroup.h +++ b/src/apps/ktorrent/groups/activedownloadsgroup.h diff --git a/apps/ktorrent/groups/activegroup.cpp b/src/apps/ktorrent/groups/activegroup.cpp index 7a5e640..7a5e640 100644 --- a/apps/ktorrent/groups/activegroup.cpp +++ b/src/apps/ktorrent/groups/activegroup.cpp diff --git a/apps/ktorrent/groups/activegroup.h b/src/apps/ktorrent/groups/activegroup.h index 73e2aef..73e2aef 100644 --- a/apps/ktorrent/groups/activegroup.h +++ b/src/apps/ktorrent/groups/activegroup.h diff --git a/apps/ktorrent/groups/activeuploadsgroup.cpp b/src/apps/ktorrent/groups/activeuploadsgroup.cpp index 6415eb9..6415eb9 100644 --- a/apps/ktorrent/groups/activeuploadsgroup.cpp +++ b/src/apps/ktorrent/groups/activeuploadsgroup.cpp diff --git a/apps/ktorrent/groups/activeuploadsgroup.h b/src/apps/ktorrent/groups/activeuploadsgroup.h index 02fd468..02fd468 100644 --- a/apps/ktorrent/groups/activeuploadsgroup.h +++ b/src/apps/ktorrent/groups/activeuploadsgroup.h diff --git a/apps/ktorrent/groups/allgroup.cpp b/src/apps/ktorrent/groups/allgroup.cpp index 6b8ffb5..6b8ffb5 100644 --- a/apps/ktorrent/groups/allgroup.cpp +++ b/src/apps/ktorrent/groups/allgroup.cpp diff --git a/apps/ktorrent/groups/allgroup.h b/src/apps/ktorrent/groups/allgroup.h index 399691b..399691b 100644 --- a/apps/ktorrent/groups/allgroup.h +++ b/src/apps/ktorrent/groups/allgroup.h diff --git a/apps/ktorrent/groups/downloadgroup.cpp b/src/apps/ktorrent/groups/downloadgroup.cpp index 2dfcf0d..2dfcf0d 100644 --- a/apps/ktorrent/groups/downloadgroup.cpp +++ b/src/apps/ktorrent/groups/downloadgroup.cpp diff --git a/apps/ktorrent/groups/downloadgroup.h b/src/apps/ktorrent/groups/downloadgroup.h index 959f74b..959f74b 100644 --- a/apps/ktorrent/groups/downloadgroup.h +++ b/src/apps/ktorrent/groups/downloadgroup.h diff --git a/apps/ktorrent/groups/group.cpp b/src/apps/ktorrent/groups/group.cpp index 7a3cbf2..7a3cbf2 100644 --- a/apps/ktorrent/groups/group.cpp +++ b/src/apps/ktorrent/groups/group.cpp diff --git a/apps/ktorrent/groups/group.h b/src/apps/ktorrent/groups/group.h index 9f4775d..9f4775d 100644 --- a/apps/ktorrent/groups/group.h +++ b/src/apps/ktorrent/groups/group.h diff --git a/apps/ktorrent/groups/groupmanager.cpp b/src/apps/ktorrent/groups/groupmanager.cpp index 6cfd193..6cfd193 100644 --- a/apps/ktorrent/groups/groupmanager.cpp +++ b/src/apps/ktorrent/groups/groupmanager.cpp diff --git a/apps/ktorrent/groups/groupmanager.h b/src/apps/ktorrent/groups/groupmanager.h index 5c5491e..a2fa4fd 100644 --- a/apps/ktorrent/groups/groupmanager.h +++ b/src/apps/ktorrent/groups/groupmanager.h @@ -23,6 +23,7 @@ #include <tqstring.h> #include <tdelocale.h> #include <util/ptrmap.h> +#include <libktorrent_export.h> namespace kt @@ -35,7 +36,7 @@ namespace kt * * Manages all user created groups and the standard groups. */ - class GroupManager : public bt::PtrMap<TQString,Group> + class LIBKTORRENT_EXPORT GroupManager : public bt::PtrMap<TQString,Group> { bt::PtrMap<TQString,Group> default_groups; diff --git a/apps/ktorrent/groups/groupview.cpp b/src/apps/ktorrent/groups/groupview.cpp index 25cf9f2..eeef28b 100644 --- a/apps/ktorrent/groups/groupview.cpp +++ b/src/apps/ktorrent/groups/groupview.cpp @@ -24,7 +24,7 @@ #include <tdeaction.h> #include <tdemessagebox.h> #include <kinputdialog.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdepopupmenu.h> #include <tqheader.h> #include <util/log.h> @@ -80,11 +80,11 @@ namespace kt current = gman->allGroup(); - connect(this,TQT_SIGNAL(clicked(TQListViewItem*)),this,TQT_SLOT(onExecuted( TQListViewItem* ))); - connect(this,TQT_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint & )), - this,TQT_SLOT(showContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ))); - connect(this,TQT_SIGNAL(dropped(TQDropEvent*,TQListViewItem*)), - this,TQT_SLOT(onDropped( TQDropEvent*, TQListViewItem* ))); + connect(this,TQ_SIGNAL(clicked(TQListViewItem*)),this,TQ_SLOT(onExecuted( TQListViewItem* ))); + connect(this,TQ_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint & )), + this,TQ_SLOT(showContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ))); + connect(this,TQ_SIGNAL(dropped(TQDropEvent*,TQListViewItem*)), + this,TQ_SLOT(onDropped( TQDropEvent*, TQListViewItem* ))); current_item = 0; menu = 0; @@ -136,16 +136,16 @@ namespace kt menu = new TDEPopupMenu(this); new_group = new TDEAction(i18n("New Group"),"document-new",0, - TQT_TQOBJECT(this), TQT_SLOT(addGroup()),col, "New Group"); + this, TQ_SLOT(addGroup()),col, "New Group"); edit_group = new TDEAction(i18n("Edit Name"),"edit",0, - TQT_TQOBJECT(this), TQT_SLOT(editGroupName()),col,"Edit Group Name"); + this, TQ_SLOT(editGroupName()),col,"Edit Group Name"); remove_group = new TDEAction(i18n("Remove Group"),"remove",0, - TQT_TQOBJECT(this), TQT_SLOT(removeGroup()),col,"Remove Group"); + this, TQ_SLOT(removeGroup()),col,"Remove Group"); open_in_new_tab = new TDEAction(i18n("Open Tab"),"document-open",0, - TQT_TQOBJECT(this) ,TQT_SLOT(openView()),col,"Open Tab"); + this ,TQ_SLOT(openView()),col,"Open Tab"); open_in_new_tab->plug(menu); menu->insertSeparator(); diff --git a/apps/ktorrent/groups/groupview.h b/src/apps/ktorrent/groups/groupview.h index 5b5d053..00a47ed 100644 --- a/apps/ktorrent/groups/groupview.h +++ b/src/apps/ktorrent/groups/groupview.h @@ -52,7 +52,7 @@ namespace kt */ class GroupView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: GroupView(ViewManager* view,TDEActionCollection* col,TQWidget *parent = 0, const char *name = 0); diff --git a/apps/ktorrent/groups/inactivedownloadsgroup.cpp b/src/apps/ktorrent/groups/inactivedownloadsgroup.cpp index c6b37bc..c6b37bc 100644 --- a/apps/ktorrent/groups/inactivedownloadsgroup.cpp +++ b/src/apps/ktorrent/groups/inactivedownloadsgroup.cpp diff --git a/apps/ktorrent/groups/inactivedownloadsgroup.h b/src/apps/ktorrent/groups/inactivedownloadsgroup.h index 4b80ca6..4b80ca6 100644 --- a/apps/ktorrent/groups/inactivedownloadsgroup.h +++ b/src/apps/ktorrent/groups/inactivedownloadsgroup.h diff --git a/apps/ktorrent/groups/inactivegroup.cpp b/src/apps/ktorrent/groups/inactivegroup.cpp index 326436f..326436f 100644 --- a/apps/ktorrent/groups/inactivegroup.cpp +++ b/src/apps/ktorrent/groups/inactivegroup.cpp diff --git a/apps/ktorrent/groups/inactivegroup.h b/src/apps/ktorrent/groups/inactivegroup.h index 027138f..027138f 100644 --- a/apps/ktorrent/groups/inactivegroup.h +++ b/src/apps/ktorrent/groups/inactivegroup.h diff --git a/apps/ktorrent/groups/inactiveuploadsgroup.cpp b/src/apps/ktorrent/groups/inactiveuploadsgroup.cpp index 967dc9c..967dc9c 100644 --- a/apps/ktorrent/groups/inactiveuploadsgroup.cpp +++ b/src/apps/ktorrent/groups/inactiveuploadsgroup.cpp diff --git a/apps/ktorrent/groups/inactiveuploadsgroup.h b/src/apps/ktorrent/groups/inactiveuploadsgroup.h index 78e1840..78e1840 100644 --- a/apps/ktorrent/groups/inactiveuploadsgroup.h +++ b/src/apps/ktorrent/groups/inactiveuploadsgroup.h diff --git a/apps/ktorrent/groups/queueddownloadsgroup.cpp b/src/apps/ktorrent/groups/queueddownloadsgroup.cpp index 36fab9f..36fab9f 100644 --- a/apps/ktorrent/groups/queueddownloadsgroup.cpp +++ b/src/apps/ktorrent/groups/queueddownloadsgroup.cpp diff --git a/apps/ktorrent/groups/queueddownloadsgroup.h b/src/apps/ktorrent/groups/queueddownloadsgroup.h index 019a69c..019a69c 100644 --- a/apps/ktorrent/groups/queueddownloadsgroup.h +++ b/src/apps/ktorrent/groups/queueddownloadsgroup.h diff --git a/apps/ktorrent/groups/queueduploadsgroup.cpp b/src/apps/ktorrent/groups/queueduploadsgroup.cpp index c51ab42..c51ab42 100644 --- a/apps/ktorrent/groups/queueduploadsgroup.cpp +++ b/src/apps/ktorrent/groups/queueduploadsgroup.cpp diff --git a/apps/ktorrent/groups/queueduploadsgroup.h b/src/apps/ktorrent/groups/queueduploadsgroup.h index 601e02f..601e02f 100644 --- a/apps/ktorrent/groups/queueduploadsgroup.h +++ b/src/apps/ktorrent/groups/queueduploadsgroup.h diff --git a/apps/ktorrent/groups/torrentdrag.cpp b/src/apps/ktorrent/groups/torrentdrag.cpp index c7296fe..c7296fe 100644 --- a/apps/ktorrent/groups/torrentdrag.cpp +++ b/src/apps/ktorrent/groups/torrentdrag.cpp diff --git a/apps/ktorrent/groups/torrentdrag.h b/src/apps/ktorrent/groups/torrentdrag.h index b7eeebd..6943d18 100644 --- a/apps/ktorrent/groups/torrentdrag.h +++ b/src/apps/ktorrent/groups/torrentdrag.h @@ -31,7 +31,7 @@ namespace kt */ class TorrentDrag : public TQStoredDrag { - Q_OBJECT + TQ_OBJECT public: TorrentDrag(TQWidget* src,const char *name = 0); diff --git a/apps/ktorrent/groups/torrentgroup.cpp b/src/apps/ktorrent/groups/torrentgroup.cpp index d44b744..d44b744 100644 --- a/apps/ktorrent/groups/torrentgroup.cpp +++ b/src/apps/ktorrent/groups/torrentgroup.cpp diff --git a/apps/ktorrent/groups/torrentgroup.h b/src/apps/ktorrent/groups/torrentgroup.h index 14f1b37..432cffb 100644 --- a/apps/ktorrent/groups/torrentgroup.h +++ b/src/apps/ktorrent/groups/torrentgroup.h @@ -23,6 +23,7 @@ #include <set> #include <group.h> #include <util/sha1hash.h> +#include <libktorrent_export.h> namespace kt @@ -32,7 +33,7 @@ namespace kt /** @author Joris Guisson <joris.guisson@gmail.com> */ - class TorrentGroup : public Group + class LIBKTORRENT_EXPORT TorrentGroup : public Group { std::set<TorrentInterface*> torrents; std::set<bt::SHA1Hash> hashes; diff --git a/apps/ktorrent/groups/uploadgroup.cpp b/src/apps/ktorrent/groups/uploadgroup.cpp index 3a320b5..3a320b5 100644 --- a/apps/ktorrent/groups/uploadgroup.cpp +++ b/src/apps/ktorrent/groups/uploadgroup.cpp diff --git a/apps/ktorrent/groups/uploadgroup.h b/src/apps/ktorrent/groups/uploadgroup.h index f90a5bd..f90a5bd 100644 --- a/apps/ktorrent/groups/uploadgroup.h +++ b/src/apps/ktorrent/groups/uploadgroup.h diff --git a/apps/ktorrent/groups/userdownloadsgroup.cpp b/src/apps/ktorrent/groups/userdownloadsgroup.cpp index ff1b13b..ff1b13b 100644 --- a/apps/ktorrent/groups/userdownloadsgroup.cpp +++ b/src/apps/ktorrent/groups/userdownloadsgroup.cpp diff --git a/apps/ktorrent/groups/userdownloadsgroup.h b/src/apps/ktorrent/groups/userdownloadsgroup.h index a77e7ac..a77e7ac 100644 --- a/apps/ktorrent/groups/userdownloadsgroup.h +++ b/src/apps/ktorrent/groups/userdownloadsgroup.h diff --git a/apps/ktorrent/groups/useruploadsgroup.cpp b/src/apps/ktorrent/groups/useruploadsgroup.cpp index f8c9d96..f8c9d96 100644 --- a/apps/ktorrent/groups/useruploadsgroup.cpp +++ b/src/apps/ktorrent/groups/useruploadsgroup.cpp diff --git a/apps/ktorrent/groups/useruploadsgroup.h b/src/apps/ktorrent/groups/useruploadsgroup.h index 9286c88..9286c88 100644 --- a/apps/ktorrent/groups/useruploadsgroup.h +++ b/src/apps/ktorrent/groups/useruploadsgroup.h diff --git a/apps/ktorrent/hi128-app-ktorrent.png b/src/apps/ktorrent/hi128-app-ktorrent.png Binary files differindex fbe2294..fbe2294 100644 --- a/apps/ktorrent/hi128-app-ktorrent.png +++ b/src/apps/ktorrent/hi128-app-ktorrent.png diff --git a/apps/ktorrent/hi128-mime-torrent.png b/src/apps/ktorrent/hi128-mime-torrent.png Binary files differindex f8ee4f1..f8ee4f1 100644 --- a/apps/ktorrent/hi128-mime-torrent.png +++ b/src/apps/ktorrent/hi128-mime-torrent.png diff --git a/apps/ktorrent/hi16-app-ktorrent.png b/src/apps/ktorrent/hi16-app-ktorrent.png Binary files differindex 6956852..6956852 100644 --- a/apps/ktorrent/hi16-app-ktorrent.png +++ b/src/apps/ktorrent/hi16-app-ktorrent.png diff --git a/apps/ktorrent/hi16-mime-torrent.png b/src/apps/ktorrent/hi16-mime-torrent.png Binary files differindex 36c11bf..36c11bf 100644 --- a/apps/ktorrent/hi16-mime-torrent.png +++ b/src/apps/ktorrent/hi16-mime-torrent.png diff --git a/apps/ktorrent/hi22-action-ktencrypted.png b/src/apps/ktorrent/hi22-action-ktencrypted.png Binary files differindex cb66fb9..cb66fb9 100644 --- a/apps/ktorrent/hi22-action-ktencrypted.png +++ b/src/apps/ktorrent/hi22-action-ktencrypted.png diff --git a/apps/ktorrent/hi22-action-ktremove.png b/src/apps/ktorrent/hi22-action-ktremove.png Binary files differindex 7df1928..7df1928 100644 --- a/apps/ktorrent/hi22-action-ktremove.png +++ b/src/apps/ktorrent/hi22-action-ktremove.png diff --git a/apps/ktorrent/hi22-action-ktstart.png b/src/apps/ktorrent/hi22-action-ktstart.png Binary files differindex a55e49c..a55e49c 100644 --- a/apps/ktorrent/hi22-action-ktstart.png +++ b/src/apps/ktorrent/hi22-action-ktstart.png diff --git a/apps/ktorrent/hi22-action-ktstart_all.png b/src/apps/ktorrent/hi22-action-ktstart_all.png Binary files differindex f46ed84..f46ed84 100644 --- a/apps/ktorrent/hi22-action-ktstart_all.png +++ b/src/apps/ktorrent/hi22-action-ktstart_all.png diff --git a/apps/ktorrent/hi22-action-ktstop.png b/src/apps/ktorrent/hi22-action-ktstop.png Binary files differindex 9c464de..9c464de 100644 --- a/apps/ktorrent/hi22-action-ktstop.png +++ b/src/apps/ktorrent/hi22-action-ktstop.png diff --git a/apps/ktorrent/hi22-action-ktstop_all.png b/src/apps/ktorrent/hi22-action-ktstop_all.png Binary files differindex 73b548b..73b548b 100644 --- a/apps/ktorrent/hi22-action-ktstop_all.png +++ b/src/apps/ktorrent/hi22-action-ktstop_all.png diff --git a/apps/ktorrent/hi22-app-ktorrent.png b/src/apps/ktorrent/hi22-app-ktorrent.png Binary files differindex 0b04e49..0b04e49 100644 --- a/apps/ktorrent/hi22-app-ktorrent.png +++ b/src/apps/ktorrent/hi22-app-ktorrent.png diff --git a/apps/ktorrent/hi22-mime-torrent.png b/src/apps/ktorrent/hi22-mime-torrent.png Binary files differindex 5e28465..5e28465 100644 --- a/apps/ktorrent/hi22-mime-torrent.png +++ b/src/apps/ktorrent/hi22-mime-torrent.png diff --git a/apps/ktorrent/hi32-app-ktorrent.png b/src/apps/ktorrent/hi32-app-ktorrent.png Binary files differindex b074bed..b074bed 100644 --- a/apps/ktorrent/hi32-app-ktorrent.png +++ b/src/apps/ktorrent/hi32-app-ktorrent.png diff --git a/apps/ktorrent/hi32-mime-torrent.png b/src/apps/ktorrent/hi32-mime-torrent.png Binary files differindex dbaca97..dbaca97 100644 --- a/apps/ktorrent/hi32-mime-torrent.png +++ b/src/apps/ktorrent/hi32-mime-torrent.png diff --git a/apps/ktorrent/hi48-action-ktplugins.png b/src/apps/ktorrent/hi48-action-ktplugins.png Binary files differindex 936fd6a..936fd6a 100644 --- a/apps/ktorrent/hi48-action-ktplugins.png +++ b/src/apps/ktorrent/hi48-action-ktplugins.png diff --git a/apps/ktorrent/hi48-app-ktorrent.png b/src/apps/ktorrent/hi48-app-ktorrent.png Binary files differindex f2c81eb..f2c81eb 100644 --- a/apps/ktorrent/hi48-app-ktorrent.png +++ b/src/apps/ktorrent/hi48-app-ktorrent.png diff --git a/apps/ktorrent/hi48-mime-torrent.png b/src/apps/ktorrent/hi48-mime-torrent.png Binary files differindex 95b3c0d..95b3c0d 100644 --- a/apps/ktorrent/hi48-mime-torrent.png +++ b/src/apps/ktorrent/hi48-mime-torrent.png diff --git a/apps/ktorrent/hi64-action-ktinfowidget.png b/src/apps/ktorrent/hi64-action-ktinfowidget.png Binary files differindex 703696d..703696d 100644 --- a/apps/ktorrent/hi64-action-ktinfowidget.png +++ b/src/apps/ktorrent/hi64-action-ktinfowidget.png diff --git a/apps/ktorrent/hi64-action-ktqueuemanager.png b/src/apps/ktorrent/hi64-action-ktqueuemanager.png Binary files differindex 7e21b70..7e21b70 100644 --- a/apps/ktorrent/hi64-action-ktqueuemanager.png +++ b/src/apps/ktorrent/hi64-action-ktqueuemanager.png diff --git a/apps/ktorrent/hi64-action-ktupnp.png b/src/apps/ktorrent/hi64-action-ktupnp.png Binary files differindex 2c7df7d..2c7df7d 100644 --- a/apps/ktorrent/hi64-action-ktupnp.png +++ b/src/apps/ktorrent/hi64-action-ktupnp.png diff --git a/apps/ktorrent/hi64-app-ktorrent.png b/src/apps/ktorrent/hi64-app-ktorrent.png Binary files differindex 453488b..453488b 100644 --- a/apps/ktorrent/hi64-app-ktorrent.png +++ b/src/apps/ktorrent/hi64-app-ktorrent.png diff --git a/apps/ktorrent/hi64-filesys-ktprefdownloads.png b/src/apps/ktorrent/hi64-filesys-ktprefdownloads.png Binary files differindex 8efc3d8..8efc3d8 100644 --- a/apps/ktorrent/hi64-filesys-ktprefdownloads.png +++ b/src/apps/ktorrent/hi64-filesys-ktprefdownloads.png diff --git a/apps/ktorrent/hi64-mime-torrent.png b/src/apps/ktorrent/hi64-mime-torrent.png Binary files differindex 2e7f063..2e7f063 100644 --- a/apps/ktorrent/hi64-mime-torrent.png +++ b/src/apps/ktorrent/hi64-mime-torrent.png diff --git a/apps/ktorrent/hisc-app-ktorrent.svgz b/src/apps/ktorrent/hisc-app-ktorrent.svgz Binary files differindex 3d068d8..3d068d8 100644 --- a/apps/ktorrent/hisc-app-ktorrent.svgz +++ b/src/apps/ktorrent/hisc-app-ktorrent.svgz diff --git a/apps/ktorrent/hisc-mime-torrent.svgz b/src/apps/ktorrent/hisc-mime-torrent.svgz Binary files differindex beb7c28..beb7c28 100644 --- a/apps/ktorrent/hisc-mime-torrent.svgz +++ b/src/apps/ktorrent/hisc-mime-torrent.svgz diff --git a/apps/ktorrent/ipfilterwidget.cpp b/src/apps/ktorrent/ipfilterwidget.cpp index 22c77f7..22c77f7 100644 --- a/apps/ktorrent/ipfilterwidget.cpp +++ b/src/apps/ktorrent/ipfilterwidget.cpp diff --git a/apps/ktorrent/ipfilterwidget.h b/src/apps/ktorrent/ipfilterwidget.h index 8863b1a..d8a49e1 100644 --- a/apps/ktorrent/ipfilterwidget.h +++ b/src/apps/ktorrent/ipfilterwidget.h @@ -29,7 +29,7 @@ */ class IPFilterWidget: public BlacklistWidgetBase { - Q_OBJECT + TQ_OBJECT public: IPFilterWidget(TQWidget *parent = 0, const char *name = 0); diff --git a/apps/ktorrent/ipfilterwidgetbase.ui b/src/apps/ktorrent/ipfilterwidgetbase.ui index 3c8478c..6ef38e1 100644 --- a/apps/ktorrent/ipfilterwidgetbase.ui +++ b/src/apps/ktorrent/ipfilterwidgetbase.ui @@ -338,7 +338,7 @@ <tabstop>peerIP</tabstop> <tabstop>btnAdd</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>btnAdd_clicked()</slot> <slot>btnRemove_clicked()</slot> <slot>btnClear_clicked()</slot> @@ -346,7 +346,7 @@ <slot>btnSave_clicked()</slot> <slot>btnOk_clicked()</slot> <slot>btnApply_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/apps/ktorrent/ktorrent.cpp b/src/apps/ktorrent/ktorrent.cpp index 02df83a..432d481 100644 --- a/apps/ktorrent/ktorrent.cpp +++ b/src/apps/ktorrent/ktorrent.cpp @@ -37,7 +37,7 @@ #include <kstatusbar.h> #include <kkeydialog.h> #include <tdeaccel.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeio/netaccess.h> #include <tdefiledialog.h> #include <tdeconfig.h> @@ -117,11 +117,11 @@ KTorrent::KTorrent() { setHidden(true); //setToolviewStyle(KMdi::TextAndIcon); - connect(this,TQT_SIGNAL(widgetChanged(TQWidget*)),this,TQT_SLOT(currentTabChanged(TQWidget*))); + connect(this,TQ_SIGNAL(widgetChanged(TQWidget*)),this,TQ_SLOT(currentTabChanged(TQWidget*))); - m_view_man = new ViewManager(TQT_TQOBJECT(this)); + m_view_man = new ViewManager(this); m_group_view = new kt::GroupView(m_view_man,actionCollection()); - connect(m_group_view,TQT_SIGNAL(openNewTab(kt::Group*)),this,TQT_SLOT(openView(kt::Group*))); + connect(m_group_view,TQ_SIGNAL(openNewTab(kt::Group*)),this,TQ_SLOT(openView(kt::Group*))); m_pref = new KTorrentPreferences(*this); @@ -137,26 +137,26 @@ KTorrent::KTorrent() TQToolButton* tb = new TQToolButton(m_activeTabWidget); tb->setIconSet(SmallIcon("tab_new")); tb->adjustSize(); - connect(tb,TQT_SIGNAL(clicked()),this,TQT_SLOT(openDefaultView())); + connect(tb,TQ_SIGNAL(clicked()),this,TQ_SLOT(openDefaultView())); m_activeTabWidget->setCornerWidget(tb, TopLeft); - connect(m_group_view,TQT_SIGNAL(currentGroupChanged( kt::Group* )), - this,TQT_SLOT(groupChanged(kt::Group*))); + connect(m_group_view,TQ_SIGNAL(currentGroupChanged( kt::Group* )), + this,TQ_SLOT(groupChanged(kt::Group*))); - connect(m_group_view,TQT_SIGNAL(groupRenamed(kt::Group*)), - this,TQT_SLOT(groupRenamed(kt::Group*))); + connect(m_group_view,TQ_SIGNAL(groupRenamed(kt::Group*)), + this,TQ_SLOT(groupRenamed(kt::Group*))); - connect(m_group_view,TQT_SIGNAL(groupRemoved(kt::Group*)), - this,TQT_SLOT(groupRemoved(kt::Group*))); + connect(m_group_view,TQ_SIGNAL(groupRemoved(kt::Group*)), + this,TQ_SLOT(groupRemoved(kt::Group*))); - connect(m_core,TQT_SIGNAL(torrentAdded(kt::TorrentInterface* )), - m_view_man,TQT_SLOT(addTorrent(kt::TorrentInterface* ))); + connect(m_core,TQ_SIGNAL(torrentAdded(kt::TorrentInterface* )), + m_view_man,TQ_SLOT(addTorrent(kt::TorrentInterface* ))); - connect(m_core,TQT_SIGNAL(torrentRemoved(kt::TorrentInterface* )), - m_view_man,TQT_SLOT(removeTorrent(kt::TorrentInterface* ))); + connect(m_core,TQ_SIGNAL(torrentRemoved(kt::TorrentInterface* )), + m_view_man,TQ_SLOT(removeTorrent(kt::TorrentInterface* ))); - connect(m_core, TQT_SIGNAL(torrentRemoved( kt::TorrentInterface* )), - m_group_view, TQT_SLOT(onTorrentRemoved( kt::TorrentInterface* ))); + connect(m_core, TQ_SIGNAL(torrentRemoved( kt::TorrentInterface* )), + m_group_view, TQ_SLOT(onTorrentRemoved( kt::TorrentInterface* ))); m_statusInfo = new KSqueezedTextLabel(this); m_statusSpeed = new TQLabel(this); @@ -191,7 +191,7 @@ KTorrent::KTorrent() m_core->loadTorrents(); m_core->loadPlugins(); - connect(&m_gui_update_timer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(updatedStats())); + connect(&m_gui_update_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updatedStats())); //Apply GUI update interval int val = 500; switch(Settings::guiUpdateInterval()) @@ -243,7 +243,7 @@ KTorrent::KTorrent() m_statusbarAction->setChecked(!statusbar_hidden); MaximizeLimits(); - connect(&m_status_msg_expire,TQT_SIGNAL(timeout()),this,TQT_SLOT(statusBarMsgExpired())); + connect(&m_status_msg_expire,TQ_SIGNAL(timeout()),this,TQ_SLOT(statusBarMsgExpired())); m_view_man->updateActions(); } @@ -270,36 +270,36 @@ void KTorrent::openView(kt::Group* g) addTabPage(v,g->groupIcon(),v->caption(),m_view_man); - connect(v,TQT_SIGNAL(currentChanged(kt::TorrentInterface* )), - this,TQT_SLOT(currentTorrentChanged(kt::TorrentInterface* ))); + connect(v,TQ_SIGNAL(currentChanged(kt::TorrentInterface* )), + this,TQ_SLOT(currentTorrentChanged(kt::TorrentInterface* ))); - connect(v,TQT_SIGNAL(wantToRemove(kt::TorrentInterface*,bool )), - m_core,TQT_SLOT(remove(kt::TorrentInterface*,bool ))); + connect(v,TQ_SIGNAL(wantToRemove(kt::TorrentInterface*,bool )), + m_core,TQ_SLOT(remove(kt::TorrentInterface*,bool ))); - connect(v->listView(),TQT_SIGNAL(dropped(TQDropEvent*,TQListViewItem*)), - this,TQT_SLOT(urlDropped(TQDropEvent*,TQListViewItem*))); + connect(v->listView(),TQ_SIGNAL(dropped(TQDropEvent*,TQListViewItem*)), + this,TQ_SLOT(urlDropped(TQDropEvent*,TQListViewItem*))); - connect(v,TQT_SIGNAL(wantToStart( kt::TorrentInterface* )), - m_core,TQT_SLOT(start( kt::TorrentInterface* ))); + connect(v,TQ_SIGNAL(wantToStart( kt::TorrentInterface* )), + m_core,TQ_SLOT(start( kt::TorrentInterface* ))); - connect(v,TQT_SIGNAL(wantToStop( kt::TorrentInterface*, bool )), - m_core,TQT_SLOT(stop( kt::TorrentInterface*, bool ))); + connect(v,TQ_SIGNAL(wantToStop( kt::TorrentInterface*, bool )), + m_core,TQ_SLOT(stop( kt::TorrentInterface*, bool ))); - connect(v,TQT_SIGNAL(needsDataCheck( kt::TorrentInterface* )), - m_core,TQT_SLOT(doDataCheck( kt::TorrentInterface* ))); + connect(v,TQ_SIGNAL(needsDataCheck( kt::TorrentInterface* )), + m_core,TQ_SLOT(doDataCheck( kt::TorrentInterface* ))); - connect(v,TQT_SIGNAL(updateActions( int )), - this,TQT_SLOT(onUpdateActions( int ))); + connect(v,TQ_SIGNAL(updateActions( int )), + this,TQ_SLOT(onUpdateActions( int ))); //connect Core queue() with queue() from KTView. - connect(v, TQT_SIGNAL(queue( kt::TorrentInterface* )), - m_core, TQT_SLOT(queue( kt::TorrentInterface* ))); + connect(v, TQ_SIGNAL(queue( kt::TorrentInterface* )), + m_core, TQ_SLOT(queue( kt::TorrentInterface* ))); - connect(v,TQT_SIGNAL(updateGroupsSubMenu(TDEPopupMenu*)), - m_group_view,TQT_SLOT(updateGroupsSubMenu(TDEPopupMenu*))); + connect(v,TQ_SIGNAL(updateGroupsSubMenu(TDEPopupMenu*)), + m_group_view,TQ_SLOT(updateGroupsSubMenu(TDEPopupMenu*))); - connect(v,TQT_SIGNAL(groupsSubMenuItemActivated(KTorrentView*, const TQString&)), - m_group_view,TQT_SLOT(onGroupsSubMenuItemActivated(KTorrentView*, const TQString&))); + connect(v,TQ_SIGNAL(groupsSubMenuItemActivated(KTorrentView*, const TQString&)), + m_group_view,TQ_SLOT(onGroupsSubMenuItemActivated(KTorrentView*, const TQString&))); if (m_core) { @@ -497,68 +497,68 @@ void KTorrent::currentTorrentChanged(kt::TorrentInterface* tc) void KTorrent::setupActions() { - KStdAction::openNew(TQT_TQOBJECT(this),TQT_SLOT(fileNew()),actionCollection()); - KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); + KStdAction::openNew(this,TQ_SLOT(fileNew()),actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); - KStdAction::paste(TQT_TQOBJECT(kapp),TQT_SLOT(paste()),actionCollection()); + KStdAction::paste(tdeApp,TQ_SLOT(paste()),actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowStatusbar()), actionCollection()); - m_menubarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowMenubar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); + m_menubarAction = KStdAction::showMenubar(this, TQ_SLOT(optionsShowMenubar()), actionCollection()); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); - TDEAction* pref = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection()); + TDEAction* pref = KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); m_start = new TDEAction( - i18n("to start", "Start"), "ktstart",0,TQT_TQOBJECT(this), TQT_SLOT(startDownload()), + i18n("to start", "Start"), "ktstart",0,this, TQ_SLOT(startDownload()), actionCollection(), "Start"); m_stop = new TDEAction( - i18n("to stop", "Stop"), "ktstop",0,TQT_TQOBJECT(this), TQT_SLOT(stopDownload()), + i18n("to stop", "Stop"), "ktstop",0,this, TQ_SLOT(stopDownload()), actionCollection(), "Stop"); m_remove = new TDEAction( - i18n("Remove"), "ktremove",0,TQT_TQOBJECT(this), TQT_SLOT(removeDownload()), + i18n("Remove"), "ktremove",0,this, TQ_SLOT(removeDownload()), actionCollection(), "Remove"); m_startall = new TDEAction( - i18n("to start all", "Start All"), "ktstart_all",0,TQT_TQOBJECT(this), TQT_SLOT(startAllDownloadsCurrentView()), + i18n("to start all", "Start All"), "ktstart_all",0,this, TQ_SLOT(startAllDownloadsCurrentView()), actionCollection(), "Start all"); - m_startall_systray = new TDEAction(i18n("to start all", "Start All"), "ktstart_all",0,TQT_TQOBJECT(this), TQT_SLOT(startAllDownloads()),actionCollection()); + m_startall_systray = new TDEAction(i18n("to start all", "Start All"), "ktstart_all",0,this, TQ_SLOT(startAllDownloads()),actionCollection()); m_stopall = new TDEAction( - i18n("to stop all", "Stop All"), "ktstop_all",0,TQT_TQOBJECT(this), TQT_SLOT(stopAllDownloadsCurrentView()), + i18n("to stop all", "Stop All"), "ktstop_all",0,this, TQ_SLOT(stopAllDownloadsCurrentView()), actionCollection(), "Stop all"); - m_stopall_systray = new TDEAction(i18n("to stop all", "Stop All"), "ktstop_all",0,TQT_TQOBJECT(this), TQT_SLOT(stopAllDownloads()),actionCollection()); + m_stopall_systray = new TDEAction(i18n("to stop all", "Stop All"), "ktstop_all",0,this, TQ_SLOT(stopAllDownloads()),actionCollection()); m_pasteurl = new TDEAction( - i18n("to paste torrent URL", "Paste Torrent URL..."), "ktstart",0,TQT_TQOBJECT(this), TQT_SLOT(torrentPaste()), + i18n("to paste torrent URL", "Paste Torrent URL..."), "ktstart",0,this, TQ_SLOT(torrentPaste()), actionCollection(), "paste_url"); m_queuemgr = new TDEAction( i18n("to open Queue Manager", "Open Queue Manager..."), - "ktqueuemanager", 0, TQT_TQOBJECT(this), TQT_SLOT(queueManagerShow()), + "ktqueuemanager", 0, this, TQ_SLOT(queueManagerShow()), actionCollection(), "Queue manager"); m_queueaction = new TDEAction( i18n("Enqueue/Dequeue"), - "player_playlist", 0, m_view_man, TQT_SLOT(queueAction()), + "player_playlist", 0, m_view_man, TQ_SLOT(queueAction()), actionCollection(), "queue_action"); m_ipfilter = new TDEAction( i18n("IPFilter"), - "filter", 0, TQT_TQOBJECT(this), TQT_SLOT(showIPFilter()), + "filter", 0, this, TQ_SLOT(showIPFilter()), actionCollection(), "ipfilter_action"); m_datacheck = new TDEAction( i18n("Check Data Integrity"), - TQString(),0,m_view_man,TQT_SLOT(checkDataIntegrity()),actionCollection(),"check_data"); + TQString(),0,m_view_man,TQ_SLOT(checkDataIntegrity()),actionCollection(),"check_data"); - m_find = KStdAction::find(TQT_TQOBJECT(this),TQT_SLOT(find()),actionCollection()); + m_find = KStdAction::find(this,TQ_SLOT(find()),actionCollection()); //Plug actions to systemtray context menu m_startall_systray->plug(m_systray_icon->contextMenu()); @@ -582,7 +582,7 @@ void KTorrent::setupActions() bool KTorrent::queryClose() { - if (Settings::showSystemTrayIcon() && !TDEApplication::kApplication()->sessionSaving()) + if (Settings::showSystemTrayIcon() && !tdeApp->sessionSaving()) { hide(); return false; @@ -720,7 +720,7 @@ void KTorrent::optionsConfigureToolbars() saveMainWindowSettings(TDEGlobal::config()); #endif KEditToolbar dlg(factory()); - connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(newToolbarConfig())); + connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(newToolbarConfig())); dlg.exec(); } diff --git a/src/apps/ktorrent/ktorrent.desktop b/src/apps/ktorrent/ktorrent.desktop new file mode 100644 index 0000000..923b8cd --- /dev/null +++ b/src/apps/ktorrent/ktorrent.desktop @@ -0,0 +1,15 @@ +[Desktop Entry] +Name=KTorrent + +GenericName=BitTorrent Client + +Comment=A BitTorrent program for TDE + +Type=Application +Exec=ktorrent %i %m -caption "%c" %u +Icon=ktorrent +MimeType=application/x-bittorrent;application/x-torrent; +Terminal=false +X-DCOP-ServiceType=Unique +X-DocPath=ktorrent/index.html +Categories=Qt;TDE;Network;FileTransfer; diff --git a/apps/ktorrent/ktorrent.h b/src/apps/ktorrent/ktorrent.h index 7297ac2..6669443 100644 --- a/apps/ktorrent/ktorrent.h +++ b/src/apps/ktorrent/ktorrent.h @@ -65,7 +65,7 @@ namespace kt */ class KTorrent : public DMainWindow, public kt::GUIInterface { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/apps/ktorrent/ktorrentapp.cpp b/src/apps/ktorrent/ktorrentapp.cpp index 38204fe..9ced625 100644 --- a/apps/ktorrent/ktorrentapp.cpp +++ b/src/apps/ktorrent/ktorrentapp.cpp @@ -23,7 +23,7 @@ #include <tdeglobal.h> #include <tdestartupinfo.h> #include <tdecmdlineargs.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <dcopclient.h> #include <util/log.h> @@ -33,7 +33,7 @@ #include "ktorrent.h" KTorrentApp::KTorrentApp() - : KUniqueApplication() + : TDEUniqueApplication() {} KTorrentApp::~KTorrentApp() @@ -59,10 +59,10 @@ int KTorrentApp::newInstance() setMainWidget(widget); } else - TDEStartupInfo::setNewStartupId( mainWidget(), kapp->startupId()); + TDEStartupInfo::setNewStartupId( mainWidget(), tdeApp->startupId()); - KTorrent *widget = ::tqqt_cast<KTorrent*>( mainWidget() ); + KTorrent *widget = ::tqt_cast<KTorrent*>( mainWidget() ); for (int i = 0; i < args->count(); i++) { diff --git a/apps/ktorrent/ktorrentapp.h b/src/apps/ktorrent/ktorrentapp.h index 5e6d300..489eb04 100644 --- a/apps/ktorrent/ktorrentapp.h +++ b/src/apps/ktorrent/ktorrentapp.h @@ -22,11 +22,11 @@ #define _KTORRENTAPP_H_ #include "dcopinterface.h" -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> -class KTorrentApp : public KUniqueApplication +class KTorrentApp : public TDEUniqueApplication { - Q_OBJECT + TQ_OBJECT public: KTorrentApp(); diff --git a/apps/ktorrent/ktorrentcore.cpp b/src/apps/ktorrent/ktorrentcore.cpp index c520d60..6ac9426 100644 --- a/apps/ktorrent/ktorrentcore.cpp +++ b/src/apps/ktorrent/ktorrentcore.cpp @@ -25,7 +25,7 @@ #include <tdefiledialog.h> #include <kprogress.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <tdeio/job.h> #include <tdeio/netaccess.h> @@ -70,7 +70,7 @@ KTorrentCore::KTorrentCore(kt::GUIInterface* gui) : max_downloads(0),keep_seedin UpdateCurrentTime(); qman = new QueueManager(); - connect(qman, TQT_SIGNAL(lowDiskSpace(kt::TorrentInterface*,bool)), TQT_TQOBJECT(this), TQT_SLOT(onLowDiskSpace(kt::TorrentInterface*,bool))); + connect(qman, TQ_SIGNAL(lowDiskSpace(kt::TorrentInterface*,bool)), this, TQ_SLOT(onLowDiskSpace(kt::TorrentInterface*,bool))); data_dir = Settings::tempDir(); @@ -91,7 +91,7 @@ KTorrentCore::KTorrentCore(kt::GUIInterface* gui) : max_downloads(0),keep_seedin data_dir += bt::DirSeparator(); // downloads.setAutoDelete(true); - connect(&update_timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(update())); + connect(&update_timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(update())); update_timer.start(CORE_UPDATE_INTERVAL); Uint16 port = Settings::port(); @@ -212,7 +212,7 @@ bool KTorrentCore::init(TorrentControl* tc,bool silently) try { - bt::CopyFile(torFile, destination, TRUE); + bt::CopyFile(torFile, destination, true); } catch(bt::Error& err) { @@ -328,7 +328,7 @@ void KTorrentCore::load(const KURL& url) else { TDEIO::Job* j = TDEIO::storedGet(url,false,true); - connect(j,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(downloadFinished( TDEIO::Job* ))); + connect(j,TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(downloadFinished( TDEIO::Job* ))); } } @@ -395,7 +395,7 @@ void KTorrentCore::loadSilently(const KURL& url) { // download to a random file in tmp TDEIO::Job* j = TDEIO::storedGet(url,false,true); - connect(j,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(downloadFinishedSilently( TDEIO::Job* ))); + connect(j,TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(downloadFinishedSilently( TDEIO::Job* ))); } } @@ -427,7 +427,7 @@ void KTorrentCore::loadSilentlyDir(const KURL& url, const KURL& savedir) // download to a random file in tmp TDEIO::Job* j = TDEIO::storedGet(url,false,true); custom_save_locations.insert(j,savedir); // keep track of save location - connect(j,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(downloadFinishedSilently( TDEIO::Job* ))); + connect(j,TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(downloadFinishedSilently( TDEIO::Job* ))); } } @@ -741,7 +741,7 @@ void KTorrentCore::makeTorrent(const TQString & file,const TQStringList & tracke prog->setProgress(ns); ns++; if (ns % 10 == 0) - TDEApplication::kApplication()->processEvents(); + tdeApp->processEvents(); } mktor.saveTorrent(output_file); @@ -1097,20 +1097,20 @@ void KTorrentCore::emitCorruptedData(kt::TorrentInterface* tc) void KTorrentCore::connectSignals(kt::TorrentInterface* tc) { - connect(tc,TQT_SIGNAL(finished(kt::TorrentInterface*)), - this,TQT_SLOT(torrentFinished(kt::TorrentInterface* ))); - connect(tc, TQT_SIGNAL(stoppedByError(kt::TorrentInterface*, TQString )), - TQT_TQOBJECT(this), TQT_SLOT(slotStoppedByError(kt::TorrentInterface*, TQString ))); - connect(tc, TQT_SIGNAL(seedingAutoStopped(kt::TorrentInterface*, kt::AutoStopReason)), - TQT_TQOBJECT(this), TQT_SLOT(torrentSeedAutoStopped(kt::TorrentInterface*, kt::AutoStopReason))); - connect(tc,TQT_SIGNAL(aboutToBeStarted( kt::TorrentInterface*,bool & )), - TQT_TQOBJECT(this), TQT_SLOT(aboutToBeStarted( kt::TorrentInterface*,bool & ))); - connect(tc,TQT_SIGNAL(corruptedDataFound( kt::TorrentInterface* )), - TQT_TQOBJECT(this), TQT_SLOT(emitCorruptedData( kt::TorrentInterface* ))); - connect(qman, TQT_SIGNAL(queuingNotPossible(kt::TorrentInterface*)), - TQT_TQOBJECT(this), TQT_SLOT(enqueueTorrentOverMaxRatio( kt::TorrentInterface* ))); - connect(qman, TQT_SIGNAL(lowDiskSpace(kt::TorrentInterface*, bool)), - TQT_TQOBJECT(this), TQT_SLOT(onLowDiskSpace(kt::TorrentInterface*, bool))); + connect(tc,TQ_SIGNAL(finished(kt::TorrentInterface*)), + this,TQ_SLOT(torrentFinished(kt::TorrentInterface* ))); + connect(tc, TQ_SIGNAL(stoppedByError(kt::TorrentInterface*, TQString )), + this, TQ_SLOT(slotStoppedByError(kt::TorrentInterface*, TQString ))); + connect(tc, TQ_SIGNAL(seedingAutoStopped(kt::TorrentInterface*, kt::AutoStopReason)), + this, TQ_SLOT(torrentSeedAutoStopped(kt::TorrentInterface*, kt::AutoStopReason))); + connect(tc,TQ_SIGNAL(aboutToBeStarted( kt::TorrentInterface*,bool & )), + this, TQ_SLOT(aboutToBeStarted( kt::TorrentInterface*,bool & ))); + connect(tc,TQ_SIGNAL(corruptedDataFound( kt::TorrentInterface* )), + this, TQ_SLOT(emitCorruptedData( kt::TorrentInterface* ))); + connect(qman, TQ_SIGNAL(queuingNotPossible(kt::TorrentInterface*)), + this, TQ_SLOT(enqueueTorrentOverMaxRatio( kt::TorrentInterface* ))); + connect(qman, TQ_SIGNAL(lowDiskSpace(kt::TorrentInterface*, bool)), + this, TQ_SLOT(onLowDiskSpace(kt::TorrentInterface*, bool))); } diff --git a/apps/ktorrent/ktorrentcore.h b/src/apps/ktorrent/ktorrentcore.h index 8e25653..4c79ad5 100644 --- a/apps/ktorrent/ktorrentcore.h +++ b/src/apps/ktorrent/ktorrentcore.h @@ -62,7 +62,7 @@ class KProgress; */ class KTorrentCore : public kt::CoreInterface { - Q_OBJECT + TQ_OBJECT public: KTorrentCore(kt::GUIInterface* gui); diff --git a/apps/ktorrent/ktorrentdcop.cpp b/src/apps/ktorrent/ktorrentdcop.cpp index 10e09cb..10e09cb 100644 --- a/apps/ktorrent/ktorrentdcop.cpp +++ b/src/apps/ktorrent/ktorrentdcop.cpp diff --git a/apps/ktorrent/ktorrentdcop.h b/src/apps/ktorrent/ktorrentdcop.h index 2e0f7e0..14f30ba 100644 --- a/apps/ktorrent/ktorrentdcop.h +++ b/src/apps/ktorrent/ktorrentdcop.h @@ -29,7 +29,7 @@ class KTorrent; */ class KTorrentDCOP : public TQObject,virtual public DCOPInterface { - Q_OBJECT + TQ_OBJECT KTorrent* app; public: diff --git a/src/apps/ktorrent/ktorrentplugin.desktop b/src/apps/ktorrent/ktorrentplugin.desktop new file mode 100644 index 0000000..298abb0 --- /dev/null +++ b/src/apps/ktorrent/ktorrentplugin.desktop @@ -0,0 +1,5 @@ +[Desktop Entry] +Name=KTorrent Plugin + +Type=ServiceType +X-TDE-ServiceType=KTorrent/Plugin diff --git a/apps/ktorrent/ktorrentui.rc b/src/apps/ktorrent/ktorrentui.rc index a5845a1..a5845a1 100644 --- a/apps/ktorrent/ktorrentui.rc +++ b/src/apps/ktorrent/ktorrentui.rc diff --git a/apps/ktorrent/ktorrentview.cpp b/src/apps/ktorrent/ktorrentview.cpp index a22afcb..15e1d83 100644 --- a/apps/ktorrent/ktorrentview.cpp +++ b/src/apps/ktorrent/ktorrentview.cpp @@ -69,7 +69,7 @@ bool TorrentView::eventFilter(TQObject* watched, TQEvent* e) { case TQEvent::MouseButtonPress: { - if(TQT_TQMOUSEEVENT(e)->button() == Qt::RightButton) + if(static_cast<TQMouseEvent*>(e)->button() == TQt::RightButton) ktview->m_headerMenu->popup(TQCursor::pos()); break; @@ -93,21 +93,21 @@ KTorrentView::KTorrentView(TQWidget *parent) setupColumns(); - connect(view,TQT_SIGNAL(executed(TQListViewItem* )), - this,TQT_SLOT(onExecuted(TQListViewItem* ))); + connect(view,TQ_SIGNAL(executed(TQListViewItem* )), + this,TQ_SLOT(onExecuted(TQListViewItem* ))); - connect(view,TQT_SIGNAL(currentChanged(TQListViewItem* )), - this,TQT_SLOT(onExecuted(TQListViewItem* ))); + connect(view,TQ_SIGNAL(currentChanged(TQListViewItem* )), + this,TQ_SLOT(onExecuted(TQListViewItem* ))); - connect(view,TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint& )), - this,TQT_SLOT(showContextMenu(TDEListView*, TQListViewItem*, const TQPoint& ))); + connect(view,TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint& )), + this,TQ_SLOT(showContextMenu(TDEListView*, TQListViewItem*, const TQPoint& ))); - connect(view,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(onSelectionChanged())); + connect(view,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(onSelectionChanged())); menu = new KTorrentViewMenu(this); - connect(menu,TQT_SIGNAL(groupItemActivated(const TQString&)),this,TQT_SLOT(gsmItemActived(const TQString&))); + connect(menu,TQ_SIGNAL(groupItemActivated(const TQString&)),this,TQ_SLOT(gsmItemActived(const TQString&))); - connect(m_headerMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(onColumnVisibilityChange( int ))); + connect(m_headerMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(onColumnVisibilityChange( int ))); view->setFrameShape(TQFrame::NoFrame); } @@ -811,13 +811,13 @@ void KTorrentView::speedLimits() void KTorrentView::columnHide(int index) { view->hideColumn(index); - view->header()->setResizeEnabled(FALSE, index); + view->header()->setResizeEnabled(false, index); } void KTorrentView::columnShow(int index) { view->setColumnWidth(index, 100); - view->header()->setResizeEnabled(TRUE, index); + view->header()->setResizeEnabled(true, index); } bool KTorrentView::columnVisible(int index) diff --git a/apps/ktorrent/ktorrentview.h b/src/apps/ktorrent/ktorrentview.h index a388c87..bf52598 100644 --- a/apps/ktorrent/ktorrentview.h +++ b/src/apps/ktorrent/ktorrentview.h @@ -65,7 +65,7 @@ private: */ class KTorrentView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: enum ActionEnableFlags diff --git a/apps/ktorrent/ktorrentviewitem.cpp b/src/apps/ktorrent/ktorrentviewitem.cpp index 4a60329..4a60329 100644 --- a/apps/ktorrent/ktorrentviewitem.cpp +++ b/src/apps/ktorrent/ktorrentviewitem.cpp diff --git a/apps/ktorrent/ktorrentviewitem.h b/src/apps/ktorrent/ktorrentviewitem.h index 575844d..575844d 100644 --- a/apps/ktorrent/ktorrentviewitem.h +++ b/src/apps/ktorrent/ktorrentviewitem.h diff --git a/apps/ktorrent/ktorrentviewmenu.cpp b/src/apps/ktorrent/ktorrentviewmenu.cpp index 2f2d42f..5dca77e 100644 --- a/apps/ktorrent/ktorrentviewmenu.cpp +++ b/src/apps/ktorrent/ktorrentviewmenu.cpp @@ -35,69 +35,69 @@ KTorrentViewMenu::KTorrentViewMenu (KTorrentView *parent, const char *name ) stop_id = insertItem( iload->loadIconSet("ktstop",TDEIcon::Small),i18n("to stop", "Stop"), - parent,TQT_SLOT(stopDownloads())); + parent,TQ_SLOT(stopDownloads())); start_id = insertItem( iload->loadIconSet("ktstart",TDEIcon::Small),i18n("to start", "Start"), - parent,TQT_SLOT(startDownloads())); + parent,TQ_SLOT(startDownloads())); remove_id = insertItem( iload->loadIconSet("ktremove",TDEIcon::Small),i18n("Remove Torrent"), - parent,TQT_SLOT(removeDownloads())); + parent,TQ_SLOT(removeDownloads())); remove_all_id = insertItem( iload->loadIconSet("ktremove",TDEIcon::Small),i18n("Remove Torrent and Data"), - parent,TQT_SLOT(removeDownloadsAndData())); + parent,TQ_SLOT(removeDownloadsAndData())); queue_id = insertItem( iload->loadIconSet("player_playlist",TDEIcon::Small),i18n("Enqueue/Dequeue"), - parent,TQT_SLOT(queueSlot())); + parent,TQ_SLOT(queueSlot())); insertSeparator(); add_peer_id = insertItem( iload->loadIconSet("add", TDEIcon::Small), i18n("Add Peers"), - parent, TQT_SLOT(showAddPeersWidget())); + parent, TQ_SLOT(showAddPeersWidget())); peer_sources_menu = new TDEPopupMenu(this); peer_sources_id = insertItem(i18n("Additional Peer Sources"), peer_sources_menu); peer_sources_menu->insertTitle(i18n("Torrent Peer Sources:")); peer_sources_menu->setCheckable(true); - dht_id = peer_sources_menu->insertItem(i18n("DHT"), parent, TQT_SLOT(dhtSlot())); - ut_pex_id = peer_sources_menu->insertItem(i18n("Peer Exchange"), parent, TQT_SLOT(utPexSlot())); + dht_id = peer_sources_menu->insertItem(i18n("DHT"), parent, TQ_SLOT(dhtSlot())); + ut_pex_id = peer_sources_menu->insertItem(i18n("Peer Exchange"), parent, TQ_SLOT(utPexSlot())); insertSeparator(); announce_id = insertItem( iload->loadIconSet("apply",TDEIcon::Small),i18n("Manual Announce"), - parent,TQT_SLOT(manualAnnounce())); + parent,TQ_SLOT(manualAnnounce())); preview_id = insertItem( iload->loadIconSet("frame_image",TDEIcon::Small),i18n("Preview"), - parent, TQT_SLOT(previewFiles())); + parent, TQ_SLOT(previewFiles())); insertSeparator(); dirs_sub_menu = new TDEPopupMenu(this); dirs_id = insertItem(i18n("Open Directory"), dirs_sub_menu); outputdir_id = dirs_sub_menu->insertItem(iload->loadIconSet("folder",TDEIcon::Small), i18n("Data Directory"), - parent, TQT_SLOT(openOutputDirectory())); + parent, TQ_SLOT(openOutputDirectory())); torxdir_id = dirs_sub_menu->insertItem(iload->loadIconSet("folder",TDEIcon::Small), i18n("Temporary Directory"), - parent, TQT_SLOT(openTorXDirectory())); + parent, TQ_SLOT(openTorXDirectory())); - downloaddir_id = insertItem(i18n("Set Download Location"), parent, TQT_SLOT(setDownloadLocationSlot())); + downloaddir_id = insertItem(i18n("Set Download Location"), parent, TQ_SLOT(setDownloadLocationSlot())); insertSeparator(); - remove_from_group_id = insertItem(i18n("Remove From Group"),parent, TQT_SLOT(removeFromGroup())); + remove_from_group_id = insertItem(i18n("Remove From Group"),parent, TQ_SLOT(removeFromGroup())); groups_sub_menu = new TDEPopupMenu(this); add_to_group_id = insertItem(i18n("Add to Group"),groups_sub_menu); insertSeparator(); - scan_id = insertItem(i18n("Check Data Integrity"),parent, TQT_SLOT(checkDataIntegrity())); + scan_id = insertItem(i18n("Check Data Integrity"),parent, TQ_SLOT(checkDataIntegrity())); - connect(groups_sub_menu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(gsmItemActived(int))); + connect(groups_sub_menu,TQ_SIGNAL(activated(int)),this,TQ_SLOT(gsmItemActived(int))); - traffic_lim_id = insertItem(i18n("Speed Limits"),parent,TQT_SLOT(speedLimits())); + traffic_lim_id = insertItem(i18n("Speed Limits"),parent,TQ_SLOT(speedLimits())); } diff --git a/apps/ktorrent/ktorrentviewmenu.h b/src/apps/ktorrent/ktorrentviewmenu.h index fd850a6..75c5112 100644 --- a/apps/ktorrent/ktorrentviewmenu.h +++ b/src/apps/ktorrent/ktorrentviewmenu.h @@ -29,7 +29,7 @@ class KTorrentView; */ class KTorrentViewMenu : public TDEPopupMenu { - Q_OBJECT + TQ_OBJECT public: KTorrentViewMenu(KTorrentView *parent, const char *name = 0 ); diff --git a/apps/ktorrent/leaktrace.cpp b/src/apps/ktorrent/leaktrace.cpp index 76439ce..76439ce 100644 --- a/apps/ktorrent/leaktrace.cpp +++ b/src/apps/ktorrent/leaktrace.cpp diff --git a/apps/ktorrent/main.cpp b/src/apps/ktorrent/main.cpp index 748001a..a6b67c8 100644 --- a/apps/ktorrent/main.cpp +++ b/src/apps/ktorrent/main.cpp @@ -116,7 +116,7 @@ int main(int argc, char **argv) // ignore SIGPIPE's signal(SIGPIPE,SIG_IGN); signal(SIGXFSZ,SIG_IGN); - tqInstallMsgHandler( StupidWarningMessagesFromTQt ); + qInstallMsgHandler( StupidWarningMessagesFromTQt ); TDEAboutData about("ktorrent", I18N_NOOP("KTorrent"), kt::VERSION_STRING, description, TDEAboutData::License_GPL, "(C) 2005 -2008 Joris Guisson and Ivan Vasic", 0); about.addAuthor("Joris Guisson", 0, "joris.guisson@gmail.com" ); diff --git a/src/apps/ktorrent/newui/CMakeLists.txt b/src/apps/ktorrent/newui/CMakeLists.txt new file mode 100644 index 0000000..a9dc774 --- /dev/null +++ b/src/apps/ktorrent/newui/CMakeLists.txt @@ -0,0 +1,14 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/src/libktorrent + ${CMAKE_CURRENT_BINARY_DIR} +) + + +##### newui library (static) + +tde_add_library( newui STATIC_PIC AUTOMOC + SOURCES + button.cpp button.h buttonbar.cpp buttonbar.h comdefs.h ddockwindow.cpp ddockwindow.h + dmainwindow.cpp dmainwindow.h docksplitter.cpp docksplitter.h dtabwidget.cpp dtabwidget.h +) diff --git a/apps/ktorrent/newui/button.cpp b/src/apps/ktorrent/newui/button.cpp index 4754cd0..d2d839b 100644 --- a/apps/ktorrent/newui/button.cpp +++ b/src/apps/ktorrent/newui/button.cpp @@ -47,7 +47,7 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon, hide(); setFlat(true); setToggleButton(true); - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setDescription(m_description); setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); resize(sizeHint()); @@ -56,11 +56,11 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon, TQToolTip::add(this, m_realText); m_assignAccelAction = new TDEAction(i18n("Assign Accelerator..."), 0, - TQT_TQOBJECT(this), TQT_SLOT(assignAccel()), TQT_TQOBJECT(this)); + this, TQ_SLOT(assignAccel()), this); m_clearAccelAction = new TDEAction(i18n("Clear Accelerator"), 0, - TQT_TQOBJECT(this), TQT_SLOT(clearAccel()), TQT_TQOBJECT(this)); + this, TQ_SLOT(clearAccel()), this); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("UI"); TQString accel = config->readEntry(TQString("button_%1").arg(text), ""); if (!accel.isEmpty()) @@ -70,7 +70,7 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon, Button::~Button() { // m_buttonBar->removeButton(this); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("UI"); TQRegExp r("^&([0-9])\\s.*"); @@ -229,7 +229,7 @@ TQSize Button::sizeHint(const TQString &text) const h = TQMAX(h, sz.height()); } - return (style().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)). + return (style().sizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)). expandedTo(TQApplication::globalStrut())); } diff --git a/apps/ktorrent/newui/button.h b/src/apps/ktorrent/newui/button.h index 00a31de..23c45c1 100644 --- a/apps/ktorrent/newui/button.h +++ b/src/apps/ktorrent/newui/button.h @@ -38,7 +38,7 @@ A TQPushButton derivative with a size of a TQToolBar. Button can be rotated (placed onto different places in ideal mode). */ class Button : public TQPushButton { - Q_OBJECT + TQ_OBJECT public: Button(ButtonBar *parent, const TQString text, const TQIconSet &icon = TQIconSet(), diff --git a/apps/ktorrent/newui/buttonbar.cpp b/src/apps/ktorrent/newui/buttonbar.cpp index 640fb3e..640fb3e 100644 --- a/apps/ktorrent/newui/buttonbar.cpp +++ b/src/apps/ktorrent/newui/buttonbar.cpp diff --git a/apps/ktorrent/newui/buttonbar.h b/src/apps/ktorrent/newui/buttonbar.h index 97e162d..3f23957 100644 --- a/apps/ktorrent/newui/buttonbar.h +++ b/src/apps/ktorrent/newui/buttonbar.h @@ -52,7 +52,7 @@ Looks like a toolbar but has another behaviour. It is suitable for placing on the left(right, bottom, top) corners of a window as a bar with slider. */ class ButtonBar : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ButtonBar(Place place, ButtonMode mode = IconsAndText, diff --git a/apps/ktorrent/newui/comdefs.h b/src/apps/ktorrent/newui/comdefs.h index 8233f12..8233f12 100644 --- a/apps/ktorrent/newui/comdefs.h +++ b/src/apps/ktorrent/newui/comdefs.h diff --git a/apps/ktorrent/newui/ddockwindow.cpp b/src/apps/ktorrent/newui/ddockwindow.cpp index 7234038..b52815f 100644 --- a/apps/ktorrent/newui/ddockwindow.cpp +++ b/src/apps/ktorrent/newui/ddockwindow.cpp @@ -68,7 +68,7 @@ DDockWindow::DDockWindow(DMainWindow *parent, Position position) break; } - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("UI"); int mode = config->readNumEntry("MDIStyle", 3); Ideal::ButtonMode buttonMode = Ideal::Text; @@ -85,9 +85,9 @@ DDockWindow::DDockWindow(DMainWindow *parent, Position position) m_widgetStack = new TQWidgetStack(this); m_internalLayout->addWidget(m_widgetStack); - m_moveToDockLeft = new TDEAction( i18n("Move to left dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockLeft()), TQT_TQOBJECT(this) ); - m_moveToDockRight = new TDEAction( i18n("Move to right dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockRight()), TQT_TQOBJECT(this) ); - m_moveToDockBottom = new TDEAction( i18n("Move to bottom dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockBottom()), TQT_TQOBJECT(this) ); + m_moveToDockLeft = new TDEAction( i18n("Move to left dock"), 0, this, TQ_SLOT(moveToDockLeft()), this ); + m_moveToDockRight = new TDEAction( i18n("Move to right dock"), 0, this, TQ_SLOT(moveToDockRight()), this ); + m_moveToDockBottom = new TDEAction( i18n("Move to bottom dock"), 0, this, TQ_SLOT(moveToDockBottom()), this ); setVisible(m_visible); @@ -103,7 +103,7 @@ DDockWindow::~DDockWindow() void DDockWindow::setVisible(bool v) { //write dock width to the config file - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); TQString group = TQString("%1").arg(m_name); config->setGroup(group); @@ -147,7 +147,7 @@ void DDockWindow::loadSettings() void DDockWindow::saveSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); TQString group = TQString("%1").arg(m_name); int invisibleWidth = 0; config->setGroup(group); @@ -192,14 +192,14 @@ void DDockWindow::addWidget(const TQString &title, TQWidget *widget, bool skipAc m_bar->addButton(button); m_widgetStack->addWidget(widget); - connect(button, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(selectWidget())); - connect(button, TQT_SIGNAL(contextMenu(TQPopupMenu*)), TQT_TQOBJECT(this), TQT_SLOT(contextMenu(TQPopupMenu*)) ); + connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectWidget())); + connect(button, TQ_SIGNAL(contextMenu(TQPopupMenu*)), this, TQ_SLOT(contextMenu(TQPopupMenu*)) ); if (!skipActivation) { //if the widget was selected last time the dock is deleted //we need to show it - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); TQString group = TQString("%1").arg(m_name); config->setGroup(group); if (config->readEntry("ViewLastWidget") == title) @@ -294,7 +294,7 @@ void DDockWindow::selectWidget(Ideal::Button *button) void DDockWindow::selectWidget() { - selectWidget((Ideal::Button*)TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))); + selectWidget((Ideal::Button*)sender()); } void DDockWindow::hideWidget(TQWidget *widget) @@ -375,7 +375,7 @@ void DDockWindow::selectPrevWidget() void DDockWindow::contextMenu(TQPopupMenu * menu) { - m_lastContextMenuButton = static_cast<Ideal::Button*>( TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME*>(sender())) ); + m_lastContextMenuButton = static_cast<Ideal::Button*>( const_cast<TQObject*>( sender() ) ); menu->insertSeparator(); diff --git a/apps/ktorrent/newui/ddockwindow.h b/src/apps/ktorrent/newui/ddockwindow.h index 3012e02..84b5163 100644 --- a/apps/ktorrent/newui/ddockwindow.h +++ b/src/apps/ktorrent/newui/ddockwindow.h @@ -39,7 +39,7 @@ namespace Ideal { } class DDockWindow : public TQDockWindow { - Q_OBJECT + TQ_OBJECT public: enum Position { Bottom, Left, Right }; diff --git a/apps/ktorrent/newui/dmainwindow.cpp b/src/apps/ktorrent/newui/dmainwindow.cpp index 8f946b2..d4a2424 100644 --- a/apps/ktorrent/newui/dmainwindow.cpp +++ b/src/apps/ktorrent/newui/dmainwindow.cpp @@ -34,7 +34,7 @@ DMainWindow::DMainWindow(TQWidget *parent, const char *name) { loadSettings(); createToolWindows(); - m_central = new Ideal::DockSplitter(Qt::Horizontal, this); + m_central = new Ideal::DockSplitter(TQt::Horizontal, this); m_activeTabWidget = createTab(); m_central->addDock(0, 0, m_activeTabWidget); setCentralWidget(m_central); @@ -42,7 +42,7 @@ DMainWindow::DMainWindow(TQWidget *parent, const char *name) void DMainWindow::loadSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("UI"); m_openTabAfterCurrent = config->readBoolEntry("OpenNewTabAfterCurrent", true); m_showIconsOnTabs = config->readBoolEntry("ShowTabIcons", false); @@ -213,10 +213,10 @@ DTabWidget *DMainWindow::createTab() DTabWidget *tab = new DTabWidget(m_central); m_tabs.append(tab); if (tab->closeButton()) - connect(tab->closeButton(), TQT_SIGNAL(clicked()), this, TQT_SLOT(closeTab())); - connect(tab, TQT_SIGNAL(closeRequest(TQWidget*)), this, TQT_SLOT(closeTab(TQWidget*))); - connect(tab, TQT_SIGNAL(contextMenu(TQWidget*,const TQPoint &)), - this, TQT_SLOT(tabContext(TQWidget*,const TQPoint &))); + connect(tab->closeButton(), TQ_SIGNAL(clicked()), this, TQ_SLOT(closeTab())); + connect(tab, TQ_SIGNAL(closeRequest(TQWidget*)), this, TQ_SLOT(closeTab(TQWidget*))); + connect(tab, TQ_SIGNAL(contextMenu(TQWidget*,const TQPoint &)), + this, TQ_SLOT(tabContext(TQWidget*,const TQPoint &))); return tab; } @@ -280,7 +280,7 @@ void DMainWindow::addDockWidget(DDockWindow::Position position, TQWidget *view, DDockWindow* dock = toolWindow(position); dock->addWidget(title, view); m_docks[view] = position; - connect(view, TQT_SIGNAL(destroyed()), this, TQT_SLOT(widgetDestroyed())); + connect(view, TQ_SIGNAL(destroyed()), this, TQ_SLOT(widgetDestroyed())); if (dock->isHidden()) dock->show(); } @@ -306,7 +306,7 @@ DDockWindow::Position DMainWindow::dockWidgetPosition(TQWidget *view) void DMainWindow::widgetDestroyed() { - TQWidget *w = TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME*>(sender())); + TQWidget *w = static_cast<TQWidget*>(const_cast<TQObject*>(sender())); if (m_docks.contains(w)) { diff --git a/apps/ktorrent/newui/dmainwindow.h b/src/apps/ktorrent/newui/dmainwindow.h index ab98207..7483971 100644 --- a/apps/ktorrent/newui/dmainwindow.h +++ b/src/apps/ktorrent/newui/dmainwindow.h @@ -32,7 +32,7 @@ namespace Ideal { /**Main window which provides simplified IDEA mode.*/ class DMainWindow: public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: DMainWindow(TQWidget *parent = 0, const char *name = 0); diff --git a/apps/ktorrent/newui/docksplitter.cpp b/src/apps/ktorrent/newui/docksplitter.cpp index bb6a68d..115abf2 100644 --- a/apps/ktorrent/newui/docksplitter.cpp +++ b/src/apps/ktorrent/newui/docksplitter.cpp @@ -23,16 +23,16 @@ namespace Ideal { -DockSplitter::DockSplitter(Qt::Orientation orientation, TQWidget *parent, const char *name) +DockSplitter::DockSplitter(TQt::Orientation orientation, TQWidget *parent, const char *name) :TQSplitter(parent, name), m_orientation(orientation) { switch (m_orientation) { - case Qt::Horizontal: - setOrientation(Qt::Vertical); + case TQt::Horizontal: + setOrientation(TQt::Vertical); break; - case Qt::Vertical: - setOrientation(Qt::Horizontal); + case TQt::Vertical: + setOrientation(TQt::Horizontal); break; } setOpaqueResize(true); @@ -73,11 +73,11 @@ void DockSplitter::appendSplitter() { switch (m_orientation) { - case Qt::Horizontal: - m_splitters.append(new TQSplitter(Qt::Horizontal, this)); + case TQt::Horizontal: + m_splitters.append(new TQSplitter(TQt::Horizontal, this)); break; - case Qt::Vertical: - m_splitters.append(new TQSplitter(Qt::Vertical, this)); + case TQt::Vertical: + m_splitters.append(new TQSplitter(TQt::Vertical, this)); break; } m_splitters[m_splitters.size()-1]->setOpaqueResize(true); @@ -166,8 +166,8 @@ TQPair<uint, uint> DockSplitter::indexOf(TQWidget *dock) for (uint i = 0; i < m_docks.count(); ++i) for (uint j = 0; j < m_docks[i].count(); ++j) if (dock == m_docks[i][j]) - return tqMakePair(i, j); - return tqMakePair(0u, 0u); + return qMakePair(i, j); + return qMakePair(0u, 0u); } } diff --git a/apps/ktorrent/newui/docksplitter.h b/src/apps/ktorrent/newui/docksplitter.h index c167a5b..3856c4c 100644 --- a/apps/ktorrent/newui/docksplitter.h +++ b/src/apps/ktorrent/newui/docksplitter.h @@ -31,10 +31,10 @@ class DockWidget; @short Splitter for docks */ class DockSplitter: public TQSplitter { - Q_OBJECT + TQ_OBJECT public: - DockSplitter(Qt::Orientation orientation, TQWidget *parent = 0, const char *name = 0); + DockSplitter(TQt::Orientation orientation, TQWidget *parent = 0, const char *name = 0); ~DockSplitter(); void addDock(uint row, uint col, TQWidget *dock); @@ -53,7 +53,7 @@ protected: bool isRowEmpty(int row); private: - Qt::Orientation m_orientation; + TQt::Orientation m_orientation; TQValueList<TQSplitter*> m_splitters; TQValueList<TQValueList<TQWidget*> > m_docks; }; diff --git a/apps/ktorrent/newui/dtabwidget.cpp b/src/apps/ktorrent/newui/dtabwidget.cpp index 50cf9cd..c74e1d6 100644 --- a/apps/ktorrent/newui/dtabwidget.cpp +++ b/src/apps/ktorrent/newui/dtabwidget.cpp @@ -29,7 +29,7 @@ DTabWidget::DTabWidget(TQWidget *parent, const char *name) :KTabWidget(parent, name), m_closeButton(0) { - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setMargin(0); loadSettings(); @@ -49,14 +49,14 @@ DTabWidget::DTabWidget(TQWidget *parent, const char *name) setTabReorderingEnabled(true); } - connect(this, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(setFocus(TQWidget*))); -// connect(this, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(updateHistory(TQWidget*))); + connect(this, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(setFocus(TQWidget*))); +// connect(this, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(updateHistory(TQWidget*))); } void DTabWidget::loadSettings() { /* - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("UI"); // m_tabBarShown = config->readBoolEntry("TabBarShown", true); m_tabBarShown = ! config->readNumEntry("TabWidgetVisibility", 0); diff --git a/apps/ktorrent/newui/dtabwidget.h b/src/apps/ktorrent/newui/dtabwidget.h index f312554..529a42d 100644 --- a/apps/ktorrent/newui/dtabwidget.h +++ b/src/apps/ktorrent/newui/dtabwidget.h @@ -25,7 +25,7 @@ class TQToolButton; class DTabWidget: public KTabWidget { - Q_OBJECT + TQ_OBJECT public: DTabWidget(TQWidget *parent=0, const char *name=0); diff --git a/apps/ktorrent/pastedialog.cpp b/src/apps/ktorrent/pastedialog.cpp index 82cf6df..82cf6df 100644 --- a/apps/ktorrent/pastedialog.cpp +++ b/src/apps/ktorrent/pastedialog.cpp diff --git a/apps/ktorrent/pastedialog.h b/src/apps/ktorrent/pastedialog.h index c40cf43..cb31cd2 100644 --- a/apps/ktorrent/pastedialog.h +++ b/src/apps/ktorrent/pastedialog.h @@ -30,7 +30,7 @@ class KTorrentCore; **/ class PasteDialog: public PasteDlgBase { - Q_OBJECT + TQ_OBJECT public slots: virtual void btnOK_clicked(); diff --git a/apps/ktorrent/pastedlgbase.ui b/src/apps/ktorrent/pastedlgbase.ui index c847cb9..4c9539a 100644 --- a/apps/ktorrent/pastedlgbase.ui +++ b/src/apps/ktorrent/pastedlgbase.ui @@ -132,9 +132,9 @@ <slot>reject()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>btnOK_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/apps/ktorrent/pref.cpp b/src/apps/ktorrent/pref.cpp index ee08bdc..da52905 100644 --- a/apps/ktorrent/pref.cpp +++ b/src/apps/ktorrent/pref.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kactivelabel.h> #include <tdeglobal.h> #include <kcombobox.h> @@ -226,12 +226,12 @@ void GeneralPrefPage::createWidget(TQWidget* parent) { gp = new GeneralPref(parent); updateData(); - connect(gp->custom_ip_check, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(customIPChecked(bool))); - connect(gp->use_dht, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(dhtChecked(bool))); - connect(gp->use_encryption, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(useEncryptionChecked(bool))); + connect(gp->custom_ip_check, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(customIPChecked(bool))); + connect(gp->use_dht, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(dhtChecked(bool))); + connect(gp->use_encryption, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(useEncryptionChecked(bool))); } bool GeneralPrefPage::apply() @@ -463,14 +463,14 @@ void AdvancedPrefPage::createWidget(TQWidget* parent) { ap = new AdvancedPref(parent); updateData(); - connect(ap->no_recheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(noDataCheckChecked(bool))); - connect(ap->auto_recheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(autoRecheckChecked(bool))); - connect(ap->do_not_use_kde_proxy, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(doNotUseKDEProxyChecked(bool))); - connect(ap->prealloc_disabled,TQT_SIGNAL(toggled(bool)), - this,TQT_SLOT(preallocDisabledChecked(bool))); + connect(ap->no_recheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(noDataCheckChecked(bool))); + connect(ap->auto_recheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(autoRecheckChecked(bool))); + connect(ap->do_not_use_kde_proxy, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(doNotUseKDEProxyChecked(bool))); + connect(ap->prealloc_disabled,TQ_SIGNAL(toggled(bool)), + this,TQ_SLOT(preallocDisabledChecked(bool))); preallocDisabledChecked(ap->prealloc_disabled->isChecked()); } diff --git a/apps/ktorrent/pref.h b/src/apps/ktorrent/pref.h index e1108d5..f9a4331 100644 --- a/apps/ktorrent/pref.h +++ b/src/apps/ktorrent/pref.h @@ -50,7 +50,7 @@ public: class GeneralPrefPage : public TQObject,public kt::PrefPageInterface { - Q_OBJECT + TQ_OBJECT GeneralPref* gp; public: @@ -71,7 +71,7 @@ private slots: class AdvancedPrefPage : public TQObject,public kt::PrefPageInterface { - Q_OBJECT + TQ_OBJECT AdvancedPref* ap; @@ -94,7 +94,7 @@ private slots: class KTorrentPreferences : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KTorrentPreferences(KTorrent & ktor); diff --git a/apps/ktorrent/queuedialog.cpp b/src/apps/ktorrent/queuedialog.cpp index 79c06d1..69bb1ea 100644 --- a/apps/ktorrent/queuedialog.cpp +++ b/src/apps/ktorrent/queuedialog.cpp @@ -105,8 +105,8 @@ QueueDialog::QueueDialog(bt::QueueManager* qm, TQWidget *parent, const char *nam logo->setPixmap(iload->loadIcon("ktqueuemanager", TDEIcon::Desktop)); - connect(downloadList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(downloadList_currentChanged( TQListViewItem* ))); - connect(seedList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(seedList_currentChanged( TQListViewItem* ))); + connect(downloadList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(downloadList_currentChanged( TQListViewItem* ))); + connect(seedList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(seedList_currentChanged( TQListViewItem* ))); if(downloadList->firstChild()) downloadList->setCurrentItem(downloadList->firstChild()); diff --git a/apps/ktorrent/queuedialog.h b/src/apps/ktorrent/queuedialog.h index a6900e4..ae8629c 100644 --- a/apps/ktorrent/queuedialog.h +++ b/src/apps/ktorrent/queuedialog.h @@ -50,7 +50,7 @@ class QueueItem: public TQListViewItem class QueueDialog: public QueueDlg { - Q_OBJECT + TQ_OBJECT public: QueueDialog(bt::QueueManager* qm, TQWidget *parent = 0, const char *name = 0); diff --git a/apps/ktorrent/queuedlg.ui b/src/apps/ktorrent/queuedlg.ui index 04b0d1c..9bd5532 100644 --- a/apps/ktorrent/queuedlg.ui +++ b/src/apps/ktorrent/queuedlg.ui @@ -699,7 +699,7 @@ <tabstop>btnDequeue</tabstop> <tabstop>seedList</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>btnMoveUp_clicked()</slot> <slot>btnMoveDown_clicked()</slot> <slot>btnEnqueue_clicked()</slot> @@ -711,7 +711,7 @@ <slot>btnClose_clicked()</slot> <slot>btnMoveTop_clicked()</slot> <slot>btnMoveBottom_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/apps/ktorrent/scandialog.cpp b/src/apps/ktorrent/scandialog.cpp index 5c9ef8a..834539d 100644 --- a/apps/ktorrent/scandialog.cpp +++ b/src/apps/ktorrent/scandialog.cpp @@ -40,8 +40,8 @@ ScanDialog::ScanDialog(KTorrentCore* core,bool auto_import, : ScanDlgBase(parent,name, modal,fl),DataCheckerListener(auto_import),mutex(true),core(core) { m_cancel->setGuiItem(KStdGuiItem::cancel()); - connect(m_cancel,TQT_SIGNAL(clicked()),this,TQT_SLOT(onCancelPressed())); - connect(&timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(update())); + connect(m_cancel,TQ_SIGNAL(clicked()),this,TQ_SLOT(onCancelPressed())); + connect(&timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(update())); tc = 0; silently = false; restart = false; @@ -127,8 +127,8 @@ void ScanDialog::finished() { // cancel now becomes a close button m_cancel->setGuiItem(KStdGuiItem::close()); - disconnect(m_cancel,TQT_SIGNAL(clicked()),this,TQT_SLOT(onCancelPressed())); - connect(m_cancel,TQT_SIGNAL(clicked()),this,TQT_SLOT(accept())); + disconnect(m_cancel,TQ_SIGNAL(clicked()),this,TQ_SLOT(onCancelPressed())); + connect(m_cancel,TQ_SIGNAL(clicked()),this,TQ_SLOT(accept())); } } else diff --git a/apps/ktorrent/scandialog.h b/src/apps/ktorrent/scandialog.h index 62a3d7b..b22e1b8 100644 --- a/apps/ktorrent/scandialog.h +++ b/src/apps/ktorrent/scandialog.h @@ -36,7 +36,7 @@ class KTorrentCore; class ScanDialog : public ScanDlgBase, public bt::DataCheckerListener { - Q_OBJECT + TQ_OBJECT public: ScanDialog(KTorrentCore* core,bool auto_import,TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = WDestructiveClose ); diff --git a/apps/ktorrent/scandlgbase.ui b/src/apps/ktorrent/scandlgbase.ui index 44facbb..44facbb 100644 --- a/apps/ktorrent/scandlgbase.ui +++ b/src/apps/ktorrent/scandlgbase.ui diff --git a/apps/ktorrent/speedlimitsdlg.cpp b/src/apps/ktorrent/speedlimitsdlg.cpp index 70e2f1c..70e2f1c 100644 --- a/apps/ktorrent/speedlimitsdlg.cpp +++ b/src/apps/ktorrent/speedlimitsdlg.cpp diff --git a/apps/ktorrent/speedlimitsdlg.h b/src/apps/ktorrent/speedlimitsdlg.h index e1b8b60..01d3e31 100644 --- a/apps/ktorrent/speedlimitsdlg.h +++ b/src/apps/ktorrent/speedlimitsdlg.h @@ -30,7 +30,7 @@ namespace kt class SpeedLimitsDlg : public SpeedLimitsDlgBase { - Q_OBJECT + TQ_OBJECT kt::TorrentInterface* tor; diff --git a/apps/ktorrent/speedlimitsdlgbase.ui b/src/apps/ktorrent/speedlimitsdlgbase.ui index c3997a7..c3997a7 100644 --- a/apps/ktorrent/speedlimitsdlgbase.ui +++ b/src/apps/ktorrent/speedlimitsdlgbase.ui diff --git a/apps/ktorrent/torrentcreatordlg.cpp b/src/apps/ktorrent/torrentcreatordlg.cpp index fb3af47..25c5e37 100644 --- a/apps/ktorrent/torrentcreatordlg.cpp +++ b/src/apps/ktorrent/torrentcreatordlg.cpp @@ -38,8 +38,8 @@ TorrentCreatorDlg::TorrentCreatorDlg(KTorrentCore* core,TQWidget *parent, const KComboBox* cb = m_chunk_size; cb->setCurrentItem(3); - connect(m_create_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onCreate())); - connect(m_cancel_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject())); + connect(m_create_btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(onCreate())); + connect(m_cancel_btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(reject())); m_nodes->setHidden(true); diff --git a/apps/ktorrent/torrentcreatordlg.h b/src/apps/ktorrent/torrentcreatordlg.h index b19c2fb..76ce111 100644 --- a/apps/ktorrent/torrentcreatordlg.h +++ b/src/apps/ktorrent/torrentcreatordlg.h @@ -18,7 +18,7 @@ class KTorrentCore; class TorrentCreatorDlg: public TorrentCreatorDlgBase { - Q_OBJECT + TQ_OBJECT public: TorrentCreatorDlg(KTorrentCore* core,TQWidget *parent = 0, const char *name = 0); diff --git a/apps/ktorrent/torrentcreatordlgbase.ui b/src/apps/ktorrent/torrentcreatordlgbase.ui index fcd100d..97488be 100644 --- a/apps/ktorrent/torrentcreatordlgbase.ui +++ b/src/apps/ktorrent/torrentcreatordlgbase.ui @@ -508,12 +508,12 @@ <forwards> <forward>class TQListViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot>btnRemoveNode_clicked()</slot> <slot>btnAddNode_clicked()</slot> <slot>m_node_textChanged(const TQString&)</slot> <slot>m_nodeList_selectionChanged(TQListViewItem*)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/apps/ktorrent/trayhoverpopup.cpp b/src/apps/ktorrent/trayhoverpopup.cpp index 5cce261..b325184 100644 --- a/apps/ktorrent/trayhoverpopup.cpp +++ b/src/apps/ktorrent/trayhoverpopup.cpp @@ -33,8 +33,8 @@ TrayHoverPopup::TrayHoverPopup(const TQPixmap & pix,TQWidget *parent, const char { setTimeout(0); setAutoDelete(false); - connect(&hover_timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(onHoverTimeout())); - connect(&show_timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(onShowTimeout())); + connect(&hover_timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(onHoverTimeout())); + connect(&show_timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(onShowTimeout())); create(); setPalette(TQToolTip::palette()); setLineWidth(1); diff --git a/apps/ktorrent/trayhoverpopup.h b/src/apps/ktorrent/trayhoverpopup.h index f052424..c3cf9fb 100644 --- a/apps/ktorrent/trayhoverpopup.h +++ b/src/apps/ktorrent/trayhoverpopup.h @@ -33,7 +33,7 @@ class TQPixmap; */ class TrayHoverPopup : public KPassivePopup { - Q_OBJECT + TQ_OBJECT public: TrayHoverPopup(const TQPixmap & pix,TQWidget *parent = 0, const char *name = 0 ); diff --git a/apps/ktorrent/trayicon.cpp b/src/apps/ktorrent/trayicon.cpp index ab4f2b2..19667ab 100644 --- a/apps/ktorrent/trayicon.cpp +++ b/src/apps/ktorrent/trayicon.cpp @@ -49,26 +49,26 @@ TrayIcon::TrayIcon( KTorrentCore* tc, TQWidget *parent, const char *name) m_hover_popup = new TrayHoverPopup(m_kt_pix,this); - connect(this,TQT_SIGNAL(quitSelected()),kapp,TQT_SLOT(quit())); - connect(m_core, TQT_SIGNAL(finished(kt::TorrentInterface* )), - this, TQT_SLOT(finished(kt::TorrentInterface* ))); - connect(m_core,TQT_SIGNAL(torrentStoppedByError(kt::TorrentInterface*, TQString )), - this,TQT_SLOT(torrentStoppedByError(kt::TorrentInterface*, TQString ))); - connect(m_core,TQT_SIGNAL(maxShareRatioReached( kt::TorrentInterface* )), - this,TQT_SLOT(maxShareRatioReached( kt::TorrentInterface* ))); - connect(m_core,TQT_SIGNAL(maxSeedTimeReached(kt::TorrentInterface*)), - this, TQT_SLOT(maxSeedTimeReached(kt::TorrentInterface*))); - connect(m_core,TQT_SIGNAL(corruptedData( kt::TorrentInterface* )), - this,TQT_SLOT(corruptedData( kt::TorrentInterface* ))); - connect(m_core, TQT_SIGNAL(queuingNotPossible( kt::TorrentInterface* )), - this, TQT_SLOT(queuingNotPossible( kt::TorrentInterface* ))); - connect(m_core,TQT_SIGNAL(canNotStart(kt::TorrentInterface*, kt::TorrentStartResponse)), - this,TQT_SLOT(canNotStart(kt::TorrentInterface*, kt::TorrentStartResponse))); - connect(m_core, TQT_SIGNAL(lowDiskSpace(kt::TorrentInterface*, bool)), - this, TQT_SLOT(lowDiskSpace(kt::TorrentInterface*, bool))); + connect(this,TQ_SIGNAL(quitSelected()),tdeApp,TQ_SLOT(quit())); + connect(m_core, TQ_SIGNAL(finished(kt::TorrentInterface* )), + this, TQ_SLOT(finished(kt::TorrentInterface* ))); + connect(m_core,TQ_SIGNAL(torrentStoppedByError(kt::TorrentInterface*, TQString )), + this,TQ_SLOT(torrentStoppedByError(kt::TorrentInterface*, TQString ))); + connect(m_core,TQ_SIGNAL(maxShareRatioReached( kt::TorrentInterface* )), + this,TQ_SLOT(maxShareRatioReached( kt::TorrentInterface* ))); + connect(m_core,TQ_SIGNAL(maxSeedTimeReached(kt::TorrentInterface*)), + this, TQ_SLOT(maxSeedTimeReached(kt::TorrentInterface*))); + connect(m_core,TQ_SIGNAL(corruptedData( kt::TorrentInterface* )), + this,TQ_SLOT(corruptedData( kt::TorrentInterface* ))); + connect(m_core, TQ_SIGNAL(queuingNotPossible( kt::TorrentInterface* )), + this, TQ_SLOT(queuingNotPossible( kt::TorrentInterface* ))); + connect(m_core,TQ_SIGNAL(canNotStart(kt::TorrentInterface*, kt::TorrentStartResponse)), + this,TQ_SLOT(canNotStart(kt::TorrentInterface*, kt::TorrentStartResponse))); + connect(m_core, TQ_SIGNAL(lowDiskSpace(kt::TorrentInterface*, bool)), + this, TQ_SLOT(lowDiskSpace(kt::TorrentInterface*, bool))); - connect(this->contextMenu(),TQT_SIGNAL(aboutToShow()),m_hover_popup,TQT_SLOT(contextMenuAboutToShow())); - connect(this->contextMenu(),TQT_SIGNAL(aboutToHide()),m_hover_popup,TQT_SLOT(contextMenuAboutToHide())); + connect(this->contextMenu(),TQ_SIGNAL(aboutToShow()),m_hover_popup,TQ_SLOT(contextMenuAboutToShow())); + connect(this->contextMenu(),TQ_SIGNAL(aboutToHide()),m_hover_popup,TQ_SLOT(contextMenuAboutToHide())); } TrayIcon::~TrayIcon() @@ -287,7 +287,7 @@ SetMaxRate::SetMaxRate( KTorrentCore* tc, int t, TQWidget *parent, const char *n m_core = tc; type=t; makeMenu(); - connect(this,TQT_SIGNAL(activated (int)),this,TQT_SLOT(rateSelected(int ))); + connect(this,TQ_SIGNAL(activated (int)),this,TQ_SLOT(rateSelected(int ))); } void SetMaxRate::makeMenu() { diff --git a/apps/ktorrent/trayicon.h b/src/apps/ktorrent/trayicon.h index a277f79..f31767d 100644 --- a/apps/ktorrent/trayicon.h +++ b/src/apps/ktorrent/trayicon.h @@ -49,7 +49,7 @@ struct TrayStats */ class TrayIcon : public KSystemTray { - Q_OBJECT + TQ_OBJECT public: TrayIcon(KTorrentCore* tc, TQWidget *parent = 0, const char *name = 0); @@ -123,7 +123,7 @@ private: class SetMaxRate : public TDEPopupMenu { - Q_OBJECT + TQ_OBJECT public: SetMaxRate(KTorrentCore* tc, int t, TQWidget *parent=0, const char *name=0); // type: 0 Upload; 1 Download diff --git a/apps/ktorrent/viewmanager.cpp b/src/apps/ktorrent/viewmanager.cpp index eef9d06..eef9d06 100644 --- a/apps/ktorrent/viewmanager.cpp +++ b/src/apps/ktorrent/viewmanager.cpp diff --git a/apps/ktorrent/viewmanager.h b/src/apps/ktorrent/viewmanager.h index 67025aa..e402a92 100644 --- a/apps/ktorrent/viewmanager.h +++ b/src/apps/ktorrent/viewmanager.h @@ -34,7 +34,7 @@ class KTorrent; */ class ViewManager : public TQObject, public kt::CloseTabListener { - Q_OBJECT + TQ_OBJECT public: ViewManager(TQObject *parent = 0, const char *name = 0); diff --git a/src/apps/ktorrent/x-bittorrent.desktop b/src/apps/ktorrent/x-bittorrent.desktop new file mode 100644 index 0000000..5180adf --- /dev/null +++ b/src/apps/ktorrent/x-bittorrent.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Comment=BitTorrent Download + +Type=MimeType +Hidden=false +Icon=torrent +MimeType=application/x-bittorrent +Patterns=*.torrent;*.tor +X-TDE-AutoEmbed=false diff --git a/src/apps/kttorinfo/CMakeLists.txt b/src/apps/kttorinfo/CMakeLists.txt new file mode 100644 index 0000000..0dba8e0 --- /dev/null +++ b/src/apps/kttorinfo/CMakeLists.txt @@ -0,0 +1,13 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/src/libktorrent +) + + +##### kttorinfo (executable) + +tde_add_executable( kttorinfo + SOURCES main.cpp + LINK ktorrent-shared + DESTINATION ${BIN_INSTALL_DIR} +) diff --git a/apps/kttorinfo/main.cpp b/src/apps/kttorinfo/main.cpp index 2208f7f..2208f7f 100644 --- a/apps/kttorinfo/main.cpp +++ b/src/apps/kttorinfo/main.cpp diff --git a/src/apps/ktupnptest/CMakeLists.txt b/src/apps/ktupnptest/CMakeLists.txt new file mode 100644 index 0000000..674d951 --- /dev/null +++ b/src/apps/ktupnptest/CMakeLists.txt @@ -0,0 +1,15 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/src + ${CMAKE_SOURCE_DIR}/src/libktorrent + ${CMAKE_CURRENT_BINARY_DIR} +) + + +##### ktupnptest (executable) + +tde_add_executable( ktupnptest AUTOMOC + SOURCES main.cpp upnptestapp.cpp mainwidget.ui + LINK ktupnp-static ktorrent-shared tdecore-shared tdeui-shared tdeio-shared DCOP-shared + DESTINATION ${BIN_INSTALL_DIR} +) diff --git a/apps/ktupnptest/main.cpp b/src/apps/ktupnptest/main.cpp index 2493f36..2493f36 100644 --- a/apps/ktupnptest/main.cpp +++ b/src/apps/ktupnptest/main.cpp diff --git a/apps/ktupnptest/mainwidget.ui b/src/apps/ktupnptest/mainwidget.ui index 7faa40d..7faa40d 100644 --- a/apps/ktupnptest/mainwidget.ui +++ b/src/apps/ktupnptest/mainwidget.ui diff --git a/apps/ktupnptest/upnptestapp.cpp b/src/apps/ktupnptest/upnptestapp.cpp index f38c419..a6e0852 100644 --- a/apps/ktupnptest/upnptestapp.cpp +++ b/src/apps/ktupnptest/upnptestapp.cpp @@ -33,11 +33,11 @@ UPnPTestApp::UPnPTestApp(TQWidget *parent, const char *name) : TDEMainWindow(parent, name) { sock = new UPnPMCastSocket(true); - connect(sock,TQT_SIGNAL(discovered( UPnPRouter* )),this,TQT_SLOT(discovered( UPnPRouter* ))); + connect(sock,TQ_SIGNAL(discovered( UPnPRouter* )),this,TQ_SLOT(discovered( UPnPRouter* ))); mwnd = new MainWidget(this); setCentralWidget(mwnd); - connect(mwnd->test_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onTestBtn())); - connect(mwnd->close_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onCloseBtn())); + connect(mwnd->test_btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(onTestBtn())); + connect(mwnd->close_btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(onCloseBtn())); bt::Log & lg = bt::Globals::instance().getLog(0); lg.addMonitor(this); Out() << "UPnPTestApp started up !" << endl; @@ -68,7 +68,7 @@ void UPnPTestApp::onTestBtn() void UPnPTestApp::onCloseBtn() { - kapp->quit(); + tdeApp->quit(); } bool UPnPTestApp::queryExit() diff --git a/apps/ktupnptest/upnptestapp.h b/src/apps/ktupnptest/upnptestapp.h index 17aae8d..7c5ac98 100644 --- a/apps/ktupnptest/upnptestapp.h +++ b/src/apps/ktupnptest/upnptestapp.h @@ -37,7 +37,7 @@ using kt::UPnPRouter; */ class UPnPTestApp : public TDEMainWindow, public kt::LogMonitorInterface { - Q_OBJECT + TQ_OBJECT public: UPnPTestApp(TQWidget *parent = 0, const char *name = 0); diff --git a/estimation-scripts/EstimationResults.rb b/src/estimation-scripts/EstimationResults.rb index 01eedcc..01eedcc 100644 --- a/estimation-scripts/EstimationResults.rb +++ b/src/estimation-scripts/EstimationResults.rb diff --git a/estimation-scripts/Estimators.rb b/src/estimation-scripts/Estimators.rb index 1ef0c6e..1ef0c6e 100644 --- a/estimation-scripts/Estimators.rb +++ b/src/estimation-scripts/Estimators.rb diff --git a/estimation-scripts/README b/src/estimation-scripts/README index c1066a6..c1066a6 100644 --- a/estimation-scripts/README +++ b/src/estimation-scripts/README diff --git a/estimation-scripts/Sample.rb b/src/estimation-scripts/Sample.rb index b0c38c2..b0c38c2 100644 --- a/estimation-scripts/Sample.rb +++ b/src/estimation-scripts/Sample.rb diff --git a/estimation-scripts/demo.rb b/src/estimation-scripts/demo.rb index 9cf235b..9cf235b 100644 --- a/estimation-scripts/demo.rb +++ b/src/estimation-scripts/demo.rb diff --git a/estimation-scripts/enable-logging.diff b/src/estimation-scripts/enable-logging.diff index 172b6cf..172b6cf 100644 --- a/estimation-scripts/enable-logging.diff +++ b/src/estimation-scripts/enable-logging.diff diff --git a/estimation-scripts/processlog.rb b/src/estimation-scripts/processlog.rb index c750ba5..c750ba5 100644 --- a/estimation-scripts/processlog.rb +++ b/src/estimation-scripts/processlog.rb diff --git a/src/libktorrent/CMakeLists.txt b/src/libktorrent/CMakeLists.txt new file mode 100644 index 0000000..4bcf0ba --- /dev/null +++ b/src/libktorrent/CMakeLists.txt @@ -0,0 +1,54 @@ +##### generate settings.h + +add_custom_command( + OUTPUT settings.cpp settings.h + COMMAND "${BIN_INSTALL_DIR}/tdeconfig_compiler" + ARGS "${CMAKE_CURRENT_SOURCE_DIR}/ktorrent.kcfg" + "${CMAKE_CURRENT_SOURCE_DIR}/settings.kcfgc" +) + +add_custom_target( SettingsH DEPENDS settings.h ) + + +##### subfolders + +add_subdirectory( datachecker ) +add_subdirectory( interfaces ) +add_subdirectory( kademlia ) +add_subdirectory( migrate ) +add_subdirectory( mse ) +add_subdirectory( net ) +add_subdirectory( torrent ) +add_subdirectory( util ) + + +##### current folder + +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} +) + + +##### ktorrent library (static) + +tde_add_library( ktorrent SHARED AUTOMOC + SOURCES + expandablewidget.cpp functions.cpp labelview.cpp labelviewitembase.ui pluginmanager.cpp + pluginmanagerprefpage.cpp pluginmanagerwidget.ui settings.cpp + EMBED + torrent-static net-static datachecker-static mse-static migrate-static + kademlia-static interfaces-static util-static + LINK + tdecore-shared tdeio-shared tdeui-shared tdeparts-shared + VERSION 2.2.8 + DESTINATION ${LIB_INSTALL_DIR} +) + + +##### other files + +install( + FILES ktorrent.kcfg + DESTINATION ${KCFG_INSTALL_DIR} +) diff --git a/src/libktorrent/datachecker/CMakeLists.txt b/src/libktorrent/datachecker/CMakeLists.txt new file mode 100644 index 0000000..f09dd85 --- /dev/null +++ b/src/libktorrent/datachecker/CMakeLists.txt @@ -0,0 +1,13 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/.. +) + + +##### datachecker library (static) + +tde_add_library( datachecker STATIC_PIC AUTOMOC + SOURCES + datachecker.cpp multidatachecker.cpp singledatachecker.cpp + datacheckerlistener.cpp datacheckerthread.cpp +) diff --git a/libktorrent/datachecker/datachecker.cpp b/src/libktorrent/datachecker/datachecker.cpp index 04bd08e..04bd08e 100644 --- a/libktorrent/datachecker/datachecker.cpp +++ b/src/libktorrent/datachecker/datachecker.cpp diff --git a/libktorrent/datachecker/datachecker.h b/src/libktorrent/datachecker/datachecker.h index e038152..edc53f5 100644 --- a/libktorrent/datachecker/datachecker.h +++ b/src/libktorrent/datachecker/datachecker.h @@ -22,6 +22,7 @@ #include <util/bitset.h> #include "datacheckerlistener.h" +#include <libktorrent_export.h> class TQString; @@ -37,7 +38,7 @@ namespace bt * Checks which data is downloaded, given a torrent and a file or directory containing * files of the torrent. */ - class DataChecker + class LIBKTORRENT_EXPORT DataChecker { public: DataChecker(); diff --git a/libktorrent/datachecker/datacheckerlistener.cpp b/src/libktorrent/datachecker/datacheckerlistener.cpp index a4a2201..a4a2201 100644 --- a/libktorrent/datachecker/datacheckerlistener.cpp +++ b/src/libktorrent/datachecker/datacheckerlistener.cpp diff --git a/libktorrent/datachecker/datacheckerlistener.h b/src/libktorrent/datachecker/datacheckerlistener.h index a770bab..abadc21 100644 --- a/libktorrent/datachecker/datacheckerlistener.h +++ b/src/libktorrent/datachecker/datacheckerlistener.h @@ -21,6 +21,7 @@ #define BTDATACHECKERLISTENER_H #include <util/constants.h> +#include <libktorrent_export.h> namespace bt { @@ -28,7 +29,7 @@ namespace bt /** @author Joris Guisson <joris.guisson@gmail.com> */ - class DataCheckerListener + class LIBKTORRENT_EXPORT DataCheckerListener { public: DataCheckerListener(bool auto_import); diff --git a/libktorrent/datachecker/datacheckerthread.cpp b/src/libktorrent/datachecker/datacheckerthread.cpp index fcbdf3d..fcbdf3d 100644 --- a/libktorrent/datachecker/datacheckerthread.cpp +++ b/src/libktorrent/datachecker/datacheckerthread.cpp diff --git a/libktorrent/datachecker/datacheckerthread.h b/src/libktorrent/datachecker/datacheckerthread.h index 207b245..207b245 100644 --- a/libktorrent/datachecker/datacheckerthread.h +++ b/src/libktorrent/datachecker/datacheckerthread.h diff --git a/libktorrent/datachecker/multidatachecker.cpp b/src/libktorrent/datachecker/multidatachecker.cpp index f63e05c..6fe8e39 100644 --- a/libktorrent/datachecker/multidatachecker.cpp +++ b/src/libktorrent/datachecker/multidatachecker.cpp @@ -94,7 +94,7 @@ namespace bt if (now - last_update_time > 1000) { Out() << "Checked " << cur_chunk << " chunks" << endl; - // TDEApplication::kApplication()->processEvents(); + // tdeApp->processEvents(); last_update_time = now; } } diff --git a/libktorrent/datachecker/multidatachecker.h b/src/libktorrent/datachecker/multidatachecker.h index bb68a06..f6271dd 100644 --- a/libktorrent/datachecker/multidatachecker.h +++ b/src/libktorrent/datachecker/multidatachecker.h @@ -28,7 +28,7 @@ namespace bt /** @author Joris Guisson */ - class MultiDataChecker : public DataChecker + class LIBKTORRENT_EXPORT MultiDataChecker : public DataChecker { public: MultiDataChecker(); diff --git a/libktorrent/datachecker/singledatachecker.cpp b/src/libktorrent/datachecker/singledatachecker.cpp index 4ecc268..4ecc268 100644 --- a/libktorrent/datachecker/singledatachecker.cpp +++ b/src/libktorrent/datachecker/singledatachecker.cpp diff --git a/libktorrent/datachecker/singledatachecker.h b/src/libktorrent/datachecker/singledatachecker.h index 3b86829..d0d15b4 100644 --- a/libktorrent/datachecker/singledatachecker.h +++ b/src/libktorrent/datachecker/singledatachecker.h @@ -30,7 +30,7 @@ namespace bt * * Data checker for single file torrents. */ - class SingleDataChecker : public DataChecker + class LIBKTORRENT_EXPORT SingleDataChecker : public DataChecker { public: SingleDataChecker(); diff --git a/libktorrent/expandablewidget.cpp b/src/libktorrent/expandablewidget.cpp index fe7a0df..2302329 100644 --- a/libktorrent/expandablewidget.cpp +++ b/src/libktorrent/expandablewidget.cpp @@ -57,7 +57,7 @@ namespace kt top_layout->remove(begin->w); // create new toplevel splitter - Qt::Orientation orientation = (pos == RIGHT || pos == LEFT) ? Qt::Horizontal : Qt::Vertical; + TQt::Orientation orientation = (pos == RIGHT || pos == LEFT) ? TQt::Horizontal : TQt::Vertical; TQSplitter* s = new TQSplitter(orientation,this);; se->s = s; diff --git a/libktorrent/expandablewidget.h b/src/libktorrent/expandablewidget.h index 5d7f8f0..6aa0709 100644 --- a/libktorrent/expandablewidget.h +++ b/src/libktorrent/expandablewidget.h @@ -42,7 +42,7 @@ namespace kt */ class ExpandableWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/libktorrent/functions.cpp b/src/libktorrent/functions.cpp index 45ef9a2..a6e703b 100644 --- a/libktorrent/functions.cpp +++ b/src/libktorrent/functions.cpp @@ -20,7 +20,7 @@ #include <tqdatetime.h> #include <tdelocale.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <util/functions.h> #include "functions.h" diff --git a/libktorrent/functions.h b/src/libktorrent/functions.h index 4b2a9ee..4076d9e 100644 --- a/libktorrent/functions.h +++ b/src/libktorrent/functions.h @@ -22,6 +22,7 @@ #include <tqstring.h> #include <util/constants.h> +#include <libktorrent_export.h> namespace kt { @@ -29,7 +30,7 @@ namespace kt * Will return the data directory * @return ~/.trinity/share/apps/ktorrent/ */ - TQString DataDir(); + LIBKTORRENT_EXPORT TQString DataDir(); } #endif diff --git a/src/libktorrent/interfaces/CMakeLists.txt b/src/libktorrent/interfaces/CMakeLists.txt new file mode 100644 index 0000000..e2b6e12 --- /dev/null +++ b/src/libktorrent/interfaces/CMakeLists.txt @@ -0,0 +1,16 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/.. + ${CMAKE_CURRENT_BINARY_DIR} +) + + +##### interfaces library (static) + +tde_add_library( interfaces STATIC_PIC AUTOMOC + SOURCES + plugin.cpp coreinterface.cpp guiinterface.cpp prefpageinterface.cpp torrentinterface.cpp + monitorinterface.cpp chunkdownloadinterface.cpp peerinterface.cpp torrentfileinterface.cpp + filetreeitem.cpp filetreediritem.cpp functions.cpp logmonitorinterface.cpp + ipblockinginterface.cpp trackerslist.cpp peersource.cpp exitoperation.cpp +) diff --git a/libktorrent/interfaces/chunkdownloadinterface.cpp b/src/libktorrent/interfaces/chunkdownloadinterface.cpp index d991605..d991605 100644 --- a/libktorrent/interfaces/chunkdownloadinterface.cpp +++ b/src/libktorrent/interfaces/chunkdownloadinterface.cpp diff --git a/libktorrent/interfaces/chunkdownloadinterface.h b/src/libktorrent/interfaces/chunkdownloadinterface.h index 0945006..0945006 100644 --- a/libktorrent/interfaces/chunkdownloadinterface.h +++ b/src/libktorrent/interfaces/chunkdownloadinterface.h diff --git a/libktorrent/interfaces/coreinterface.cpp b/src/libktorrent/interfaces/coreinterface.cpp index cb350d8..cb350d8 100644 --- a/libktorrent/interfaces/coreinterface.cpp +++ b/src/libktorrent/interfaces/coreinterface.cpp diff --git a/libktorrent/interfaces/coreinterface.h b/src/libktorrent/interfaces/coreinterface.h index d3e80c9..6e779f9 100644 --- a/libktorrent/interfaces/coreinterface.h +++ b/src/libktorrent/interfaces/coreinterface.h @@ -24,6 +24,7 @@ #include <tqobject.h> #include <util/constants.h> #include <torrent/queuemanager.h> +#include <libktorrent_export.h> ///Stats struct struct CurrentStats @@ -50,9 +51,9 @@ namespace kt * the applications core, the core is responsible for managing all * TorrentControl objects. */ - class CoreInterface : public TQObject + class LIBKTORRENT_EXPORT CoreInterface : public TQObject { - Q_OBJECT + TQ_OBJECT public: CoreInterface(); diff --git a/libktorrent/interfaces/exitoperation.cpp b/src/libktorrent/interfaces/exitoperation.cpp index fd9883f..7d1867e 100644 --- a/libktorrent/interfaces/exitoperation.cpp +++ b/src/libktorrent/interfaces/exitoperation.cpp @@ -31,7 +31,7 @@ namespace kt ExitJobOperation::ExitJobOperation(TDEIO::Job* j) { - connect(j,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(onResult( TDEIO::Job* ))); + connect(j,TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(onResult( TDEIO::Job* ))); } ExitJobOperation::~ExitJobOperation() diff --git a/libktorrent/interfaces/exitoperation.h b/src/libktorrent/interfaces/exitoperation.h index 2a33f24..655b344 100644 --- a/libktorrent/interfaces/exitoperation.h +++ b/src/libktorrent/interfaces/exitoperation.h @@ -22,6 +22,7 @@ #include <tqobject.h> #include <tdeio/job.h> +#include <libktorrent_export.h> namespace kt { @@ -35,9 +36,9 @@ namespace kt * ExitOperation's can be used in combination with a WaitJob, to wait for a certain amount of time * to give serveral ExitOperation's the time time to finish up. */ - class ExitOperation : public TQObject + class LIBKTORRENT_EXPORT ExitOperation : public TQObject { - Q_OBJECT + TQ_OBJECT public: ExitOperation(); @@ -54,7 +55,7 @@ namespace kt */ class ExitJobOperation : public ExitOperation { - Q_OBJECT + TQ_OBJECT public: ExitJobOperation(TDEIO::Job* j); diff --git a/libktorrent/interfaces/filetreediritem.cpp b/src/libktorrent/interfaces/filetreediritem.cpp index 167ff2d..167ff2d 100644 --- a/libktorrent/interfaces/filetreediritem.cpp +++ b/src/libktorrent/interfaces/filetreediritem.cpp diff --git a/libktorrent/interfaces/filetreediritem.h b/src/libktorrent/interfaces/filetreediritem.h index 6b35031..6f60070 100644 --- a/libktorrent/interfaces/filetreediritem.h +++ b/src/libktorrent/interfaces/filetreediritem.h @@ -23,6 +23,7 @@ #include <tdelistview.h> #include <util/constants.h> #include <util/ptrmap.h> +#include <libktorrent_export.h> namespace kt { @@ -44,7 +45,7 @@ namespace kt * * Directory item the file tree showing the files in a multifile torrent */ - class FileTreeDirItem : public TQCheckListItem + class LIBKTORRENT_EXPORT FileTreeDirItem : public TQCheckListItem { protected: TQString name; diff --git a/libktorrent/interfaces/filetreeitem.cpp b/src/libktorrent/interfaces/filetreeitem.cpp index ca431b5..ca431b5 100644 --- a/libktorrent/interfaces/filetreeitem.cpp +++ b/src/libktorrent/interfaces/filetreeitem.cpp diff --git a/libktorrent/interfaces/filetreeitem.h b/src/libktorrent/interfaces/filetreeitem.h index 5cc17f9..af7759e 100644 --- a/libktorrent/interfaces/filetreeitem.h +++ b/src/libktorrent/interfaces/filetreeitem.h @@ -22,6 +22,7 @@ #include <tdelistview.h> #include <util/constants.h> +#include <libktorrent_export.h> using namespace bt; @@ -40,7 +41,7 @@ namespace kt * This is derived from TQCheckListItem, if the user checks or unchecks the box, * wether or not to download a file will be changed. */ - class FileTreeItem : public TQCheckListItem + class LIBKTORRENT_EXPORT FileTreeItem : public TQCheckListItem { protected: TQString name; diff --git a/libktorrent/interfaces/functions.cpp b/src/libktorrent/interfaces/functions.cpp index 096a48c..096a48c 100644 --- a/libktorrent/interfaces/functions.cpp +++ b/src/libktorrent/interfaces/functions.cpp diff --git a/libktorrent/interfaces/functions.h b/src/libktorrent/interfaces/functions.h index 4ffe9a9..4836a6f 100644 --- a/libktorrent/interfaces/functions.h +++ b/src/libktorrent/interfaces/functions.h @@ -22,6 +22,7 @@ #include <tqstring.h> #include <util/constants.h> +#include <libktorrent_export.h> namespace kt { @@ -29,9 +30,9 @@ namespace kt const double TO_MEG = (1024.0 * 1024.0); const double TO_GIG = (1024.0 * 1024.0 * 1024.0); - TQString BytesToString(bt::Uint64 bytes,int precision = -1); - TQString KBytesPerSecToString(double speed,int precision = 1); - TQString DurationToString(bt::Uint32 nsecs); + LIBKTORRENT_EXPORT TQString BytesToString(bt::Uint64 bytes,int precision = -1); + LIBKTORRENT_EXPORT TQString KBytesPerSecToString(double speed,int precision = 1); + LIBKTORRENT_EXPORT TQString DurationToString(bt::Uint32 nsecs); template<class T> int CompareVal(T a,T b) { diff --git a/libktorrent/interfaces/guiinterface.cpp b/src/libktorrent/interfaces/guiinterface.cpp index 635415e..635415e 100644 --- a/libktorrent/interfaces/guiinterface.cpp +++ b/src/libktorrent/interfaces/guiinterface.cpp diff --git a/libktorrent/interfaces/guiinterface.h b/src/libktorrent/interfaces/guiinterface.h index 69d168b..d94559e 100644 --- a/libktorrent/interfaces/guiinterface.h +++ b/src/libktorrent/interfaces/guiinterface.h @@ -21,6 +21,7 @@ #define KTGUIINTERFACE_H #include <tqptrlist.h> +#include <libktorrent_export.h> class TQWidget; class TQIconSet; @@ -77,7 +78,7 @@ namespace kt * * This interface allows plugins and others to modify the GUI. */ - class GUIInterface + class LIBKTORRENT_EXPORT GUIInterface { TQPtrList<ViewListener> listeners; public: diff --git a/libktorrent/interfaces/ipblockinginterface.cpp b/src/libktorrent/interfaces/ipblockinginterface.cpp index e92e24c..e92e24c 100644 --- a/libktorrent/interfaces/ipblockinginterface.cpp +++ b/src/libktorrent/interfaces/ipblockinginterface.cpp diff --git a/libktorrent/interfaces/ipblockinginterface.h b/src/libktorrent/interfaces/ipblockinginterface.h index 236a549..f281d2c 100644 --- a/libktorrent/interfaces/ipblockinginterface.h +++ b/src/libktorrent/interfaces/ipblockinginterface.h @@ -22,6 +22,8 @@ #ifndef IPBLOCKINGINTERFACE_H #define IPBLOCKINGINTERFACE_H +#include <libktorrent_export.h> + class TQString; namespace kt @@ -30,7 +32,7 @@ namespace kt * @author Ivan Vasic * @brief Interface for IPBlocklist to communicate with IPBlockingPlugin */ - class IPBlockingInterface + class LIBKTORRENT_EXPORT IPBlockingInterface { public: IPBlockingInterface(); @@ -38,7 +40,7 @@ namespace kt /** * This function checks if IP is listed in antip2p filter list. - * @return TRUE if IP should be blocked. FALSE otherwise + * @return true if IP should be blocked. false otherwise * @arg ip String representation of IP address. */ virtual bool isBlockedIP(const TQString& ip) = 0; diff --git a/libktorrent/interfaces/logmonitorinterface.cpp b/src/libktorrent/interfaces/logmonitorinterface.cpp index df77a53..df77a53 100644 --- a/libktorrent/interfaces/logmonitorinterface.cpp +++ b/src/libktorrent/interfaces/logmonitorinterface.cpp diff --git a/libktorrent/interfaces/logmonitorinterface.h b/src/libktorrent/interfaces/logmonitorinterface.h index 54e1a21..7ee6498 100644 --- a/libktorrent/interfaces/logmonitorinterface.h +++ b/src/libktorrent/interfaces/logmonitorinterface.h @@ -20,6 +20,8 @@ #ifndef KTLOGMONITORINTERFACE_H #define KTLOGMONITORINTERFACE_H +#include <libktorrent_export.h> + class TQString; namespace kt @@ -32,7 +34,7 @@ namespace kt * This class is an interface for all classes which want to know, * what is written to the log. */ - class LogMonitorInterface + class LIBKTORRENT_EXPORT LogMonitorInterface { public: LogMonitorInterface(); diff --git a/libktorrent/interfaces/monitorinterface.cpp b/src/libktorrent/interfaces/monitorinterface.cpp index d3d0c52..d3d0c52 100644 --- a/libktorrent/interfaces/monitorinterface.cpp +++ b/src/libktorrent/interfaces/monitorinterface.cpp diff --git a/libktorrent/interfaces/monitorinterface.h b/src/libktorrent/interfaces/monitorinterface.h index a199800..0f864de 100644 --- a/libktorrent/interfaces/monitorinterface.h +++ b/src/libktorrent/interfaces/monitorinterface.h @@ -20,6 +20,7 @@ #ifndef KTMONITORINTERFACE_H #define KTMONITORINTERFACE_H +#include <libktorrent_export.h> namespace kt { @@ -33,7 +34,7 @@ namespace kt * Classes who want to keep track of all peers currently connected for a given * torrent and all chunks who are currently downloading can implement this interface. */ - class MonitorInterface + class LIBKTORRENT_EXPORT MonitorInterface { public: MonitorInterface(); diff --git a/libktorrent/interfaces/peerinterface.cpp b/src/libktorrent/interfaces/peerinterface.cpp index a4ab246..a4ab246 100644 --- a/libktorrent/interfaces/peerinterface.cpp +++ b/src/libktorrent/interfaces/peerinterface.cpp diff --git a/libktorrent/interfaces/peerinterface.h b/src/libktorrent/interfaces/peerinterface.h index d5424ac..d5424ac 100644 --- a/libktorrent/interfaces/peerinterface.h +++ b/src/libktorrent/interfaces/peerinterface.h diff --git a/libktorrent/interfaces/peersource.cpp b/src/libktorrent/interfaces/peersource.cpp index 6a1eb87..6a1eb87 100644 --- a/libktorrent/interfaces/peersource.cpp +++ b/src/libktorrent/interfaces/peersource.cpp diff --git a/libktorrent/interfaces/peersource.h b/src/libktorrent/interfaces/peersource.h index 4b3b82a..a6f2e79 100644 --- a/libktorrent/interfaces/peersource.h +++ b/src/libktorrent/interfaces/peersource.h @@ -23,6 +23,7 @@ #include <tqobject.h> #include <tqvaluelist.h> #include <util/constants.h> +#include <libktorrent_export.h> namespace bt { @@ -47,9 +48,9 @@ namespace kt * for torrents. PeerSources should work independently and should emit a signal when they * have peers ready. */ - class PeerSource : public TQObject + class LIBKTORRENT_EXPORT PeerSource : public TQObject { - Q_OBJECT + TQ_OBJECT public: PeerSource(); diff --git a/libktorrent/interfaces/plugin.cpp b/src/libktorrent/interfaces/plugin.cpp index 92a4f22..92a4f22 100644 --- a/libktorrent/interfaces/plugin.cpp +++ b/src/libktorrent/interfaces/plugin.cpp diff --git a/libktorrent/interfaces/plugin.h b/src/libktorrent/interfaces/plugin.h index c3e3f90..1c185cc 100644 --- a/libktorrent/interfaces/plugin.h +++ b/src/libktorrent/interfaces/plugin.h @@ -21,6 +21,7 @@ #define KTPLUGIN_H #include <ktversion.h> +#include <libktorrent_export.h> #include <tdeparts/plugin.h> namespace bt @@ -45,9 +46,9 @@ namespace kt * (setting an int to 0 is ok, creating widgets isn't). * Only the name, author and description may be set in the constructor. */ - class Plugin : public KParts::Plugin + class LIBKTORRENT_EXPORT Plugin : public KParts::Plugin { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/libktorrent/interfaces/prefpageinterface.cpp b/src/libktorrent/interfaces/prefpageinterface.cpp index ae6414f..ae6414f 100644 --- a/libktorrent/interfaces/prefpageinterface.cpp +++ b/src/libktorrent/interfaces/prefpageinterface.cpp diff --git a/libktorrent/interfaces/prefpageinterface.h b/src/libktorrent/interfaces/prefpageinterface.h index 850a344..665cdac 100644 --- a/libktorrent/interfaces/prefpageinterface.h +++ b/src/libktorrent/interfaces/prefpageinterface.h @@ -21,6 +21,7 @@ #define PREFPAGEINTERFACE_H #include <tqpixmap.h> +#include <libktorrent_export.h> class TQWidget; @@ -32,7 +33,7 @@ namespace kt * * This interface allows plugins and others to add their own pages in Configuration dialog */ - class PrefPageInterface + class LIBKTORRENT_EXPORT PrefPageInterface { public: /** diff --git a/libktorrent/interfaces/torrentfileinterface.cpp b/src/libktorrent/interfaces/torrentfileinterface.cpp index d49414e..d49414e 100644 --- a/libktorrent/interfaces/torrentfileinterface.cpp +++ b/src/libktorrent/interfaces/torrentfileinterface.cpp diff --git a/libktorrent/interfaces/torrentfileinterface.h b/src/libktorrent/interfaces/torrentfileinterface.h index 9795964..2590fa7 100644 --- a/libktorrent/interfaces/torrentfileinterface.h +++ b/src/libktorrent/interfaces/torrentfileinterface.h @@ -23,6 +23,7 @@ #include <tqobject.h> #include <tqstring.h> #include <util/constants.h> +#include <libktorrent_export.h> namespace kt { @@ -41,9 +42,9 @@ namespace kt * * This class is the interface for a file in a multifile torrent. */ - class TorrentFileInterface : public TQObject + class LIBKTORRENT_EXPORT TorrentFileInterface : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/libktorrent/interfaces/torrentinterface.cpp b/src/libktorrent/interfaces/torrentinterface.cpp index 763bd55..763bd55 100644 --- a/libktorrent/interfaces/torrentinterface.cpp +++ b/src/libktorrent/interfaces/torrentinterface.cpp diff --git a/libktorrent/interfaces/torrentinterface.h b/src/libktorrent/interfaces/torrentinterface.h index e76e00e..464a640 100644 --- a/libktorrent/interfaces/torrentinterface.h +++ b/src/libktorrent/interfaces/torrentinterface.h @@ -22,9 +22,9 @@ #include <tqobject.h> #include <util/constants.h> -#include <interfaces/trackerslist.h> - #include <kurl.h> +#include <interfaces/trackerslist.h> +#include <libktorrent_export.h> namespace bt { @@ -179,9 +179,9 @@ namespace kt * This class is the interface for an object which controls the * up- and download of one torrent. */ - class TorrentInterface : public TQObject + class LIBKTORRENT_EXPORT TorrentInterface : public TQObject { - Q_OBJECT + TQ_OBJECT public: TorrentInterface(); @@ -503,7 +503,7 @@ namespace kt * @param stats The stats of the torrent * @return The share ratio */ - float ShareRatio(const TorrentStats & stats); + LIBKTORRENT_EXPORT float ShareRatio(const TorrentStats & stats); } diff --git a/libktorrent/interfaces/trackerslist.cpp b/src/libktorrent/interfaces/trackerslist.cpp index c119625..c119625 100644 --- a/libktorrent/interfaces/trackerslist.cpp +++ b/src/libktorrent/interfaces/trackerslist.cpp diff --git a/libktorrent/interfaces/trackerslist.h b/src/libktorrent/interfaces/trackerslist.h index 55dc05e..55dc05e 100644 --- a/libktorrent/interfaces/trackerslist.h +++ b/src/libktorrent/interfaces/trackerslist.h diff --git a/src/libktorrent/kademlia/CMakeLists.txt b/src/libktorrent/kademlia/CMakeLists.txt new file mode 100644 index 0000000..83c1fd1 --- /dev/null +++ b/src/libktorrent/kademlia/CMakeLists.txt @@ -0,0 +1,15 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/.. + ${CMAKE_CURRENT_BINARY_DIR} +) + + +##### kademlia library (static) + +tde_add_library( kademlia STATIC_PIC AUTOMOC + SOURCES + key.cpp node.cpp kbucket.cpp rpccall.cpp rpcserver.cpp database.cpp dht.cpp rpcmsg.cpp + kclosestnodessearch.cpp nodelookup.cpp task.cpp pack.cpp taskmanager.cpp announcetask.cpp + dhttrackerbackend.cpp dhtbase.cpp +) diff --git a/libktorrent/kademlia/announcetask.cpp b/src/libktorrent/kademlia/announcetask.cpp index 95f4020..95f4020 100644 --- a/libktorrent/kademlia/announcetask.cpp +++ b/src/libktorrent/kademlia/announcetask.cpp diff --git a/libktorrent/kademlia/announcetask.h b/src/libktorrent/kademlia/announcetask.h index 02dec19..02dec19 100644 --- a/libktorrent/kademlia/announcetask.h +++ b/src/libktorrent/kademlia/announcetask.h diff --git a/libktorrent/kademlia/database.cpp b/src/libktorrent/kademlia/database.cpp index 447975f..447975f 100644 --- a/libktorrent/kademlia/database.cpp +++ b/src/libktorrent/kademlia/database.cpp diff --git a/libktorrent/kademlia/database.h b/src/libktorrent/kademlia/database.h index 365f6bb..365f6bb 100644 --- a/libktorrent/kademlia/database.h +++ b/src/libktorrent/kademlia/database.h diff --git a/libktorrent/kademlia/dht.cpp b/src/libktorrent/kademlia/dht.cpp index 95bcccb..ff14340 100644 --- a/libktorrent/kademlia/dht.cpp +++ b/src/libktorrent/kademlia/dht.cpp @@ -46,7 +46,7 @@ namespace dht DHT::DHT() : node(0),srv(0),db(0),tman(0) { - connect(&update_timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(update())); + connect(&update_timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(update())); } diff --git a/libktorrent/kademlia/dht.h b/src/libktorrent/kademlia/dht.h index e3d9c35..0e6207d 100644 --- a/libktorrent/kademlia/dht.h +++ b/src/libktorrent/kademlia/dht.h @@ -63,7 +63,7 @@ namespace dht */ class DHT : public DHTBase { - Q_OBJECT + TQ_OBJECT public: DHT(); diff --git a/libktorrent/kademlia/dhtbase.cpp b/src/libktorrent/kademlia/dhtbase.cpp index b0ff582..b0ff582 100644 --- a/libktorrent/kademlia/dhtbase.cpp +++ b/src/libktorrent/kademlia/dhtbase.cpp diff --git a/libktorrent/kademlia/dhtbase.h b/src/libktorrent/kademlia/dhtbase.h index dca5e58..57c42a6 100644 --- a/libktorrent/kademlia/dhtbase.h +++ b/src/libktorrent/kademlia/dhtbase.h @@ -50,7 +50,7 @@ namespace dht */ class DHTBase : public TQObject { - Q_OBJECT + TQ_OBJECT public: DHTBase(); diff --git a/libktorrent/kademlia/dhttrackerbackend.cpp b/src/libktorrent/kademlia/dhttrackerbackend.cpp index f266744..024abd7 100644 --- a/libktorrent/kademlia/dhttrackerbackend.cpp +++ b/src/libktorrent/kademlia/dhttrackerbackend.cpp @@ -37,9 +37,9 @@ namespace dht DHTTrackerBackend::DHTTrackerBackend(DHTBase & dh_table,kt::TorrentInterface* tor) : dh_table(dh_table),curr_task(0),tor(tor) { - connect(&timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(onTimeout())); - connect(&dh_table,TQT_SIGNAL(started()),this,TQT_SLOT(manualUpdate())); - connect(&dh_table,TQT_SIGNAL(stopped()),this,TQT_SLOT(dhtStopped())); + connect(&timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(onTimeout())); + connect(&dh_table,TQ_SIGNAL(started()),this,TQ_SLOT(manualUpdate())); + connect(&dh_table,TQ_SIGNAL(stopped()),this,TQ_SLOT(dhtStopped())); started = false; } @@ -98,8 +98,8 @@ namespace dht const kt::DHTNode & n = tor->getDHTNode(i); curr_task->addDHTNode(n.ip,n.port); } - connect(curr_task,TQT_SIGNAL(dataReady( Task* )),this,TQT_SLOT(onDataReady( Task* ))); - connect(curr_task,TQT_SIGNAL(finished( Task* )),this,TQT_SLOT(onFinished( Task* ))); + connect(curr_task,TQ_SIGNAL(dataReady( Task* )),this,TQ_SLOT(onDataReady( Task* ))); + connect(curr_task,TQ_SIGNAL(finished( Task* )),this,TQ_SLOT(onFinished( Task* ))); return true; } diff --git a/libktorrent/kademlia/dhttrackerbackend.h b/src/libktorrent/kademlia/dhttrackerbackend.h index 6c87413..6994cdb 100644 --- a/libktorrent/kademlia/dhttrackerbackend.h +++ b/src/libktorrent/kademlia/dhttrackerbackend.h @@ -46,7 +46,7 @@ namespace dht */ class DHTTrackerBackend : public kt::PeerSource { - Q_OBJECT + TQ_OBJECT public: DHTTrackerBackend(DHTBase & dh_table,kt::TorrentInterface* tor); diff --git a/libktorrent/kademlia/kbucket.cpp b/src/libktorrent/kademlia/kbucket.cpp index e331a51..f8d77c2 100644 --- a/libktorrent/kademlia/kbucket.cpp +++ b/src/libktorrent/kademlia/kbucket.cpp @@ -345,8 +345,8 @@ namespace dht refresh_task = t; if (refresh_task) { - connect(refresh_task,TQT_SIGNAL(finished( Task* )), - this,TQT_SLOT(onFinished( Task* ))); + connect(refresh_task,TQ_SIGNAL(finished( Task* )), + this,TQ_SLOT(onFinished( Task* ))); } } diff --git a/libktorrent/kademlia/kbucket.h b/src/libktorrent/kademlia/kbucket.h index cf065a9..a31b713 100644 --- a/libktorrent/kademlia/kbucket.h +++ b/src/libktorrent/kademlia/kbucket.h @@ -142,7 +142,7 @@ namespace dht */ class KBucket : public RPCCallListener { - Q_OBJECT + TQ_OBJECT Uint32 idx; diff --git a/libktorrent/kademlia/kclosestnodessearch.cpp b/src/libktorrent/kademlia/kclosestnodessearch.cpp index 5421b6c..5421b6c 100644 --- a/libktorrent/kademlia/kclosestnodessearch.cpp +++ b/src/libktorrent/kademlia/kclosestnodessearch.cpp diff --git a/libktorrent/kademlia/kclosestnodessearch.h b/src/libktorrent/kademlia/kclosestnodessearch.h index f4b460d..f4b460d 100644 --- a/libktorrent/kademlia/kclosestnodessearch.h +++ b/src/libktorrent/kademlia/kclosestnodessearch.h diff --git a/libktorrent/kademlia/key.cpp b/src/libktorrent/kademlia/key.cpp index 35ecfff..35ecfff 100644 --- a/libktorrent/kademlia/key.cpp +++ b/src/libktorrent/kademlia/key.cpp diff --git a/libktorrent/kademlia/key.h b/src/libktorrent/kademlia/key.h index e383a5e..e383a5e 100644 --- a/libktorrent/kademlia/key.h +++ b/src/libktorrent/kademlia/key.h diff --git a/libktorrent/kademlia/node.cpp b/src/libktorrent/kademlia/node.cpp index bd450e4..bd450e4 100644 --- a/libktorrent/kademlia/node.cpp +++ b/src/libktorrent/kademlia/node.cpp diff --git a/libktorrent/kademlia/node.h b/src/libktorrent/kademlia/node.h index 01646da..38ddd38 100644 --- a/libktorrent/kademlia/node.h +++ b/src/libktorrent/kademlia/node.h @@ -44,7 +44,7 @@ namespace dht */ class Node : public TQObject { - Q_OBJECT + TQ_OBJECT public: Node(RPCServer* srv,const TQString & key_file); diff --git a/libktorrent/kademlia/nodelookup.cpp b/src/libktorrent/kademlia/nodelookup.cpp index d1544b6..d1544b6 100644 --- a/libktorrent/kademlia/nodelookup.cpp +++ b/src/libktorrent/kademlia/nodelookup.cpp diff --git a/libktorrent/kademlia/nodelookup.h b/src/libktorrent/kademlia/nodelookup.h index ff19e92..ff19e92 100644 --- a/libktorrent/kademlia/nodelookup.h +++ b/src/libktorrent/kademlia/nodelookup.h diff --git a/libktorrent/kademlia/pack.cpp b/src/libktorrent/kademlia/pack.cpp index 200c686..200c686 100644 --- a/libktorrent/kademlia/pack.cpp +++ b/src/libktorrent/kademlia/pack.cpp diff --git a/libktorrent/kademlia/pack.h b/src/libktorrent/kademlia/pack.h index 46c2405..46c2405 100644 --- a/libktorrent/kademlia/pack.h +++ b/src/libktorrent/kademlia/pack.h diff --git a/libktorrent/kademlia/rpccall.cpp b/src/libktorrent/kademlia/rpccall.cpp index 9ed926a..17a15de 100644 --- a/libktorrent/kademlia/rpccall.cpp +++ b/src/libktorrent/kademlia/rpccall.cpp @@ -33,7 +33,7 @@ namespace dht RPCCall::RPCCall(RPCServer* rpc,MsgBase* msg,bool queued) : msg(msg),rpc(rpc),queued(queued) { - connect(&timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(onTimeout())); + connect(&timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(onTimeout())); if (!queued) timer.start(30*1000,true); } @@ -71,8 +71,8 @@ namespace dht void RPCCall::addListener(RPCCallListener* cl) { - connect(this,TQT_SIGNAL(onCallResponse( RPCCall*, MsgBase* )),cl,TQT_SLOT(onResponse( RPCCall*, MsgBase* ))); - connect(this,TQT_SIGNAL(onCallTimeout( RPCCall* )),cl,TQT_SLOT(onTimeout( RPCCall* ))); + connect(this,TQ_SIGNAL(onCallResponse( RPCCall*, MsgBase* )),cl,TQ_SLOT(onResponse( RPCCall*, MsgBase* ))); + connect(this,TQ_SIGNAL(onCallTimeout( RPCCall* )),cl,TQ_SLOT(onTimeout( RPCCall* ))); } } diff --git a/libktorrent/kademlia/rpccall.h b/src/libktorrent/kademlia/rpccall.h index d7b5ee5..1b718d9 100644 --- a/libktorrent/kademlia/rpccall.h +++ b/src/libktorrent/kademlia/rpccall.h @@ -34,7 +34,7 @@ namespace dht */ class RPCCallListener : public TQObject { - Q_OBJECT + TQ_OBJECT public: RPCCallListener(); @@ -61,7 +61,7 @@ namespace dht */ class RPCCall : public TQObject { - Q_OBJECT + TQ_OBJECT public: RPCCall(RPCServer* rpc,MsgBase* msg,bool queued); diff --git a/libktorrent/kademlia/rpcmsg.cpp b/src/libktorrent/kademlia/rpcmsg.cpp index b5b2b7d..b5b2b7d 100644 --- a/libktorrent/kademlia/rpcmsg.cpp +++ b/src/libktorrent/kademlia/rpcmsg.cpp diff --git a/libktorrent/kademlia/rpcmsg.h b/src/libktorrent/kademlia/rpcmsg.h index acdae14..be8f418 100644 --- a/libktorrent/kademlia/rpcmsg.h +++ b/src/libktorrent/kademlia/rpcmsg.h @@ -24,6 +24,7 @@ #include <util/constants.h> #include "key.h" #include "database.h" +#include <libktorrent_export.h> namespace bt { @@ -128,7 +129,7 @@ namespace dht */ MsgBase* MakeRPCMsg(bt::BDictNode* dict,RPCServer* srv); - MsgBase* MakeRPCMsgTest(bt::BDictNode* dict,dht::Method req_method); + LIBKTORRENT_EXPORT MsgBase* MakeRPCMsgTest(bt::BDictNode* dict,dht::Method req_method); class ErrMsg : public MsgBase { diff --git a/libktorrent/kademlia/rpcserver.cpp b/src/libktorrent/kademlia/rpcserver.cpp index 571d4d8..960a2d8 100644 --- a/libktorrent/kademlia/rpcserver.cpp +++ b/src/libktorrent/kademlia/rpcserver.cpp @@ -72,7 +72,7 @@ namespace dht bt::Globals::instance().getPortList().addNewPort(port,net::UDP,true); } sock->setBlocking(false); - connect(sock,TQT_SIGNAL(readyRead()),this,TQT_SLOT(readPacket())); + connect(sock,TQ_SIGNAL(readyRead()),this,TQ_SLOT(readPacket())); } void RPCServer::stop() diff --git a/libktorrent/kademlia/rpcserver.h b/src/libktorrent/kademlia/rpcserver.h index b555fb4..19af2f8 100644 --- a/libktorrent/kademlia/rpcserver.h +++ b/src/libktorrent/kademlia/rpcserver.h @@ -54,7 +54,7 @@ namespace dht */ class RPCServer : public TQObject { - Q_OBJECT + TQ_OBJECT public: RPCServer(DHT* dh_table,Uint16 port,TQObject *parent = 0); diff --git a/libktorrent/kademlia/task.cpp b/src/libktorrent/kademlia/task.cpp index 96e37b4..8dcb521 100644 --- a/libktorrent/kademlia/task.cpp +++ b/src/libktorrent/kademlia/task.cpp @@ -117,7 +117,7 @@ namespace dht void Task::addDHTNode(const TQString & ip,bt::Uint16 port) { - KResolver::resolveAsync(this,TQT_SLOT(onResolverResults(KResolverResults )), + KResolver::resolveAsync(this,TQ_SLOT(onResolverResults(KResolverResults )), ip,TQString::number(port)); } diff --git a/libktorrent/kademlia/task.h b/src/libktorrent/kademlia/task.h index c5dd0e6..c54470b 100644 --- a/libktorrent/kademlia/task.h +++ b/src/libktorrent/kademlia/task.h @@ -48,7 +48,7 @@ namespace dht */ class Task : public RPCCallListener { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/libktorrent/kademlia/taskmanager.cpp b/src/libktorrent/kademlia/taskmanager.cpp index 4e1e21a..4e1e21a 100644 --- a/libktorrent/kademlia/taskmanager.cpp +++ b/src/libktorrent/kademlia/taskmanager.cpp diff --git a/libktorrent/kademlia/taskmanager.h b/src/libktorrent/kademlia/taskmanager.h index 5349d8c..5349d8c 100644 --- a/libktorrent/kademlia/taskmanager.h +++ b/src/libktorrent/kademlia/taskmanager.h diff --git a/libktorrent/ktorrent.kcfg b/src/libktorrent/ktorrent.kcfg index 2d1e9b2..2d1e9b2 100644 --- a/libktorrent/ktorrent.kcfg +++ b/src/libktorrent/ktorrent.kcfg diff --git a/libktorrent/ktversion.h b/src/libktorrent/ktversion.h index 494b1be..494b1be 100644 --- a/libktorrent/ktversion.h +++ b/src/libktorrent/ktversion.h diff --git a/libktorrent/labelview.cpp b/src/libktorrent/labelview.cpp index 7fe1424..b488271 100644 --- a/libktorrent/labelview.cpp +++ b/src/libktorrent/labelview.cpp @@ -91,7 +91,7 @@ namespace kt void LabelViewItem::mousePressEvent(TQMouseEvent *e) { - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { clicked(this); } @@ -165,8 +165,8 @@ namespace kt items.push_back(item); item->setOdd(items.size() % 2 == 1); - connect(item, TQT_SIGNAL(clicked(LabelViewItem*)), - this, TQT_SLOT(onItemClicked(LabelViewItem*))); + connect(item, TQ_SIGNAL(clicked(LabelViewItem*)), + this, TQ_SLOT(onItemClicked(LabelViewItem*))); } void LabelView::removeItem(LabelViewItem* item) @@ -176,8 +176,8 @@ namespace kt { item_box->remove(item); items.erase(i); - disconnect(item, TQT_SIGNAL(clicked(LabelViewItem*)), - this, TQT_SLOT(onItemClicked(LabelViewItem*))); + disconnect(item, TQ_SIGNAL(clicked(LabelViewItem*)), + this, TQ_SLOT(onItemClicked(LabelViewItem*))); // check for selected being equal to item if (item == selected) diff --git a/libktorrent/labelview.h b/src/libktorrent/labelview.h index bfd816c..4cdcb64 100644 --- a/libktorrent/labelview.h +++ b/src/libktorrent/labelview.h @@ -37,7 +37,7 @@ namespace kt */ class LabelViewItem : public LabelViewItemBase { - Q_OBJECT + TQ_OBJECT public: LabelViewItem(const TQString & icon,const TQString & title,const TQString & description,LabelView* view); @@ -82,7 +82,7 @@ namespace kt */ class LabelView : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: LabelView(TQWidget *parent = 0, const char *name = 0); diff --git a/libktorrent/labelviewitembase.ui b/src/libktorrent/labelviewitembase.ui index fbce874..fbce874 100644 --- a/libktorrent/labelviewitembase.ui +++ b/src/libktorrent/labelviewitembase.ui diff --git a/src/libktorrent/libktorrent_export.h b/src/libktorrent/libktorrent_export.h new file mode 100644 index 0000000..fa80a7b --- /dev/null +++ b/src/libktorrent/libktorrent_export.h @@ -0,0 +1,12 @@ +#ifndef _LIBKTORRENT_EXPORT_H +#define _LIBKTORRENT_EXPORT_H + +#include <tdemacros.h> + +#ifdef __TDE_HAVE_GCC_VISIBILITY +#define LIBKTORRENT_EXPORT TDE_EXPORT +#else +#define LIBKTORRENT_EXPORT +#endif + +#endif diff --git a/src/libktorrent/migrate/CMakeLists.txt b/src/libktorrent/migrate/CMakeLists.txt new file mode 100644 index 0000000..9213efc --- /dev/null +++ b/src/libktorrent/migrate/CMakeLists.txt @@ -0,0 +1,11 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/.. +) + + +##### migrate library (static) + +tde_add_library( migrate STATIC_PIC AUTOMOC + SOURCES migrate.cpp ccmigrate.cpp cachemigrate.cpp +) diff --git a/libktorrent/migrate/cachemigrate.cpp b/src/libktorrent/migrate/cachemigrate.cpp index 9006e2a..9006e2a 100644 --- a/libktorrent/migrate/cachemigrate.cpp +++ b/src/libktorrent/migrate/cachemigrate.cpp diff --git a/libktorrent/migrate/cachemigrate.h b/src/libktorrent/migrate/cachemigrate.h index fc618f1..fc618f1 100644 --- a/libktorrent/migrate/cachemigrate.h +++ b/src/libktorrent/migrate/cachemigrate.h diff --git a/libktorrent/migrate/ccmigrate.cpp b/src/libktorrent/migrate/ccmigrate.cpp index 631ac6f..631ac6f 100644 --- a/libktorrent/migrate/ccmigrate.cpp +++ b/src/libktorrent/migrate/ccmigrate.cpp diff --git a/libktorrent/migrate/ccmigrate.h b/src/libktorrent/migrate/ccmigrate.h index 5272bf5..5272bf5 100644 --- a/libktorrent/migrate/ccmigrate.h +++ b/src/libktorrent/migrate/ccmigrate.h diff --git a/libktorrent/migrate/migrate.cpp b/src/libktorrent/migrate/migrate.cpp index 4de80cc..4de80cc 100644 --- a/libktorrent/migrate/migrate.cpp +++ b/src/libktorrent/migrate/migrate.cpp diff --git a/libktorrent/migrate/migrate.h b/src/libktorrent/migrate/migrate.h index 8a943b4..8a943b4 100644 --- a/libktorrent/migrate/migrate.h +++ b/src/libktorrent/migrate/migrate.h diff --git a/src/libktorrent/mse/CMakeLists.txt b/src/libktorrent/mse/CMakeLists.txt new file mode 100644 index 0000000..2d0d01c --- /dev/null +++ b/src/libktorrent/mse/CMakeLists.txt @@ -0,0 +1,16 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/.. + ${CMAKE_CURRENT_BINARY_DIR} +) + + +##### mse library (static) + +tde_add_library( mse STATIC_PIC AUTOMOC + SOURCES + bigint.cpp rc4encryptor.cpp streamsocket.cpp encryptedauthenticate.cpp + encryptedserverauthenticate.cpp functions.cpp + LINK + ${GMP_LIBRARIES} +) diff --git a/libktorrent/mse/bigint.cpp b/src/libktorrent/mse/bigint.cpp index e2746f6..e2746f6 100644 --- a/libktorrent/mse/bigint.cpp +++ b/src/libktorrent/mse/bigint.cpp diff --git a/libktorrent/mse/bigint.h b/src/libktorrent/mse/bigint.h index 39bb865..5cd1940 100644 --- a/libktorrent/mse/bigint.h +++ b/src/libktorrent/mse/bigint.h @@ -24,6 +24,7 @@ #include <util/constants.h> #include <stdio.h> #include <gmp.h> +#include <libktorrent_export.h> using bt::Uint8; using bt::Uint16; @@ -39,7 +40,7 @@ namespace mse * Class which can hold an arbitrary large integer. This will be a very important part of our * MSE implementation. */ - class BigInt + class LIBKTORRENT_EXPORT BigInt { public: /** diff --git a/libktorrent/mse/encryptedauthenticate.cpp b/src/libktorrent/mse/encryptedauthenticate.cpp index e60aa22..e60aa22 100644 --- a/libktorrent/mse/encryptedauthenticate.cpp +++ b/src/libktorrent/mse/encryptedauthenticate.cpp diff --git a/libktorrent/mse/encryptedauthenticate.h b/src/libktorrent/mse/encryptedauthenticate.h index 729f18f..85c591b 100644 --- a/libktorrent/mse/encryptedauthenticate.h +++ b/src/libktorrent/mse/encryptedauthenticate.h @@ -38,7 +38,7 @@ namespace mse */ class EncryptedAuthenticate : public bt::Authenticate { - Q_OBJECT + TQ_OBJECT public: EncryptedAuthenticate(const TQString& ip, Uint16 port, const bt::SHA1Hash& info_hash, const bt::PeerID& peer_id, bt::PeerManager* pman); diff --git a/libktorrent/mse/encryptedserverauthenticate.cpp b/src/libktorrent/mse/encryptedserverauthenticate.cpp index 40353ad..40353ad 100644 --- a/libktorrent/mse/encryptedserverauthenticate.cpp +++ b/src/libktorrent/mse/encryptedserverauthenticate.cpp diff --git a/libktorrent/mse/encryptedserverauthenticate.h b/src/libktorrent/mse/encryptedserverauthenticate.h index 1868d48..bcdc13a 100644 --- a/libktorrent/mse/encryptedserverauthenticate.h +++ b/src/libktorrent/mse/encryptedserverauthenticate.h @@ -35,7 +35,7 @@ namespace mse */ class EncryptedServerAuthenticate : public bt::ServerAuthenticate { - Q_OBJECT + TQ_OBJECT public: EncryptedServerAuthenticate(mse::StreamSocket* sock, bt::Server* server); diff --git a/libktorrent/mse/functions.cpp b/src/libktorrent/mse/functions.cpp index a478cda..a478cda 100644 --- a/libktorrent/mse/functions.cpp +++ b/src/libktorrent/mse/functions.cpp diff --git a/libktorrent/mse/functions.h b/src/libktorrent/mse/functions.h index 95e8e5d..a5e7cab 100644 --- a/libktorrent/mse/functions.h +++ b/src/libktorrent/mse/functions.h @@ -20,6 +20,8 @@ #ifndef MSEFUNCTIONS_H #define MSEFUNCTIONS_H +#include <libktorrent_export.h> + namespace bt { class SHA1Hash; @@ -29,11 +31,11 @@ namespace mse { class BigInt; - void GeneratePublicPrivateKey(BigInt & pub,BigInt & priv); - BigInt DHSecret(const BigInt & our_priv,const BigInt & peer_pub); - bt::SHA1Hash EncryptionKey(bool a,const BigInt & s,const bt::SHA1Hash & skey); + LIBKTORRENT_EXPORT void GeneratePublicPrivateKey(BigInt & pub,BigInt & priv); + LIBKTORRENT_EXPORT BigInt DHSecret(const BigInt & our_priv,const BigInt & peer_pub); + LIBKTORRENT_EXPORT bt::SHA1Hash EncryptionKey(bool a,const BigInt & s,const bt::SHA1Hash & skey); - void DumpBigInt(const TQString & name,const BigInt & bi); + LIBKTORRENT_EXPORT void DumpBigInt(const TQString & name,const BigInt & bi); } #endif diff --git a/libktorrent/mse/rc4encryptor.cpp b/src/libktorrent/mse/rc4encryptor.cpp index 422fe5d..422fe5d 100644 --- a/libktorrent/mse/rc4encryptor.cpp +++ b/src/libktorrent/mse/rc4encryptor.cpp diff --git a/libktorrent/mse/rc4encryptor.h b/src/libktorrent/mse/rc4encryptor.h index 650b54e..c36b9c6 100644 --- a/libktorrent/mse/rc4encryptor.h +++ b/src/libktorrent/mse/rc4encryptor.h @@ -22,6 +22,7 @@ #include <util/sha1hash.h> #include <util/constants.h> +#include <libktorrent_export.h> using bt::Uint8; using bt::Uint32; @@ -31,7 +32,7 @@ namespace mse /** * Helper class to do the actual encryption / decryption */ - class RC4 + class LIBKTORRENT_EXPORT RC4 { Uint8 i,j; Uint8 s[256]; @@ -50,7 +51,7 @@ namespace mse * This class has a static encryption buffer, which makes it not thread safe * because the buffer is not protected by mutexes. */ - class RC4Encryptor + class LIBKTORRENT_EXPORT RC4Encryptor { RC4 enc,dec; public: diff --git a/libktorrent/mse/streamsocket.cpp b/src/libktorrent/mse/streamsocket.cpp index 08f2d7b..08f2d7b 100644 --- a/libktorrent/mse/streamsocket.cpp +++ b/src/libktorrent/mse/streamsocket.cpp diff --git a/libktorrent/mse/streamsocket.h b/src/libktorrent/mse/streamsocket.h index 7448296..0b3c234 100644 --- a/libktorrent/mse/streamsocket.h +++ b/src/libktorrent/mse/streamsocket.h @@ -23,6 +23,7 @@ #include <tqobject.h> #include <util/constants.h> #include <net/bufferedsocket.h> +#include <libktorrent_export.h> class TQString; @@ -52,9 +53,9 @@ namespace mse * not be used anymore, a SocketReader and SocketWriter should be provided, * so that reading and writing is controlled from the monitor thread. */ - class StreamSocket : public TQObject,public net::SocketReader,public net::SocketWriter + class LIBKTORRENT_EXPORT StreamSocket : public TQObject,public net::SocketReader,public net::SocketWriter { - Q_OBJECT + TQ_OBJECT public: StreamSocket(); diff --git a/src/libktorrent/net/CMakeLists.txt b/src/libktorrent/net/CMakeLists.txt new file mode 100644 index 0000000..27f84f8 --- /dev/null +++ b/src/libktorrent/net/CMakeLists.txt @@ -0,0 +1,13 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/.. +) + + +##### net library (static) + +tde_add_library( net STATIC_PIC AUTOMOC + SOURCES + address.cpp bufferedsocket.cpp circularbuffer.cpp downloadthread.cpp networkthread.cpp + portlist.cpp socket.cpp socketgroup.cpp socketmonitor.cpp speed.cpp uploadthread.cpp +) diff --git a/libktorrent/net/address.cpp b/src/libktorrent/net/address.cpp index d4877da..d4877da 100644 --- a/libktorrent/net/address.cpp +++ b/src/libktorrent/net/address.cpp diff --git a/libktorrent/net/address.h b/src/libktorrent/net/address.h index af39380..af39380 100644 --- a/libktorrent/net/address.h +++ b/src/libktorrent/net/address.h diff --git a/libktorrent/net/bufferedsocket.cpp b/src/libktorrent/net/bufferedsocket.cpp index 2165f70..2165f70 100644 --- a/libktorrent/net/bufferedsocket.cpp +++ b/src/libktorrent/net/bufferedsocket.cpp diff --git a/libktorrent/net/bufferedsocket.h b/src/libktorrent/net/bufferedsocket.h index 2e594df..2e594df 100644 --- a/libktorrent/net/bufferedsocket.h +++ b/src/libktorrent/net/bufferedsocket.h diff --git a/libktorrent/net/circularbuffer.cpp b/src/libktorrent/net/circularbuffer.cpp index abce80a..abce80a 100644 --- a/libktorrent/net/circularbuffer.cpp +++ b/src/libktorrent/net/circularbuffer.cpp diff --git a/libktorrent/net/circularbuffer.h b/src/libktorrent/net/circularbuffer.h index 6d45723..6d45723 100644 --- a/libktorrent/net/circularbuffer.h +++ b/src/libktorrent/net/circularbuffer.h diff --git a/libktorrent/net/downloadthread.cpp b/src/libktorrent/net/downloadthread.cpp index ae0f0b9..ae0f0b9 100644 --- a/libktorrent/net/downloadthread.cpp +++ b/src/libktorrent/net/downloadthread.cpp diff --git a/libktorrent/net/downloadthread.h b/src/libktorrent/net/downloadthread.h index 08e9e46..08e9e46 100644 --- a/libktorrent/net/downloadthread.h +++ b/src/libktorrent/net/downloadthread.h diff --git a/libktorrent/net/networkthread.cpp b/src/libktorrent/net/networkthread.cpp index 40791c9..40791c9 100644 --- a/libktorrent/net/networkthread.cpp +++ b/src/libktorrent/net/networkthread.cpp diff --git a/libktorrent/net/networkthread.h b/src/libktorrent/net/networkthread.h index d31ae3e..d31ae3e 100644 --- a/libktorrent/net/networkthread.h +++ b/src/libktorrent/net/networkthread.h diff --git a/libktorrent/net/portlist.cpp b/src/libktorrent/net/portlist.cpp index 56076ed..56076ed 100644 --- a/libktorrent/net/portlist.cpp +++ b/src/libktorrent/net/portlist.cpp diff --git a/libktorrent/net/portlist.h b/src/libktorrent/net/portlist.h index c1a6e99..e4a6976 100644 --- a/libktorrent/net/portlist.h +++ b/src/libktorrent/net/portlist.h @@ -22,6 +22,7 @@ #include <tqvaluelist.h> #include <util/constants.h> +#include <libktorrent_export.h> namespace net { @@ -31,7 +32,7 @@ namespace net UDP }; - struct Port + struct LIBKTORRENT_EXPORT Port { bt::Uint16 number; Protocol proto; @@ -69,7 +70,7 @@ namespace net * List of ports which are currently being used. * */ - class PortList : public TQValueList<Port> + class LIBKTORRENT_EXPORT PortList : public TQValueList<Port> { PortListener* lst; public: diff --git a/libktorrent/net/socket.cpp b/src/libktorrent/net/socket.cpp index e1e67ea..e1e67ea 100644 --- a/libktorrent/net/socket.cpp +++ b/src/libktorrent/net/socket.cpp diff --git a/libktorrent/net/socket.h b/src/libktorrent/net/socket.h index db8953b..db8953b 100644 --- a/libktorrent/net/socket.h +++ b/src/libktorrent/net/socket.h diff --git a/libktorrent/net/socketgroup.cpp b/src/libktorrent/net/socketgroup.cpp index 8c9c5e7..8c9c5e7 100644 --- a/libktorrent/net/socketgroup.cpp +++ b/src/libktorrent/net/socketgroup.cpp diff --git a/libktorrent/net/socketgroup.h b/src/libktorrent/net/socketgroup.h index ba08029..ba08029 100644 --- a/libktorrent/net/socketgroup.h +++ b/src/libktorrent/net/socketgroup.h diff --git a/libktorrent/net/socketmonitor.cpp b/src/libktorrent/net/socketmonitor.cpp index 123536a..123536a 100644 --- a/libktorrent/net/socketmonitor.cpp +++ b/src/libktorrent/net/socketmonitor.cpp diff --git a/libktorrent/net/socketmonitor.h b/src/libktorrent/net/socketmonitor.h index 6fc63c1..aa2aa56 100644 --- a/libktorrent/net/socketmonitor.h +++ b/src/libktorrent/net/socketmonitor.h @@ -20,10 +20,10 @@ #ifndef NETSOCKETMONITOR_H #define NETSOCKETMONITOR_H - #include <tqmutex.h> #include <tqptrlist.h> #include <util/constants.h> +#include <libktorrent_export.h> namespace net @@ -40,7 +40,7 @@ namespace net * Monitors all sockets for upload and download traffic. * It uses two threads to do this. */ - class SocketMonitor + class LIBKTORRENT_EXPORT SocketMonitor { static SocketMonitor self; diff --git a/libktorrent/net/speed.cpp b/src/libktorrent/net/speed.cpp index 35fde9d..e4328fc 100644 --- a/libktorrent/net/speed.cpp +++ b/src/libktorrent/net/speed.cpp @@ -37,7 +37,7 @@ namespace net void Speed::onData(Uint32 b,bt::TimeStamp ts) { - dlrate.append(tqMakePair(b,ts)); + dlrate.append(qMakePair(b,ts)); bytes += b; } diff --git a/libktorrent/net/speed.h b/src/libktorrent/net/speed.h index a9ea561..a9ea561 100644 --- a/libktorrent/net/speed.h +++ b/src/libktorrent/net/speed.h diff --git a/libktorrent/net/uploadthread.cpp b/src/libktorrent/net/uploadthread.cpp index 0023cf6..0023cf6 100644 --- a/libktorrent/net/uploadthread.cpp +++ b/src/libktorrent/net/uploadthread.cpp diff --git a/libktorrent/net/uploadthread.h b/src/libktorrent/net/uploadthread.h index b273846..b273846 100644 --- a/libktorrent/net/uploadthread.h +++ b/src/libktorrent/net/uploadthread.h diff --git a/libktorrent/pluginmanager.cpp b/src/libktorrent/pluginmanager.cpp index cd5a1eb..cd5a1eb 100644 --- a/libktorrent/pluginmanager.cpp +++ b/src/libktorrent/pluginmanager.cpp diff --git a/libktorrent/pluginmanager.h b/src/libktorrent/pluginmanager.h index b86e521..27511c5 100644 --- a/libktorrent/pluginmanager.h +++ b/src/libktorrent/pluginmanager.h @@ -24,6 +24,7 @@ #include <util/ptrmap.h> #include <interfaces/plugin.h> #include <tqstringlist.h> +#include <libktorrent_export.h> namespace kt @@ -38,7 +39,7 @@ namespace kt * * This class manages all plugins. Plugins are stored in a map */ - class PluginManager + class LIBKTORRENT_EXPORT PluginManager { bt::PtrMap<TQString,Plugin> plugins,unloaded; CoreInterface* core; diff --git a/libktorrent/pluginmanagerprefpage.cpp b/src/libktorrent/pluginmanagerprefpage.cpp index 872c8c1..20651d5 100644 --- a/libktorrent/pluginmanagerprefpage.cpp +++ b/src/libktorrent/pluginmanagerprefpage.cpp @@ -78,12 +78,12 @@ namespace kt { pmw = new PluginManagerWidget(parent); - connect(pmw->load_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onLoad())); - connect(pmw->unload_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onUnload())); - connect(pmw->load_all_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onLoadAll())); - connect(pmw->unload_all_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onUnloadAll())); + connect(pmw->load_btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(onLoad())); + connect(pmw->unload_btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(onUnload())); + connect(pmw->load_all_btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(onLoadAll())); + connect(pmw->unload_all_btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(onUnloadAll())); LabelView* lv = pmw->plugin_view; - connect(lv,TQT_SIGNAL(currentChanged(LabelViewItem * )),this,TQT_SLOT(onCurrentChanged( LabelViewItem* ))); + connect(lv,TQ_SIGNAL(currentChanged(LabelViewItem * )),this,TQ_SLOT(onCurrentChanged( LabelViewItem* ))); } void PluginManagerPrefPage::updatePluginList() @@ -211,3 +211,5 @@ namespace kt } } + +#include "pluginmanagerprefpage.moc" diff --git a/libktorrent/pluginmanagerprefpage.h b/src/libktorrent/pluginmanagerprefpage.h index 72376aa..7caa75a 100644 --- a/libktorrent/pluginmanagerprefpage.h +++ b/src/libktorrent/pluginmanagerprefpage.h @@ -38,7 +38,7 @@ namespace kt */ class PluginManagerPrefPage : public TQObject,public PrefPageInterface { - Q_OBJECT + TQ_OBJECT public: PluginManagerPrefPage(PluginManager* pman); diff --git a/libktorrent/pluginmanagerwidget.ui b/src/libktorrent/pluginmanagerwidget.ui index 628bb8f..628bb8f 100644 --- a/libktorrent/pluginmanagerwidget.ui +++ b/src/libktorrent/pluginmanagerwidget.ui diff --git a/libktorrent/settings.kcfgc b/src/libktorrent/settings.kcfgc index f6817f5..b283270 100644 --- a/libktorrent/settings.kcfgc +++ b/src/libktorrent/settings.kcfgc @@ -4,3 +4,5 @@ ClassName=Settings Singleton=true Mutators=true # will create the necessary code for setting those variables +IncludeFiles=libktorrent_export.h +Visibility=LIBKTORRENT_EXPORT diff --git a/src/libktorrent/torrent/CMakeLists.txt b/src/libktorrent/torrent/CMakeLists.txt new file mode 100644 index 0000000..4efbdf3 --- /dev/null +++ b/src/libktorrent/torrent/CMakeLists.txt @@ -0,0 +1,29 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/.. + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR}/.. +) + + +##### torrent library (static) + +tde_add_library( torrent STATIC_PIC AUTOMOC + SOURCES + advancedchokealgorithm.cpp announcelist.cpp + authenticate.cpp authenticatebase.cpp authenticationmonitor.cpp bdecoder.cpp + bencoder.cpp bnode.cpp cache.cpp cachefile.cpp cap.cpp choker.cpp chunk.cpp + chunkcounter.cpp chunkdownload.cpp chunkmanager.cpp chunkselector.cpp dndfile.cpp + downloadcap.cpp downloader.cpp globals.cpp httptracker.cpp ipblocklist.cpp + movedatafilesjob.cpp multifilecache.cpp newchokealgorithm.cpp packet.cpp packetreader.cpp + packetwriter.cpp peer.cpp peerdownloader.cpp peerid.cpp peermanager.cpp + peersourcemanager.cpp peeruploader.cpp piece.cpp preallocationthread.cpp queuemanager.cpp + request.cpp server.cpp serverauthenticate.cpp singlefilecache.cpp + speedestimater.cpp statsfile.cpp timeestimator.cpp torrent.cpp torrentcontrol.cpp + torrentcreator.cpp torrentfile.cpp tracker.cpp udptracker.cpp udptrackersocket.cpp + uploadcap.cpp uploader.cpp upspeedestimater.cpp utpex.cpp value.cpp + LINK + net-static datachecker-static mse-static migrate-static util-static + kademlia-static interfaces-static + DEPENDENCIES SettingsH +) diff --git a/libktorrent/torrent/advancedchokealgorithm.cpp b/src/libktorrent/torrent/advancedchokealgorithm.cpp index 7ca0578..7ca0578 100644 --- a/libktorrent/torrent/advancedchokealgorithm.cpp +++ b/src/libktorrent/torrent/advancedchokealgorithm.cpp diff --git a/libktorrent/torrent/advancedchokealgorithm.h b/src/libktorrent/torrent/advancedchokealgorithm.h index f8a1086..f8a1086 100644 --- a/libktorrent/torrent/advancedchokealgorithm.h +++ b/src/libktorrent/torrent/advancedchokealgorithm.h diff --git a/libktorrent/torrent/announcelist.cpp b/src/libktorrent/torrent/announcelist.cpp index 65424d0..65424d0 100644 --- a/libktorrent/torrent/announcelist.cpp +++ b/src/libktorrent/torrent/announcelist.cpp diff --git a/libktorrent/torrent/announcelist.h b/src/libktorrent/torrent/announcelist.h index 3cb9edd..b843e56 100644 --- a/libktorrent/torrent/announcelist.h +++ b/src/libktorrent/torrent/announcelist.h @@ -67,7 +67,7 @@ namespace bt /** * Removes a tracker from the list * @param url Tracker URL to remove from custom trackers list. - * @returns TRUE if URL is in custom list and it is removed or FALSE if it could not be removed or it's a default tracker + * @returns true if URL is in custom list and it is removed or false if it could not be removed or it's a default tracker */ bool removeTracker(KURL url); diff --git a/libktorrent/torrent/authenticate.cpp b/src/libktorrent/torrent/authenticate.cpp index bb7fe3a..bb7fe3a 100644 --- a/libktorrent/torrent/authenticate.cpp +++ b/src/libktorrent/torrent/authenticate.cpp diff --git a/libktorrent/torrent/authenticate.h b/src/libktorrent/torrent/authenticate.h index 0aeb499..eceda08 100644 --- a/libktorrent/torrent/authenticate.h +++ b/src/libktorrent/torrent/authenticate.h @@ -43,7 +43,7 @@ namespace bt */ class Authenticate : public AuthenticateBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/libktorrent/torrent/authenticatebase.cpp b/src/libktorrent/torrent/authenticatebase.cpp index c00e87f..51d3f26 100644 --- a/libktorrent/torrent/authenticatebase.cpp +++ b/src/libktorrent/torrent/authenticatebase.cpp @@ -32,7 +32,7 @@ namespace bt AuthenticateBase::AuthenticateBase(mse::StreamSocket* s) : sock(s),finished(false),local(false) { - connect(&timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(onTimeout())); + connect(&timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(onTimeout())); timer.start(20000,true); memset(handshake,0x00,68); bytes_of_handshake_recieved = 0; diff --git a/libktorrent/torrent/authenticatebase.h b/src/libktorrent/torrent/authenticatebase.h index 2be4ad5..a425118 100644 --- a/libktorrent/torrent/authenticatebase.h +++ b/src/libktorrent/torrent/authenticatebase.h @@ -47,7 +47,7 @@ namespace bt */ class AuthenticateBase : public TQObject { - Q_OBJECT + TQ_OBJECT public: AuthenticateBase(mse::StreamSocket* s = 0); diff --git a/libktorrent/torrent/authenticationmonitor.cpp b/src/libktorrent/torrent/authenticationmonitor.cpp index 08215d0..08215d0 100644 --- a/libktorrent/torrent/authenticationmonitor.cpp +++ b/src/libktorrent/torrent/authenticationmonitor.cpp diff --git a/libktorrent/torrent/authenticationmonitor.h b/src/libktorrent/torrent/authenticationmonitor.h index 43a4ebb..64d824d 100644 --- a/libktorrent/torrent/authenticationmonitor.h +++ b/src/libktorrent/torrent/authenticationmonitor.h @@ -22,6 +22,8 @@ #include <list> #include <vector> + +#include <libktorrent_export.h> struct pollfd; @@ -34,7 +36,7 @@ namespace bt Monitors ongoing authentication attempts. This class is a singleton. */ - class AuthenticationMonitor + class LIBKTORRENT_EXPORT AuthenticationMonitor { std::list<AuthenticateBase*> auths; std::vector<struct pollfd> fd_vec; diff --git a/libktorrent/torrent/bdecoder.cpp b/src/libktorrent/torrent/bdecoder.cpp index 38bc67b..38bc67b 100644 --- a/libktorrent/torrent/bdecoder.cpp +++ b/src/libktorrent/torrent/bdecoder.cpp diff --git a/libktorrent/torrent/bdecoder.h b/src/libktorrent/torrent/bdecoder.h index 438a656..57bcdf0 100644 --- a/libktorrent/torrent/bdecoder.h +++ b/src/libktorrent/torrent/bdecoder.h @@ -22,6 +22,7 @@ #include <tqstring.h> #include <util/constants.h> +#include <libktorrent_export.h> namespace bt { @@ -37,7 +38,7 @@ namespace bt * * Class to decode b-encoded data. */ - class BDecoder + class LIBKTORRENT_EXPORT BDecoder { const TQByteArray & data; Uint32 pos; diff --git a/libktorrent/torrent/bencoder.cpp b/src/libktorrent/torrent/bencoder.cpp index cb82db7..cb82db7 100644 --- a/libktorrent/torrent/bencoder.cpp +++ b/src/libktorrent/torrent/bencoder.cpp diff --git a/libktorrent/torrent/bencoder.h b/src/libktorrent/torrent/bencoder.h index eb84c39..1338681 100644 --- a/libktorrent/torrent/bencoder.h +++ b/src/libktorrent/torrent/bencoder.h @@ -22,6 +22,7 @@ #include <util/file.h> +#include <libktorrent_export.h> namespace bt @@ -79,7 +80,7 @@ namespace bt * the BitTorrent protocol docs. The data gets written to a BEncoderOutput * thing. */ - class BEncoder + class LIBKTORRENT_EXPORT BEncoder { BEncoderOutput* out; bool del; diff --git a/libktorrent/torrent/bnode.cpp b/src/libktorrent/torrent/bnode.cpp index c32f09b..c32f09b 100644 --- a/libktorrent/torrent/bnode.cpp +++ b/src/libktorrent/torrent/bnode.cpp diff --git a/libktorrent/torrent/bnode.h b/src/libktorrent/torrent/bnode.h index 84b306e..c8482cd 100644 --- a/libktorrent/torrent/bnode.h +++ b/src/libktorrent/torrent/bnode.h @@ -24,6 +24,7 @@ #include <tqvaluelist.h> #include <util/constants.h> #include "value.h" +#include <libktorrent_export.h> namespace bt @@ -37,7 +38,7 @@ namespace bt * There are 3 possible pieces of data in b-encoded piece of data. * This is the base class for all those 3 things. */ - class BNode + class LIBKTORRENT_EXPORT BNode { public: enum Type @@ -79,7 +80,7 @@ namespace bt * * @todo Use TQVariant */ - class BValueNode : public BNode + class LIBKTORRENT_EXPORT BValueNode : public BNode { Value v; public: @@ -95,7 +96,7 @@ namespace bt * @brief Represents a dictionary in bencoded data * */ - class BDictNode : public BNode + class LIBKTORRENT_EXPORT BDictNode : public BNode { struct DictEntry { @@ -157,7 +158,7 @@ namespace bt * @brief Represents a list in bencoded data * */ - class BListNode : public BNode + class LIBKTORRENT_EXPORT BListNode : public BNode { TQPtrList<BNode> children; public: diff --git a/libktorrent/torrent/cache.cpp b/src/libktorrent/torrent/cache.cpp index 927e631..927e631 100644 --- a/libktorrent/torrent/cache.cpp +++ b/src/libktorrent/torrent/cache.cpp diff --git a/libktorrent/torrent/cache.h b/src/libktorrent/torrent/cache.h index 0b3cc4d..0b3cc4d 100644 --- a/libktorrent/torrent/cache.h +++ b/src/libktorrent/torrent/cache.h diff --git a/libktorrent/torrent/cachefile.cpp b/src/libktorrent/torrent/cachefile.cpp index fc7cd33..fc7cd33 100644 --- a/libktorrent/torrent/cachefile.cpp +++ b/src/libktorrent/torrent/cachefile.cpp diff --git a/libktorrent/torrent/cachefile.h b/src/libktorrent/torrent/cachefile.h index 749f46a..749f46a 100644 --- a/libktorrent/torrent/cachefile.h +++ b/src/libktorrent/torrent/cachefile.h diff --git a/libktorrent/torrent/cap.cpp b/src/libktorrent/torrent/cap.cpp index 9338444..9338444 100644 --- a/libktorrent/torrent/cap.cpp +++ b/src/libktorrent/torrent/cap.cpp diff --git a/libktorrent/torrent/cap.h b/src/libktorrent/torrent/cap.h index 712f5fa..712f5fa 100644 --- a/libktorrent/torrent/cap.h +++ b/src/libktorrent/torrent/cap.h diff --git a/libktorrent/torrent/choker.cpp b/src/libktorrent/torrent/choker.cpp index 6162644..6162644 100644 --- a/libktorrent/torrent/choker.cpp +++ b/src/libktorrent/torrent/choker.cpp diff --git a/libktorrent/torrent/choker.h b/src/libktorrent/torrent/choker.h index b44fc48..9dd4bba 100644 --- a/libktorrent/torrent/choker.h +++ b/src/libktorrent/torrent/choker.h @@ -23,6 +23,7 @@ #include <tqptrlist.h> #include <util/constants.h> #include "peer.h" +#include <libktorrent_export.h> namespace kt { @@ -91,7 +92,7 @@ namespace bt * This class handles the choking and unchoking of Peer's. * This class needs to be updated every 10 seconds. */ - class Choker + class LIBKTORRENT_EXPORT Choker { ChokeAlgorithm* choke; PeerManager & pman; diff --git a/libktorrent/torrent/chunk.cpp b/src/libktorrent/torrent/chunk.cpp index 6873713..6873713 100644 --- a/libktorrent/torrent/chunk.cpp +++ b/src/libktorrent/torrent/chunk.cpp diff --git a/libktorrent/torrent/chunk.h b/src/libktorrent/torrent/chunk.h index 0896e96..0896e96 100644 --- a/libktorrent/torrent/chunk.h +++ b/src/libktorrent/torrent/chunk.h diff --git a/libktorrent/torrent/chunkcounter.cpp b/src/libktorrent/torrent/chunkcounter.cpp index 95b7535..95b7535 100644 --- a/libktorrent/torrent/chunkcounter.cpp +++ b/src/libktorrent/torrent/chunkcounter.cpp diff --git a/libktorrent/torrent/chunkcounter.h b/src/libktorrent/torrent/chunkcounter.h index ac2ec49..ac2ec49 100644 --- a/libktorrent/torrent/chunkcounter.h +++ b/src/libktorrent/torrent/chunkcounter.h diff --git a/libktorrent/torrent/chunkdownload.cpp b/src/libktorrent/torrent/chunkdownload.cpp index 76638ce..6f21fcf 100644 --- a/libktorrent/torrent/chunkdownload.cpp +++ b/src/libktorrent/torrent/chunkdownload.cpp @@ -155,8 +155,8 @@ namespace bt { PeerDownloader* pd = pdown.at(i); pd->release(); - disconnect(pd,TQT_SIGNAL(timedout(const Request& )),this,TQT_SLOT(onTimeout(const Request& ))); - disconnect(pd,TQT_SIGNAL(rejected( const Request& )),this,TQT_SLOT(onRejected( const Request& ))); + disconnect(pd,TQ_SIGNAL(timedout(const Request& )),this,TQ_SLOT(onTimeout(const Request& ))); + disconnect(pd,TQ_SIGNAL(rejected( const Request& )),this,TQ_SLOT(onRejected( const Request& ))); } dstatus.clear(); pdown.clear(); @@ -171,8 +171,8 @@ namespace bt pdown.append(pd); dstatus.insert(pd->getPeer()->getID(),new DownloadStatus()); sendRequests(pd); - connect(pd,TQT_SIGNAL(timedout(const Request& )),this,TQT_SLOT(onTimeout(const Request& ))); - connect(pd,TQT_SIGNAL(rejected( const Request& )),this,TQT_SLOT(onRejected( const Request& ))); + connect(pd,TQ_SIGNAL(timedout(const Request& )),this,TQ_SLOT(onTimeout(const Request& ))); + connect(pd,TQ_SIGNAL(rejected( const Request& )),this,TQ_SLOT(onRejected( const Request& ))); return true; } @@ -305,8 +305,8 @@ namespace bt dstatus.erase(pd->getPeer()->getID()); pdown.remove(pd); - disconnect(pd,TQT_SIGNAL(timedout(const Request& )),this,TQT_SLOT(onTimeout(const Request& ))); - disconnect(pd,TQT_SIGNAL(rejected( const Request& )),this,TQT_SLOT(onRejected( const Request& ))); + disconnect(pd,TQ_SIGNAL(timedout(const Request& )),this,TQ_SLOT(onTimeout(const Request& ))); + disconnect(pd,TQ_SIGNAL(rejected( const Request& )),this,TQ_SLOT(onRejected( const Request& ))); } diff --git a/libktorrent/torrent/chunkdownload.h b/src/libktorrent/torrent/chunkdownload.h index 5c89017..a432c28 100644 --- a/libktorrent/torrent/chunkdownload.h +++ b/src/libktorrent/torrent/chunkdownload.h @@ -61,7 +61,7 @@ namespace bt */ class ChunkDownload : public TQObject,public kt::ChunkDownloadInterface { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/libktorrent/torrent/chunkmanager.cpp b/src/libktorrent/torrent/chunkmanager.cpp index 67359ba..fe40850 100644 --- a/libktorrent/torrent/chunkmanager.cpp +++ b/src/libktorrent/torrent/chunkmanager.cpp @@ -79,8 +79,8 @@ namespace bt for (Uint32 i = 0;i < tor.getNumFiles();i++) { TorrentFile & tf = tor.getFile(i); - connect(&tf,TQT_SIGNAL(downloadPriorityChanged(TorrentFile*, Priority, Priority )), - this,TQT_SLOT(downloadPriorityChanged(TorrentFile*, Priority, Priority ))); + connect(&tf,TQ_SIGNAL(downloadPriorityChanged(TorrentFile*, Priority, Priority )), + this,TQ_SLOT(downloadPriorityChanged(TorrentFile*, Priority, Priority ))); if (tf.getPriority() != NORMAL_PRIORITY) { @@ -232,8 +232,8 @@ namespace bt for (Uint32 i = 0;i < tor.getNumFiles();i++) { TorrentFile & tf = tor.getFile(i); - connect(&tf,TQT_SIGNAL(downloadPriorityChanged(TorrentFile*, Priority, Priority )), - this,TQT_SLOT(downloadPriorityChanged(TorrentFile*, Priority, Priority ))); + connect(&tf,TQ_SIGNAL(downloadPriorityChanged(TorrentFile*, Priority, Priority )), + this,TQ_SLOT(downloadPriorityChanged(TorrentFile*, Priority, Priority ))); if (tf.getPriority() != NORMAL_PRIORITY) { diff --git a/libktorrent/torrent/chunkmanager.h b/src/libktorrent/torrent/chunkmanager.h index fa6491a..6cb320f 100644 --- a/libktorrent/torrent/chunkmanager.h +++ b/src/libktorrent/torrent/chunkmanager.h @@ -27,6 +27,7 @@ #include <util/bitset.h> #include "chunk.h" #include "globals.h" +#include <libktorrent_export.h> class TQStringList; @@ -58,9 +59,9 @@ namespace bt * The chunks are stored in the cache file in the correct order. Eliminating * the need for a file reconstruction algorithm for single files. */ - class ChunkManager : public TQObject + class LIBKTORRENT_EXPORT ChunkManager : public TQObject { - Q_OBJECT + TQ_OBJECT Torrent & tor; diff --git a/libktorrent/torrent/chunkselector.cpp b/src/libktorrent/torrent/chunkselector.cpp index b1c42fa..d5d6cc6 100644 --- a/libktorrent/torrent/chunkselector.cpp +++ b/src/libktorrent/torrent/chunkselector.cpp @@ -20,6 +20,7 @@ #include <stdlib.h> #include <vector> #include <algorithm> +#include <random> #include <util/log.h> #include <util/bitset.h> #include "chunkcounter.h" @@ -79,7 +80,9 @@ namespace bt tmp.push_back(i); } } - std::random_shuffle(tmp.begin(),tmp.end()); + std::random_device randomDev; + std::mt19937 randomGenerator(randomDev()); + std::shuffle(tmp.begin(), tmp.end(), randomGenerator); // std::list does not support random_shuffle so we use a vector as a temporary storage // for the random_shuffle chunks.insert(chunks.begin(),tmp.begin(),tmp.end()); diff --git a/libktorrent/torrent/chunkselector.h b/src/libktorrent/torrent/chunkselector.h index 3ba2f8a..3ba2f8a 100644 --- a/libktorrent/torrent/chunkselector.h +++ b/src/libktorrent/torrent/chunkselector.h diff --git a/libktorrent/torrent/dndfile.cpp b/src/libktorrent/torrent/dndfile.cpp index 23f0f1c..23f0f1c 100644 --- a/libktorrent/torrent/dndfile.cpp +++ b/src/libktorrent/torrent/dndfile.cpp diff --git a/libktorrent/torrent/dndfile.h b/src/libktorrent/torrent/dndfile.h index 09873d1..09873d1 100644 --- a/libktorrent/torrent/dndfile.h +++ b/src/libktorrent/torrent/dndfile.h diff --git a/libktorrent/torrent/downloadcap.cpp b/src/libktorrent/torrent/downloadcap.cpp index 73e0cbb..73e0cbb 100644 --- a/libktorrent/torrent/downloadcap.cpp +++ b/src/libktorrent/torrent/downloadcap.cpp diff --git a/libktorrent/torrent/downloadcap.h b/src/libktorrent/torrent/downloadcap.h index e05be21..e05be21 100644 --- a/libktorrent/torrent/downloadcap.h +++ b/src/libktorrent/torrent/downloadcap.h diff --git a/libktorrent/torrent/downloader.cpp b/src/libktorrent/torrent/downloader.cpp index 582fa7e..dc00927 100644 --- a/libktorrent/torrent/downloader.cpp +++ b/src/libktorrent/torrent/downloader.cpp @@ -52,8 +52,8 @@ namespace bt unnecessary_data = 0; current_chunks.setAutoDelete(true); - connect(&pman,TQT_SIGNAL(newPeer(Peer* )),this,TQT_SLOT(onNewPeer(Peer* ))); - connect(&pman,TQT_SIGNAL(peerKilled(Peer* )),this,TQT_SLOT(onPeerKilled(Peer*))); + connect(&pman,TQ_SIGNAL(newPeer(Peer* )),this,TQ_SLOT(onNewPeer(Peer* ))); + connect(&pman,TQ_SIGNAL(peerKilled(Peer* )),this,TQ_SLOT(onPeerKilled(Peer*))); } @@ -360,8 +360,8 @@ namespace bt void Downloader::onNewPeer(Peer* peer) { PeerDownloader* pd = peer->getPeerDownloader(); - connect(pd,TQT_SIGNAL(downloaded(const Piece& )), - this,TQT_SLOT(pieceRecieved(const Piece& ))); + connect(pd,TQ_SIGNAL(downloaded(const Piece& )), + this,TQ_SLOT(pieceRecieved(const Piece& ))); } void Downloader::onPeerKilled(Peer* peer) diff --git a/libktorrent/torrent/downloader.h b/src/libktorrent/torrent/downloader.h index 6c470a1..9ad8910 100644 --- a/libktorrent/torrent/downloader.h +++ b/src/libktorrent/torrent/downloader.h @@ -64,9 +64,9 @@ namespace bt * This class manages the downloading of the file. It should * regurarly be updated. */ - class Downloader : public TQObject + class LIBKTORRENT_EXPORT Downloader : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libktorrent/torrent/globals.cpp b/src/libktorrent/torrent/globals.cpp index 51dd7a1..51dd7a1 100644 --- a/libktorrent/torrent/globals.cpp +++ b/src/libktorrent/torrent/globals.cpp diff --git a/libktorrent/torrent/globals.h b/src/libktorrent/torrent/globals.h index 16de41e..11eb051 100644 --- a/libktorrent/torrent/globals.h +++ b/src/libktorrent/torrent/globals.h @@ -20,6 +20,7 @@ #ifndef BTGLOBALS_H #define BTGLOBALS_H +#include <libktorrent_export.h> #include <util/constants.h> class TQString; @@ -39,9 +40,7 @@ namespace bt class Log; class Server; - - - class Globals + class LIBKTORRENT_EXPORT Globals { public: virtual ~Globals(); diff --git a/libktorrent/torrent/httptracker.cpp b/src/libktorrent/torrent/httptracker.cpp index 2367ca0..c6dd983 100644 --- a/libktorrent/torrent/httptracker.cpp +++ b/src/libktorrent/torrent/httptracker.cpp @@ -124,7 +124,7 @@ namespace bt j->setMetaData(md); TDEIO::Scheduler::scheduleJob(j); - connect(j,TQT_SIGNAL(result(TDEIO::Job* )),this,TQT_SLOT(onScrapeResult( TDEIO::Job* ))); + connect(j,TQ_SIGNAL(result(TDEIO::Job* )),this,TQ_SLOT(onScrapeResult( TDEIO::Job* ))); } void HTTPTracker::onScrapeResult(TDEIO::Job* j) @@ -188,7 +188,7 @@ namespace bt if (!url.isValid()) { requestPending(); - TQTimer::singleShot(500,this,TQT_SLOT(emitInvalidURLFailure())); + TQTimer::singleShot(500,this,TQ_SLOT(emitInvalidURLFailure())); return; } @@ -453,7 +453,7 @@ namespace bt j->setMetaData(md); TDEIO::Scheduler::scheduleJob(j); - connect(j,TQT_SIGNAL(result(TDEIO::Job* )),this,TQT_SLOT(onAnnounceResult( TDEIO::Job* ))); + connect(j,TQ_SIGNAL(result(TDEIO::Job* )),this,TQ_SLOT(onAnnounceResult( TDEIO::Job* ))); active_job = j; requestPending(); diff --git a/libktorrent/torrent/httptracker.h b/src/libktorrent/torrent/httptracker.h index 8457934..1037bf2 100644 --- a/libktorrent/torrent/httptracker.h +++ b/src/libktorrent/torrent/httptracker.h @@ -41,7 +41,7 @@ namespace bt */ class HTTPTracker : public Tracker { - Q_OBJECT + TQ_OBJECT public: HTTPTracker(const KURL & url,kt::TorrentInterface* tor,const PeerID & id,int tier); diff --git a/libktorrent/torrent/ipblocklist.cpp b/src/libktorrent/torrent/ipblocklist.cpp index f524d6b..f524d6b 100644 --- a/libktorrent/torrent/ipblocklist.cpp +++ b/src/libktorrent/torrent/ipblocklist.cpp diff --git a/libktorrent/torrent/ipblocklist.h b/src/libktorrent/torrent/ipblocklist.h index 6439972..0253826 100644 --- a/libktorrent/torrent/ipblocklist.h +++ b/src/libktorrent/torrent/ipblocklist.h @@ -21,6 +21,7 @@ #ifndef IPBLOCKLIST_H #define IPBLOCKLIST_H +#include <libktorrent_export.h> #include <interfaces/ipblockinginterface.h> #include <tqmap.h> @@ -31,7 +32,7 @@ class TQString; namespace bt { - class IPKey + class LIBKTORRENT_EXPORT IPKey { public: IPKey(); @@ -60,7 +61,7 @@ namespace bt * * Peers that have sent >= 3 bad chunks are blocked. */ - class IPBlocklist + class LIBKTORRENT_EXPORT IPBlocklist { IPBlocklist(); IPBlocklist(const IPBlocklist & ); @@ -159,13 +160,13 @@ namespace bt /** * Checks if IP is listed in local database (IPBlocklist::m_peers) - * @return TRUE if IP is to be blocked + * @return true if IP is to be blocked */ bool isBlockedLocal(const TQString& ip); /** * Checks if IP is listed in plugins antip2p file - * @return TRUE if IP is to be blocked + * @return true if IP is to be blocked */ bool isBlockedPlugin(const TQString& ip); }; diff --git a/libktorrent/torrent/movedatafilesjob.cpp b/src/libktorrent/torrent/movedatafilesjob.cpp index 7fc3fa6..7db1472 100644 --- a/libktorrent/torrent/movedatafilesjob.cpp +++ b/src/libktorrent/torrent/movedatafilesjob.cpp @@ -81,8 +81,8 @@ namespace bt active_src = i.key(); active_dst = i.data(); Out(SYS_GEN|LOG_DEBUG) << "Moving " << active_src << " -> " << active_dst << endl; - connect(active_job,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(onJobDone(TDEIO::Job*))); - connect(active_job,TQT_SIGNAL(canceled(TDEIO::Job*)),this,TQT_SLOT(onCanceled(TDEIO::Job*))); + connect(active_job,TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(onJobDone(TDEIO::Job*))); + connect(active_job,TQ_SIGNAL(canceled(TDEIO::Job*)),this,TQ_SLOT(onCanceled(TDEIO::Job*))); todo.erase(i); } @@ -95,8 +95,8 @@ namespace bt } TQMap<TQString,TQString>::iterator i = success.begin(); active_job = TDEIO::move(KURL::fromPathOrURL(i.data()),KURL::fromPathOrURL(i.key()),false); - connect(active_job,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(onJobDone(TDEIO::Job*))); - connect(active_job,TQT_SIGNAL(canceled(TDEIO::Job*)),this,TQT_SLOT(onCanceled(TDEIO::Job*))); + connect(active_job,TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(onJobDone(TDEIO::Job*))); + connect(active_job,TQ_SIGNAL(canceled(TDEIO::Job*)),this,TQ_SLOT(onCanceled(TDEIO::Job*))); success.erase(i); } } diff --git a/libktorrent/torrent/movedatafilesjob.h b/src/libktorrent/torrent/movedatafilesjob.h index ff5d0bc..afc98ca 100644 --- a/libktorrent/torrent/movedatafilesjob.h +++ b/src/libktorrent/torrent/movedatafilesjob.h @@ -31,7 +31,7 @@ namespace bt */ class MoveDataFilesJob : public TDEIO::Job { - Q_OBJECT + TQ_OBJECT public: MoveDataFilesJob(); diff --git a/libktorrent/torrent/multifilecache.cpp b/src/libktorrent/torrent/multifilecache.cpp index aaa2797..aaa2797 100644 --- a/libktorrent/torrent/multifilecache.cpp +++ b/src/libktorrent/torrent/multifilecache.cpp diff --git a/libktorrent/torrent/multifilecache.h b/src/libktorrent/torrent/multifilecache.h index 7de197a..7de197a 100644 --- a/libktorrent/torrent/multifilecache.h +++ b/src/libktorrent/torrent/multifilecache.h diff --git a/libktorrent/torrent/newchokealgorithm.cpp b/src/libktorrent/torrent/newchokealgorithm.cpp index 875f356..875f356 100644 --- a/libktorrent/torrent/newchokealgorithm.cpp +++ b/src/libktorrent/torrent/newchokealgorithm.cpp diff --git a/libktorrent/torrent/newchokealgorithm.h b/src/libktorrent/torrent/newchokealgorithm.h index 9a0738a..9a0738a 100644 --- a/libktorrent/torrent/newchokealgorithm.h +++ b/src/libktorrent/torrent/newchokealgorithm.h diff --git a/libktorrent/torrent/oldchokealgorithm.cpp b/src/libktorrent/torrent/oldchokealgorithm.cpp index 6c529ce..6c529ce 100644 --- a/libktorrent/torrent/oldchokealgorithm.cpp +++ b/src/libktorrent/torrent/oldchokealgorithm.cpp diff --git a/libktorrent/torrent/oldchokealgorithm.h b/src/libktorrent/torrent/oldchokealgorithm.h index bc813a8..bc813a8 100644 --- a/libktorrent/torrent/oldchokealgorithm.h +++ b/src/libktorrent/torrent/oldchokealgorithm.h diff --git a/libktorrent/torrent/packet.cpp b/src/libktorrent/torrent/packet.cpp index e5b1aa0..e5b1aa0 100644 --- a/libktorrent/torrent/packet.cpp +++ b/src/libktorrent/torrent/packet.cpp diff --git a/libktorrent/torrent/packet.h b/src/libktorrent/torrent/packet.h index d9eb550..d9eb550 100644 --- a/libktorrent/torrent/packet.h +++ b/src/libktorrent/torrent/packet.h diff --git a/libktorrent/torrent/packetreader.cpp b/src/libktorrent/torrent/packetreader.cpp index b17becc..b17becc 100644 --- a/libktorrent/torrent/packetreader.cpp +++ b/src/libktorrent/torrent/packetreader.cpp diff --git a/libktorrent/torrent/packetreader.h b/src/libktorrent/torrent/packetreader.h index 782604d..782604d 100644 --- a/libktorrent/torrent/packetreader.h +++ b/src/libktorrent/torrent/packetreader.h diff --git a/libktorrent/torrent/packetwriter.cpp b/src/libktorrent/torrent/packetwriter.cpp index 21d26cf..21d26cf 100644 --- a/libktorrent/torrent/packetwriter.cpp +++ b/src/libktorrent/torrent/packetwriter.cpp diff --git a/libktorrent/torrent/packetwriter.h b/src/libktorrent/torrent/packetwriter.h index 8330b65..8330b65 100644 --- a/libktorrent/torrent/packetwriter.h +++ b/src/libktorrent/torrent/packetwriter.h diff --git a/libktorrent/torrent/peer.cpp b/src/libktorrent/torrent/peer.cpp index 6e5f519..6e5f519 100644 --- a/libktorrent/torrent/peer.cpp +++ b/src/libktorrent/torrent/peer.cpp diff --git a/libktorrent/torrent/peer.h b/src/libktorrent/torrent/peer.h index c5dd974..8e8b11a 100644 --- a/libktorrent/torrent/peer.h +++ b/src/libktorrent/torrent/peer.h @@ -27,6 +27,7 @@ #include <util/bitset.h> #include "globals.h" #include "peerid.h" +#include <libktorrent_export.h> namespace net { @@ -64,10 +65,10 @@ namespace bt * It provides functions for sending packets. Packets it receives * get relayed to the outside world using a bunch of signals. */ - class Peer : public TQObject, public kt::PeerInterface + class LIBKTORRENT_EXPORT Peer : public TQObject, public kt::PeerInterface //,public Object { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/libktorrent/torrent/peerdownloader.cpp b/src/libktorrent/torrent/peerdownloader.cpp index 6f0738f..4909c5a 100644 --- a/libktorrent/torrent/peerdownloader.cpp +++ b/src/libktorrent/torrent/peerdownloader.cpp @@ -70,8 +70,8 @@ namespace bt PeerDownloader::PeerDownloader(Peer* peer,Uint32 chunk_size) : peer(peer),grabbed(0),chunk_size(chunk_size / MAX_PIECE_LEN) { - connect(peer,TQT_SIGNAL(piece(const Piece& )),this,TQT_SLOT(piece(const Piece& ))); - connect(peer,TQT_SIGNAL(destroyed()),this,TQT_SLOT(peerDestroyed())); + connect(peer,TQ_SIGNAL(piece(const Piece& )),this,TQ_SLOT(piece(const Piece& ))); + connect(peer,TQ_SIGNAL(destroyed()),this,TQ_SLOT(peerDestroyed())); nearly_done = false; max_wait_queue_size = 25; } diff --git a/libktorrent/torrent/peerdownloader.h b/src/libktorrent/torrent/peerdownloader.h index 16957e3..5b22739 100644 --- a/libktorrent/torrent/peerdownloader.h +++ b/src/libktorrent/torrent/peerdownloader.h @@ -93,7 +93,7 @@ namespace bt */ class PeerDownloader : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/libktorrent/torrent/peerid.cpp b/src/libktorrent/torrent/peerid.cpp index f15d5f2..66e9533 100644 --- a/libktorrent/torrent/peerid.cpp +++ b/src/libktorrent/torrent/peerid.cpp @@ -74,7 +74,7 @@ namespace bt return *this; } - bool operator == (const PeerID & a,const PeerID & b) + LIBKTORRENT_EXPORT bool operator == (const PeerID & a,const PeerID & b) { for (int i = 0;i < 20;i++) if (a.id[i] != b.id[i]) @@ -83,12 +83,12 @@ namespace bt return true; } - bool operator != (const PeerID & a,const PeerID & b) + LIBKTORRENT_EXPORT bool operator != (const PeerID & a,const PeerID & b) { return ! operator == (a,b); } - bool operator < (const PeerID & a,const PeerID & b) + LIBKTORRENT_EXPORT bool operator < (const PeerID & a,const PeerID & b) { for (int i = 0;i < 20;i++) if (a.id[i] < b.id[i]) diff --git a/libktorrent/torrent/peerid.h b/src/libktorrent/torrent/peerid.h index 8ebea9a..e1bb479 100644 --- a/libktorrent/torrent/peerid.h +++ b/src/libktorrent/torrent/peerid.h @@ -21,6 +21,7 @@ #define BTPEERID_H #include <tqstring.h> +#include <libktorrent_export.h> namespace bt { @@ -28,7 +29,7 @@ namespace bt /** @author Joris Guisson */ - class PeerID + class LIBKTORRENT_EXPORT PeerID { char id[20]; TQString client_name; diff --git a/libktorrent/torrent/peermanager.cpp b/src/libktorrent/torrent/peermanager.cpp index 3f542c8..ee0cd38 100644 --- a/libktorrent/torrent/peermanager.cpp +++ b/src/libktorrent/torrent/peermanager.cpp @@ -239,7 +239,7 @@ namespace bt if (auth->isLocal()) st->setLocal(true); - connect(this,TQT_SIGNAL(stopped()),st,TQT_SLOT(onPeerManagerDestroyed())); + connect(this,TQ_SIGNAL(stopped()),st,TQ_SLOT(onPeerManagerDestroyed())); AuthenticationMonitor::instance().add(st); num_pending++; total_connections++; @@ -259,11 +259,11 @@ namespace bt { Peer* peer = new Peer(sock,peer_id,tor.getNumChunks(),tor.getChunkSize(),support,local); - connect(peer,TQT_SIGNAL(haveChunk(Peer*, Uint32 )),this,TQT_SLOT(onHave(Peer*, Uint32 ))); - connect(peer,TQT_SIGNAL(bitSetRecieved(const BitSet& )), - this,TQT_SLOT(onBitSetRecieved(const BitSet& ))); - connect(peer,TQT_SIGNAL(rerunChoker()),this,TQT_SLOT(onRerunChoker())); - connect(peer,TQT_SIGNAL(pex( const TQByteArray& )),this,TQT_SLOT(pex( const TQByteArray& ))); + connect(peer,TQ_SIGNAL(haveChunk(Peer*, Uint32 )),this,TQ_SLOT(onHave(Peer*, Uint32 ))); + connect(peer,TQ_SIGNAL(bitSetRecieved(const BitSet& )), + this,TQ_SLOT(onBitSetRecieved(const BitSet& ))); + connect(peer,TQ_SIGNAL(rerunChoker()),this,TQ_SLOT(onRerunChoker())); + connect(peer,TQ_SIGNAL(pex( const TQByteArray& )),this,TQ_SLOT(pex( const TQByteArray& ))); peer_list.append(peer); peer_map.insert(peer->getID(),peer); @@ -356,7 +356,7 @@ namespace bt if (pp.local) auth->setLocal(true); - connect(this,TQT_SIGNAL(stopped()),auth,TQT_SLOT(onPeerManagerDestroyed())); + connect(this,TQ_SIGNAL(stopped()),auth,TQ_SLOT(onPeerManagerDestroyed())); AuthenticationMonitor::instance().add(auth); num_pending++; diff --git a/libktorrent/torrent/peermanager.h b/src/libktorrent/torrent/peermanager.h index 33492c5..5bc785d 100644 --- a/libktorrent/torrent/peermanager.h +++ b/src/libktorrent/torrent/peermanager.h @@ -53,9 +53,9 @@ namespace bt * This class manages all Peer objects. * It can also open connections to other peers. */ - class PeerManager : public TQObject + class LIBKTORRENT_EXPORT PeerManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/libktorrent/torrent/peersourcemanager.cpp b/src/libktorrent/torrent/peersourcemanager.cpp index a48ccb0..c85c144 100644 --- a/libktorrent/torrent/peersourcemanager.cpp +++ b/src/libktorrent/torrent/peersourcemanager.cpp @@ -65,7 +65,7 @@ namespace bt //load custom trackers loadCustomURLs(); - connect(&timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(updateCurrentManually())); + connect(&timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(updateCurrentManually())); } PeerSourceManager::~PeerSourceManager() @@ -85,21 +85,21 @@ namespace bt void PeerSourceManager::addTracker(Tracker* trk) { trackers.insert(trk->trackerURL(),trk); - connect(trk,TQT_SIGNAL(peersReady( kt::PeerSource* )), - pman,TQT_SLOT(peerSourceReady( kt::PeerSource* ))); + connect(trk,TQ_SIGNAL(peersReady( kt::PeerSource* )), + pman,TQ_SLOT(peerSourceReady( kt::PeerSource* ))); } void PeerSourceManager::addPeerSource(kt::PeerSource* ps) { additional.append(ps); - connect(ps,TQT_SIGNAL(peersReady( kt::PeerSource* )), - pman,TQT_SLOT(peerSourceReady( kt::PeerSource* ))); + connect(ps,TQ_SIGNAL(peersReady( kt::PeerSource* )), + pman,TQ_SLOT(peerSourceReady( kt::PeerSource* ))); } void PeerSourceManager::removePeerSource(kt::PeerSource* ps) { - disconnect(ps,TQT_SIGNAL(peersReady( kt::PeerSource* )), - pman,TQT_SLOT(peerSourceReady( kt::PeerSource* ))); + disconnect(ps,TQ_SIGNAL(peersReady( kt::PeerSource* )), + pman,TQ_SLOT(peerSourceReady( kt::PeerSource* ))); additional.remove(ps); } @@ -477,10 +477,10 @@ namespace bt if (curr) { - disconnect(curr,TQT_SIGNAL(requestFailed( const TQString& )), - this,TQT_SLOT(onTrackerError( const TQString& ))); - disconnect(curr,TQT_SIGNAL(requestOK()),this,TQT_SLOT(onTrackerOK())); - disconnect(curr,TQT_SIGNAL(requestPending()),this,TQT_SLOT(onTrackerRequestPending())); + disconnect(curr,TQ_SIGNAL(requestFailed( const TQString& )), + this,TQ_SLOT(onTrackerError( const TQString& ))); + disconnect(curr,TQ_SIGNAL(requestOK()),this,TQ_SLOT(onTrackerOK())); + disconnect(curr,TQ_SIGNAL(requestPending()),this,TQ_SLOT(onTrackerRequestPending())); curr = 0; } @@ -488,14 +488,14 @@ namespace bt if (curr) { Out(SYS_TRK|LOG_NOTICE) << "Switching to tracker " << trk->trackerURL() << endl; - TQObject::connect(curr,TQT_SIGNAL(requestFailed( const TQString& )), - this,TQT_SLOT(onTrackerError( const TQString& ))); + TQObject::connect(curr,TQ_SIGNAL(requestFailed( const TQString& )), + this,TQ_SLOT(onTrackerError( const TQString& ))); - TQObject::connect(curr,TQT_SIGNAL(requestOK()), - this,TQT_SLOT(onTrackerOK())); + TQObject::connect(curr,TQ_SIGNAL(requestOK()), + this,TQ_SLOT(onTrackerOK())); - TQObject::connect(curr,TQT_SIGNAL(requestPending()), - this,TQT_SLOT(onTrackerRequestPending())); + TQObject::connect(curr,TQ_SIGNAL(requestPending()), + this,TQ_SLOT(onTrackerRequestPending())); } } diff --git a/libktorrent/torrent/peersourcemanager.h b/src/libktorrent/torrent/peersourcemanager.h index e6ef3e6..e7de4f8 100644 --- a/libktorrent/torrent/peersourcemanager.h +++ b/src/libktorrent/torrent/peersourcemanager.h @@ -50,7 +50,7 @@ namespace bt */ class PeerSourceManager : public TQObject, public kt::TrackersList { - Q_OBJECT + TQ_OBJECT TorrentControl* tor; diff --git a/libktorrent/torrent/peeruploader.cpp b/src/libktorrent/torrent/peeruploader.cpp index 1127f22..1127f22 100644 --- a/libktorrent/torrent/peeruploader.cpp +++ b/src/libktorrent/torrent/peeruploader.cpp diff --git a/libktorrent/torrent/peeruploader.h b/src/libktorrent/torrent/peeruploader.h index 596cdbb..596cdbb 100644 --- a/libktorrent/torrent/peeruploader.h +++ b/src/libktorrent/torrent/peeruploader.h diff --git a/libktorrent/torrent/piece.cpp b/src/libktorrent/torrent/piece.cpp index 0fff862..0fff862 100644 --- a/libktorrent/torrent/piece.cpp +++ b/src/libktorrent/torrent/piece.cpp diff --git a/libktorrent/torrent/piece.h b/src/libktorrent/torrent/piece.h index 9e749db..9e749db 100644 --- a/libktorrent/torrent/piece.h +++ b/src/libktorrent/torrent/piece.h diff --git a/libktorrent/torrent/preallocationthread.cpp b/src/libktorrent/torrent/preallocationthread.cpp index dfa8c56..dfa8c56 100644 --- a/libktorrent/torrent/preallocationthread.cpp +++ b/src/libktorrent/torrent/preallocationthread.cpp diff --git a/libktorrent/torrent/preallocationthread.h b/src/libktorrent/torrent/preallocationthread.h index 581017d..581017d 100644 --- a/libktorrent/torrent/preallocationthread.h +++ b/src/libktorrent/torrent/preallocationthread.h diff --git a/libktorrent/torrent/queuemanager.cpp b/src/libktorrent/torrent/queuemanager.cpp index bc04f9f..e4d063c 100644 --- a/libktorrent/torrent/queuemanager.cpp +++ b/src/libktorrent/torrent/queuemanager.cpp @@ -61,8 +61,8 @@ namespace bt downloads.append(tc); downloads.sort(); - connect(tc, TQT_SIGNAL(diskSpaceLow(kt::TorrentInterface*, bool)), this, TQT_SLOT(onLowDiskSpace(kt::TorrentInterface*, bool))); - connect(tc, TQT_SIGNAL(torrentStopped(kt::TorrentInterface*)), this, TQT_SLOT(torrentStopped(kt::TorrentInterface*))); + connect(tc, TQ_SIGNAL(diskSpaceLow(kt::TorrentInterface*, bool)), this, TQ_SLOT(onLowDiskSpace(kt::TorrentInterface*, bool))); + connect(tc, TQ_SIGNAL(torrentStopped(kt::TorrentInterface*)), this, TQ_SLOT(torrentStopped(kt::TorrentInterface*))); } void QueueManager::remove(kt::TorrentInterface* tc) diff --git a/libktorrent/torrent/queuemanager.h b/src/libktorrent/torrent/queuemanager.h index a51e9ec..3618c7a 100644 --- a/libktorrent/torrent/queuemanager.h +++ b/src/libktorrent/torrent/queuemanager.h @@ -26,6 +26,7 @@ #include <tqptrlist.h> #include <interfaces/torrentinterface.h> +#include <libktorrent_export.h> namespace kt { @@ -53,9 +54,9 @@ namespace bt * @author Ivan Vasic * @brief This class contains list of all TorrentControls and is responsible for starting/stopping them */ - class QueueManager : public TQObject + class LIBKTORRENT_EXPORT QueueManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libktorrent/torrent/request.cpp b/src/libktorrent/torrent/request.cpp index 413eb11..413eb11 100644 --- a/libktorrent/torrent/request.cpp +++ b/src/libktorrent/torrent/request.cpp diff --git a/libktorrent/torrent/request.h b/src/libktorrent/torrent/request.h index aeeff78..aeeff78 100644 --- a/libktorrent/torrent/request.h +++ b/src/libktorrent/torrent/request.h diff --git a/libktorrent/torrent/server.cpp b/src/libktorrent/torrent/server.cpp index 758ebf5..758ebf5 100644 --- a/libktorrent/torrent/server.cpp +++ b/src/libktorrent/torrent/server.cpp diff --git a/libktorrent/torrent/server.h b/src/libktorrent/torrent/server.h index 3129fd2..600685c 100644 --- a/libktorrent/torrent/server.h +++ b/src/libktorrent/torrent/server.h @@ -23,6 +23,7 @@ #include <tqptrlist.h> #include <tqobject.h> #include "globals.h" +#include <libktorrent_export.h> namespace bt { @@ -42,9 +43,9 @@ namespace bt * All PeerManager's should register with this class when they * are created and should unregister when they are destroyed. */ - class Server : public TQObject + class LIBKTORRENT_EXPORT Server : public TQObject { - Q_OBJECT + TQ_OBJECT TQPtrList<PeerManager> peer_managers; diff --git a/libktorrent/torrent/serverauthenticate.cpp b/src/libktorrent/torrent/serverauthenticate.cpp index 9f7c76f..9f7c76f 100644 --- a/libktorrent/torrent/serverauthenticate.cpp +++ b/src/libktorrent/torrent/serverauthenticate.cpp diff --git a/libktorrent/torrent/serverauthenticate.h b/src/libktorrent/torrent/serverauthenticate.h index bc65cba..bb82e39 100644 --- a/libktorrent/torrent/serverauthenticate.h +++ b/src/libktorrent/torrent/serverauthenticate.h @@ -21,6 +21,7 @@ #define BTSERVERAUTHENTICATE_H #include "authenticatebase.h" +#include <libktorrent_export.h> namespace bt { @@ -35,9 +36,9 @@ namespace bt * Once the authentication is finished, the socket gets handed over * to the right PeerManager. */ - class ServerAuthenticate : public AuthenticateBase + class LIBKTORRENT_EXPORT ServerAuthenticate : public AuthenticateBase { - Q_OBJECT + TQ_OBJECT public: ServerAuthenticate(mse::StreamSocket* sock,Server* server); diff --git a/libktorrent/torrent/singlefilecache.cpp b/src/libktorrent/torrent/singlefilecache.cpp index c89c0be..c89c0be 100644 --- a/libktorrent/torrent/singlefilecache.cpp +++ b/src/libktorrent/torrent/singlefilecache.cpp diff --git a/libktorrent/torrent/singlefilecache.h b/src/libktorrent/torrent/singlefilecache.h index 4a787b1..4a787b1 100644 --- a/libktorrent/torrent/singlefilecache.h +++ b/src/libktorrent/torrent/singlefilecache.h diff --git a/libktorrent/torrent/speedestimater.cpp b/src/libktorrent/torrent/speedestimater.cpp index a0b67da..7752999 100644 --- a/libktorrent/torrent/speedestimater.cpp +++ b/src/libktorrent/torrent/speedestimater.cpp @@ -36,7 +36,7 @@ namespace bt void data(Uint32 bytes) { - dlrate.append(tqMakePair(bytes,GetCurrentTime())); + dlrate.append(qMakePair(bytes,GetCurrentTime())); } void update() diff --git a/libktorrent/torrent/speedestimater.h b/src/libktorrent/torrent/speedestimater.h index 16bbdcc..16bbdcc 100644 --- a/libktorrent/torrent/speedestimater.h +++ b/src/libktorrent/torrent/speedestimater.h diff --git a/libktorrent/torrent/statsfile.cpp b/src/libktorrent/torrent/statsfile.cpp index 772f6be..772f6be 100644 --- a/libktorrent/torrent/statsfile.cpp +++ b/src/libktorrent/torrent/statsfile.cpp diff --git a/libktorrent/torrent/statsfile.h b/src/libktorrent/torrent/statsfile.h index 3b3decb..3b3decb 100644 --- a/libktorrent/torrent/statsfile.h +++ b/src/libktorrent/torrent/statsfile.h diff --git a/libktorrent/torrent/timeestimator.cpp b/src/libktorrent/torrent/timeestimator.cpp index 7d18300..7d18300 100644 --- a/libktorrent/torrent/timeestimator.cpp +++ b/src/libktorrent/torrent/timeestimator.cpp diff --git a/libktorrent/torrent/timeestimator.h b/src/libktorrent/torrent/timeestimator.h index 972e239..972e239 100644 --- a/libktorrent/torrent/timeestimator.h +++ b/src/libktorrent/torrent/timeestimator.h diff --git a/libktorrent/torrent/torrent.cpp b/src/libktorrent/torrent/torrent.cpp index a829230..a829230 100644 --- a/libktorrent/torrent/torrent.cpp +++ b/src/libktorrent/torrent/torrent.cpp diff --git a/libktorrent/torrent/torrent.h b/src/libktorrent/torrent/torrent.h index 05c28cc..5ed623c 100644 --- a/libktorrent/torrent/torrent.h +++ b/src/libktorrent/torrent/torrent.h @@ -29,6 +29,7 @@ #include "globals.h" #include "peerid.h" #include "torrentfile.h" +#include <libktorrent_export.h> @@ -62,7 +63,7 @@ namespace bt * Loads a torrent file and calculates some miscelanious other data, * like the info_hash and the peer_id. */ - class Torrent + class LIBKTORRENT_EXPORT Torrent { public: Torrent(); diff --git a/libktorrent/torrent/torrentcontrol.cpp b/src/libktorrent/torrent/torrentcontrol.cpp index 14ff2c6..9771e80 100644 --- a/libktorrent/torrent/torrentcontrol.cpp +++ b/src/libktorrent/torrent/torrentcontrol.cpp @@ -613,8 +613,8 @@ namespace bt pman = new PeerManager(*tor); //Out() << "Tracker url " << url << " " << url.protocol() << " " << url.prettyURL() << endl; psman = new PeerSourceManager(this,pman); - connect(psman,TQT_SIGNAL(statusChanged( const TQString& )), - this,TQT_SLOT(trackerStatusChanged( const TQString& ))); + connect(psman,TQ_SIGNAL(statusChanged( const TQString& )), + this,TQ_SLOT(trackerStatusChanged( const TQString& ))); // Create chunkmanager, load the index file if it exists @@ -626,7 +626,7 @@ namespace bt // store the outputdir into the output_path variable, so others can access it - connect(cman,TQT_SIGNAL(updateStats()),this,TQT_SLOT(updateStats())); + connect(cman,TQ_SIGNAL(updateStats()),this,TQ_SLOT(updateStats())); if (bt::Exists(datadir + "index")) cman->loadIndexFile(); @@ -634,17 +634,17 @@ namespace bt // create downloader,uploader and choker down = new Downloader(*tor,*pman,*cman); - connect(down,TQT_SIGNAL(ioError(const TQString& )), - this,TQT_SLOT(onIOError(const TQString& ))); + connect(down,TQ_SIGNAL(ioError(const TQString& )), + this,TQ_SLOT(onIOError(const TQString& ))); up = new Uploader(*cman,*pman); choke = new Choker(*pman,*cman); - connect(pman,TQT_SIGNAL(newPeer(Peer* )),this,TQT_SLOT(onNewPeer(Peer* ))); - connect(pman,TQT_SIGNAL(peerKilled(Peer* )),this,TQT_SLOT(onPeerRemoved(Peer* ))); - connect(cman,TQT_SIGNAL(excluded(Uint32, Uint32 )),down,TQT_SLOT(onExcluded(Uint32, Uint32 ))); - connect(cman,TQT_SIGNAL(included( Uint32, Uint32 )),down,TQT_SLOT(onIncluded( Uint32, Uint32 ))); - connect(cman,TQT_SIGNAL(corrupted( Uint32 )),this,TQT_SLOT(corrupted( Uint32 ))); + connect(pman,TQ_SIGNAL(newPeer(Peer* )),this,TQ_SLOT(onNewPeer(Peer* ))); + connect(pman,TQ_SIGNAL(peerKilled(Peer* )),this,TQ_SLOT(onPeerRemoved(Peer* ))); + connect(cman,TQ_SIGNAL(excluded(Uint32, Uint32 )),down,TQ_SLOT(onExcluded(Uint32, Uint32 ))); + connect(cman,TQ_SIGNAL(included( Uint32, Uint32 )),down,TQ_SLOT(onIncluded( Uint32, Uint32 ))); + connect(cman,TQ_SIGNAL(corrupted( Uint32 )),this,TQ_SLOT(corrupted( Uint32 ))); } void TorrentControl::initInternal(QueueManager* qman, @@ -731,8 +731,8 @@ namespace bt void TorrentControl::onNewPeer(Peer* p) { - connect(p,TQT_SIGNAL(gotPortPacket( const TQString&, Uint16 )), - this,TQT_SLOT(onPortPacket( const TQString&, Uint16 ))); + connect(p,TQ_SIGNAL(gotPortPacket( const TQString&, Uint16 )), + this,TQ_SLOT(onPortPacket( const TQString&, Uint16 ))); if (p->getStats().fast_extensions) { @@ -772,8 +772,8 @@ namespace bt void TorrentControl::onPeerRemoved(Peer* p) { - disconnect(p,TQT_SIGNAL(gotPortPacket( const TQString&, Uint16 )), - this,TQT_SLOT(onPortPacket( const TQString&, Uint16 ))); + disconnect(p,TQ_SIGNAL(gotPortPacket( const TQString&, Uint16 )), + this,TQ_SLOT(onPortPacket( const TQString&, Uint16 ))); if (tmon) tmon->peerRemoved(p); } @@ -855,7 +855,7 @@ namespace bt move_data_files_destination_path = nd; if (j) { - connect(j,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(moveDataFilesJobDone(TDEIO::Job*))); + connect(j,TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(moveDataFilesJobDone(TDEIO::Job*))); return true; } else diff --git a/libktorrent/torrent/torrentcontrol.h b/src/libktorrent/torrent/torrentcontrol.h index 885e9fe..def2361 100644 --- a/libktorrent/torrent/torrentcontrol.h +++ b/src/libktorrent/torrent/torrentcontrol.h @@ -30,6 +30,7 @@ #include <interfaces/torrentinterface.h> #include <interfaces/monitorinterface.h> #include <interfaces/trackerslist.h> +#include <libktorrent_export.h> class TQStringList; class TQString; @@ -65,9 +66,9 @@ namespace bt * This class controls the uploading, downloading, choking, * updating the tracker and chunk management. */ - class TorrentControl : public kt::TorrentInterface + class LIBKTORRENT_EXPORT TorrentControl : public kt::TorrentInterface { - Q_OBJECT + TQ_OBJECT public: TorrentControl(); diff --git a/libktorrent/torrent/torrentcreator.cpp b/src/libktorrent/torrent/torrentcreator.cpp index 35c8c3e..35c8c3e 100644 --- a/libktorrent/torrent/torrentcreator.cpp +++ b/src/libktorrent/torrent/torrentcreator.cpp diff --git a/libktorrent/torrent/torrentcreator.h b/src/libktorrent/torrent/torrentcreator.h index e1e2545..4f1599c 100644 --- a/libktorrent/torrent/torrentcreator.h +++ b/src/libktorrent/torrent/torrentcreator.h @@ -23,6 +23,7 @@ #include <tqstringlist.h> #include "torrent.h" #include <util/sha1hash.h> +#include <libktorrent_export.h> namespace bt { @@ -37,7 +38,7 @@ namespace bt * It also allows to create a TorrentControl object, so * that we immediately can start to share the torrent. */ - class TorrentCreator + class LIBKTORRENT_EXPORT TorrentCreator { // input values TQString target; diff --git a/libktorrent/torrent/torrentfile.cpp b/src/libktorrent/torrent/torrentfile.cpp index 106e66f..106e66f 100644 --- a/libktorrent/torrent/torrentfile.cpp +++ b/src/libktorrent/torrent/torrentfile.cpp diff --git a/libktorrent/torrent/torrentfile.h b/src/libktorrent/torrent/torrentfile.h index 7c22611..f2a96a7 100644 --- a/libktorrent/torrent/torrentfile.h +++ b/src/libktorrent/torrent/torrentfile.h @@ -37,7 +37,7 @@ namespace bt */ class TorrentFile : public kt::TorrentFileInterface { - Q_OBJECT + TQ_OBJECT Uint32 index; diff --git a/libktorrent/torrent/torrentmonitor.cpp b/src/libktorrent/torrent/torrentmonitor.cpp index ff33acb..ff33acb 100644 --- a/libktorrent/torrent/torrentmonitor.cpp +++ b/src/libktorrent/torrent/torrentmonitor.cpp diff --git a/libktorrent/torrent/torrentmonitor.h b/src/libktorrent/torrent/torrentmonitor.h index 52e3835..52e3835 100644 --- a/libktorrent/torrent/torrentmonitor.h +++ b/src/libktorrent/torrent/torrentmonitor.h diff --git a/libktorrent/torrent/tracker.cpp b/src/libktorrent/torrent/tracker.cpp index 4878a16..4848765 100644 --- a/libktorrent/torrent/tracker.cpp +++ b/src/libktorrent/torrent/tracker.cpp @@ -84,8 +84,8 @@ namespace bt void Tracker::timedDelete(int ms) { - TQTimer::singleShot(ms,this,TQT_SLOT(deleteLater())); - connect(this,TQT_SIGNAL(stopDone()),this,TQT_SLOT(deleteLater())); + TQTimer::singleShot(ms,this,TQ_SLOT(deleteLater())); + connect(this,TQ_SIGNAL(stopDone()),this,TQ_SLOT(deleteLater())); } } diff --git a/libktorrent/torrent/tracker.h b/src/libktorrent/torrent/tracker.h index 7a58264..5f35b04 100644 --- a/libktorrent/torrent/tracker.h +++ b/src/libktorrent/torrent/tracker.h @@ -41,9 +41,9 @@ namespace bt /** * Base class for all tracker classes. */ - class Tracker : public kt::PeerSource + class LIBKTORRENT_EXPORT Tracker : public kt::PeerSource { - Q_OBJECT + TQ_OBJECT public: Tracker(const KURL & url,kt::TorrentInterface* tor,const PeerID & id,int tier); diff --git a/libktorrent/torrent/udptracker.cpp b/src/libktorrent/torrent/udptracker.cpp index 6f8a4e0..89f58b8 100644 --- a/libktorrent/torrent/udptracker.cpp +++ b/src/libktorrent/torrent/udptracker.cpp @@ -51,15 +51,15 @@ namespace bt transaction_id = 0; interval = 0; - connect(&conn_timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(onConnTimeout())); - connect(socket,TQT_SIGNAL(announceRecieved(Int32, const TQByteArray &)), - this,TQT_SLOT(announceRecieved(Int32, const TQByteArray& ))); - connect(socket,TQT_SIGNAL(connectRecieved(Int32, Int64 )), - this,TQT_SLOT(connectRecieved(Int32, Int64 ))); - connect(socket,TQT_SIGNAL(error(Int32, const TQString& )), - this,TQT_SLOT(onError(Int32, const TQString& ))); + connect(&conn_timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(onConnTimeout())); + connect(socket,TQ_SIGNAL(announceRecieved(Int32, const TQByteArray &)), + this,TQ_SLOT(announceRecieved(Int32, const TQByteArray& ))); + connect(socket,TQ_SIGNAL(connectRecieved(Int32, Int64 )), + this,TQ_SLOT(connectRecieved(Int32, Int64 ))); + connect(socket,TQ_SIGNAL(error(Int32, const TQString& )), + this,TQ_SLOT(onError(Int32, const TQString& ))); - KResolver::resolveAsync(this,TQT_SLOT(onResolverResults(KResolverResults )), + KResolver::resolveAsync(this,TQ_SLOT(onResolverResults(KResolverResults )), url.host(),TQString::number(url.port())); } diff --git a/libktorrent/torrent/udptracker.h b/src/libktorrent/torrent/udptracker.h index 648aa8a..2da26d8 100644 --- a/libktorrent/torrent/udptracker.h +++ b/src/libktorrent/torrent/udptracker.h @@ -61,7 +61,7 @@ namespace bt */ class UDPTracker : public Tracker { - Q_OBJECT + TQ_OBJECT public: UDPTracker(const KURL & url,kt::TorrentInterface* tor,const PeerID & id,int tier); diff --git a/libktorrent/torrent/udptrackersocket.cpp b/src/libktorrent/torrent/udptrackersocket.cpp index 6df3cdf..eb8dc8b 100644 --- a/libktorrent/torrent/udptrackersocket.cpp +++ b/src/libktorrent/torrent/udptrackersocket.cpp @@ -42,7 +42,7 @@ namespace bt { sock = new KNetwork::KDatagramSocket(this); sock->setAddressReuseable(true); - connect(sock,TQT_SIGNAL(readyRead()),this,TQT_SLOT(dataReceived())); + connect(sock,TQ_SIGNAL(readyRead()),this,TQ_SLOT(dataReceived())); int i = 0; if (port == 0) port = 4444; diff --git a/libktorrent/torrent/udptrackersocket.h b/src/libktorrent/torrent/udptrackersocket.h index a926b8c..fadbc38 100644 --- a/libktorrent/torrent/udptrackersocket.h +++ b/src/libktorrent/torrent/udptrackersocket.h @@ -24,6 +24,7 @@ #include <tqmap.h> #include <tqcstring.h> #include <util/constants.h> +#include <libktorrent_export.h> namespace KNetwork @@ -51,9 +52,9 @@ namespace bt * * Class which handles communication with one or more UDP trackers. */ - class UDPTrackerSocket : public TQObject + class LIBKTORRENT_EXPORT UDPTrackerSocket : public TQObject { - Q_OBJECT + TQ_OBJECT public: UDPTrackerSocket(); diff --git a/libktorrent/torrent/uploadcap.cpp b/src/libktorrent/torrent/uploadcap.cpp index 701d854..701d854 100644 --- a/libktorrent/torrent/uploadcap.cpp +++ b/src/libktorrent/torrent/uploadcap.cpp diff --git a/libktorrent/torrent/uploadcap.h b/src/libktorrent/torrent/uploadcap.h index f766f59..f766f59 100644 --- a/libktorrent/torrent/uploadcap.h +++ b/src/libktorrent/torrent/uploadcap.h diff --git a/libktorrent/torrent/uploader.cpp b/src/libktorrent/torrent/uploader.cpp index 0cf3677..0cf3677 100644 --- a/libktorrent/torrent/uploader.cpp +++ b/src/libktorrent/torrent/uploader.cpp diff --git a/libktorrent/torrent/uploader.h b/src/libktorrent/torrent/uploader.h index aa4f099..06ce331 100644 --- a/libktorrent/torrent/uploader.h +++ b/src/libktorrent/torrent/uploader.h @@ -40,7 +40,7 @@ namespace bt */ class Uploader : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/libktorrent/torrent/upspeedestimater.cpp b/src/libktorrent/torrent/upspeedestimater.cpp index 08137f5..08137f5 100644 --- a/libktorrent/torrent/upspeedestimater.cpp +++ b/src/libktorrent/torrent/upspeedestimater.cpp diff --git a/libktorrent/torrent/upspeedestimater.h b/src/libktorrent/torrent/upspeedestimater.h index 27c0c06..27c0c06 100644 --- a/libktorrent/torrent/upspeedestimater.h +++ b/src/libktorrent/torrent/upspeedestimater.h diff --git a/libktorrent/torrent/utpex.cpp b/src/libktorrent/torrent/utpex.cpp index 68361e0..68361e0 100644 --- a/libktorrent/torrent/utpex.cpp +++ b/src/libktorrent/torrent/utpex.cpp diff --git a/libktorrent/torrent/utpex.h b/src/libktorrent/torrent/utpex.h index cab2f39..cab2f39 100644 --- a/libktorrent/torrent/utpex.h +++ b/src/libktorrent/torrent/utpex.h diff --git a/libktorrent/torrent/value.cpp b/src/libktorrent/torrent/value.cpp index 4d8641c..4d8641c 100644 --- a/libktorrent/torrent/value.cpp +++ b/src/libktorrent/torrent/value.cpp diff --git a/libktorrent/torrent/value.h b/src/libktorrent/torrent/value.h index 7926af4..7926af4 100644 --- a/libktorrent/torrent/value.h +++ b/src/libktorrent/torrent/value.h diff --git a/src/libktorrent/util/CMakeLists.txt b/src/libktorrent/util/CMakeLists.txt new file mode 100644 index 0000000..fb8fa30 --- /dev/null +++ b/src/libktorrent/util/CMakeLists.txt @@ -0,0 +1,24 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/.. + ${CMAKE_CURRENT_BINARY_DIR} +) + + +##### check for profiling support + +if( WITH_PROFILING_SUPPORT ) + add_definitions(-DKT_PROFILE ) +endif( ) + + +##### util library (static) + +tde_add_library( util STATIC_PIC AUTOMOC + SOURCES + array.cpp autorotatelogjob.cpp bitset.cpp error.cpp file.cpp fileops.cpp functions.cpp + httprequest.cpp log.cpp mmapfile.cpp profiler.cpp ptrmap.cpp sha1hash.cpp sha1hashgen.cpp + timer.cpp urlencoder.cpp waitjob.cpp + LINK + torrent-static +) diff --git a/libktorrent/util/array.cpp b/src/libktorrent/util/array.cpp index e57091d..e57091d 100644 --- a/libktorrent/util/array.cpp +++ b/src/libktorrent/util/array.cpp diff --git a/libktorrent/util/array.h b/src/libktorrent/util/array.h index 1694e2a..1694e2a 100644 --- a/libktorrent/util/array.h +++ b/src/libktorrent/util/array.h diff --git a/libktorrent/util/autorotatelogjob.cpp b/src/libktorrent/util/autorotatelogjob.cpp index dd1424b..100c0b9 100644 --- a/libktorrent/util/autorotatelogjob.cpp +++ b/src/libktorrent/util/autorotatelogjob.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #include <kurl.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <util/fileops.h> #include "autorotatelogjob.h" #include "log.h" @@ -51,7 +51,7 @@ namespace bt if (bt::Exists(prev)) // if file exists start the move job { TDEIO::Job* sj = TDEIO::file_move(KURL::fromPathOrURL(prev),KURL::fromPathOrURL(curr),-1,true,false,false); - connect(sj,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(moveJobDone(TDEIO::Job* ))); + connect(sj,TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(moveJobDone(TDEIO::Job* ))); return; } else @@ -65,7 +65,7 @@ namespace bt // move current log to 1 and zip it bt::Move(file,file + "-1",true); TDEIO::Job* sj = TDEIO::file_move(KURL::fromPathOrURL(file),KURL::fromPathOrURL(file + "-1"),-1,true,false,false); - connect(sj,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(moveJobDone(TDEIO::Job* ))); + connect(sj,TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(moveJobDone(TDEIO::Job* ))); } else { diff --git a/libktorrent/util/autorotatelogjob.h b/src/libktorrent/util/autorotatelogjob.h index bde477a..222a99c 100644 --- a/libktorrent/util/autorotatelogjob.h +++ b/src/libktorrent/util/autorotatelogjob.h @@ -35,7 +35,7 @@ namespace bt */ class AutoRotateLogJob : public TDEIO::Job { - Q_OBJECT + TQ_OBJECT public: AutoRotateLogJob(const TQString & file,Log* lg); diff --git a/libktorrent/util/bitset.cpp b/src/libktorrent/util/bitset.cpp index 6139e01..6139e01 100644 --- a/libktorrent/util/bitset.cpp +++ b/src/libktorrent/util/bitset.cpp diff --git a/libktorrent/util/bitset.h b/src/libktorrent/util/bitset.h index 32e7e48..54910ec 100644 --- a/libktorrent/util/bitset.h +++ b/src/libktorrent/util/bitset.h @@ -21,6 +21,7 @@ #define BTBITSET_H #include "constants.h" +#include <libktorrent_export.h> namespace bt { @@ -32,7 +33,7 @@ namespace bt * Simple implementation of a BitSet, can only turn on and off bits. * BitSet's are used to indicate which chunks we have or not. */ - class BitSet + class LIBKTORRENT_EXPORT BitSet { Uint32 num_bits,num_bytes; Uint8* data; diff --git a/libktorrent/util/constants.h b/src/libktorrent/util/constants.h index 0551f60..0551f60 100644 --- a/libktorrent/util/constants.h +++ b/src/libktorrent/util/constants.h diff --git a/libktorrent/util/error.cpp b/src/libktorrent/util/error.cpp index dd3e15d..dd3e15d 100644 --- a/libktorrent/util/error.cpp +++ b/src/libktorrent/util/error.cpp diff --git a/libktorrent/util/error.h b/src/libktorrent/util/error.h index 49aa95d..337c01a 100644 --- a/libktorrent/util/error.h +++ b/src/libktorrent/util/error.h @@ -21,6 +21,7 @@ #define BTERROR_H #include <tqstring.h> +#include <libktorrent_export.h> namespace bt { @@ -28,7 +29,7 @@ namespace bt /** @author Joris Guisson */ - class Error + class LIBKTORRENT_EXPORT Error { TQString msg; public: diff --git a/libktorrent/util/file.cpp b/src/libktorrent/util/file.cpp index 95af348..95af348 100644 --- a/libktorrent/util/file.cpp +++ b/src/libktorrent/util/file.cpp diff --git a/libktorrent/util/file.h b/src/libktorrent/util/file.h index c6567f8..40fd18b 100644 --- a/libktorrent/util/file.h +++ b/src/libktorrent/util/file.h @@ -23,6 +23,7 @@ #include <stdio.h> #include <tqstring.h> #include "constants.h" +#include <libktorrent_export.h> namespace bt { @@ -33,7 +34,7 @@ namespace bt * * Wrapper class for stdio's FILE. */ - class File + class LIBKTORRENT_EXPORT File { FILE* fptr; TQString file; diff --git a/libktorrent/util/fileops.cpp b/src/libktorrent/util/fileops.cpp index 29e7549..29e7549 100644 --- a/libktorrent/util/fileops.cpp +++ b/src/libktorrent/util/fileops.cpp diff --git a/libktorrent/util/fileops.h b/src/libktorrent/util/fileops.h index d1c3437..592ecd3 100644 --- a/libktorrent/util/fileops.h +++ b/src/libktorrent/util/fileops.h @@ -25,6 +25,8 @@ #endif #include <util/constants.h> +#include <libktorrent_export.h> + class TQString; namespace bt @@ -37,7 +39,7 @@ namespace bt * @param nothrow wether or not we shouldn't throw an Error upon failure * @throw Error upon error */ - void MakeDir(const TQString & dir,bool nothrow = false); + LIBKTORRENT_EXPORT void MakeDir(const TQString & dir,bool nothrow = false); /** * Create a symbolic link @a link_url which links to @a link_to @@ -45,7 +47,7 @@ namespace bt * @param link_url The link url * @param nothrow wether or not we shouldn't throw an Error upon failure */ - void SymLink(const TQString & link_to,const TQString & link_url,bool nothrow = false); + LIBKTORRENT_EXPORT void SymLink(const TQString & link_to,const TQString & link_url,bool nothrow = false); /** * Move a file/dir from one location to another @@ -53,7 +55,7 @@ namespace bt * @param dst The destination file / directory * @param nothrow wether or not we shouldn't throw an Error upon failure */ - void Move(const TQString & src,const TQString & dst,bool nothrow = false); + LIBKTORRENT_EXPORT void Move(const TQString & src,const TQString & dst,bool nothrow = false); /** * Copy a file. @@ -61,7 +63,7 @@ namespace bt * @param dst The destination dir/file * @param nothrow wether or not we shouldn't throw an Error upon failure */ - void CopyFile(const TQString & src,const TQString & dst,bool nothrow = false); + LIBKTORRENT_EXPORT void CopyFile(const TQString & src,const TQString & dst,bool nothrow = false); /** * Copy a file or directory @@ -69,21 +71,21 @@ namespace bt * @param dst The destination dir/file * @param nothrow wether or not we shouldn't throw an Error upon failure */ - void CopyDir(const TQString & src,const TQString & dst,bool nothrow = false); + LIBKTORRENT_EXPORT void CopyDir(const TQString & src,const TQString & dst,bool nothrow = false); /** * Check wether a file/dir exists * @param url The file/dir * @return true if it exits */ - bool Exists(const TQString & url); + LIBKTORRENT_EXPORT bool Exists(const TQString & url); /** * Delete a file or directory. * @param url The url of the file/dir * @param nothrow wether or not we shouldn't throw an Error upon failure */ - void Delete(const TQString & url,bool nothrow = false); + LIBKTORRENT_EXPORT void Delete(const TQString & url,bool nothrow = false); /** * Try to create a file. Doesn't do anything if the file @@ -91,7 +93,7 @@ namespace bt * @param url The url of the file * @param nothrow wether or not we shouldn't throw an Error upon failure */ - void Touch(const TQString & url,bool nothrow = false); + LIBKTORRENT_EXPORT void Touch(const TQString & url,bool nothrow = false); /** * Calculates the size of a file @@ -99,7 +101,7 @@ namespace bt * @return The size of the file * @throw Error if the file doesn't exist, or something else goes wrong */ - Uint64 FileSize(const TQString & url); + LIBKTORRENT_EXPORT Uint64 FileSize(const TQString & url); /** * Get the size of a file. @@ -107,7 +109,7 @@ namespace bt * @return The size * @throw Error if the file doesn't exist, or something else goes wrong */ - Uint64 FileSize(int fd); + LIBKTORRENT_EXPORT Uint64 FileSize(int fd); /** * Truncate a file (wrapper around ftruncate) @@ -115,7 +117,7 @@ namespace bt * @param size The size to truncate to * @throw Error if the file doesn't exist, or something else goes wrong */ - void TruncateFile(int fd,Uint64 size,bool quick); + LIBKTORRENT_EXPORT void TruncateFile(int fd,Uint64 size,bool quick); /** * Truncate a file (wrapper around ftruncate) @@ -124,28 +126,28 @@ namespace bt * @param quick Use the quick way (doesn't prevent fragmentationt) * @throw Error if the file doesn't exist, or something else goes wrong */ - void TruncateFile(const TQString & path,Uint64 size); + LIBKTORRENT_EXPORT void TruncateFile(const TQString & path,Uint64 size); /** * Special truncate for FAT file systems. */ - bool FatPreallocate(int fd,Uint64 size); + LIBKTORRENT_EXPORT bool FatPreallocate(int fd,Uint64 size); /** * Special truncate for FAT file systems. */ - bool FatPreallocate(const TQString & path,Uint64 size); + LIBKTORRENT_EXPORT bool FatPreallocate(const TQString & path,Uint64 size); #ifdef HAVE_XFS_XFS_H /** * Special truncate for XFS file systems. */ - bool XfsPreallocate(int fd,Uint64 size); + LIBKTORRENT_EXPORT bool XfsPreallocate(int fd,Uint64 size); /** * Special truncate for XFS file systems. */ - bool XfsPreallocate(const TQString & path,Uint64 size); + LIBKTORRENT_EXPORT bool XfsPreallocate(const TQString & path,Uint64 size); #endif @@ -156,10 +158,10 @@ namespace bt * @param whence Position to seek from * @throw Error if something else goes wrong */ - void SeekFile(int fd,Int64 off,int whence); + LIBKTORRENT_EXPORT void SeekFile(int fd,Int64 off,int whence); /// Calculate the number of bytes free on the filesystem path is located - bool FreeDiskSpace(const TQString & path,Uint64 & bytes_free); + LIBKTORRENT_EXPORT bool FreeDiskSpace(const TQString & path,Uint64 & bytes_free); } #endif diff --git a/libktorrent/util/functions.cpp b/src/libktorrent/util/functions.cpp index 2480a24..2480a24 100644 --- a/libktorrent/util/functions.cpp +++ b/src/libktorrent/util/functions.cpp diff --git a/libktorrent/util/functions.h b/src/libktorrent/util/functions.h index 9295b83..97bb3fe 100644 --- a/libktorrent/util/functions.h +++ b/src/libktorrent/util/functions.h @@ -21,6 +21,7 @@ #define BTFUNCTIONS_H #include "constants.h" +#include <libktorrent_export.h> class TQString; class TQHostAddress; @@ -29,44 +30,43 @@ class KURL; namespace bt { - void WriteUint64(Uint8* buf,Uint32 off,Uint64 val); - Uint64 ReadUint64(const Uint8* buf,Uint64 off); + LIBKTORRENT_EXPORT void WriteUint64(Uint8* buf,Uint32 off,Uint64 val); + LIBKTORRENT_EXPORT Uint64 ReadUint64(const Uint8* buf,Uint64 off); - void WriteUint32(Uint8* buf,Uint32 off,Uint32 val); - Uint32 ReadUint32(const Uint8* buf,Uint32 off); + LIBKTORRENT_EXPORT void WriteUint32(Uint8* buf,Uint32 off,Uint32 val); + LIBKTORRENT_EXPORT Uint32 ReadUint32(const Uint8* buf,Uint32 off); - void WriteUint16(Uint8* buf,Uint32 off,Uint16 val); - Uint16 ReadUint16(const Uint8* buf,Uint32 off); - + LIBKTORRENT_EXPORT void WriteUint16(Uint8* buf,Uint32 off,Uint16 val); + LIBKTORRENT_EXPORT Uint16 ReadUint16(const Uint8* buf,Uint32 off); - void WriteInt64(Uint8* buf,Uint32 off,Int64 val); - Int64 ReadInt64(const Uint8* buf,Uint32 off); + LIBKTORRENT_EXPORT void WriteInt64(Uint8* buf,Uint32 off,Int64 val); + LIBKTORRENT_EXPORT Int64 ReadInt64(const Uint8* buf,Uint32 off); - void WriteInt32(Uint8* buf,Uint32 off,Int32 val); - Int32 ReadInt32(const Uint8* buf,Uint32 off); + LIBKTORRENT_EXPORT void WriteInt32(Uint8* buf,Uint32 off,Int32 val); + LIBKTORRENT_EXPORT Int32 ReadInt32(const Uint8* buf,Uint32 off); - void WriteInt16(Uint8* buf,Uint32 off,Int16 val); - Int16 ReadInt16(const Uint8* buf,Uint32 off); + LIBKTORRENT_EXPORT void WriteInt16(Uint8* buf,Uint32 off,Int16 val); + LIBKTORRENT_EXPORT Int16 ReadInt16(const Uint8* buf,Uint32 off); - void UpdateCurrentTime(); + LIBKTORRENT_EXPORT void UpdateCurrentTime(); - extern TimeStamp global_time_stamp; + LIBKTORRENT_EXPORT extern TimeStamp global_time_stamp; inline TimeStamp GetCurrentTime() {return global_time_stamp;} - TimeStamp Now(); + LIBKTORRENT_EXPORT TimeStamp Now(); - TQHostAddress LookUpHost(const TQString & host); - TQString DirSeparator(); - bool IsMultimediaFile(const TQString & filename); + LIBKTORRENT_EXPORT TQHostAddress LookUpHost(const TQString & host); + LIBKTORRENT_EXPORT TQString DirSeparator(); + LIBKTORRENT_EXPORT bool IsMultimediaFile(const TQString & filename); /** * Maximize the file and memory limits using setrlimit. */ - bool MaximizeLimits(); + LIBKTORRENT_EXPORT bool MaximizeLimits(); /// Get the maximum number of open files - Uint32 MaxOpenFiles(); + LIBKTORRENT_EXPORT Uint32 MaxOpenFiles(); } #endif diff --git a/libktorrent/util/httprequest.cpp b/src/libktorrent/util/httprequest.cpp index 4c869a5..ff40e4c 100644 --- a/libktorrent/util/httprequest.cpp +++ b/src/libktorrent/util/httprequest.cpp @@ -34,11 +34,11 @@ namespace bt sock->enableWrite(true); sock->setTimeout(30000); sock->setBlocking(false); - connect(sock,TQT_SIGNAL(readyRead()),this,TQT_SLOT(onReadyRead())); - connect(sock,TQT_SIGNAL(gotError(int)),this,TQT_SLOT(onError(int ))); - connect(sock,TQT_SIGNAL(timedOut()),this,TQT_SLOT(onTimeout())); - connect(sock,TQT_SIGNAL(connected(const KResolverEntry&)), - this, TQT_SLOT(onConnect( const KResolverEntry& ))); + connect(sock,TQ_SIGNAL(readyRead()),this,TQ_SLOT(onReadyRead())); + connect(sock,TQ_SIGNAL(gotError(int)),this,TQ_SLOT(onError(int ))); + connect(sock,TQ_SIGNAL(timedOut()),this,TQ_SLOT(onTimeout())); + connect(sock,TQ_SIGNAL(connected(const KResolverEntry&)), + this, TQ_SLOT(onConnect( const KResolverEntry& ))); } diff --git a/libktorrent/util/httprequest.h b/src/libktorrent/util/httprequest.h index f472c07..0116e79 100644 --- a/libktorrent/util/httprequest.h +++ b/src/libktorrent/util/httprequest.h @@ -38,9 +38,9 @@ namespace bt * connect to the right signals and forget about it. After the reply has been received or * an error occurred, the appropriate signal will be emitted. */ - class HTTPRequest : public kt::ExitOperation + class LIBKTORRENT_EXPORT HTTPRequest : public kt::ExitOperation { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/libktorrent/util/log.cpp b/src/libktorrent/util/log.cpp index 42e2716..02fafe6 100644 --- a/libktorrent/util/log.cpp +++ b/src/libktorrent/util/log.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include <kurl.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdelocale.h> #include <tqdatetime.h> #include <tqtextstream.h> @@ -102,7 +102,7 @@ namespace bt if (!fptr.open(IO_WriteOnly)) throw Error(i18n("Cannot open log file %1 : %2").arg(file).arg(fptr.errorString())); - out->setDevice(TQT_TQIODEVICE(&fptr)); + out->setDevice(&fptr); } void write(const TQString & line) @@ -119,7 +119,7 @@ namespace bt *out << TQDateTime::currentDateTime().toString() << ": " << tmp << ::endl; fptr.flush(); if (to_cout) - std::cout << TQString(tmp.local8Bit()) << std::endl; + std::cout << tmp.local8Bit() << std::endl; if (monitors.count() > 0) { @@ -153,7 +153,7 @@ namespace bt void logRotateDone() { fptr.open(IO_WriteOnly); - out->setDevice(TQT_TQIODEVICE(&fptr)); + out->setDevice(&fptr); rotate_job = 0; } }; diff --git a/libktorrent/util/log.h b/src/libktorrent/util/log.h index 742b753..62260b7 100644 --- a/libktorrent/util/log.h +++ b/src/libktorrent/util/log.h @@ -23,6 +23,7 @@ #include "constants.h" +#include <libktorrent_export.h> #include <tqstring.h> // LOG MESSAGES CONSTANTS @@ -75,7 +76,7 @@ namespace bt * There is also the possibility to monitor what is written to the log using * the LogMonitorInterface class. */ - class Log + class LIBKTORRENT_EXPORT Log { class Private; @@ -195,10 +196,10 @@ namespace bt void logRotateDone(); }; - Log & endl(Log & lg); + LIBKTORRENT_EXPORT Log & endl(Log & lg); - Log & Out(unsigned int arg = 0x00); + LIBKTORRENT_EXPORT Log & Out(unsigned int arg = 0x00); inline Log & GenOut(unsigned int arg) {return Out(SYS_GEN|arg);} inline Log & DHTOut(unsigned int arg) {return Out(SYS_DHT|arg);} inline Log & ConOut(unsigned int arg) {return Out(SYS_CON|arg);} diff --git a/libktorrent/util/mmapfile.cpp b/src/libktorrent/util/mmapfile.cpp index b60bef9..b60bef9 100644 --- a/libktorrent/util/mmapfile.cpp +++ b/src/libktorrent/util/mmapfile.cpp diff --git a/libktorrent/util/mmapfile.h b/src/libktorrent/util/mmapfile.h index 4d68fd2..78ccf4c 100644 --- a/libktorrent/util/mmapfile.h +++ b/src/libktorrent/util/mmapfile.h @@ -21,6 +21,7 @@ #define BTMMAPFILE_H +#include <libktorrent_export.h> #include <tqstring.h> #include <util/constants.h> @@ -35,11 +36,12 @@ namespace bt * File. * TODO: make sure large files work (not really needed for the blocklist) */ - class MMapFile + class LIBKTORRENT_EXPORT MMapFile { public: MMapFile(); - virtual ~MMapFile(); + //virtual + ~MMapFile(); enum Mode { diff --git a/libktorrent/util/profiler.cpp b/src/libktorrent/util/profiler.cpp index 4da9e7f..4da9e7f 100644 --- a/libktorrent/util/profiler.cpp +++ b/src/libktorrent/util/profiler.cpp diff --git a/libktorrent/util/profiler.h b/src/libktorrent/util/profiler.h index 1b220b1..1b220b1 100644 --- a/libktorrent/util/profiler.h +++ b/src/libktorrent/util/profiler.h diff --git a/libktorrent/util/ptrmap.cpp b/src/libktorrent/util/ptrmap.cpp index 28a4340..28a4340 100644 --- a/libktorrent/util/ptrmap.cpp +++ b/src/libktorrent/util/ptrmap.cpp diff --git a/libktorrent/util/ptrmap.h b/src/libktorrent/util/ptrmap.h index 36e1c20..36e1c20 100644 --- a/libktorrent/util/ptrmap.h +++ b/src/libktorrent/util/ptrmap.h diff --git a/libktorrent/util/sha1hash.cpp b/src/libktorrent/util/sha1hash.cpp index 6cdbbc4..00a1bb2 100644 --- a/libktorrent/util/sha1hash.cpp +++ b/src/libktorrent/util/sha1hash.cpp @@ -115,7 +115,7 @@ namespace bt return k; } - bool operator < (const SHA1Hash & a,const SHA1Hash & b) + LIBKTORRENT_EXPORT bool operator < (const SHA1Hash & a,const SHA1Hash & b) { for (int i = 0;i < 20;i++) { diff --git a/libktorrent/util/sha1hash.h b/src/libktorrent/util/sha1hash.h index dba66c9..5363555 100644 --- a/libktorrent/util/sha1hash.h +++ b/src/libktorrent/util/sha1hash.h @@ -22,6 +22,7 @@ #include <tqcstring.h> #include "constants.h" +#include <libktorrent_export.h> class TQString; @@ -36,7 +37,7 @@ namespace bt * This class keeps track of a SHA1 hash. A SHA1 hash is a 20 byte * array of bytes. */ - class SHA1Hash + class LIBKTORRENT_EXPORT SHA1Hash { protected: Uint8 hash[20]; diff --git a/libktorrent/util/sha1hashgen.cpp b/src/libktorrent/util/sha1hashgen.cpp index bacca62..bacca62 100644 --- a/libktorrent/util/sha1hashgen.cpp +++ b/src/libktorrent/util/sha1hashgen.cpp diff --git a/libktorrent/util/sha1hashgen.h b/src/libktorrent/util/sha1hashgen.h index 08cc3ad..08cc3ad 100644 --- a/libktorrent/util/sha1hashgen.h +++ b/src/libktorrent/util/sha1hashgen.h diff --git a/libktorrent/util/timer.cpp b/src/libktorrent/util/timer.cpp index a35ffc0..a35ffc0 100644 --- a/libktorrent/util/timer.cpp +++ b/src/libktorrent/util/timer.cpp diff --git a/libktorrent/util/timer.h b/src/libktorrent/util/timer.h index edef755..edef755 100644 --- a/libktorrent/util/timer.h +++ b/src/libktorrent/util/timer.h diff --git a/libktorrent/util/urlencoder.cpp b/src/libktorrent/util/urlencoder.cpp index 9d2b92b..9d2b92b 100644 --- a/libktorrent/util/urlencoder.cpp +++ b/src/libktorrent/util/urlencoder.cpp diff --git a/libktorrent/util/urlencoder.h b/src/libktorrent/util/urlencoder.h index c6fd3ec..c6fd3ec 100644 --- a/libktorrent/util/urlencoder.h +++ b/src/libktorrent/util/urlencoder.h diff --git a/libktorrent/util/waitjob.cpp b/src/libktorrent/util/waitjob.cpp index e04369e..d236b6d 100644 --- a/libktorrent/util/waitjob.cpp +++ b/src/libktorrent/util/waitjob.cpp @@ -27,7 +27,7 @@ namespace bt WaitJob::WaitJob(Uint32 millis) : TDEIO::Job(false) { - connect(&timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(timerDone())); + connect(&timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(timerDone())); timer.start(millis,true); } @@ -51,8 +51,8 @@ namespace bt void WaitJob::addExitOperation(kt::ExitOperation* op) { exit_ops.append(op); - connect(op,TQT_SIGNAL(operationFinished( kt::ExitOperation* )), - this,TQT_SLOT(operationFinished( kt::ExitOperation* ))); + connect(op,TQ_SIGNAL(operationFinished( kt::ExitOperation* )), + this,TQ_SLOT(operationFinished( kt::ExitOperation* ))); } void WaitJob::operationFinished(kt::ExitOperation* op) diff --git a/libktorrent/util/waitjob.h b/src/libktorrent/util/waitjob.h index b4c44bc..04508f4 100644 --- a/libktorrent/util/waitjob.h +++ b/src/libktorrent/util/waitjob.h @@ -35,9 +35,9 @@ namespace bt * Job to wait for a certain amount of time or until one or more ExitOperation's have * finished. */ - class WaitJob : public TDEIO::Job + class LIBKTORRENT_EXPORT WaitJob : public TDEIO::Job { - Q_OBJECT + TQ_OBJECT public: WaitJob(Uint32 millis); diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt new file mode 100644 index 0000000..b42887c --- /dev/null +++ b/src/plugins/CMakeLists.txt @@ -0,0 +1,15 @@ + +##### subfolders + +add_subdirectory( infowidget ) +add_subdirectory( ipfilter ) +add_subdirectory( logviewer ) +add_subdirectory( partfileimport ) +add_subdirectory( rssfeed ) +add_subdirectory( scanfolder ) +add_subdirectory( scheduler ) +add_subdirectory( search ) +add_subdirectory( stats ) +add_subdirectory( upnp ) +add_subdirectory( webinterface ) +tde_conditional_add_subdirectory( WITH_ZEROCONF zeroconf ) diff --git a/src/plugins/infowidget/CMakeLists.txt b/src/plugins/infowidget/CMakeLists.txt new file mode 100644 index 0000000..23ffe8e --- /dev/null +++ b/src/plugins/infowidget/CMakeLists.txt @@ -0,0 +1,54 @@ + +##### subfolders + +add_subdirectory( geoip ) + + +##### current folder + +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/src/libktorrent + ${CMAKE_CURRENT_BINARY_DIR} +) + + +##### geoip library (system-wide or builtin) + +set( LIB_GEOIP "") +if( WITH_SYSTEM_GEOIP ) + set( LIB_GEOIP "${GEOIP_LIBRARIES}" ) +else( ) + if( WITH_BUILTIN_GEOIP ) + tde_add_library( geoip_builtin STATIC_PIC SOURCES GeoIP.c ) + set( LIB_GEOIP "geoip_builtin-static") + endif( ) +endif( ) + +##### ktinfowidgetplugin (kpart) + +tde_add_kpart( ktinfowidgetplugin AUTOMOC + SOURCES + infowidgetplugin.cpp availabilitychunkbar.cpp fileview.cpp floatspinbox.cpp + chunkbar.cpp chunkdownloadview.cpp downloadedchunkbar.cpp flagdb.cpp peerview.cpp + ktorrentmonitor.cpp iwfiletreediritem.cpp iwfiletreeitem.cpp infowidgetprefpage.cpp + infowidgetpluginsettings.kcfgc iwpref.ui trackerviewbase.ui trackerview.cpp + localefloatvalidator.cpp chunkdownloadviewbase.ui statustabbase.ui statustab.cpp + LINK + ${LIB_GEOIP} ktorrent-shared + tdecore-shared tdeui-shared tdeio-shared tdeparts-shared tdehtml-shared + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other files + +install( + FILES ktinfowidgetplugin.kcfg + DESTINATION ${KCFG_INSTALL_DIR} +) + +tde_create_translated_desktop( + SOURCE ktinfowidgetplugin.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) diff --git a/plugins/infowidget/GeoIP.c b/src/plugins/infowidget/GeoIP.c index 32ce476..32ce476 100644 --- a/plugins/infowidget/GeoIP.c +++ b/src/plugins/infowidget/GeoIP.c diff --git a/plugins/infowidget/GeoIP.h b/src/plugins/infowidget/GeoIP.h index f85092c..f85092c 100644 --- a/plugins/infowidget/GeoIP.h +++ b/src/plugins/infowidget/GeoIP.h diff --git a/plugins/infowidget/availabilitychunkbar.cpp b/src/plugins/infowidget/availabilitychunkbar.cpp index 4b50f27..4b50f27 100644 --- a/plugins/infowidget/availabilitychunkbar.cpp +++ b/src/plugins/infowidget/availabilitychunkbar.cpp diff --git a/plugins/infowidget/availabilitychunkbar.h b/src/plugins/infowidget/availabilitychunkbar.h index 5897591..ce8ba27 100644 --- a/plugins/infowidget/availabilitychunkbar.h +++ b/src/plugins/infowidget/availabilitychunkbar.h @@ -30,7 +30,7 @@ namespace kt */ class AvailabilityChunkBar : public ChunkBar { - Q_OBJECT + TQ_OBJECT public: AvailabilityChunkBar(TQWidget* parent, const char* name); diff --git a/plugins/infowidget/chunkbar.cpp b/src/plugins/infowidget/chunkbar.cpp index 794bf5a..794bf5a 100644 --- a/plugins/infowidget/chunkbar.cpp +++ b/src/plugins/infowidget/chunkbar.cpp diff --git a/plugins/infowidget/chunkbar.h b/src/plugins/infowidget/chunkbar.h index 2c2ecf9..361f854 100644 --- a/plugins/infowidget/chunkbar.h +++ b/src/plugins/infowidget/chunkbar.h @@ -24,6 +24,7 @@ #include <tqlabel.h> #include <util/bitset.h> #include <tqpixmap.h> +#include <libktorrent_export.h> class TQPainter; @@ -47,9 +48,9 @@ namespace kt * BitSets can represent which chunks are downloaded, which chunks are available * and which chunks are excluded. */ - class ChunkBar : public TQFrame + class LIBKTORRENT_EXPORT ChunkBar : public TQFrame { - Q_OBJECT + TQ_OBJECT public: ChunkBar(TQWidget *parent = 0, const char *name = 0); diff --git a/plugins/infowidget/chunkdownloadview.cpp b/src/plugins/infowidget/chunkdownloadview.cpp index e67da32..e67da32 100644 --- a/plugins/infowidget/chunkdownloadview.cpp +++ b/src/plugins/infowidget/chunkdownloadview.cpp diff --git a/plugins/infowidget/chunkdownloadview.h b/src/plugins/infowidget/chunkdownloadview.h index 070b8ea..b72c07b 100644 --- a/plugins/infowidget/chunkdownloadview.h +++ b/src/plugins/infowidget/chunkdownloadview.h @@ -45,7 +45,7 @@ namespace kt */ class ChunkDownloadView : public ChunkDownloadViewBase { - Q_OBJECT + TQ_OBJECT TQMap<kt::ChunkDownloadInterface*,ChunkDownloadViewItem*> items; diff --git a/plugins/infowidget/chunkdownloadviewbase.ui b/src/plugins/infowidget/chunkdownloadviewbase.ui index 4bdc2c1..4bdc2c1 100644 --- a/plugins/infowidget/chunkdownloadviewbase.ui +++ b/src/plugins/infowidget/chunkdownloadviewbase.ui diff --git a/plugins/infowidget/downloadedchunkbar.cpp b/src/plugins/infowidget/downloadedchunkbar.cpp index 4d72a60..4d72a60 100644 --- a/plugins/infowidget/downloadedchunkbar.cpp +++ b/src/plugins/infowidget/downloadedchunkbar.cpp diff --git a/plugins/infowidget/downloadedchunkbar.h b/src/plugins/infowidget/downloadedchunkbar.h index 1982fc3..fa0fea2 100644 --- a/plugins/infowidget/downloadedchunkbar.h +++ b/src/plugins/infowidget/downloadedchunkbar.h @@ -29,7 +29,7 @@ namespace kt */ class DownloadedChunkBar : public ChunkBar { - Q_OBJECT + TQ_OBJECT public: DownloadedChunkBar(TQWidget* parent, const char* name); diff --git a/plugins/infowidget/fileview.cpp b/src/plugins/infowidget/fileview.cpp index c7bd470..63436fb 100644 --- a/plugins/infowidget/fileview.cpp +++ b/src/plugins/infowidget/fileview.cpp @@ -69,13 +69,13 @@ namespace kt context_menu->setItemEnabled(dnd_keep_id, false); context_menu->setItemEnabled(dnd_throw_away_id, false); - connect(this,TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint& )), - this,TQT_SLOT(showContextMenu(TDEListView*, TQListViewItem*, const TQPoint& ))); - connect(context_menu, TQT_SIGNAL ( activated ( int ) ), this, TQT_SLOT ( contextItem ( int ) ) ); - connect(this,TQT_SIGNAL(doubleClicked( TQListViewItem*, const TQPoint&, int )), - this,TQT_SLOT(onDoubleClicked(TQListViewItem*, const TQPoint&, int))); + connect(this,TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint& )), + this,TQ_SLOT(showContextMenu(TDEListView*, TQListViewItem*, const TQPoint& ))); + connect(context_menu, TQ_SIGNAL ( activated ( int ) ), this, TQ_SLOT ( contextItem ( int ) ) ); + connect(this,TQ_SIGNAL(doubleClicked( TQListViewItem*, const TQPoint&, int )), + this,TQ_SLOT(onDoubleClicked(TQListViewItem*, const TQPoint&, int))); - connect(&fill_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT( fillTreePartial() ) ); + connect(&fill_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT( fillTreePartial() ) ); setEnabled(false); @@ -108,8 +108,8 @@ namespace kt multi_root->updatePercentageInformation(); multi_root->updatePreviewInformation(curr_tc); fill_timer.stop(); - connect(curr_tc,TQT_SIGNAL(missingFilesMarkedDND( kt::TorrentInterface* )), - this,TQT_SLOT(refreshFileTree( kt::TorrentInterface* ))); + connect(curr_tc,TQ_SIGNAL(missingFilesMarkedDND( kt::TorrentInterface* )), + this,TQ_SLOT(refreshFileTree( kt::TorrentInterface* ))); } else fill_timer.start(0,true); @@ -141,8 +141,8 @@ namespace kt item->setPixmap(0,KMimeType::findByPath(s.torrent_name)->pixmap(TDEIcon::Small)); setEnabled(true); - connect(curr_tc,TQT_SIGNAL(missingFilesMarkedDND( kt::TorrentInterface* )), - this,TQT_SLOT(refreshFileTree( kt::TorrentInterface* ))); + connect(curr_tc,TQ_SIGNAL(missingFilesMarkedDND( kt::TorrentInterface* )), + this,TQ_SLOT(refreshFileTree( kt::TorrentInterface* ))); } } diff --git a/plugins/infowidget/fileview.h b/src/plugins/infowidget/fileview.h index 01443dd..e42935d 100644 --- a/plugins/infowidget/fileview.h +++ b/src/plugins/infowidget/fileview.h @@ -34,7 +34,7 @@ namespace kt */ class FileView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: FileView(TQWidget *parent = 0, const char *name = 0); diff --git a/plugins/infowidget/flagdb.cpp b/src/plugins/infowidget/flagdb.cpp index c1e1fb4..50a15e2 100644 --- a/plugins/infowidget/flagdb.cpp +++ b/src/plugins/infowidget/flagdb.cpp @@ -19,7 +19,7 @@ #include <tqfile.h> #include <tqimage.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "flagdb.h" kt::FlagDBSource::FlagDBSource(const char* type, const TQString& pathPattern) @@ -100,7 +100,7 @@ const TQPixmap& kt::FlagDB::getFlag(const TQString& country) if (TQFile::exists(path)) { if (img.load(path)) { if (img.width() != preferredWidth || img.height() != preferredHeight) { - const TQImage& imgScaled = img.smoothScale(preferredWidth, preferredHeight, TQ_ScaleMin); + const TQImage& imgScaled = img.smoothScale(preferredWidth, preferredHeight, TQImage::ScaleMin); if (!imgScaled.isNull()) { pixmap.convertFromImage(imgScaled); break; diff --git a/plugins/infowidget/flagdb.h b/src/plugins/infowidget/flagdb.h index 9002671..9002671 100644 --- a/plugins/infowidget/flagdb.h +++ b/src/plugins/infowidget/flagdb.h diff --git a/plugins/infowidget/floatspinbox.cpp b/src/plugins/infowidget/floatspinbox.cpp index 111070b..d463d9a 100644 --- a/plugins/infowidget/floatspinbox.cpp +++ b/src/plugins/infowidget/floatspinbox.cpp @@ -41,8 +41,8 @@ kt::FloatSpinBox::FloatSpinBox( { TQSpinBox::setValue(0); setStep( 0.25f ); - connect(this, TQT_SIGNAL(valueChanged ( int )), this, TQT_SLOT(internalValueChanged( int ))); - setValidator( new LocaleFloatValidator( TQT_TQOBJECT(dynamic_cast<TQSpinBox * > (this)) )); + connect(this, TQ_SIGNAL(valueChanged ( int )), this, TQ_SLOT(internalValueChanged( int ))); + setValidator( new LocaleFloatValidator( dynamic_cast<TQSpinBox * > (this) )); editor()->setAlignment(TQt::AlignRight); } @@ -61,8 +61,8 @@ kt::FloatSpinBox::FloatSpinBox( { TQSpinBox::setValue(0); setStep( 0.25 ); - connect(this, TQT_SIGNAL(valueChanged ( int )), this, TQT_SLOT(internalValueChanged( int ))); - setValidator( new LocaleFloatValidator( TQT_TQOBJECT(dynamic_cast<TQSpinBox * > (this)) )); + connect(this, TQ_SIGNAL(valueChanged ( int )), this, TQ_SLOT(internalValueChanged( int ))); + setValidator( new LocaleFloatValidator( dynamic_cast<TQSpinBox * > (this) )); } @@ -85,8 +85,8 @@ kt::FloatSpinBox::FloatSpinBox( TQSpinBox::setValue(0); setValue(0.0f); setStep( step ); - connect(this, TQT_SIGNAL(valueChanged ( int )), this, TQT_SLOT(internalValueChanged( int ))); - setValidator( new LocaleFloatValidator( TQT_TQOBJECT(this) )); + connect(this, TQ_SIGNAL(valueChanged ( int )), this, TQ_SLOT(internalValueChanged( int ))); + setValidator( new LocaleFloatValidator( this )); } diff --git a/plugins/infowidget/floatspinbox.h b/src/plugins/infowidget/floatspinbox.h index a123382..50c6b0c 100644 --- a/plugins/infowidget/floatspinbox.h +++ b/src/plugins/infowidget/floatspinbox.h @@ -37,7 +37,7 @@ namespace kt class FloatSpinBox : public TQSpinBox { - Q_OBJECT + TQ_OBJECT public: FloatSpinBox( TQWidget* parent=0, const char* name=0 ); diff --git a/src/plugins/infowidget/geoip/CMakeLists.txt b/src/plugins/infowidget/geoip/CMakeLists.txt new file mode 100644 index 0000000..f409728 --- /dev/null +++ b/src/plugins/infowidget/geoip/CMakeLists.txt @@ -0,0 +1,17 @@ + +##### icon files + +if( WITH_BUILTIN_FLAGS ) + file(GLOB _pics "${CMAKE_CURRENT_SOURCE_DIR}/*.png" ) + install( + FILES ${_pics} FLAGS_LICENCE + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/geoip + ) +endif( ) + +if( WITH_BUILTIN_GEOIP ) + install( + FILES geoip.dat GeoIP-LICENSE.txt + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/geoip + ) +endif( ) diff --git a/plugins/infowidget/geoip/FLAGS_LICENCE b/src/plugins/infowidget/geoip/FLAGS_LICENCE index 368a8fe..368a8fe 100644 --- a/plugins/infowidget/geoip/FLAGS_LICENCE +++ b/src/plugins/infowidget/geoip/FLAGS_LICENCE diff --git a/plugins/infowidget/geoip/GeoIP-LICENSE.txt b/src/plugins/infowidget/geoip/GeoIP-LICENSE.txt index 457710d..457710d 100644 --- a/plugins/infowidget/geoip/GeoIP-LICENSE.txt +++ b/src/plugins/infowidget/geoip/GeoIP-LICENSE.txt diff --git a/plugins/infowidget/geoip/ad.png b/src/plugins/infowidget/geoip/ad.png Binary files differindex 6c79257..6c79257 100644 --- a/plugins/infowidget/geoip/ad.png +++ b/src/plugins/infowidget/geoip/ad.png diff --git a/plugins/infowidget/geoip/ae.png b/src/plugins/infowidget/geoip/ae.png Binary files differindex 4e343d8..4e343d8 100644 --- a/plugins/infowidget/geoip/ae.png +++ b/src/plugins/infowidget/geoip/ae.png diff --git a/plugins/infowidget/geoip/af.png b/src/plugins/infowidget/geoip/af.png Binary files differindex 0792930..0792930 100644 --- a/plugins/infowidget/geoip/af.png +++ b/src/plugins/infowidget/geoip/af.png diff --git a/plugins/infowidget/geoip/ag.png b/src/plugins/infowidget/geoip/ag.png Binary files differindex 973c64b..973c64b 100644 --- a/plugins/infowidget/geoip/ag.png +++ b/src/plugins/infowidget/geoip/ag.png diff --git a/plugins/infowidget/geoip/ai.png b/src/plugins/infowidget/geoip/ai.png Binary files differindex 47fd6a7..47fd6a7 100644 --- a/plugins/infowidget/geoip/ai.png +++ b/src/plugins/infowidget/geoip/ai.png diff --git a/plugins/infowidget/geoip/al.png b/src/plugins/infowidget/geoip/al.png Binary files differindex a385c56..a385c56 100644 --- a/plugins/infowidget/geoip/al.png +++ b/src/plugins/infowidget/geoip/al.png diff --git a/plugins/infowidget/geoip/am.png b/src/plugins/infowidget/geoip/am.png Binary files differindex 42bb4ee..42bb4ee 100644 --- a/plugins/infowidget/geoip/am.png +++ b/src/plugins/infowidget/geoip/am.png diff --git a/plugins/infowidget/geoip/an.png b/src/plugins/infowidget/geoip/an.png Binary files differindex a085af7..a085af7 100644 --- a/plugins/infowidget/geoip/an.png +++ b/src/plugins/infowidget/geoip/an.png diff --git a/plugins/infowidget/geoip/ao.png b/src/plugins/infowidget/geoip/ao.png Binary files differindex a949c2d..a949c2d 100644 --- a/plugins/infowidget/geoip/ao.png +++ b/src/plugins/infowidget/geoip/ao.png diff --git a/plugins/infowidget/geoip/aq.png b/src/plugins/infowidget/geoip/aq.png Binary files differindex 31bcd6e..31bcd6e 100644 --- a/plugins/infowidget/geoip/aq.png +++ b/src/plugins/infowidget/geoip/aq.png diff --git a/plugins/infowidget/geoip/ar.png b/src/plugins/infowidget/geoip/ar.png Binary files differindex 4adc0d2..4adc0d2 100644 --- a/plugins/infowidget/geoip/ar.png +++ b/src/plugins/infowidget/geoip/ar.png diff --git a/plugins/infowidget/geoip/as.png b/src/plugins/infowidget/geoip/as.png Binary files differindex fb57a01..fb57a01 100644 --- a/plugins/infowidget/geoip/as.png +++ b/src/plugins/infowidget/geoip/as.png diff --git a/plugins/infowidget/geoip/at.png b/src/plugins/infowidget/geoip/at.png Binary files differindex d07949a..d07949a 100644 --- a/plugins/infowidget/geoip/at.png +++ b/src/plugins/infowidget/geoip/at.png diff --git a/plugins/infowidget/geoip/au.png b/src/plugins/infowidget/geoip/au.png Binary files differindex c678f14..c678f14 100644 --- a/plugins/infowidget/geoip/au.png +++ b/src/plugins/infowidget/geoip/au.png diff --git a/plugins/infowidget/geoip/aw.png b/src/plugins/infowidget/geoip/aw.png Binary files differindex ae3b5cf..ae3b5cf 100644 --- a/plugins/infowidget/geoip/aw.png +++ b/src/plugins/infowidget/geoip/aw.png diff --git a/plugins/infowidget/geoip/az.png b/src/plugins/infowidget/geoip/az.png Binary files differindex 0c996ff..0c996ff 100644 --- a/plugins/infowidget/geoip/az.png +++ b/src/plugins/infowidget/geoip/az.png diff --git a/plugins/infowidget/geoip/ba.png b/src/plugins/infowidget/geoip/ba.png Binary files differindex 0616606..0616606 100644 --- a/plugins/infowidget/geoip/ba.png +++ b/src/plugins/infowidget/geoip/ba.png diff --git a/plugins/infowidget/geoip/bb.png b/src/plugins/infowidget/geoip/bb.png Binary files differindex fea000a..fea000a 100644 --- a/plugins/infowidget/geoip/bb.png +++ b/src/plugins/infowidget/geoip/bb.png diff --git a/plugins/infowidget/geoip/bd.png b/src/plugins/infowidget/geoip/bd.png Binary files differindex 1d61698..1d61698 100644 --- a/plugins/infowidget/geoip/bd.png +++ b/src/plugins/infowidget/geoip/bd.png diff --git a/plugins/infowidget/geoip/be.png b/src/plugins/infowidget/geoip/be.png Binary files differindex 42a5707..42a5707 100644 --- a/plugins/infowidget/geoip/be.png +++ b/src/plugins/infowidget/geoip/be.png diff --git a/plugins/infowidget/geoip/bf.png b/src/plugins/infowidget/geoip/bf.png Binary files differindex c6af9b5..c6af9b5 100644 --- a/plugins/infowidget/geoip/bf.png +++ b/src/plugins/infowidget/geoip/bf.png diff --git a/plugins/infowidget/geoip/bg.png b/src/plugins/infowidget/geoip/bg.png Binary files differindex 9392514..9392514 100644 --- a/plugins/infowidget/geoip/bg.png +++ b/src/plugins/infowidget/geoip/bg.png diff --git a/plugins/infowidget/geoip/bh.png b/src/plugins/infowidget/geoip/bh.png Binary files differindex 8d0083e..8d0083e 100644 --- a/plugins/infowidget/geoip/bh.png +++ b/src/plugins/infowidget/geoip/bh.png diff --git a/plugins/infowidget/geoip/bi.png b/src/plugins/infowidget/geoip/bi.png Binary files differindex 9fc22cc..9fc22cc 100644 --- a/plugins/infowidget/geoip/bi.png +++ b/src/plugins/infowidget/geoip/bi.png diff --git a/plugins/infowidget/geoip/bj.png b/src/plugins/infowidget/geoip/bj.png Binary files differindex c1a87b9..c1a87b9 100644 --- a/plugins/infowidget/geoip/bj.png +++ b/src/plugins/infowidget/geoip/bj.png diff --git a/plugins/infowidget/geoip/bm.png b/src/plugins/infowidget/geoip/bm.png Binary files differindex 6d83eba..6d83eba 100644 --- a/plugins/infowidget/geoip/bm.png +++ b/src/plugins/infowidget/geoip/bm.png diff --git a/plugins/infowidget/geoip/bn.png b/src/plugins/infowidget/geoip/bn.png Binary files differindex 1ae2348..1ae2348 100644 --- a/plugins/infowidget/geoip/bn.png +++ b/src/plugins/infowidget/geoip/bn.png diff --git a/plugins/infowidget/geoip/bo.png b/src/plugins/infowidget/geoip/bo.png Binary files differindex 786b481..786b481 100644 --- a/plugins/infowidget/geoip/bo.png +++ b/src/plugins/infowidget/geoip/bo.png diff --git a/plugins/infowidget/geoip/br.png b/src/plugins/infowidget/geoip/br.png Binary files differindex aa14bc7..aa14bc7 100644 --- a/plugins/infowidget/geoip/br.png +++ b/src/plugins/infowidget/geoip/br.png diff --git a/plugins/infowidget/geoip/bs.png b/src/plugins/infowidget/geoip/bs.png Binary files differindex 40166af..40166af 100644 --- a/plugins/infowidget/geoip/bs.png +++ b/src/plugins/infowidget/geoip/bs.png diff --git a/plugins/infowidget/geoip/bt.png b/src/plugins/infowidget/geoip/bt.png Binary files differindex ef50d74..ef50d74 100644 --- a/plugins/infowidget/geoip/bt.png +++ b/src/plugins/infowidget/geoip/bt.png diff --git a/plugins/infowidget/geoip/bv.png b/src/plugins/infowidget/geoip/bv.png Binary files differindex 04c5f5f..04c5f5f 100644 --- a/plugins/infowidget/geoip/bv.png +++ b/src/plugins/infowidget/geoip/bv.png diff --git a/plugins/infowidget/geoip/bw.png b/src/plugins/infowidget/geoip/bw.png Binary files differindex c1f81ca..c1f81ca 100644 --- a/plugins/infowidget/geoip/bw.png +++ b/src/plugins/infowidget/geoip/bw.png diff --git a/plugins/infowidget/geoip/by.png b/src/plugins/infowidget/geoip/by.png Binary files differindex c66bb28..c66bb28 100644 --- a/plugins/infowidget/geoip/by.png +++ b/src/plugins/infowidget/geoip/by.png diff --git a/plugins/infowidget/geoip/bz.png b/src/plugins/infowidget/geoip/bz.png Binary files differindex 714eacf..714eacf 100644 --- a/plugins/infowidget/geoip/bz.png +++ b/src/plugins/infowidget/geoip/bz.png diff --git a/plugins/infowidget/geoip/ca.png b/src/plugins/infowidget/geoip/ca.png Binary files differindex b6b5701..b6b5701 100644 --- a/plugins/infowidget/geoip/ca.png +++ b/src/plugins/infowidget/geoip/ca.png diff --git a/plugins/infowidget/geoip/cc.png b/src/plugins/infowidget/geoip/cc.png Binary files differindex 6478802..6478802 100644 --- a/plugins/infowidget/geoip/cc.png +++ b/src/plugins/infowidget/geoip/cc.png diff --git a/plugins/infowidget/geoip/cd.png b/src/plugins/infowidget/geoip/cd.png Binary files differindex 470c689..470c689 100644 --- a/plugins/infowidget/geoip/cd.png +++ b/src/plugins/infowidget/geoip/cd.png diff --git a/plugins/infowidget/geoip/cf.png b/src/plugins/infowidget/geoip/cf.png Binary files differindex 0e9206b..0e9206b 100644 --- a/plugins/infowidget/geoip/cf.png +++ b/src/plugins/infowidget/geoip/cf.png diff --git a/plugins/infowidget/geoip/cg.png b/src/plugins/infowidget/geoip/cg.png Binary files differindex fb03dc9..fb03dc9 100644 --- a/plugins/infowidget/geoip/cg.png +++ b/src/plugins/infowidget/geoip/cg.png diff --git a/plugins/infowidget/geoip/ch.png b/src/plugins/infowidget/geoip/ch.png Binary files differindex bddc7d2..bddc7d2 100644 --- a/plugins/infowidget/geoip/ch.png +++ b/src/plugins/infowidget/geoip/ch.png diff --git a/plugins/infowidget/geoip/ci.png b/src/plugins/infowidget/geoip/ci.png Binary files differindex e2617bb..e2617bb 100644 --- a/plugins/infowidget/geoip/ci.png +++ b/src/plugins/infowidget/geoip/ci.png diff --git a/plugins/infowidget/geoip/ck.png b/src/plugins/infowidget/geoip/ck.png Binary files differindex 6c8b2da..6c8b2da 100644 --- a/plugins/infowidget/geoip/ck.png +++ b/src/plugins/infowidget/geoip/ck.png diff --git a/plugins/infowidget/geoip/cl.png b/src/plugins/infowidget/geoip/cl.png Binary files differindex 559332d..559332d 100644 --- a/plugins/infowidget/geoip/cl.png +++ b/src/plugins/infowidget/geoip/cl.png diff --git a/plugins/infowidget/geoip/cm.png b/src/plugins/infowidget/geoip/cm.png Binary files differindex f8ed6ea..f8ed6ea 100644 --- a/plugins/infowidget/geoip/cm.png +++ b/src/plugins/infowidget/geoip/cm.png diff --git a/plugins/infowidget/geoip/cn.png b/src/plugins/infowidget/geoip/cn.png Binary files differindex 63cbdbc..63cbdbc 100644 --- a/plugins/infowidget/geoip/cn.png +++ b/src/plugins/infowidget/geoip/cn.png diff --git a/plugins/infowidget/geoip/co.png b/src/plugins/infowidget/geoip/co.png Binary files differindex f6abf92..f6abf92 100644 --- a/plugins/infowidget/geoip/co.png +++ b/src/plugins/infowidget/geoip/co.png diff --git a/plugins/infowidget/geoip/cr.png b/src/plugins/infowidget/geoip/cr.png Binary files differindex 87e54ea..87e54ea 100644 --- a/plugins/infowidget/geoip/cr.png +++ b/src/plugins/infowidget/geoip/cr.png diff --git a/plugins/infowidget/geoip/cs.png b/src/plugins/infowidget/geoip/cs.png Binary files differindex 23f8583..23f8583 100644 --- a/plugins/infowidget/geoip/cs.png +++ b/src/plugins/infowidget/geoip/cs.png diff --git a/plugins/infowidget/geoip/cu.png b/src/plugins/infowidget/geoip/cu.png Binary files differindex 8d2a700..8d2a700 100644 --- a/plugins/infowidget/geoip/cu.png +++ b/src/plugins/infowidget/geoip/cu.png diff --git a/plugins/infowidget/geoip/cv.png b/src/plugins/infowidget/geoip/cv.png Binary files differindex 51bf11b..51bf11b 100644 --- a/plugins/infowidget/geoip/cv.png +++ b/src/plugins/infowidget/geoip/cv.png diff --git a/plugins/infowidget/geoip/cx.png b/src/plugins/infowidget/geoip/cx.png Binary files differindex 8e4bde4..8e4bde4 100644 --- a/plugins/infowidget/geoip/cx.png +++ b/src/plugins/infowidget/geoip/cx.png diff --git a/plugins/infowidget/geoip/cy.png b/src/plugins/infowidget/geoip/cy.png Binary files differindex 3f6d729..3f6d729 100644 --- a/plugins/infowidget/geoip/cy.png +++ b/src/plugins/infowidget/geoip/cy.png diff --git a/plugins/infowidget/geoip/cz.png b/src/plugins/infowidget/geoip/cz.png Binary files differindex cbc2c78..cbc2c78 100644 --- a/plugins/infowidget/geoip/cz.png +++ b/src/plugins/infowidget/geoip/cz.png diff --git a/plugins/infowidget/geoip/de.png b/src/plugins/infowidget/geoip/de.png Binary files differindex 0a74410..0a74410 100644 --- a/plugins/infowidget/geoip/de.png +++ b/src/plugins/infowidget/geoip/de.png diff --git a/plugins/infowidget/geoip/dj.png b/src/plugins/infowidget/geoip/dj.png Binary files differindex e593841..e593841 100644 --- a/plugins/infowidget/geoip/dj.png +++ b/src/plugins/infowidget/geoip/dj.png diff --git a/plugins/infowidget/geoip/dk.png b/src/plugins/infowidget/geoip/dk.png Binary files differindex 6e4bec9..6e4bec9 100644 --- a/plugins/infowidget/geoip/dk.png +++ b/src/plugins/infowidget/geoip/dk.png diff --git a/plugins/infowidget/geoip/dm.png b/src/plugins/infowidget/geoip/dm.png Binary files differindex f92556b..f92556b 100644 --- a/plugins/infowidget/geoip/dm.png +++ b/src/plugins/infowidget/geoip/dm.png diff --git a/plugins/infowidget/geoip/do.png b/src/plugins/infowidget/geoip/do.png Binary files differindex 91e6d86..91e6d86 100644 --- a/plugins/infowidget/geoip/do.png +++ b/src/plugins/infowidget/geoip/do.png diff --git a/plugins/infowidget/geoip/dz.png b/src/plugins/infowidget/geoip/dz.png Binary files differindex 6625b3f..6625b3f 100644 --- a/plugins/infowidget/geoip/dz.png +++ b/src/plugins/infowidget/geoip/dz.png diff --git a/plugins/infowidget/geoip/ec.png b/src/plugins/infowidget/geoip/ec.png Binary files differindex 3589217..3589217 100644 --- a/plugins/infowidget/geoip/ec.png +++ b/src/plugins/infowidget/geoip/ec.png diff --git a/plugins/infowidget/geoip/ee.png b/src/plugins/infowidget/geoip/ee.png Binary files differindex fafaa81..fafaa81 100644 --- a/plugins/infowidget/geoip/ee.png +++ b/src/plugins/infowidget/geoip/ee.png diff --git a/plugins/infowidget/geoip/eg.png b/src/plugins/infowidget/geoip/eg.png Binary files differindex 0e02c2a..0e02c2a 100644 --- a/plugins/infowidget/geoip/eg.png +++ b/src/plugins/infowidget/geoip/eg.png diff --git a/plugins/infowidget/geoip/eh.png b/src/plugins/infowidget/geoip/eh.png Binary files differindex 528350f..528350f 100644 --- a/plugins/infowidget/geoip/eh.png +++ b/src/plugins/infowidget/geoip/eh.png diff --git a/plugins/infowidget/geoip/er.png b/src/plugins/infowidget/geoip/er.png Binary files differindex 4e10435..4e10435 100644 --- a/plugins/infowidget/geoip/er.png +++ b/src/plugins/infowidget/geoip/er.png diff --git a/plugins/infowidget/geoip/es.png b/src/plugins/infowidget/geoip/es.png Binary files differindex 7bf2626..7bf2626 100644 --- a/plugins/infowidget/geoip/es.png +++ b/src/plugins/infowidget/geoip/es.png diff --git a/plugins/infowidget/geoip/et.png b/src/plugins/infowidget/geoip/et.png Binary files differindex 1bdb3ad..1bdb3ad 100644 --- a/plugins/infowidget/geoip/et.png +++ b/src/plugins/infowidget/geoip/et.png diff --git a/plugins/infowidget/geoip/eu.png b/src/plugins/infowidget/geoip/eu.png Binary files differindex 7dcedc7..7dcedc7 100644 --- a/plugins/infowidget/geoip/eu.png +++ b/src/plugins/infowidget/geoip/eu.png diff --git a/plugins/infowidget/geoip/fi.png b/src/plugins/infowidget/geoip/fi.png Binary files differindex 96ae42c..96ae42c 100644 --- a/plugins/infowidget/geoip/fi.png +++ b/src/plugins/infowidget/geoip/fi.png diff --git a/plugins/infowidget/geoip/fj.png b/src/plugins/infowidget/geoip/fj.png Binary files differindex d7a4362..d7a4362 100644 --- a/plugins/infowidget/geoip/fj.png +++ b/src/plugins/infowidget/geoip/fj.png diff --git a/plugins/infowidget/geoip/fk.png b/src/plugins/infowidget/geoip/fk.png Binary files differindex 45734c4..45734c4 100644 --- a/plugins/infowidget/geoip/fk.png +++ b/src/plugins/infowidget/geoip/fk.png diff --git a/plugins/infowidget/geoip/fm.png b/src/plugins/infowidget/geoip/fm.png Binary files differindex 80005b9..80005b9 100644 --- a/plugins/infowidget/geoip/fm.png +++ b/src/plugins/infowidget/geoip/fm.png diff --git a/plugins/infowidget/geoip/fo.png b/src/plugins/infowidget/geoip/fo.png Binary files differindex 79287b4..79287b4 100644 --- a/plugins/infowidget/geoip/fo.png +++ b/src/plugins/infowidget/geoip/fo.png diff --git a/plugins/infowidget/geoip/fr.png b/src/plugins/infowidget/geoip/fr.png Binary files differindex bb56940..bb56940 100644 --- a/plugins/infowidget/geoip/fr.png +++ b/src/plugins/infowidget/geoip/fr.png diff --git a/plugins/infowidget/geoip/ga.png b/src/plugins/infowidget/geoip/ga.png Binary files differindex eb2f99d..eb2f99d 100644 --- a/plugins/infowidget/geoip/ga.png +++ b/src/plugins/infowidget/geoip/ga.png diff --git a/plugins/infowidget/geoip/gb.png b/src/plugins/infowidget/geoip/gb.png Binary files differindex 8a7a6f9..8a7a6f9 100644 --- a/plugins/infowidget/geoip/gb.png +++ b/src/plugins/infowidget/geoip/gb.png diff --git a/plugins/infowidget/geoip/gd.png b/src/plugins/infowidget/geoip/gd.png Binary files differindex b7fcdbb..b7fcdbb 100644 --- a/plugins/infowidget/geoip/gd.png +++ b/src/plugins/infowidget/geoip/gd.png diff --git a/plugins/infowidget/geoip/ge.png b/src/plugins/infowidget/geoip/ge.png Binary files differindex 613eb9b..613eb9b 100644 --- a/plugins/infowidget/geoip/ge.png +++ b/src/plugins/infowidget/geoip/ge.png diff --git a/plugins/infowidget/geoip/geoip.dat b/src/plugins/infowidget/geoip/geoip.dat Binary files differindex 1f7ca0f..1f7ca0f 100644 --- a/plugins/infowidget/geoip/geoip.dat +++ b/src/plugins/infowidget/geoip/geoip.dat diff --git a/plugins/infowidget/geoip/gf.png b/src/plugins/infowidget/geoip/gf.png Binary files differindex fa7abfc..fa7abfc 100644 --- a/plugins/infowidget/geoip/gf.png +++ b/src/plugins/infowidget/geoip/gf.png diff --git a/plugins/infowidget/geoip/gh.png b/src/plugins/infowidget/geoip/gh.png Binary files differindex 8398f15..8398f15 100644 --- a/plugins/infowidget/geoip/gh.png +++ b/src/plugins/infowidget/geoip/gh.png diff --git a/plugins/infowidget/geoip/gi.png b/src/plugins/infowidget/geoip/gi.png Binary files differindex 56174e5..56174e5 100644 --- a/plugins/infowidget/geoip/gi.png +++ b/src/plugins/infowidget/geoip/gi.png diff --git a/plugins/infowidget/geoip/gl.png b/src/plugins/infowidget/geoip/gl.png Binary files differindex 8fdea6d..8fdea6d 100644 --- a/plugins/infowidget/geoip/gl.png +++ b/src/plugins/infowidget/geoip/gl.png diff --git a/plugins/infowidget/geoip/gm.png b/src/plugins/infowidget/geoip/gm.png Binary files differindex 1ebfb0a..1ebfb0a 100644 --- a/plugins/infowidget/geoip/gm.png +++ b/src/plugins/infowidget/geoip/gm.png diff --git a/plugins/infowidget/geoip/gn.png b/src/plugins/infowidget/geoip/gn.png Binary files differindex b3aeb4d..b3aeb4d 100644 --- a/plugins/infowidget/geoip/gn.png +++ b/src/plugins/infowidget/geoip/gn.png diff --git a/plugins/infowidget/geoip/gp.png b/src/plugins/infowidget/geoip/gp.png Binary files differindex e6a822a..e6a822a 100644 --- a/plugins/infowidget/geoip/gp.png +++ b/src/plugins/infowidget/geoip/gp.png diff --git a/plugins/infowidget/geoip/gq.png b/src/plugins/infowidget/geoip/gq.png Binary files differindex 55e5de6..55e5de6 100644 --- a/plugins/infowidget/geoip/gq.png +++ b/src/plugins/infowidget/geoip/gq.png diff --git a/plugins/infowidget/geoip/gr.png b/src/plugins/infowidget/geoip/gr.png Binary files differindex 93bf5be..93bf5be 100644 --- a/plugins/infowidget/geoip/gr.png +++ b/src/plugins/infowidget/geoip/gr.png diff --git a/plugins/infowidget/geoip/gs.png b/src/plugins/infowidget/geoip/gs.png Binary files differindex 34d6f11..34d6f11 100644 --- a/plugins/infowidget/geoip/gs.png +++ b/src/plugins/infowidget/geoip/gs.png diff --git a/plugins/infowidget/geoip/gt.png b/src/plugins/infowidget/geoip/gt.png Binary files differindex 8cf6f11..8cf6f11 100644 --- a/plugins/infowidget/geoip/gt.png +++ b/src/plugins/infowidget/geoip/gt.png diff --git a/plugins/infowidget/geoip/gu.png b/src/plugins/infowidget/geoip/gu.png Binary files differindex 6c7d40c..6c7d40c 100644 --- a/plugins/infowidget/geoip/gu.png +++ b/src/plugins/infowidget/geoip/gu.png diff --git a/plugins/infowidget/geoip/gw.png b/src/plugins/infowidget/geoip/gw.png Binary files differindex f0a8e54..f0a8e54 100644 --- a/plugins/infowidget/geoip/gw.png +++ b/src/plugins/infowidget/geoip/gw.png diff --git a/plugins/infowidget/geoip/gy.png b/src/plugins/infowidget/geoip/gy.png Binary files differindex 617a502..617a502 100644 --- a/plugins/infowidget/geoip/gy.png +++ b/src/plugins/infowidget/geoip/gy.png diff --git a/plugins/infowidget/geoip/hk.png b/src/plugins/infowidget/geoip/hk.png Binary files differindex a13f5af..a13f5af 100644 --- a/plugins/infowidget/geoip/hk.png +++ b/src/plugins/infowidget/geoip/hk.png diff --git a/plugins/infowidget/geoip/hm.png b/src/plugins/infowidget/geoip/hm.png Binary files differindex 7d77e1a..7d77e1a 100644 --- a/plugins/infowidget/geoip/hm.png +++ b/src/plugins/infowidget/geoip/hm.png diff --git a/plugins/infowidget/geoip/hn.png b/src/plugins/infowidget/geoip/hn.png Binary files differindex 8a8745c..8a8745c 100644 --- a/plugins/infowidget/geoip/hn.png +++ b/src/plugins/infowidget/geoip/hn.png diff --git a/plugins/infowidget/geoip/hr.png b/src/plugins/infowidget/geoip/hr.png Binary files differindex 05ce72d..05ce72d 100644 --- a/plugins/infowidget/geoip/hr.png +++ b/src/plugins/infowidget/geoip/hr.png diff --git a/plugins/infowidget/geoip/ht.png b/src/plugins/infowidget/geoip/ht.png Binary files differindex 179d91c..179d91c 100644 --- a/plugins/infowidget/geoip/ht.png +++ b/src/plugins/infowidget/geoip/ht.png diff --git a/plugins/infowidget/geoip/hu.png b/src/plugins/infowidget/geoip/hu.png Binary files differindex 32f5c2d..32f5c2d 100644 --- a/plugins/infowidget/geoip/hu.png +++ b/src/plugins/infowidget/geoip/hu.png diff --git a/plugins/infowidget/geoip/id.png b/src/plugins/infowidget/geoip/id.png Binary files differindex 866961f..866961f 100644 --- a/plugins/infowidget/geoip/id.png +++ b/src/plugins/infowidget/geoip/id.png diff --git a/plugins/infowidget/geoip/ie.png b/src/plugins/infowidget/geoip/ie.png Binary files differindex 103bd47..103bd47 100644 --- a/plugins/infowidget/geoip/ie.png +++ b/src/plugins/infowidget/geoip/ie.png diff --git a/plugins/infowidget/geoip/il.png b/src/plugins/infowidget/geoip/il.png Binary files differindex 1de07d2..1de07d2 100644 --- a/plugins/infowidget/geoip/il.png +++ b/src/plugins/infowidget/geoip/il.png diff --git a/plugins/infowidget/geoip/in.png b/src/plugins/infowidget/geoip/in.png Binary files differindex 5048509..5048509 100644 --- a/plugins/infowidget/geoip/in.png +++ b/src/plugins/infowidget/geoip/in.png diff --git a/plugins/infowidget/geoip/io.png b/src/plugins/infowidget/geoip/io.png Binary files differindex 5fb1355..5fb1355 100644 --- a/plugins/infowidget/geoip/io.png +++ b/src/plugins/infowidget/geoip/io.png diff --git a/plugins/infowidget/geoip/iq.png b/src/plugins/infowidget/geoip/iq.png Binary files differindex ec04fe3..ec04fe3 100644 --- a/plugins/infowidget/geoip/iq.png +++ b/src/plugins/infowidget/geoip/iq.png diff --git a/plugins/infowidget/geoip/ir.png b/src/plugins/infowidget/geoip/ir.png Binary files differindex 1fb19c8..1fb19c8 100644 --- a/plugins/infowidget/geoip/ir.png +++ b/src/plugins/infowidget/geoip/ir.png diff --git a/plugins/infowidget/geoip/is.png b/src/plugins/infowidget/geoip/is.png Binary files differindex 12538b1..12538b1 100644 --- a/plugins/infowidget/geoip/is.png +++ b/src/plugins/infowidget/geoip/is.png diff --git a/plugins/infowidget/geoip/it.png b/src/plugins/infowidget/geoip/it.png Binary files differindex cee752b..cee752b 100644 --- a/plugins/infowidget/geoip/it.png +++ b/src/plugins/infowidget/geoip/it.png diff --git a/plugins/infowidget/geoip/jm.png b/src/plugins/infowidget/geoip/jm.png Binary files differindex aa25040..aa25040 100644 --- a/plugins/infowidget/geoip/jm.png +++ b/src/plugins/infowidget/geoip/jm.png diff --git a/plugins/infowidget/geoip/jo.png b/src/plugins/infowidget/geoip/jo.png Binary files differindex 9ad5e6b..9ad5e6b 100644 --- a/plugins/infowidget/geoip/jo.png +++ b/src/plugins/infowidget/geoip/jo.png diff --git a/plugins/infowidget/geoip/jp.png b/src/plugins/infowidget/geoip/jp.png Binary files differindex 92a718c..92a718c 100644 --- a/plugins/infowidget/geoip/jp.png +++ b/src/plugins/infowidget/geoip/jp.png diff --git a/plugins/infowidget/geoip/ke.png b/src/plugins/infowidget/geoip/ke.png Binary files differindex 1703e58..1703e58 100644 --- a/plugins/infowidget/geoip/ke.png +++ b/src/plugins/infowidget/geoip/ke.png diff --git a/plugins/infowidget/geoip/kg.png b/src/plugins/infowidget/geoip/kg.png Binary files differindex ce21e9e..ce21e9e 100644 --- a/plugins/infowidget/geoip/kg.png +++ b/src/plugins/infowidget/geoip/kg.png diff --git a/plugins/infowidget/geoip/kh.png b/src/plugins/infowidget/geoip/kh.png Binary files differindex 51b550d..51b550d 100644 --- a/plugins/infowidget/geoip/kh.png +++ b/src/plugins/infowidget/geoip/kh.png diff --git a/plugins/infowidget/geoip/ki.png b/src/plugins/infowidget/geoip/ki.png Binary files differindex c0b8d69..c0b8d69 100644 --- a/plugins/infowidget/geoip/ki.png +++ b/src/plugins/infowidget/geoip/ki.png diff --git a/plugins/infowidget/geoip/km.png b/src/plugins/infowidget/geoip/km.png Binary files differindex 9c8ef45..9c8ef45 100644 --- a/plugins/infowidget/geoip/km.png +++ b/src/plugins/infowidget/geoip/km.png diff --git a/plugins/infowidget/geoip/kn.png b/src/plugins/infowidget/geoip/kn.png Binary files differindex a731c3b..a731c3b 100644 --- a/plugins/infowidget/geoip/kn.png +++ b/src/plugins/infowidget/geoip/kn.png diff --git a/plugins/infowidget/geoip/kp.png b/src/plugins/infowidget/geoip/kp.png Binary files differindex 368d52c..368d52c 100644 --- a/plugins/infowidget/geoip/kp.png +++ b/src/plugins/infowidget/geoip/kp.png diff --git a/plugins/infowidget/geoip/kr.png b/src/plugins/infowidget/geoip/kr.png Binary files differindex bb87cae..bb87cae 100644 --- a/plugins/infowidget/geoip/kr.png +++ b/src/plugins/infowidget/geoip/kr.png diff --git a/plugins/infowidget/geoip/kw.png b/src/plugins/infowidget/geoip/kw.png Binary files differindex 077c3a2..077c3a2 100644 --- a/plugins/infowidget/geoip/kw.png +++ b/src/plugins/infowidget/geoip/kw.png diff --git a/plugins/infowidget/geoip/ky.png b/src/plugins/infowidget/geoip/ky.png Binary files differindex 8393fda..8393fda 100644 --- a/plugins/infowidget/geoip/ky.png +++ b/src/plugins/infowidget/geoip/ky.png diff --git a/plugins/infowidget/geoip/kz.png b/src/plugins/infowidget/geoip/kz.png Binary files differindex 23d933d..23d933d 100644 --- a/plugins/infowidget/geoip/kz.png +++ b/src/plugins/infowidget/geoip/kz.png diff --git a/plugins/infowidget/geoip/la.png b/src/plugins/infowidget/geoip/la.png Binary files differindex 94d1d5b..94d1d5b 100644 --- a/plugins/infowidget/geoip/la.png +++ b/src/plugins/infowidget/geoip/la.png diff --git a/plugins/infowidget/geoip/lb.png b/src/plugins/infowidget/geoip/lb.png Binary files differindex 03632b5..03632b5 100644 --- a/plugins/infowidget/geoip/lb.png +++ b/src/plugins/infowidget/geoip/lb.png diff --git a/plugins/infowidget/geoip/lc.png b/src/plugins/infowidget/geoip/lc.png Binary files differindex db71de5..db71de5 100644 --- a/plugins/infowidget/geoip/lc.png +++ b/src/plugins/infowidget/geoip/lc.png diff --git a/plugins/infowidget/geoip/li.png b/src/plugins/infowidget/geoip/li.png Binary files differindex 434689b..434689b 100644 --- a/plugins/infowidget/geoip/li.png +++ b/src/plugins/infowidget/geoip/li.png diff --git a/plugins/infowidget/geoip/lk.png b/src/plugins/infowidget/geoip/lk.png Binary files differindex 813298b..813298b 100644 --- a/plugins/infowidget/geoip/lk.png +++ b/src/plugins/infowidget/geoip/lk.png diff --git a/plugins/infowidget/geoip/lr.png b/src/plugins/infowidget/geoip/lr.png Binary files differindex 9181a94..9181a94 100644 --- a/plugins/infowidget/geoip/lr.png +++ b/src/plugins/infowidget/geoip/lr.png diff --git a/plugins/infowidget/geoip/ls.png b/src/plugins/infowidget/geoip/ls.png Binary files differindex 40bc932..40bc932 100644 --- a/plugins/infowidget/geoip/ls.png +++ b/src/plugins/infowidget/geoip/ls.png diff --git a/plugins/infowidget/geoip/lt.png b/src/plugins/infowidget/geoip/lt.png Binary files differindex 980a277..980a277 100644 --- a/plugins/infowidget/geoip/lt.png +++ b/src/plugins/infowidget/geoip/lt.png diff --git a/plugins/infowidget/geoip/lu.png b/src/plugins/infowidget/geoip/lu.png Binary files differindex 0ff0539..0ff0539 100644 --- a/plugins/infowidget/geoip/lu.png +++ b/src/plugins/infowidget/geoip/lu.png diff --git a/plugins/infowidget/geoip/lv.png b/src/plugins/infowidget/geoip/lv.png Binary files differindex cb3098c..cb3098c 100644 --- a/plugins/infowidget/geoip/lv.png +++ b/src/plugins/infowidget/geoip/lv.png diff --git a/plugins/infowidget/geoip/ly.png b/src/plugins/infowidget/geoip/ly.png Binary files differindex e18232a..e18232a 100644 --- a/plugins/infowidget/geoip/ly.png +++ b/src/plugins/infowidget/geoip/ly.png diff --git a/plugins/infowidget/geoip/ma.png b/src/plugins/infowidget/geoip/ma.png Binary files differindex 0df5621..0df5621 100644 --- a/plugins/infowidget/geoip/ma.png +++ b/src/plugins/infowidget/geoip/ma.png diff --git a/plugins/infowidget/geoip/mc.png b/src/plugins/infowidget/geoip/mc.png Binary files differindex 4b4a703..4b4a703 100644 --- a/plugins/infowidget/geoip/mc.png +++ b/src/plugins/infowidget/geoip/mc.png diff --git a/plugins/infowidget/geoip/md.png b/src/plugins/infowidget/geoip/md.png Binary files differindex a329574..a329574 100644 --- a/plugins/infowidget/geoip/md.png +++ b/src/plugins/infowidget/geoip/md.png diff --git a/plugins/infowidget/geoip/mg.png b/src/plugins/infowidget/geoip/mg.png Binary files differindex ec1be7f..ec1be7f 100644 --- a/plugins/infowidget/geoip/mg.png +++ b/src/plugins/infowidget/geoip/mg.png diff --git a/plugins/infowidget/geoip/mh.png b/src/plugins/infowidget/geoip/mh.png Binary files differindex ff94bdf..ff94bdf 100644 --- a/plugins/infowidget/geoip/mh.png +++ b/src/plugins/infowidget/geoip/mh.png diff --git a/plugins/infowidget/geoip/mk.png b/src/plugins/infowidget/geoip/mk.png Binary files differindex 4512925..4512925 100644 --- a/plugins/infowidget/geoip/mk.png +++ b/src/plugins/infowidget/geoip/mk.png diff --git a/plugins/infowidget/geoip/ml.png b/src/plugins/infowidget/geoip/ml.png Binary files differindex 3025064..3025064 100644 --- a/plugins/infowidget/geoip/ml.png +++ b/src/plugins/infowidget/geoip/ml.png diff --git a/plugins/infowidget/geoip/mm.png b/src/plugins/infowidget/geoip/mm.png Binary files differindex 43cc773..43cc773 100644 --- a/plugins/infowidget/geoip/mm.png +++ b/src/plugins/infowidget/geoip/mm.png diff --git a/plugins/infowidget/geoip/mn.png b/src/plugins/infowidget/geoip/mn.png Binary files differindex 7abe1d2..7abe1d2 100644 --- a/plugins/infowidget/geoip/mn.png +++ b/src/plugins/infowidget/geoip/mn.png diff --git a/plugins/infowidget/geoip/mo.png b/src/plugins/infowidget/geoip/mo.png Binary files differindex 8baad35..8baad35 100644 --- a/plugins/infowidget/geoip/mo.png +++ b/src/plugins/infowidget/geoip/mo.png diff --git a/plugins/infowidget/geoip/mp.png b/src/plugins/infowidget/geoip/mp.png Binary files differindex c905cd0..c905cd0 100644 --- a/plugins/infowidget/geoip/mp.png +++ b/src/plugins/infowidget/geoip/mp.png diff --git a/plugins/infowidget/geoip/mq.png b/src/plugins/infowidget/geoip/mq.png Binary files differindex f88e4fe..f88e4fe 100644 --- a/plugins/infowidget/geoip/mq.png +++ b/src/plugins/infowidget/geoip/mq.png diff --git a/plugins/infowidget/geoip/mr.png b/src/plugins/infowidget/geoip/mr.png Binary files differindex ee04526..ee04526 100644 --- a/plugins/infowidget/geoip/mr.png +++ b/src/plugins/infowidget/geoip/mr.png diff --git a/plugins/infowidget/geoip/ms.png b/src/plugins/infowidget/geoip/ms.png Binary files differindex b20d935..b20d935 100644 --- a/plugins/infowidget/geoip/ms.png +++ b/src/plugins/infowidget/geoip/ms.png diff --git a/plugins/infowidget/geoip/mt.png b/src/plugins/infowidget/geoip/mt.png Binary files differindex 204dcb4..204dcb4 100644 --- a/plugins/infowidget/geoip/mt.png +++ b/src/plugins/infowidget/geoip/mt.png diff --git a/plugins/infowidget/geoip/mu.png b/src/plugins/infowidget/geoip/mu.png Binary files differindex 9d5dc4b..9d5dc4b 100644 --- a/plugins/infowidget/geoip/mu.png +++ b/src/plugins/infowidget/geoip/mu.png diff --git a/plugins/infowidget/geoip/mv.png b/src/plugins/infowidget/geoip/mv.png Binary files differindex f3140b6..f3140b6 100644 --- a/plugins/infowidget/geoip/mv.png +++ b/src/plugins/infowidget/geoip/mv.png diff --git a/plugins/infowidget/geoip/mw.png b/src/plugins/infowidget/geoip/mw.png Binary files differindex 9a09e30..9a09e30 100644 --- a/plugins/infowidget/geoip/mw.png +++ b/src/plugins/infowidget/geoip/mw.png diff --git a/plugins/infowidget/geoip/mx.png b/src/plugins/infowidget/geoip/mx.png Binary files differindex 6e018a8..6e018a8 100644 --- a/plugins/infowidget/geoip/mx.png +++ b/src/plugins/infowidget/geoip/mx.png diff --git a/plugins/infowidget/geoip/my.png b/src/plugins/infowidget/geoip/my.png Binary files differindex 24d5312..24d5312 100644 --- a/plugins/infowidget/geoip/my.png +++ b/src/plugins/infowidget/geoip/my.png diff --git a/plugins/infowidget/geoip/mz.png b/src/plugins/infowidget/geoip/mz.png Binary files differindex fdd596d..fdd596d 100644 --- a/plugins/infowidget/geoip/mz.png +++ b/src/plugins/infowidget/geoip/mz.png diff --git a/plugins/infowidget/geoip/na.png b/src/plugins/infowidget/geoip/na.png Binary files differindex 8f666bd..8f666bd 100644 --- a/plugins/infowidget/geoip/na.png +++ b/src/plugins/infowidget/geoip/na.png diff --git a/plugins/infowidget/geoip/nc.png b/src/plugins/infowidget/geoip/nc.png Binary files differindex ee6e0bc..ee6e0bc 100644 --- a/plugins/infowidget/geoip/nc.png +++ b/src/plugins/infowidget/geoip/nc.png diff --git a/plugins/infowidget/geoip/ne.png b/src/plugins/infowidget/geoip/ne.png Binary files differindex 104d221..104d221 100644 --- a/plugins/infowidget/geoip/ne.png +++ b/src/plugins/infowidget/geoip/ne.png diff --git a/plugins/infowidget/geoip/nf.png b/src/plugins/infowidget/geoip/nf.png Binary files differindex 81ba2c2..81ba2c2 100644 --- a/plugins/infowidget/geoip/nf.png +++ b/src/plugins/infowidget/geoip/nf.png diff --git a/plugins/infowidget/geoip/ng.png b/src/plugins/infowidget/geoip/ng.png Binary files differindex 823a2df..823a2df 100644 --- a/plugins/infowidget/geoip/ng.png +++ b/src/plugins/infowidget/geoip/ng.png diff --git a/plugins/infowidget/geoip/ni.png b/src/plugins/infowidget/geoip/ni.png Binary files differindex 5fe169c..5fe169c 100644 --- a/plugins/infowidget/geoip/ni.png +++ b/src/plugins/infowidget/geoip/ni.png diff --git a/plugins/infowidget/geoip/nl.png b/src/plugins/infowidget/geoip/nl.png Binary files differindex d18023e..d18023e 100644 --- a/plugins/infowidget/geoip/nl.png +++ b/src/plugins/infowidget/geoip/nl.png diff --git a/plugins/infowidget/geoip/no.png b/src/plugins/infowidget/geoip/no.png Binary files differindex 56ab362..56ab362 100644 --- a/plugins/infowidget/geoip/no.png +++ b/src/plugins/infowidget/geoip/no.png diff --git a/plugins/infowidget/geoip/np.png b/src/plugins/infowidget/geoip/np.png Binary files differindex 8a77700..8a77700 100644 --- a/plugins/infowidget/geoip/np.png +++ b/src/plugins/infowidget/geoip/np.png diff --git a/plugins/infowidget/geoip/nr.png b/src/plugins/infowidget/geoip/nr.png Binary files differindex 3d5a8fd..3d5a8fd 100644 --- a/plugins/infowidget/geoip/nr.png +++ b/src/plugins/infowidget/geoip/nr.png diff --git a/plugins/infowidget/geoip/nu.png b/src/plugins/infowidget/geoip/nu.png Binary files differindex 11c5a8a..11c5a8a 100644 --- a/plugins/infowidget/geoip/nu.png +++ b/src/plugins/infowidget/geoip/nu.png diff --git a/plugins/infowidget/geoip/nz.png b/src/plugins/infowidget/geoip/nz.png Binary files differindex ff91224..ff91224 100644 --- a/plugins/infowidget/geoip/nz.png +++ b/src/plugins/infowidget/geoip/nz.png diff --git a/plugins/infowidget/geoip/om.png b/src/plugins/infowidget/geoip/om.png Binary files differindex 9293a30..9293a30 100644 --- a/plugins/infowidget/geoip/om.png +++ b/src/plugins/infowidget/geoip/om.png diff --git a/plugins/infowidget/geoip/pa.png b/src/plugins/infowidget/geoip/pa.png Binary files differindex 0b04b5b..0b04b5b 100644 --- a/plugins/infowidget/geoip/pa.png +++ b/src/plugins/infowidget/geoip/pa.png diff --git a/plugins/infowidget/geoip/pe.png b/src/plugins/infowidget/geoip/pe.png Binary files differindex 6125956..6125956 100644 --- a/plugins/infowidget/geoip/pe.png +++ b/src/plugins/infowidget/geoip/pe.png diff --git a/plugins/infowidget/geoip/pf.png b/src/plugins/infowidget/geoip/pf.png Binary files differindex 52c2d1f..52c2d1f 100644 --- a/plugins/infowidget/geoip/pf.png +++ b/src/plugins/infowidget/geoip/pf.png diff --git a/plugins/infowidget/geoip/pg.png b/src/plugins/infowidget/geoip/pg.png Binary files differindex 2157102..2157102 100644 --- a/plugins/infowidget/geoip/pg.png +++ b/src/plugins/infowidget/geoip/pg.png diff --git a/plugins/infowidget/geoip/ph.png b/src/plugins/infowidget/geoip/ph.png Binary files differindex a4ac0b6..a4ac0b6 100644 --- a/plugins/infowidget/geoip/ph.png +++ b/src/plugins/infowidget/geoip/ph.png diff --git a/plugins/infowidget/geoip/pk.png b/src/plugins/infowidget/geoip/pk.png Binary files differindex 9fd80db..9fd80db 100644 --- a/plugins/infowidget/geoip/pk.png +++ b/src/plugins/infowidget/geoip/pk.png diff --git a/plugins/infowidget/geoip/pl.png b/src/plugins/infowidget/geoip/pl.png Binary files differindex 4ad9208..4ad9208 100644 --- a/plugins/infowidget/geoip/pl.png +++ b/src/plugins/infowidget/geoip/pl.png diff --git a/plugins/infowidget/geoip/pm.png b/src/plugins/infowidget/geoip/pm.png Binary files differindex f90f9a1..f90f9a1 100644 --- a/plugins/infowidget/geoip/pm.png +++ b/src/plugins/infowidget/geoip/pm.png diff --git a/plugins/infowidget/geoip/pn.png b/src/plugins/infowidget/geoip/pn.png Binary files differindex 2c91d41..2c91d41 100644 --- a/plugins/infowidget/geoip/pn.png +++ b/src/plugins/infowidget/geoip/pn.png diff --git a/plugins/infowidget/geoip/pr.png b/src/plugins/infowidget/geoip/pr.png Binary files differindex c71421c..c71421c 100644 --- a/plugins/infowidget/geoip/pr.png +++ b/src/plugins/infowidget/geoip/pr.png diff --git a/plugins/infowidget/geoip/ps.png b/src/plugins/infowidget/geoip/ps.png Binary files differindex aec6b35..aec6b35 100644 --- a/plugins/infowidget/geoip/ps.png +++ b/src/plugins/infowidget/geoip/ps.png diff --git a/plugins/infowidget/geoip/pt.png b/src/plugins/infowidget/geoip/pt.png Binary files differindex 6d7d54e..6d7d54e 100644 --- a/plugins/infowidget/geoip/pt.png +++ b/src/plugins/infowidget/geoip/pt.png diff --git a/plugins/infowidget/geoip/pw.png b/src/plugins/infowidget/geoip/pw.png Binary files differindex 1233430..1233430 100644 --- a/plugins/infowidget/geoip/pw.png +++ b/src/plugins/infowidget/geoip/pw.png diff --git a/plugins/infowidget/geoip/py.png b/src/plugins/infowidget/geoip/py.png Binary files differindex 5df7dd8..5df7dd8 100644 --- a/plugins/infowidget/geoip/py.png +++ b/src/plugins/infowidget/geoip/py.png diff --git a/plugins/infowidget/geoip/qa.png b/src/plugins/infowidget/geoip/qa.png Binary files differindex 2999fab..2999fab 100644 --- a/plugins/infowidget/geoip/qa.png +++ b/src/plugins/infowidget/geoip/qa.png diff --git a/plugins/infowidget/geoip/re.png b/src/plugins/infowidget/geoip/re.png Binary files differindex fef5239..fef5239 100644 --- a/plugins/infowidget/geoip/re.png +++ b/src/plugins/infowidget/geoip/re.png diff --git a/plugins/infowidget/geoip/ro.png b/src/plugins/infowidget/geoip/ro.png Binary files differindex a652c68..a652c68 100644 --- a/plugins/infowidget/geoip/ro.png +++ b/src/plugins/infowidget/geoip/ro.png diff --git a/plugins/infowidget/geoip/ru.png b/src/plugins/infowidget/geoip/ru.png Binary files differindex 7471ba5..7471ba5 100644 --- a/plugins/infowidget/geoip/ru.png +++ b/src/plugins/infowidget/geoip/ru.png diff --git a/plugins/infowidget/geoip/rw.png b/src/plugins/infowidget/geoip/rw.png Binary files differindex d6d3e42..d6d3e42 100644 --- a/plugins/infowidget/geoip/rw.png +++ b/src/plugins/infowidget/geoip/rw.png diff --git a/plugins/infowidget/geoip/sa.png b/src/plugins/infowidget/geoip/sa.png Binary files differindex 0034951..0034951 100644 --- a/plugins/infowidget/geoip/sa.png +++ b/src/plugins/infowidget/geoip/sa.png diff --git a/plugins/infowidget/geoip/sb.png b/src/plugins/infowidget/geoip/sb.png Binary files differindex c14eff5..c14eff5 100644 --- a/plugins/infowidget/geoip/sb.png +++ b/src/plugins/infowidget/geoip/sb.png diff --git a/plugins/infowidget/geoip/sc.png b/src/plugins/infowidget/geoip/sc.png Binary files differindex 8595229..8595229 100644 --- a/plugins/infowidget/geoip/sc.png +++ b/src/plugins/infowidget/geoip/sc.png diff --git a/plugins/infowidget/geoip/sd.png b/src/plugins/infowidget/geoip/sd.png Binary files differindex 6de6ddd..6de6ddd 100644 --- a/plugins/infowidget/geoip/sd.png +++ b/src/plugins/infowidget/geoip/sd.png diff --git a/plugins/infowidget/geoip/se.png b/src/plugins/infowidget/geoip/se.png Binary files differindex 44bd94c..44bd94c 100644 --- a/plugins/infowidget/geoip/se.png +++ b/src/plugins/infowidget/geoip/se.png diff --git a/plugins/infowidget/geoip/sg.png b/src/plugins/infowidget/geoip/sg.png Binary files differindex 354681d..354681d 100644 --- a/plugins/infowidget/geoip/sg.png +++ b/src/plugins/infowidget/geoip/sg.png diff --git a/plugins/infowidget/geoip/sh.png b/src/plugins/infowidget/geoip/sh.png Binary files differindex 082543a..082543a 100644 --- a/plugins/infowidget/geoip/sh.png +++ b/src/plugins/infowidget/geoip/sh.png diff --git a/plugins/infowidget/geoip/si.png b/src/plugins/infowidget/geoip/si.png Binary files differindex c0c773d..c0c773d 100644 --- a/plugins/infowidget/geoip/si.png +++ b/src/plugins/infowidget/geoip/si.png diff --git a/plugins/infowidget/geoip/sj.png b/src/plugins/infowidget/geoip/sj.png Binary files differindex f42b564..f42b564 100644 --- a/plugins/infowidget/geoip/sj.png +++ b/src/plugins/infowidget/geoip/sj.png diff --git a/plugins/infowidget/geoip/sk.png b/src/plugins/infowidget/geoip/sk.png Binary files differindex 1a475a3..1a475a3 100644 --- a/plugins/infowidget/geoip/sk.png +++ b/src/plugins/infowidget/geoip/sk.png diff --git a/plugins/infowidget/geoip/sl.png b/src/plugins/infowidget/geoip/sl.png Binary files differindex 133272b..133272b 100644 --- a/plugins/infowidget/geoip/sl.png +++ b/src/plugins/infowidget/geoip/sl.png diff --git a/plugins/infowidget/geoip/sm.png b/src/plugins/infowidget/geoip/sm.png Binary files differindex c92d649..c92d649 100644 --- a/plugins/infowidget/geoip/sm.png +++ b/src/plugins/infowidget/geoip/sm.png diff --git a/plugins/infowidget/geoip/sn.png b/src/plugins/infowidget/geoip/sn.png Binary files differindex 904de47..904de47 100644 --- a/plugins/infowidget/geoip/sn.png +++ b/src/plugins/infowidget/geoip/sn.png diff --git a/plugins/infowidget/geoip/so.png b/src/plugins/infowidget/geoip/so.png Binary files differindex e92bc22..e92bc22 100644 --- a/plugins/infowidget/geoip/so.png +++ b/src/plugins/infowidget/geoip/so.png diff --git a/plugins/infowidget/geoip/sr.png b/src/plugins/infowidget/geoip/sr.png Binary files differindex 7950528..7950528 100644 --- a/plugins/infowidget/geoip/sr.png +++ b/src/plugins/infowidget/geoip/sr.png diff --git a/plugins/infowidget/geoip/st.png b/src/plugins/infowidget/geoip/st.png Binary files differindex 0eac625..0eac625 100644 --- a/plugins/infowidget/geoip/st.png +++ b/src/plugins/infowidget/geoip/st.png diff --git a/plugins/infowidget/geoip/sv.png b/src/plugins/infowidget/geoip/sv.png Binary files differindex ac7e32a..ac7e32a 100644 --- a/plugins/infowidget/geoip/sv.png +++ b/src/plugins/infowidget/geoip/sv.png diff --git a/plugins/infowidget/geoip/sy.png b/src/plugins/infowidget/geoip/sy.png Binary files differindex 5d8f81d..5d8f81d 100644 --- a/plugins/infowidget/geoip/sy.png +++ b/src/plugins/infowidget/geoip/sy.png diff --git a/plugins/infowidget/geoip/sz.png b/src/plugins/infowidget/geoip/sz.png Binary files differindex 64b0611..64b0611 100644 --- a/plugins/infowidget/geoip/sz.png +++ b/src/plugins/infowidget/geoip/sz.png diff --git a/plugins/infowidget/geoip/tc.png b/src/plugins/infowidget/geoip/tc.png Binary files differindex 1580f66..1580f66 100644 --- a/plugins/infowidget/geoip/tc.png +++ b/src/plugins/infowidget/geoip/tc.png diff --git a/plugins/infowidget/geoip/td.png b/src/plugins/infowidget/geoip/td.png Binary files differindex 3e9d4eb..3e9d4eb 100644 --- a/plugins/infowidget/geoip/td.png +++ b/src/plugins/infowidget/geoip/td.png diff --git a/plugins/infowidget/geoip/tf.png b/src/plugins/infowidget/geoip/tf.png Binary files differindex 4d1ffbe..4d1ffbe 100644 --- a/plugins/infowidget/geoip/tf.png +++ b/src/plugins/infowidget/geoip/tf.png diff --git a/plugins/infowidget/geoip/tg.png b/src/plugins/infowidget/geoip/tg.png Binary files differindex cd5be57..cd5be57 100644 --- a/plugins/infowidget/geoip/tg.png +++ b/src/plugins/infowidget/geoip/tg.png diff --git a/plugins/infowidget/geoip/th.png b/src/plugins/infowidget/geoip/th.png Binary files differindex d7b7eee..d7b7eee 100644 --- a/plugins/infowidget/geoip/th.png +++ b/src/plugins/infowidget/geoip/th.png diff --git a/plugins/infowidget/geoip/tj.png b/src/plugins/infowidget/geoip/tj.png Binary files differindex f873509..f873509 100644 --- a/plugins/infowidget/geoip/tj.png +++ b/src/plugins/infowidget/geoip/tj.png diff --git a/plugins/infowidget/geoip/tk.png b/src/plugins/infowidget/geoip/tk.png Binary files differindex ae2e51d..ae2e51d 100644 --- a/plugins/infowidget/geoip/tk.png +++ b/src/plugins/infowidget/geoip/tk.png diff --git a/plugins/infowidget/geoip/tl.png b/src/plugins/infowidget/geoip/tl.png Binary files differindex 45ea272..45ea272 100644 --- a/plugins/infowidget/geoip/tl.png +++ b/src/plugins/infowidget/geoip/tl.png diff --git a/plugins/infowidget/geoip/tm.png b/src/plugins/infowidget/geoip/tm.png Binary files differindex 49bdd96..49bdd96 100644 --- a/plugins/infowidget/geoip/tm.png +++ b/src/plugins/infowidget/geoip/tm.png diff --git a/plugins/infowidget/geoip/tn.png b/src/plugins/infowidget/geoip/tn.png Binary files differindex 702cfcb..702cfcb 100644 --- a/plugins/infowidget/geoip/tn.png +++ b/src/plugins/infowidget/geoip/tn.png diff --git a/plugins/infowidget/geoip/to.png b/src/plugins/infowidget/geoip/to.png Binary files differindex f79a329..f79a329 100644 --- a/plugins/infowidget/geoip/to.png +++ b/src/plugins/infowidget/geoip/to.png diff --git a/plugins/infowidget/geoip/tp.png b/src/plugins/infowidget/geoip/tp.png Binary files differindex cf52ab2..cf52ab2 100644 --- a/plugins/infowidget/geoip/tp.png +++ b/src/plugins/infowidget/geoip/tp.png diff --git a/plugins/infowidget/geoip/tr.png b/src/plugins/infowidget/geoip/tr.png Binary files differindex 6bee31c..6bee31c 100644 --- a/plugins/infowidget/geoip/tr.png +++ b/src/plugins/infowidget/geoip/tr.png diff --git a/plugins/infowidget/geoip/tt.png b/src/plugins/infowidget/geoip/tt.png Binary files differindex 391fc51..391fc51 100644 --- a/plugins/infowidget/geoip/tt.png +++ b/src/plugins/infowidget/geoip/tt.png diff --git a/plugins/infowidget/geoip/tv.png b/src/plugins/infowidget/geoip/tv.png Binary files differindex 37e05fd..37e05fd 100644 --- a/plugins/infowidget/geoip/tv.png +++ b/src/plugins/infowidget/geoip/tv.png diff --git a/plugins/infowidget/geoip/tw.png b/src/plugins/infowidget/geoip/tw.png Binary files differindex bf02e45..bf02e45 100644 --- a/plugins/infowidget/geoip/tw.png +++ b/src/plugins/infowidget/geoip/tw.png diff --git a/plugins/infowidget/geoip/tz.png b/src/plugins/infowidget/geoip/tz.png Binary files differindex 55fee25..55fee25 100644 --- a/plugins/infowidget/geoip/tz.png +++ b/src/plugins/infowidget/geoip/tz.png diff --git a/plugins/infowidget/geoip/ua.png b/src/plugins/infowidget/geoip/ua.png Binary files differindex d1633c8..d1633c8 100644 --- a/plugins/infowidget/geoip/ua.png +++ b/src/plugins/infowidget/geoip/ua.png diff --git a/plugins/infowidget/geoip/ug.png b/src/plugins/infowidget/geoip/ug.png Binary files differindex fb42945..fb42945 100644 --- a/plugins/infowidget/geoip/ug.png +++ b/src/plugins/infowidget/geoip/ug.png diff --git a/plugins/infowidget/geoip/um.png b/src/plugins/infowidget/geoip/um.png Binary files differindex 5bae9cc..5bae9cc 100644 --- a/plugins/infowidget/geoip/um.png +++ b/src/plugins/infowidget/geoip/um.png diff --git a/plugins/infowidget/geoip/us.png b/src/plugins/infowidget/geoip/us.png Binary files differindex 0c86308..0c86308 100644 --- a/plugins/infowidget/geoip/us.png +++ b/src/plugins/infowidget/geoip/us.png diff --git a/plugins/infowidget/geoip/uy.png b/src/plugins/infowidget/geoip/uy.png Binary files differindex 33e72c6..33e72c6 100644 --- a/plugins/infowidget/geoip/uy.png +++ b/src/plugins/infowidget/geoip/uy.png diff --git a/plugins/infowidget/geoip/uz.png b/src/plugins/infowidget/geoip/uz.png Binary files differindex b3f52e2..b3f52e2 100644 --- a/plugins/infowidget/geoip/uz.png +++ b/src/plugins/infowidget/geoip/uz.png diff --git a/plugins/infowidget/geoip/va.png b/src/plugins/infowidget/geoip/va.png Binary files differindex 0719d84..0719d84 100644 --- a/plugins/infowidget/geoip/va.png +++ b/src/plugins/infowidget/geoip/va.png diff --git a/plugins/infowidget/geoip/vc.png b/src/plugins/infowidget/geoip/vc.png Binary files differindex 59d7764..59d7764 100644 --- a/plugins/infowidget/geoip/vc.png +++ b/src/plugins/infowidget/geoip/vc.png diff --git a/plugins/infowidget/geoip/ve.png b/src/plugins/infowidget/geoip/ve.png Binary files differindex 9080d0d..9080d0d 100644 --- a/plugins/infowidget/geoip/ve.png +++ b/src/plugins/infowidget/geoip/ve.png diff --git a/plugins/infowidget/geoip/vg.png b/src/plugins/infowidget/geoip/vg.png Binary files differindex f8592e5..f8592e5 100644 --- a/plugins/infowidget/geoip/vg.png +++ b/src/plugins/infowidget/geoip/vg.png diff --git a/plugins/infowidget/geoip/vi.png b/src/plugins/infowidget/geoip/vi.png Binary files differindex 2252cd0..2252cd0 100644 --- a/plugins/infowidget/geoip/vi.png +++ b/src/plugins/infowidget/geoip/vi.png diff --git a/plugins/infowidget/geoip/vn.png b/src/plugins/infowidget/geoip/vn.png Binary files differindex fdcdcfa..fdcdcfa 100644 --- a/plugins/infowidget/geoip/vn.png +++ b/src/plugins/infowidget/geoip/vn.png diff --git a/plugins/infowidget/geoip/vu.png b/src/plugins/infowidget/geoip/vu.png Binary files differindex b60c22e..b60c22e 100644 --- a/plugins/infowidget/geoip/vu.png +++ b/src/plugins/infowidget/geoip/vu.png diff --git a/plugins/infowidget/geoip/wf.png b/src/plugins/infowidget/geoip/wf.png Binary files differindex ef12a01..ef12a01 100644 --- a/plugins/infowidget/geoip/wf.png +++ b/src/plugins/infowidget/geoip/wf.png diff --git a/plugins/infowidget/geoip/ws.png b/src/plugins/infowidget/geoip/ws.png Binary files differindex de73922..de73922 100644 --- a/plugins/infowidget/geoip/ws.png +++ b/src/plugins/infowidget/geoip/ws.png diff --git a/plugins/infowidget/geoip/ye.png b/src/plugins/infowidget/geoip/ye.png Binary files differindex 7631624..7631624 100644 --- a/plugins/infowidget/geoip/ye.png +++ b/src/plugins/infowidget/geoip/ye.png diff --git a/plugins/infowidget/geoip/yt.png b/src/plugins/infowidget/geoip/yt.png Binary files differindex 56ad306..56ad306 100644 --- a/plugins/infowidget/geoip/yt.png +++ b/src/plugins/infowidget/geoip/yt.png diff --git a/plugins/infowidget/geoip/yu.png b/src/plugins/infowidget/geoip/yu.png Binary files differindex 5306cdb..5306cdb 100644 --- a/plugins/infowidget/geoip/yu.png +++ b/src/plugins/infowidget/geoip/yu.png diff --git a/plugins/infowidget/geoip/za.png b/src/plugins/infowidget/geoip/za.png Binary files differindex bdef019..bdef019 100644 --- a/plugins/infowidget/geoip/za.png +++ b/src/plugins/infowidget/geoip/za.png diff --git a/plugins/infowidget/geoip/zm.png b/src/plugins/infowidget/geoip/zm.png Binary files differindex dff2d14..dff2d14 100644 --- a/plugins/infowidget/geoip/zm.png +++ b/src/plugins/infowidget/geoip/zm.png diff --git a/plugins/infowidget/geoip/zw.png b/src/plugins/infowidget/geoip/zw.png Binary files differindex f4cfc36..f4cfc36 100644 --- a/plugins/infowidget/geoip/zw.png +++ b/src/plugins/infowidget/geoip/zw.png diff --git a/plugins/infowidget/infowidgetplugin.cpp b/src/plugins/infowidget/infowidgetplugin.cpp index 506efdb..00df391 100644 --- a/plugins/infowidget/infowidgetplugin.cpp +++ b/src/plugins/infowidget/infowidgetplugin.cpp @@ -216,8 +216,8 @@ namespace kt tracker_view->changeTC(const_cast<kt::TorrentInterface*>(getGUI()->getCurrentTorrent())); // seeing that a merge of the trackers might happen after a torrent has been loaded // we need to update the tracker_view - connect(getCore(),TQT_SIGNAL(loadingFinished(const KURL&, bool, bool)), - tracker_view,TQT_SLOT(onLoadingFinished(const KURL&, bool, bool))); + connect(getCore(),TQ_SIGNAL(loadingFinished(const KURL&, bool, bool)), + tracker_view,TQ_SLOT(onLoadingFinished(const KURL&, bool, bool))); } else if (!show && tracker_view) { diff --git a/plugins/infowidget/infowidgetplugin.h b/src/plugins/infowidget/infowidgetplugin.h index 75a7fea..01796ec 100644 --- a/plugins/infowidget/infowidgetplugin.h +++ b/src/plugins/infowidget/infowidgetplugin.h @@ -41,7 +41,7 @@ namespace kt */ class InfoWidgetPlugin : public Plugin,public ViewListener { - Q_OBJECT + TQ_OBJECT public: InfoWidgetPlugin(TQObject* parent, const char* name, const TQStringList& args); diff --git a/plugins/infowidget/infowidgetpluginsettings.kcfgc b/src/plugins/infowidget/infowidgetpluginsettings.kcfgc index a6d8cb9..a6d8cb9 100644 --- a/plugins/infowidget/infowidgetpluginsettings.kcfgc +++ b/src/plugins/infowidget/infowidgetpluginsettings.kcfgc diff --git a/plugins/infowidget/infowidgetprefpage.cpp b/src/plugins/infowidget/infowidgetprefpage.cpp index 63e2987..63e2987 100644 --- a/plugins/infowidget/infowidgetprefpage.cpp +++ b/src/plugins/infowidget/infowidgetprefpage.cpp diff --git a/plugins/infowidget/infowidgetprefpage.h b/src/plugins/infowidget/infowidgetprefpage.h index 1274462..1274462 100644 --- a/plugins/infowidget/infowidgetprefpage.h +++ b/src/plugins/infowidget/infowidgetprefpage.h diff --git a/plugins/infowidget/iwfiletreediritem.cpp b/src/plugins/infowidget/iwfiletreediritem.cpp index 7bfe462..7bfe462 100644 --- a/plugins/infowidget/iwfiletreediritem.cpp +++ b/src/plugins/infowidget/iwfiletreediritem.cpp diff --git a/plugins/infowidget/iwfiletreediritem.h b/src/plugins/infowidget/iwfiletreediritem.h index 4a1cd4c..4a1cd4c 100644 --- a/plugins/infowidget/iwfiletreediritem.h +++ b/src/plugins/infowidget/iwfiletreediritem.h diff --git a/plugins/infowidget/iwfiletreeitem.cpp b/src/plugins/infowidget/iwfiletreeitem.cpp index effe20a..d641fe5 100644 --- a/plugins/infowidget/iwfiletreeitem.cpp +++ b/src/plugins/infowidget/iwfiletreeitem.cpp @@ -37,8 +37,8 @@ namespace kt : FileTreeItem(item,name,file) { perc_complete = 0.0; - connect(&file,TQT_SIGNAL(downloadPercentageChanged( float )),this,TQT_SLOT(onPercentageUpdated( float ))); - connect(&file,TQT_SIGNAL(previewAvailable( bool )),this,TQT_SLOT(onPreviewAvailable( bool ))); + connect(&file,TQ_SIGNAL(downloadPercentageChanged( float )),this,TQ_SLOT(onPercentageUpdated( float ))); + connect(&file,TQ_SIGNAL(previewAvailable( bool )),this,TQ_SLOT(onPreviewAvailable( bool ))); } IWFileTreeItem::~IWFileTreeItem() diff --git a/plugins/infowidget/iwfiletreeitem.h b/src/plugins/infowidget/iwfiletreeitem.h index d2eb350..20972fa 100644 --- a/plugins/infowidget/iwfiletreeitem.h +++ b/src/plugins/infowidget/iwfiletreeitem.h @@ -38,7 +38,7 @@ namespace kt */ class IWFileTreeItem : public TQObject, public kt::FileTreeItem { - Q_OBJECT + TQ_OBJECT double perc_complete; diff --git a/plugins/infowidget/iwpref.ui b/src/plugins/infowidget/iwpref.ui index c39fdf8..c39fdf8 100644 --- a/plugins/infowidget/iwpref.ui +++ b/src/plugins/infowidget/iwpref.ui diff --git a/src/plugins/infowidget/ktinfowidgetplugin.desktop b/src/plugins/infowidget/ktinfowidgetplugin.desktop new file mode 100644 index 0000000..097b081 --- /dev/null +++ b/src/plugins/infowidget/ktinfowidgetplugin.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=InfoWidgetPlugin + +Type=Service +X-TDE-Library=ktinfowidgetplugin +X-TDE-ServiceTypes=KTorrent/Plugin diff --git a/plugins/infowidget/ktinfowidgetplugin.kcfg b/src/plugins/infowidget/ktinfowidgetplugin.kcfg index 51048fa..51048fa 100644 --- a/plugins/infowidget/ktinfowidgetplugin.kcfg +++ b/src/plugins/infowidget/ktinfowidgetplugin.kcfg diff --git a/plugins/infowidget/ktorrentmonitor.cpp b/src/plugins/infowidget/ktorrentmonitor.cpp index 7494a5c..7494a5c 100644 --- a/plugins/infowidget/ktorrentmonitor.cpp +++ b/src/plugins/infowidget/ktorrentmonitor.cpp diff --git a/plugins/infowidget/ktorrentmonitor.h b/src/plugins/infowidget/ktorrentmonitor.h index 6a312a2..6a312a2 100644 --- a/plugins/infowidget/ktorrentmonitor.h +++ b/src/plugins/infowidget/ktorrentmonitor.h diff --git a/plugins/infowidget/localefloatvalidator.cpp b/src/plugins/infowidget/localefloatvalidator.cpp index 48aa75c..48aa75c 100644 --- a/plugins/infowidget/localefloatvalidator.cpp +++ b/src/plugins/infowidget/localefloatvalidator.cpp diff --git a/plugins/infowidget/localefloatvalidator.h b/src/plugins/infowidget/localefloatvalidator.h index a20858f..83be87d 100644 --- a/plugins/infowidget/localefloatvalidator.h +++ b/src/plugins/infowidget/localefloatvalidator.h @@ -32,7 +32,7 @@ namespace kt{ */ class LocaleFloatValidator : public TQValidator { - Q_OBJECT + TQ_OBJECT public: LocaleFloatValidator( TQObject * parent, const char *name = 0 ); diff --git a/plugins/infowidget/peerview.cpp b/src/plugins/infowidget/peerview.cpp index f3b346f..6f4a19c 100644 --- a/plugins/infowidget/peerview.cpp +++ b/src/plugins/infowidget/peerview.cpp @@ -24,7 +24,7 @@ #include <tdelocale.h> #include <tdeglobal.h> #include <kiconloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <tdesocketaddress.h> #include <tqpoint.h> @@ -249,9 +249,9 @@ namespace kt kick_id = menu->insertItem(TDEGlobal::iconLoader()->loadIcon("delete_user", TDEIcon::NoGroup), i18n("to kick", "Kick peer")); ban_id = menu->insertItem(TDEGlobal::iconLoader()->loadIcon("filter",TDEIcon::NoGroup), i18n("to ban", "Ban peer")); - connect(this,TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint& )), - this,TQT_SLOT(showContextMenu(TDEListView*, TQListViewItem*, const TQPoint& ))); - connect(menu, TQT_SIGNAL ( activated ( int ) ), this, TQT_SLOT ( contextItem ( int ) ) ); + connect(this,TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint& )), + this,TQ_SLOT(showContextMenu(TDEListView*, TQListViewItem*, const TQPoint& ))); + connect(menu, TQ_SIGNAL ( activated ( int ) ), this, TQ_SLOT ( contextItem ( int ) ) ); setFrameShape(TQFrame::NoFrame); } diff --git a/plugins/infowidget/peerview.h b/src/plugins/infowidget/peerview.h index 9c4289a..b75371d 100644 --- a/plugins/infowidget/peerview.h +++ b/src/plugins/infowidget/peerview.h @@ -54,7 +54,7 @@ namespace kt */ class PeerView : public TDEListView { - Q_OBJECT + TQ_OBJECT TQMap<kt::PeerInterface*,PeerViewItem*> items; diff --git a/plugins/infowidget/statustab.cpp b/src/plugins/infowidget/statustab.cpp index a4eab2c..b87487f 100644 --- a/plugins/infowidget/statustab.cpp +++ b/src/plugins/infowidget/statustab.cpp @@ -46,15 +46,15 @@ namespace kt maxRatio->setMinValue(0.0f); maxRatio->setMaxValue(100.0f); maxRatio->setStep(0.1f); - connect(maxRatio, TQT_SIGNAL(valueHasChanged()), this, TQT_SLOT(maxRatioReturnPressed())); - connect(useLimit, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( useLimitToggled(bool) ) ); + connect(maxRatio, TQ_SIGNAL(valueHasChanged()), this, TQ_SLOT(maxRatioReturnPressed())); + connect(useLimit, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( useLimitToggled(bool) ) ); maxTime->setMinValue(0.0f); maxTime->setMaxValue(10000000.0f); maxTime->setStep(0.05f); maxTime->setSpecialValueText(i18n("No limit")); - connect(useTimeLimit,TQT_SIGNAL(toggled(bool)), this,TQT_SLOT(useTimeLimitToggled(bool))); - connect(maxTime,TQT_SIGNAL(valueHasChanged()), this, TQT_SLOT(timeValueChanged())); + connect(useTimeLimit,TQ_SIGNAL(toggled(bool)), this,TQ_SLOT(useTimeLimitToggled(bool))); + connect(maxTime,TQ_SIGNAL(valueHasChanged()), this, TQ_SLOT(timeValueChanged())); int h = (int)ceil(fontMetrics().height()*1.25); m_chunk_bar->setFixedHeight(h); diff --git a/plugins/infowidget/statustab.h b/src/plugins/infowidget/statustab.h index b5f73dc..1a7d7ac 100644 --- a/plugins/infowidget/statustab.h +++ b/src/plugins/infowidget/statustab.h @@ -22,14 +22,15 @@ #define STATUSTAB_H #include "statustabbase.h" +#include <libktorrent_export.h> namespace kt { class TorrentInterface; - class StatusTab : public StatusTabBase + class LIBKTORRENT_EXPORT StatusTab : public StatusTabBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/infowidget/statustabbase.ui b/src/plugins/infowidget/statustabbase.ui index 8f7bb83..8f7bb83 100644 --- a/plugins/infowidget/statustabbase.ui +++ b/src/plugins/infowidget/statustabbase.ui diff --git a/plugins/infowidget/trackerview.cpp b/src/plugins/infowidget/trackerview.cpp index 4dd4f96..4dd4f96 100644 --- a/plugins/infowidget/trackerview.cpp +++ b/src/plugins/infowidget/trackerview.cpp diff --git a/plugins/infowidget/trackerview.h b/src/plugins/infowidget/trackerview.h index 2c22eb5..44d8872 100644 --- a/plugins/infowidget/trackerview.h +++ b/src/plugins/infowidget/trackerview.h @@ -36,7 +36,7 @@ namespace kt */ class TrackerView: public TrackerViewBase { - Q_OBJECT + TQ_OBJECT public: TrackerView(TQWidget *parent = 0, const char *name = 0); diff --git a/plugins/infowidget/trackerviewbase.ui b/src/plugins/infowidget/trackerviewbase.ui index c1e05fe..3ec9d91 100644 --- a/plugins/infowidget/trackerviewbase.ui +++ b/src/plugins/infowidget/trackerviewbase.ui @@ -295,14 +295,14 @@ <forwards> <forward>class TQListViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot>btnChange_clicked()</slot> <slot>listTrackers_currentChanged(TQListViewItem*)</slot> <slot>btnUpdate_clicked()</slot> <slot>btnAdd_clicked()</slot> <slot>btnRemove_clicked()</slot> <slot>btnRestore_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/src/plugins/ipfilter/CMakeLists.txt b/src/plugins/ipfilter/CMakeLists.txt new file mode 100644 index 0000000..4de7b52 --- /dev/null +++ b/src/plugins/ipfilter/CMakeLists.txt @@ -0,0 +1,30 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/src/libktorrent + ${CMAKE_CURRENT_BINARY_DIR} +) + + +##### ktipfilterplugin (kpart) + +tde_add_kpart( ktipfilterplugin AUTOMOC + SOURCES + ipfilterplugin.cpp ipblockingpref.ui ipblockingprefpage.cpp ipfilterpluginsettings.kcfgc + antip2p.cpp convert_dlg.ui convertdialog.cpp + LINK + ktorrent-shared tdecore-shared tdeui-shared tdeio-shared tdeparts-shared tdehtml-shared + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other files + +install( + FILES ktipfilterplugin.kcfg + DESTINATION ${KCFG_INSTALL_DIR} +) + +tde_create_translated_desktop( + SOURCE ktipfilterplugin.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) diff --git a/plugins/ipfilter/antip2p.cpp b/src/plugins/ipfilter/antip2p.cpp index 802c37c..2f9fb55 100644 --- a/plugins/ipfilter/antip2p.cpp +++ b/src/plugins/ipfilter/antip2p.cpp @@ -26,7 +26,7 @@ #include <util/mmapfile.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqstring.h> #include <tqvaluelist.h> diff --git a/plugins/ipfilter/antip2p.h b/src/plugins/ipfilter/antip2p.h index ce54c53..4c3cf7e 100644 --- a/plugins/ipfilter/antip2p.h +++ b/src/plugins/ipfilter/antip2p.h @@ -69,7 +69,7 @@ namespace kt /** * Checks if specified IP is listed in filter file. - * @return TRUE if IP should be blocked, FALSE otherwise + * @return true if IP should be blocked, false otherwise * @param ip TQString representation of IP to be checked **/ bool isBlockedIP(const TQString& ip); @@ -108,7 +108,7 @@ namespace kt /** * Binary searches AntiP2P::file to find IP. - * @returns TRUE if IP should be blocked FALSE otherwise + * @returns true if IP should be blocked false otherwise **/ bool searchFile(IPBlock* file_blocks, bt::Uint32& ip, int start, int end); diff --git a/plugins/ipfilter/convert_dlg.ui b/src/plugins/ipfilter/convert_dlg.ui index 15e1a2f..de0aa40 100644 --- a/plugins/ipfilter/convert_dlg.ui +++ b/src/plugins/ipfilter/convert_dlg.ui @@ -146,10 +146,10 @@ <slot>btnCancel_clicked()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>btnClose_clicked()</slot> <slot>btnCancel_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kprogress.h</include> diff --git a/plugins/ipfilter/convertdialog.cpp b/src/plugins/ipfilter/convertdialog.cpp index 2334297..e2686fd 100644 --- a/plugins/ipfilter/convertdialog.cpp +++ b/src/plugins/ipfilter/convertdialog.cpp @@ -21,7 +21,7 @@ #include <tdeapplication.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kurl.h> #include <tdemessagebox.h> @@ -122,7 +122,7 @@ namespace kt if(canceled) return; - TDEApplication::kApplication() ->processEvents(); + tdeApp ->processEvents(); TQString line = stream.readLine(); i += line.length() * sizeof( char ); //rough estimation of string size kProgress1->setProgress( i * 100 / source_size ); @@ -184,7 +184,7 @@ namespace kt if ( i % 10000 == 0 ) Out(SYS_IPF|LOG_DEBUG) << "Block " << i << " written." << endl; } - TDEApplication::kApplication()->processEvents(); + tdeApp->processEvents(); if(canceled) return; @@ -206,7 +206,7 @@ namespace kt converting = false; } - TDEApplication::kApplication()->processEvents(); + tdeApp->processEvents(); //reload level1 filter if ( m_plugin ) m_plugin->loadAntiP2P(); diff --git a/plugins/ipfilter/convertdialog.h b/src/plugins/ipfilter/convertdialog.h index 408ff39..cf292a3 100644 --- a/plugins/ipfilter/convertdialog.h +++ b/src/plugins/ipfilter/convertdialog.h @@ -29,7 +29,7 @@ namespace kt { class ConvertDialog: public ConvertingDlg { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/ipfilter/ipblockingpref.ui b/src/plugins/ipfilter/ipblockingpref.ui index d221270..3435167 100644 --- a/plugins/ipfilter/ipblockingpref.ui +++ b/src/plugins/ipfilter/ipblockingpref.ui @@ -188,11 +188,11 @@ NOTE: ZIP file from bluetack.co.uk is supported.</string> <slot>setEnabled(bool)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>btnDownload_clicked()</slot> <slot>checkUseLevel1_toggled(bool)</slot> <slot>checkUseKTfilter_toggled(bool)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/plugins/ipfilter/ipblockingprefpage.cpp b/src/plugins/ipfilter/ipblockingprefpage.cpp index ae44ab2..a797f93 100644 --- a/plugins/ipfilter/ipblockingprefpage.cpp +++ b/src/plugins/ipfilter/ipblockingprefpage.cpp @@ -26,7 +26,7 @@ #include <tdeapplication.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kiconloader.h> #include <kurlrequester.h> diff --git a/plugins/ipfilter/ipblockingprefpage.h b/src/plugins/ipfilter/ipblockingprefpage.h index 1e6d19e..1e6d19e 100644 --- a/plugins/ipfilter/ipblockingprefpage.h +++ b/src/plugins/ipfilter/ipblockingprefpage.h diff --git a/plugins/ipfilter/ipfilterplugin.cpp b/src/plugins/ipfilter/ipfilterplugin.cpp index 96f71bf..b607b47 100644 --- a/plugins/ipfilter/ipfilterplugin.cpp +++ b/src/plugins/ipfilter/ipfilterplugin.cpp @@ -127,3 +127,5 @@ namespace kt return version == KT_VERSION_MACRO; } } + +#include "ipfilterplugin.moc" diff --git a/plugins/ipfilter/ipfilterplugin.h b/src/plugins/ipfilter/ipfilterplugin.h index 251bdcd..44098a1 100644 --- a/plugins/ipfilter/ipfilterplugin.h +++ b/src/plugins/ipfilter/ipfilterplugin.h @@ -39,9 +39,9 @@ namespace kt * * This plugin will load IP ranges from specific files into KT IPBlocklist. */ - class IPFilterPlugin : public Plugin, public kt::IPBlockingInterface + class LIBKTORRENT_EXPORT IPFilterPlugin : public Plugin, public kt::IPBlockingInterface { - Q_OBJECT + TQ_OBJECT public: IPFilterPlugin(TQObject* parent, const char* name, const TQStringList& args); diff --git a/plugins/ipfilter/ipfilterpluginsettings.kcfgc b/src/plugins/ipfilter/ipfilterpluginsettings.kcfgc index 29f74c4..29f74c4 100644 --- a/plugins/ipfilter/ipfilterpluginsettings.kcfgc +++ b/src/plugins/ipfilter/ipfilterpluginsettings.kcfgc diff --git a/src/plugins/ipfilter/ktipfilterplugin.desktop b/src/plugins/ipfilter/ktipfilterplugin.desktop new file mode 100644 index 0000000..5f34e2b --- /dev/null +++ b/src/plugins/ipfilter/ktipfilterplugin.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=IPFilterPlugin + +Comment=IP filter plugin for KTorrent + +Type=Service +X-TDE-Library=ktipfilterplugin +X-TDE-ServiceTypes=KTorrent/Plugin diff --git a/plugins/ipfilter/ktipfilterplugin.kcfg b/src/plugins/ipfilter/ktipfilterplugin.kcfg index 18ab419..6130189 100644 --- a/plugins/ipfilter/ktipfilterplugin.kcfg +++ b/src/plugins/ipfilter/ktipfilterplugin.kcfg @@ -12,7 +12,7 @@ </entry> <entry name="useLevel1" type="Bool"> <label>Use level1 filter?</label> - <default>FALSE</default> + <default>false</default> </entry> </group> </kcfg> diff --git a/src/plugins/logviewer/CMakeLists.txt b/src/plugins/logviewer/CMakeLists.txt new file mode 100644 index 0000000..93d2eb4 --- /dev/null +++ b/src/plugins/logviewer/CMakeLists.txt @@ -0,0 +1,30 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/src/libktorrent + ${CMAKE_CURRENT_BINARY_DIR} +) + + +##### ktlogviewerplugin (kpart) + +tde_add_kpart( ktlogviewerplugin AUTOMOC + SOURCES + logviewerplugin.cpp logviewer.cpp logprefpage.cpp logprefwidgetbase.ui + logprefwidget.cpp logviewerpluginsettings.kcfgc logflags.cpp + LINK + ktorrent-shared tdecore-shared tdeui-shared tdeio-shared tdeparts-shared tdehtml-shared + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other files + +install( + FILES ktlogviewerplugin.kcfg + DESTINATION ${KCFG_INSTALL_DIR} +) + +tde_create_translated_desktop( + SOURCE ktlogviewerplugin.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) diff --git a/src/plugins/logviewer/ktlogviewerplugin.desktop b/src/plugins/logviewer/ktlogviewerplugin.desktop new file mode 100644 index 0000000..8b09332 --- /dev/null +++ b/src/plugins/logviewer/ktlogviewerplugin.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=LogViewerPlugin + +Type=Service +X-TDE-Library=ktlogviewerplugin +X-TDE-ServiceTypes=KTorrent/Plugin diff --git a/plugins/logviewer/ktlogviewerplugin.kcfg b/src/plugins/logviewer/ktlogviewerplugin.kcfg index c6e4a25..c6e4a25 100644 --- a/plugins/logviewer/ktlogviewerplugin.kcfg +++ b/src/plugins/logviewer/ktlogviewerplugin.kcfg diff --git a/plugins/logviewer/logflags.cpp b/src/plugins/logviewer/logflags.cpp index c6ab95b..c6ab95b 100644 --- a/plugins/logviewer/logflags.cpp +++ b/src/plugins/logviewer/logflags.cpp diff --git a/plugins/logviewer/logflags.h b/src/plugins/logviewer/logflags.h index 618a020..618a020 100644 --- a/plugins/logviewer/logflags.h +++ b/src/plugins/logviewer/logflags.h diff --git a/plugins/logviewer/logprefpage.cpp b/src/plugins/logviewer/logprefpage.cpp index 34a2c3f..34a2c3f 100644 --- a/plugins/logviewer/logprefpage.cpp +++ b/src/plugins/logviewer/logprefpage.cpp diff --git a/plugins/logviewer/logprefpage.h b/src/plugins/logviewer/logprefpage.h index 1176d92..1176d92 100644 --- a/plugins/logviewer/logprefpage.h +++ b/src/plugins/logviewer/logprefpage.h diff --git a/plugins/logviewer/logprefwidget.cpp b/src/plugins/logviewer/logprefwidget.cpp index 66a6cdb..66a6cdb 100644 --- a/plugins/logviewer/logprefwidget.cpp +++ b/src/plugins/logviewer/logprefwidget.cpp diff --git a/plugins/logviewer/logprefwidget.h b/src/plugins/logviewer/logprefwidget.h index edb93f6..4b23949 100644 --- a/plugins/logviewer/logprefwidget.h +++ b/src/plugins/logviewer/logprefwidget.h @@ -26,7 +26,7 @@ namespace kt { class LogPrefWidget: public LogPrefWidgetBase { - Q_OBJECT + TQ_OBJECT public: LogPrefWidget(TQWidget *parent = 0, const char *name = 0); diff --git a/plugins/logviewer/logprefwidgetbase.ui b/src/plugins/logviewer/logprefwidgetbase.ui index 1fcf3bb..1fcf3bb 100644 --- a/plugins/logviewer/logprefwidgetbase.ui +++ b/src/plugins/logviewer/logprefwidgetbase.ui diff --git a/plugins/logviewer/logviewer.cpp b/src/plugins/logviewer/logviewer.cpp index 8b1be8a..8b1be8a 100644 --- a/plugins/logviewer/logviewer.cpp +++ b/src/plugins/logviewer/logviewer.cpp diff --git a/plugins/logviewer/logviewer.h b/src/plugins/logviewer/logviewer.h index 5fc7933..e8a1476 100644 --- a/plugins/logviewer/logviewer.h +++ b/src/plugins/logviewer/logviewer.h @@ -31,7 +31,7 @@ namespace kt */ class LogViewer : public KTextBrowser, public LogMonitorInterface { - Q_OBJECT + TQ_OBJECT public: LogViewer(TQWidget *parent = 0, const char *name = 0); diff --git a/plugins/logviewer/logviewerplugin.cpp b/src/plugins/logviewer/logviewerplugin.cpp index 55ccb9f..55ccb9f 100644 --- a/plugins/logviewer/logviewerplugin.cpp +++ b/src/plugins/logviewer/logviewerplugin.cpp diff --git a/plugins/logviewer/logviewerplugin.h b/src/plugins/logviewer/logviewerplugin.h index ba990d6..7742880 100644 --- a/plugins/logviewer/logviewerplugin.h +++ b/src/plugins/logviewer/logviewerplugin.h @@ -34,7 +34,7 @@ namespace kt */ class LogViewerPlugin : public Plugin { - Q_OBJECT + TQ_OBJECT public: LogViewerPlugin(TQObject* parent, const char* qt_name, const TQStringList& args); diff --git a/plugins/logviewer/logviewerpluginsettings.kcfgc b/src/plugins/logviewer/logviewerpluginsettings.kcfgc index dfd7768..dfd7768 100644 --- a/plugins/logviewer/logviewerpluginsettings.kcfgc +++ b/src/plugins/logviewer/logviewerpluginsettings.kcfgc diff --git a/src/plugins/partfileimport/CMakeLists.txt b/src/plugins/partfileimport/CMakeLists.txt new file mode 100644 index 0000000..53e1691 --- /dev/null +++ b/src/plugins/partfileimport/CMakeLists.txt @@ -0,0 +1,29 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/src/libktorrent + ${CMAKE_CURRENT_BINARY_DIR} +) + + +##### ktpartfileimportplugin (kpart) + +tde_add_kpart( ktpartfileimportplugin AUTOMOC + SOURCES + partfileimportplugin.cpp importdlgbase.ui importdialog.cpp + LINK + ktorrent-shared tdecore-shared tdeui-shared tdeio-shared tdeparts-shared tdehtml-shared + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other files + +install( + FILES ktpartfileimportpluginui.rc + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME} +) + +tde_create_translated_desktop( + SOURCE ktpartfileimportplugin.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) diff --git a/plugins/partfileimport/importdialog.cpp b/src/plugins/partfileimport/importdialog.cpp index 6f517be..a3cb863 100644 --- a/plugins/partfileimport/importdialog.cpp +++ b/src/plugins/partfileimport/importdialog.cpp @@ -52,8 +52,8 @@ namespace kt r = m_data_url; r->setMode(KFile::File|KFile::Directory|KFile::LocalOnly); - connect(m_import_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onImport())); - connect(m_cancel_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject())); + connect(m_import_btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(onImport())); + connect(m_cancel_btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(reject())); m_progress->setEnabled(false); } @@ -226,7 +226,7 @@ namespace kt { // download the torrent file TDEIO::StoredTransferJob* j = TDEIO::storedGet(tor_url); - connect(j,TQT_SIGNAL(result(TDEIO::Job* )),this,TQT_SLOT(onTorrentGetReult(TDEIO::Job*))); + connect(j,TQ_SIGNAL(result(TDEIO::Job* )),this,TQ_SLOT(onTorrentGetReult(TDEIO::Job*))); } else { @@ -383,7 +383,5 @@ namespace kt } } - - #include "importdialog.moc" diff --git a/plugins/partfileimport/importdialog.h b/src/plugins/partfileimport/importdialog.h index 1f1a82a..aab0438 100644 --- a/plugins/partfileimport/importdialog.h +++ b/src/plugins/partfileimport/importdialog.h @@ -45,11 +45,11 @@ namespace kt class ImportDialog : public ImportDlgBase,public bt::DataCheckerListener { - Q_OBJECT + TQ_OBJECT public: - ImportDialog(CoreInterface* core,TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + ImportDialog(CoreInterface* core,TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); virtual ~ImportDialog(); public slots: diff --git a/plugins/partfileimport/importdlgbase.ui b/src/plugins/partfileimport/importdlgbase.ui index c48abef..c48abef 100644 --- a/plugins/partfileimport/importdlgbase.ui +++ b/src/plugins/partfileimport/importdlgbase.ui diff --git a/src/plugins/partfileimport/ktpartfileimportplugin.desktop b/src/plugins/partfileimport/ktpartfileimportplugin.desktop new file mode 100644 index 0000000..cd4276c --- /dev/null +++ b/src/plugins/partfileimport/ktpartfileimportplugin.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=PartialFileImportPlugin + +Type=Service +X-TDE-Library=ktpartfileimportplugin +X-TDE-ServiceTypes=KTorrent/Plugin diff --git a/plugins/partfileimport/ktpartfileimportpluginui.rc b/src/plugins/partfileimport/ktpartfileimportpluginui.rc index f8867e3..f8867e3 100644 --- a/plugins/partfileimport/ktpartfileimportpluginui.rc +++ b/src/plugins/partfileimport/ktpartfileimportpluginui.rc diff --git a/plugins/partfileimport/partfileimportplugin.cpp b/src/plugins/partfileimport/partfileimportplugin.cpp index 148cf4f..ab05633 100644 --- a/plugins/partfileimport/partfileimportplugin.cpp +++ b/src/plugins/partfileimport/partfileimportplugin.cpp @@ -54,7 +54,7 @@ namespace kt void PartFileImportPlugin::load() { import_action = new TDEAction(i18n("Import existing download" ), 0, this, - TQT_SLOT(onImport()), actionCollection(), "partfileimport" ); + TQ_SLOT(onImport()), actionCollection(), "partfileimport" ); } void PartFileImportPlugin::unload() diff --git a/plugins/partfileimport/partfileimportplugin.h b/src/plugins/partfileimport/partfileimportplugin.h index 6753f07..7525bec 100644 --- a/plugins/partfileimport/partfileimportplugin.h +++ b/src/plugins/partfileimport/partfileimportplugin.h @@ -32,7 +32,7 @@ namespace kt */ class PartFileImportPlugin : public Plugin { - Q_OBJECT + TQ_OBJECT public: PartFileImportPlugin(TQObject* parent, const char* name, const TQStringList& args); diff --git a/src/plugins/rssfeed/CMakeLists.txt b/src/plugins/rssfeed/CMakeLists.txt new file mode 100644 index 0000000..4a5a0a7 --- /dev/null +++ b/src/plugins/rssfeed/CMakeLists.txt @@ -0,0 +1,39 @@ + +##### subfolders + +add_subdirectory( rss ) + + +##### current folder + +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/src/libktorrent + ${CMAKE_CURRENT_BINARY_DIR} +) + + +##### ktrssfeedplugin (kpart) + +tde_add_kpart( ktrssfeedplugin AUTOMOC + SOURCES + rssfeedplugin.cpp rssfeedmanager.cpp rssfeedwidget.ui rssfeed.cpp + rssfilter.cpp rssarticle.cpp rsslinkdownloader.cpp + LINK + rsslocal-static + ktorrent-shared tdecore-shared tdeui-shared tdeio-shared tdeparts-shared tdehtml-shared + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other files + +install( + FILES ktrssfeedplugin.kcfg + DESTINATION ${KCFG_INSTALL_DIR} +) + +tde_create_translated_desktop( + SOURCE ktrssfeedplugin.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) diff --git a/src/plugins/rssfeed/ktrssfeedplugin.desktop b/src/plugins/rssfeed/ktrssfeedplugin.desktop new file mode 100644 index 0000000..b8998b4 --- /dev/null +++ b/src/plugins/rssfeed/ktrssfeedplugin.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=RssFeedPlugin + +Type=Service +X-TDE-Library=ktrssfeedplugin +X-TDE-ServiceTypes=KTorrent/Plugin diff --git a/plugins/rssfeed/ktrssfeedplugin.kcfg b/src/plugins/rssfeed/ktrssfeedplugin.kcfg index 86499cb..86499cb 100644 --- a/plugins/rssfeed/ktrssfeedplugin.kcfg +++ b/src/plugins/rssfeed/ktrssfeedplugin.kcfg diff --git a/src/plugins/rssfeed/rss/CMakeLists.txt b/src/plugins/rssfeed/rss/CMakeLists.txt new file mode 100644 index 0000000..dd9af6e --- /dev/null +++ b/src/plugins/rssfeed/rss/CMakeLists.txt @@ -0,0 +1,24 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} +) + + +##### rsslocal library (static) + +tde_add_library( rsslocal STATIC_PIC AUTOMOC + SOURCES + article.cpp document.cpp image.cpp textinput.cpp tools_p.cpp loader.cpp +) + + +##### testlibrss (executable) + +tde_add_check_executable( testlibrss AUTOMOC + SOURCES testlibrss.cpp + LINK + rsslocal-static + ktorrent-shared tdecore-shared tdeui-shared tdeio-shared tdeparts-shared + # uncomment the following line for a real test during building + # TEST https://floss.social/@tde.rss +) diff --git a/plugins/rssfeed/rss/COPYING b/src/plugins/rssfeed/rss/COPYING index cca2a5c..cca2a5c 100644 --- a/plugins/rssfeed/rss/COPYING +++ b/src/plugins/rssfeed/rss/COPYING diff --git a/plugins/rssfeed/rss/README b/src/plugins/rssfeed/rss/README index 77d9450..77d9450 100644 --- a/plugins/rssfeed/rss/README +++ b/src/plugins/rssfeed/rss/README diff --git a/plugins/rssfeed/rss/article.cpp b/src/plugins/rssfeed/rss/article.cpp index 14c9f21..14c9f21 100644 --- a/plugins/rssfeed/rss/article.cpp +++ b/src/plugins/rssfeed/rss/article.cpp diff --git a/plugins/rssfeed/rss/article.h b/src/plugins/rssfeed/rss/article.h index 563492d..563492d 100644 --- a/plugins/rssfeed/rss/article.h +++ b/src/plugins/rssfeed/rss/article.h diff --git a/plugins/rssfeed/rss/document.cpp b/src/plugins/rssfeed/rss/document.cpp index 7dfcd0a..7dfcd0a 100644 --- a/plugins/rssfeed/rss/document.cpp +++ b/src/plugins/rssfeed/rss/document.cpp diff --git a/plugins/rssfeed/rss/document.h b/src/plugins/rssfeed/rss/document.h index 840bb1e..840bb1e 100644 --- a/plugins/rssfeed/rss/document.h +++ b/src/plugins/rssfeed/rss/document.h diff --git a/plugins/rssfeed/rss/global.h b/src/plugins/rssfeed/rss/global.h index d3a7514..d3a7514 100644 --- a/plugins/rssfeed/rss/global.h +++ b/src/plugins/rssfeed/rss/global.h diff --git a/plugins/rssfeed/rss/image.cpp b/src/plugins/rssfeed/rss/image.cpp index 174a105..65aaf53 100644 --- a/plugins/rssfeed/rss/image.cpp +++ b/src/plugins/rssfeed/rss/image.cpp @@ -112,9 +112,9 @@ void Image::getPixmap() d->pixmapBuffer->open(IO_WriteOnly); d->job = TDEIO::get(d->url, false, false); - connect(d->job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); - connect(d->job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotResult(TDEIO::Job *))); + connect(d->job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + connect(d->job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotResult(TDEIO::Job *))); } void Image::slotData(TDEIO::Job *, const TQByteArray &data) diff --git a/plugins/rssfeed/rss/image.h b/src/plugins/rssfeed/rss/image.h index adbb800..19a8103 100644 --- a/plugins/rssfeed/rss/image.h +++ b/src/plugins/rssfeed/rss/image.h @@ -33,7 +33,7 @@ namespace RSS */ class Image : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/plugins/rssfeed/rss/librss.doxyfile b/src/plugins/rssfeed/rss/librss.doxyfile index c81ac16..c81ac16 100644 --- a/plugins/rssfeed/rss/librss.doxyfile +++ b/src/plugins/rssfeed/rss/librss.doxyfile diff --git a/plugins/rssfeed/rss/librss.h b/src/plugins/rssfeed/rss/librss.h index 3eb4f36..3eb4f36 100644 --- a/plugins/rssfeed/rss/librss.h +++ b/src/plugins/rssfeed/rss/librss.h diff --git a/plugins/rssfeed/rss/loader.cpp b/src/plugins/rssfeed/rss/loader.cpp index 09450a2..06f95d6 100644 --- a/plugins/rssfeed/rss/loader.cpp +++ b/src/plugins/rssfeed/rss/loader.cpp @@ -12,7 +12,7 @@ #include "document.h" #include <tdeio/job.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kurl.h> #include <kdebug.h> @@ -83,13 +83,13 @@ void FileRetriever::retrieveData(const KURL &url) d->job = TDEIO::get(u, !m_useCache, false); - TQTimer::singleShot(1000*90, this, TQT_SLOT(slotTimeout())); + TQTimer::singleShot(1000*90, this, TQ_SLOT(slotTimeout())); - connect(d->job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); - connect(d->job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *))); - connect(d->job, TQT_SIGNAL(permanentRedirection(TDEIO::Job *, const KURL &, const KURL &)), - TQT_SLOT(slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &))); + connect(d->job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + connect(d->job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(slotResult(TDEIO::Job *))); + connect(d->job, TQ_SIGNAL(permanentRedirection(TDEIO::Job *, const KURL &, const KURL &)), + TQ_SLOT(slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &))); } void FileRetriever::slotTimeout() @@ -179,10 +179,10 @@ void OutputRetriever::retrieveData(const KURL &url) d->buffer->open(IO_WriteOnly); d->process = new KShellProcess(); - connect(d->process, TQT_SIGNAL(processExited(TDEProcess *)), - TQT_SLOT(slotExited(TDEProcess *))); - connect(d->process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - TQT_SLOT(slotOutput(TDEProcess *, char *, int))); + connect(d->process, TQ_SIGNAL(processExited(TDEProcess *)), + TQ_SLOT(slotExited(TDEProcess *))); + connect(d->process, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + TQ_SLOT(slotOutput(TDEProcess *, char *, int))); *d->process << url.path(); d->process->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); } @@ -240,7 +240,7 @@ Loader *Loader::create() Loader *Loader::create(TQObject *object, const char *slot) { Loader *loader = create(); - connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)), + connect(loader, TQ_SIGNAL(loadingComplete(Loader *, Document, Status)), object, slot); return loader; } @@ -262,8 +262,8 @@ void Loader::loadFrom(const KURL &url, DataRetriever *retriever) d->url=url; d->retriever = retriever; - connect(d->retriever, TQT_SIGNAL(dataRetrieved(const TQByteArray &, bool)), - this, TQT_SLOT(slotRetrieverDone(const TQByteArray &, bool))); + connect(d->retriever, TQ_SIGNAL(dataRetrieved(const TQByteArray &, bool)), + this, TQ_SLOT(slotRetrieverDone(const TQByteArray &, bool))); d->retriever->retrieveData(url); } diff --git a/plugins/rssfeed/rss/loader.h b/src/plugins/rssfeed/rss/loader.h index 3a48e49..7d2dbc0 100644 --- a/plugins/rssfeed/rss/loader.h +++ b/src/plugins/rssfeed/rss/loader.h @@ -34,7 +34,7 @@ namespace RSS */ class DataRetriever : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** @@ -89,7 +89,7 @@ namespace RSS */ class FileRetriever : public DataRetriever { - Q_OBJECT + TQ_OBJECT public: /** @@ -159,7 +159,7 @@ namespace RSS */ class OutputRetriever : public DataRetriever { - Q_OBJECT + TQ_OBJECT public: /** @@ -209,8 +209,8 @@ namespace RSS * * \code * Loader *loader = Loader::create(); - * connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)), - * this, TQT_SLOT(slotLoadingComplete(Loader *, Document, Status))); + * connect(loader, TQ_SIGNAL(loadingComplete(Loader *, Document, Status)), + * this, TQ_SLOT(slotLoadingComplete(Loader *, Document, Status))); * loader->loadFrom("http://www.blah.org/foobar.rdf", new FileRetriever); * \endcode * @@ -254,7 +254,7 @@ namespace RSS */ class Loader : public TQObject { - Q_OBJECT + TQ_OBJECT friend class someClassWhichDoesNotExist; public: diff --git a/plugins/rssfeed/rss/rss-faq.html b/src/plugins/rssfeed/rss/rss-faq.html index 480b19f..480b19f 100644 --- a/plugins/rssfeed/rss/rss-faq.html +++ b/src/plugins/rssfeed/rss/rss-faq.html diff --git a/plugins/rssfeed/rss/testlibrss.cpp b/src/plugins/rssfeed/rss/testlibrss.cpp index bef989c..a6e970e 100644 --- a/plugins/rssfeed/rss/testlibrss.cpp +++ b/src/plugins/rssfeed/rss/testlibrss.cpp @@ -19,8 +19,8 @@ static const TDECmdLineOptions options[] = void Tester::test( const TQString &url ) { Loader *loader = Loader::create(); - connect( loader, TQT_SIGNAL( loadingComplete( Loader *, Document, Status ) ), - this, TQT_SLOT( slotLoadingComplete( Loader *, Document, Status ) ) ); + connect( loader, TQ_SIGNAL( loadingComplete( Loader *, Document, Status ) ), + this, TQ_SLOT( slotLoadingComplete( Loader *, Document, Status ) ) ); loader->loadFrom( url, new FileRetriever ); } @@ -53,7 +53,7 @@ void Tester::slotLoadingComplete( Loader *loader, Document doc, Status status ) if ( status != Success ) kdDebug() << "ERROR " << loader->errorCode() << endl; - kapp->quit(); + tdeApp->quit(); } int main( int argc, char **argv ) diff --git a/plugins/rssfeed/rss/testlibrss.h b/src/plugins/rssfeed/rss/testlibrss.h index 222943a..2a918a5 100644 --- a/plugins/rssfeed/rss/testlibrss.h +++ b/src/plugins/rssfeed/rss/testlibrss.h @@ -14,7 +14,7 @@ using RSS::Status; class Tester : public TQObject { - Q_OBJECT + TQ_OBJECT public: void test( const TQString &url ); diff --git a/plugins/rssfeed/rss/textinput.cpp b/src/plugins/rssfeed/rss/textinput.cpp index a32c9f5..a32c9f5 100644 --- a/plugins/rssfeed/rss/textinput.cpp +++ b/src/plugins/rssfeed/rss/textinput.cpp diff --git a/plugins/rssfeed/rss/textinput.h b/src/plugins/rssfeed/rss/textinput.h index dd46d17..dd46d17 100644 --- a/plugins/rssfeed/rss/textinput.h +++ b/src/plugins/rssfeed/rss/textinput.h diff --git a/plugins/rssfeed/rss/tools_p.cpp b/src/plugins/rssfeed/rss/tools_p.cpp index e608f04..e608f04 100644 --- a/plugins/rssfeed/rss/tools_p.cpp +++ b/src/plugins/rssfeed/rss/tools_p.cpp diff --git a/plugins/rssfeed/rss/tools_p.h b/src/plugins/rssfeed/rss/tools_p.h index c242766..c242766 100644 --- a/plugins/rssfeed/rss/tools_p.h +++ b/src/plugins/rssfeed/rss/tools_p.h diff --git a/plugins/rssfeed/rssarticle.cpp b/src/plugins/rssfeed/rssarticle.cpp index a73b3c9..a73b3c9 100644 --- a/plugins/rssfeed/rssarticle.cpp +++ b/src/plugins/rssfeed/rssarticle.cpp diff --git a/plugins/rssfeed/rssarticle.h b/src/plugins/rssfeed/rssarticle.h index e727456..e727456 100644 --- a/plugins/rssfeed/rssarticle.h +++ b/src/plugins/rssfeed/rssarticle.h diff --git a/plugins/rssfeed/rssfeed.cpp b/src/plugins/rssfeed/rssfeed.cpp index 5b45a4c..2e2e908 100644 --- a/plugins/rssfeed/rssfeed.cpp +++ b/src/plugins/rssfeed/rssfeed.cpp @@ -20,7 +20,7 @@ #include "rssfeed.h" #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <krfcdate.h> #include <tdeio/netaccess.h> #include <tqfile.h> @@ -48,8 +48,8 @@ namespace kt feedLoading = false; loadArticles(); - connect(&refreshTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT( refreshFeed() ) ); - connect(this, TQT_SIGNAL(articlesChanged(const RssArticle::List&)), this, TQT_SLOT( saveArticles() ) ); + connect(&refreshTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT( refreshFeed() ) ); + connect(this, TQ_SIGNAL(articlesChanged(const RssArticle::List&)), this, TQ_SLOT( saveArticles() ) ); startFeed(); } @@ -261,8 +261,8 @@ namespace kt feedLoading = true; cleanArticles(); Loader * feedLoader = Loader::create(); - connect( feedLoader, TQT_SIGNAL( loadingComplete( Loader *, Document, Status ) ), - this, TQT_SLOT( feedLoaded( Loader *, Document, Status ) ) ); + connect( feedLoader, TQ_SIGNAL( loadingComplete( Loader *, Document, Status ) ), + this, TQ_SLOT( feedLoaded( Loader *, Document, Status ) ) ); feedLoader->loadFrom( m_feedUrl, new FileRetriever ); } @@ -313,8 +313,8 @@ namespace kt tqDebug( "There was and error loading the feed\n"); } - disconnect( feedLoader, TQT_SIGNAL( loadingComplete( Loader *, Document, Status ) ), - this, TQT_SLOT( feedLoaded( Loader *, Document, Status ) ) ); + disconnect( feedLoader, TQ_SIGNAL( loadingComplete( Loader *, Document, Status ) ), + this, TQ_SLOT( feedLoaded( Loader *, Document, Status ) ) ); feedLoader->deleteLater(); } @@ -364,3 +364,5 @@ namespace kt { } } + +#include "rssfeed.moc" diff --git a/plugins/rssfeed/rssfeed.h b/src/plugins/rssfeed/rssfeed.h index 46bd837..214177b 100644 --- a/plugins/rssfeed/rssfeed.h +++ b/src/plugins/rssfeed/rssfeed.h @@ -47,7 +47,7 @@ namespace kt class RssFeed : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/rssfeed/rssfeedmanager.cpp b/src/plugins/rssfeed/rssfeedmanager.cpp index 8addd09..5a4b719 100644 --- a/plugins/rssfeed/rssfeedmanager.cpp +++ b/src/plugins/rssfeed/rssfeedmanager.cpp @@ -23,7 +23,7 @@ #include <tdefileitem.h> #include <tdelocale.h> #include <tdeio/netaccess.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <keditlistbox.h> // #include <kmimetype.h> #include <tdemessagebox.h> @@ -94,37 +94,37 @@ namespace kt loadFilterList(); //connect the buttons - connect(newFeed, TQT_SIGNAL(clicked()), this, TQT_SLOT(addNewFeed() ) ); - connect(deleteFeed, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSelectedFeed() ) ); + connect(newFeed, TQ_SIGNAL(clicked()), this, TQ_SLOT(addNewFeed() ) ); + connect(deleteFeed, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteSelectedFeed() ) ); - connect(newAcceptFilter, TQT_SIGNAL(clicked()), this, TQT_SLOT(addNewAcceptFilter() ) ); - connect(deleteAcceptFilter, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSelectedAcceptFilter() ) ); + connect(newAcceptFilter, TQ_SIGNAL(clicked()), this, TQ_SLOT(addNewAcceptFilter() ) ); + connect(deleteAcceptFilter, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteSelectedAcceptFilter() ) ); - connect(newRejectFilter, TQT_SIGNAL(clicked()), this, TQT_SLOT(addNewRejectFilter() ) ); - connect(deleteRejectFilter, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSelectedRejectFilter() ) ); + connect(newRejectFilter, TQ_SIGNAL(clicked()), this, TQ_SLOT(addNewRejectFilter() ) ); + connect(deleteRejectFilter, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteSelectedRejectFilter() ) ); //connect the changing of the active feed - connect(feedlist, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(changedActiveFeed()) ); + connect(feedlist, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(changedActiveFeed()) ); //connect the changing of the url to enable the refresh button - connect(feedUrl, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changedFeedUrl()) ); + connect(feedUrl, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changedFeedUrl()) ); //connect the changing of the filters - connect(acceptFilterList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(changedActiveAcceptFilter()) ); - connect(rejectFilterList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(changedActiveRejectFilter()) ); + connect(acceptFilterList, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(changedActiveAcceptFilter()) ); + connect(rejectFilterList, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(changedActiveRejectFilter()) ); //connect the selection and downloading of articles - connect(feedArticles, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(changedArticleSelection()) ); - connect(downloadArticle, TQT_SIGNAL(clicked()), this, TQT_SLOT(downloadSelectedArticles()) ); + connect(feedArticles, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(changedArticleSelection()) ); + connect(downloadArticle, TQ_SIGNAL(clicked()), this, TQ_SLOT(downloadSelectedArticles()) ); //connect the selection, downloading and deletion of matches - connect(filterMatches, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(changedMatchSelection()) ); - connect(downloadFilterMatch, TQT_SIGNAL(clicked()), this, TQT_SLOT(downloadSelectedMatches()) ); - connect(deleteFilterMatch, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSelectedMatches()) ); + connect(filterMatches, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(changedMatchSelection()) ); + connect(downloadFilterMatch, TQ_SIGNAL(clicked()), this, TQ_SLOT(downloadSelectedMatches()) ); + connect(deleteFilterMatch, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteSelectedMatches()) ); //connect the test text update to the slot - connect(testText, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(testTextChanged()) ); - connect(testTestText, TQT_SIGNAL(clicked()), this, TQT_SLOT(testFilter()) ); + connect(testText, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(testTextChanged()) ); + connect(testTestText, TQ_SIGNAL(clicked()), this, TQ_SLOT(testFilter()) ); changedActiveFeed(); changedActiveAcceptFilter(); @@ -159,65 +159,65 @@ namespace kt void RssFeedManager::connectFeed(int index) { - connect(feedTitle, TQT_SIGNAL(textChanged(const TQString &)), feeds.at(index), TQT_SLOT(setTitle(const TQString &) ) ); - connect(feeds.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(setFeedTitle(const TQString &) ) ); + connect(feedTitle, TQ_SIGNAL(textChanged(const TQString &)), feeds.at(index), TQ_SLOT(setTitle(const TQString &) ) ); + connect(feeds.at(index), TQ_SIGNAL(titleChanged(const TQString &)), this, TQ_SLOT(setFeedTitle(const TQString &) ) ); //url - connect(feedUrl, TQT_SIGNAL(textChanged(const TQString &)), feeds.at(index), TQT_SLOT(setFeedUrl(const TQString&) ) ); - connect(feeds.at(index), TQT_SIGNAL(feedUrlChanged(const KURL&)), feedUrl, TQT_SLOT(setKURL(const KURL&) ) ); + connect(feedUrl, TQ_SIGNAL(textChanged(const TQString &)), feeds.at(index), TQ_SLOT(setFeedUrl(const TQString&) ) ); + connect(feeds.at(index), TQ_SIGNAL(feedUrlChanged(const KURL&)), feedUrl, TQ_SLOT(setKURL(const KURL&) ) ); //articleAge - connect(feedArticleAge, TQT_SIGNAL(valueChanged(int)), feeds.at(index), TQT_SLOT(setArticleAge(int) ) ); - connect(feeds.at(index), TQT_SIGNAL(articleAgeChanged(int)), feedArticleAge, TQT_SLOT(setValue(int) ) ); + connect(feedArticleAge, TQ_SIGNAL(valueChanged(int)), feeds.at(index), TQ_SLOT(setArticleAge(int) ) ); + connect(feeds.at(index), TQ_SIGNAL(articleAgeChanged(int)), feedArticleAge, TQ_SLOT(setValue(int) ) ); //active - connect(feedActive, TQT_SIGNAL(toggled(bool)), feeds.at(index), TQT_SLOT(setActive(bool) ) ); - connect(feeds.at(index), TQT_SIGNAL(activeChanged(bool)), feedActive, TQT_SLOT(setChecked(bool) ) ); + connect(feedActive, TQ_SIGNAL(toggled(bool)), feeds.at(index), TQ_SLOT(setActive(bool) ) ); + connect(feeds.at(index), TQ_SIGNAL(activeChanged(bool)), feedActive, TQ_SLOT(setChecked(bool) ) ); //autoRefresh - connect(feedAutoRefresh, TQT_SIGNAL(valueChanged(const TQTime&)), feeds.at(index), TQT_SLOT(setAutoRefresh(const TQTime&) ) ); - connect(feeds.at(index), TQT_SIGNAL(autoRefreshChanged(const TQTime&)), feedAutoRefresh, TQT_SLOT(setTime(const TQTime&) ) ); + connect(feedAutoRefresh, TQ_SIGNAL(valueChanged(const TQTime&)), feeds.at(index), TQ_SLOT(setAutoRefresh(const TQTime&) ) ); + connect(feeds.at(index), TQ_SIGNAL(autoRefreshChanged(const TQTime&)), feedAutoRefresh, TQ_SLOT(setTime(const TQTime&) ) ); //ignoreTTL - connect(feedIgnoreTTL, TQT_SIGNAL(toggled(bool)), feeds.at(index), TQT_SLOT(setIgnoreTTL(bool) ) ); - connect(feeds.at(index), TQT_SIGNAL(ignoreTTLChanged(bool)), feedIgnoreTTL, TQT_SLOT(setChecked(bool) ) ); + connect(feedIgnoreTTL, TQ_SIGNAL(toggled(bool)), feeds.at(index), TQ_SLOT(setIgnoreTTL(bool) ) ); + connect(feeds.at(index), TQ_SIGNAL(ignoreTTLChanged(bool)), feedIgnoreTTL, TQ_SLOT(setChecked(bool) ) ); //articles - connect(feeds.at(index), TQT_SIGNAL(articlesChanged(const RssArticle::List&)), this, TQT_SLOT(updateArticles(const RssArticle::List&) ) ); + connect(feeds.at(index), TQ_SIGNAL(articlesChanged(const RssArticle::List&)), this, TQ_SLOT(updateArticles(const RssArticle::List&) ) ); //connect the refresh button - connect(refreshFeed, TQT_SIGNAL(clicked()), feeds.at(index), TQT_SLOT(refreshFeed()) ); + connect(refreshFeed, TQ_SIGNAL(clicked()), feeds.at(index), TQ_SLOT(refreshFeed()) ); } void RssFeedManager::disconnectFeed(int index) { - disconnect(feedTitle, TQT_SIGNAL(textChanged(const TQString &)), feeds.at(index), TQT_SLOT(setTitle(const TQString &) ) ); - disconnect(feeds.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(setFeedTitle(const TQString &) ) ); + disconnect(feedTitle, TQ_SIGNAL(textChanged(const TQString &)), feeds.at(index), TQ_SLOT(setTitle(const TQString &) ) ); + disconnect(feeds.at(index), TQ_SIGNAL(titleChanged(const TQString &)), this, TQ_SLOT(setFeedTitle(const TQString &) ) ); //url - disconnect(feedUrl, TQT_SIGNAL(textChanged(const TQString &)), feeds.at(index), TQT_SLOT(setFeedUrl(const TQString&) ) ); - disconnect(feeds.at(index), TQT_SIGNAL(feedUrlChanged(const KURL&)), feedUrl, TQT_SLOT(setKURL(const KURL&) ) ); + disconnect(feedUrl, TQ_SIGNAL(textChanged(const TQString &)), feeds.at(index), TQ_SLOT(setFeedUrl(const TQString&) ) ); + disconnect(feeds.at(index), TQ_SIGNAL(feedUrlChanged(const KURL&)), feedUrl, TQ_SLOT(setKURL(const KURL&) ) ); //articleAge - disconnect(feedArticleAge, TQT_SIGNAL(valueChanged(int)), feeds.at(index), TQT_SLOT(setArticleAge(int) ) ); - disconnect(feeds.at(index), TQT_SIGNAL(articleAgeChanged(int)), feedArticleAge, TQT_SLOT(setValue(int) ) ); + disconnect(feedArticleAge, TQ_SIGNAL(valueChanged(int)), feeds.at(index), TQ_SLOT(setArticleAge(int) ) ); + disconnect(feeds.at(index), TQ_SIGNAL(articleAgeChanged(int)), feedArticleAge, TQ_SLOT(setValue(int) ) ); //active - disconnect(feedActive, TQT_SIGNAL(toggled(bool)), feeds.at(index), TQT_SLOT(setActive(bool) ) ); - disconnect(feeds.at(index), TQT_SIGNAL(activeChanged(bool)), feedActive, TQT_SLOT(setChecked(bool) ) ); + disconnect(feedActive, TQ_SIGNAL(toggled(bool)), feeds.at(index), TQ_SLOT(setActive(bool) ) ); + disconnect(feeds.at(index), TQ_SIGNAL(activeChanged(bool)), feedActive, TQ_SLOT(setChecked(bool) ) ); //autoRefresh - disconnect(feedAutoRefresh, TQT_SIGNAL(valueChanged(const TQTime&)), feeds.at(index), TQT_SLOT(setAutoRefresh(const TQTime&) ) ); - disconnect(feeds.at(index), TQT_SIGNAL(autoRefreshChanged(const TQTime&)), feedAutoRefresh, TQT_SLOT(setTime(const TQTime&) ) ); + disconnect(feedAutoRefresh, TQ_SIGNAL(valueChanged(const TQTime&)), feeds.at(index), TQ_SLOT(setAutoRefresh(const TQTime&) ) ); + disconnect(feeds.at(index), TQ_SIGNAL(autoRefreshChanged(const TQTime&)), feedAutoRefresh, TQ_SLOT(setTime(const TQTime&) ) ); //ignoreTTL - disconnect(feedIgnoreTTL, TQT_SIGNAL(toggled(bool)), feeds.at(index), TQT_SLOT(setIgnoreTTL(bool) ) ); - disconnect(feeds.at(index), TQT_SIGNAL(ignoreTTLChanged(bool)), feedIgnoreTTL, TQT_SLOT(setChecked(bool) ) ); + disconnect(feedIgnoreTTL, TQ_SIGNAL(toggled(bool)), feeds.at(index), TQ_SLOT(setIgnoreTTL(bool) ) ); + disconnect(feeds.at(index), TQ_SIGNAL(ignoreTTLChanged(bool)), feedIgnoreTTL, TQ_SLOT(setChecked(bool) ) ); //articles - disconnect(feeds.at(index), TQT_SIGNAL(articlesChanged(const RssArticle::List&)), this, TQT_SLOT(updateArticles(const RssArticle::List&) ) ); + disconnect(feeds.at(index), TQ_SIGNAL(articlesChanged(const RssArticle::List&)), this, TQ_SLOT(updateArticles(const RssArticle::List&) ) ); - disconnect(refreshFeed, TQT_SIGNAL(clicked()), feeds.at(index), TQT_SLOT(refreshFeed()) ); + disconnect(refreshFeed, TQ_SIGNAL(clicked()), feeds.at(index), TQ_SLOT(refreshFeed()) ); } void RssFeedManager::connectFilter(int index, bool acceptFilter) @@ -225,69 +225,69 @@ namespace kt if (acceptFilter) { //title - connect(filterTitle, TQT_SIGNAL(textChanged(const TQString &)), acceptFilters.at(index), TQT_SLOT(setTitle(const TQString &) ) ); - connect(acceptFilters.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(setFilterTitle(const TQString &) ) ); + connect(filterTitle, TQ_SIGNAL(textChanged(const TQString &)), acceptFilters.at(index), TQ_SLOT(setTitle(const TQString &) ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(titleChanged(const TQString &)), this, TQ_SLOT(setFilterTitle(const TQString &) ) ); //active - connect(filterActive, TQT_SIGNAL(toggled(bool)), acceptFilters.at(index), TQT_SLOT(setActive(bool) ) ); - connect(acceptFilters.at(index), TQT_SIGNAL(activeChanged(bool)), filterActive, TQT_SLOT(setChecked(bool) ) ); + connect(filterActive, TQ_SIGNAL(toggled(bool)), acceptFilters.at(index), TQ_SLOT(setActive(bool) ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(activeChanged(bool)), filterActive, TQ_SLOT(setChecked(bool) ) ); //regExps - connect(filterRegExps, TQT_SIGNAL(changed()), this, TQT_SLOT(updateRegExps()) ); + connect(filterRegExps, TQ_SIGNAL(changed()), this, TQ_SLOT(updateRegExps()) ); //series - connect(filterSeries, TQT_SIGNAL(toggled(bool)), acceptFilters.at(index), TQT_SLOT(setSeries(bool) ) ); - connect(acceptFilters.at(index), TQT_SIGNAL(seriesChanged(bool)), filterSeries, TQT_SLOT(setChecked(bool) ) ); + connect(filterSeries, TQ_SIGNAL(toggled(bool)), acceptFilters.at(index), TQ_SLOT(setSeries(bool) ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(seriesChanged(bool)), filterSeries, TQ_SLOT(setChecked(bool) ) ); //sansEpisode - connect(filterSansEpisode, TQT_SIGNAL(toggled(bool)), acceptFilters.at(index), TQT_SLOT(setSansEpisode(bool) ) ); - connect(acceptFilters.at(index), TQT_SIGNAL(sansEpisodeChanged(bool)), filterSansEpisode, TQT_SLOT(setChecked(bool) ) ); + connect(filterSansEpisode, TQ_SIGNAL(toggled(bool)), acceptFilters.at(index), TQ_SLOT(setSansEpisode(bool) ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(sansEpisodeChanged(bool)), filterSansEpisode, TQ_SLOT(setChecked(bool) ) ); //minSeason - connect(filterMinSeason, TQT_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQT_SLOT(setMinSeason(int) ) ); - connect(acceptFilters.at(index), TQT_SIGNAL(minSeasonChanged(int)), filterMinSeason, TQT_SLOT(setValue(int) ) ); + connect(filterMinSeason, TQ_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQ_SLOT(setMinSeason(int) ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(minSeasonChanged(int)), filterMinSeason, TQ_SLOT(setValue(int) ) ); //minEpisode - connect(filterMinEpisode, TQT_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQT_SLOT(setMinEpisode(int) ) ); - connect(acceptFilters.at(index), TQT_SIGNAL(minEpisodeChanged(int)), filterMinEpisode, TQT_SLOT(setValue(int) ) ); + connect(filterMinEpisode, TQ_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQ_SLOT(setMinEpisode(int) ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(minEpisodeChanged(int)), filterMinEpisode, TQ_SLOT(setValue(int) ) ); //maxSeason - connect(filterMaxSeason, TQT_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQT_SLOT(setMaxSeason(int) ) ); - connect(acceptFilters.at(index), TQT_SIGNAL(maxSeasonChanged(int)), filterMaxSeason, TQT_SLOT(setValue(int) ) ); + connect(filterMaxSeason, TQ_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQ_SLOT(setMaxSeason(int) ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(maxSeasonChanged(int)), filterMaxSeason, TQ_SLOT(setValue(int) ) ); //maxEpisode - connect(filterMaxEpisode, TQT_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQT_SLOT(setMaxEpisode(int) ) ); - connect(acceptFilters.at(index), TQT_SIGNAL(maxEpisodeChanged(int)), filterMaxEpisode, TQT_SLOT(setValue(int) ) ); + connect(filterMaxEpisode, TQ_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQ_SLOT(setMaxEpisode(int) ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(maxEpisodeChanged(int)), filterMaxEpisode, TQ_SLOT(setValue(int) ) ); //matches - connect(acceptFilters.at(index), TQT_SIGNAL(matchesChanged(const TQValueList<FilterMatch>&)), this, TQT_SLOT(updateMatches(const TQValueList<FilterMatch>&) ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(matchesChanged(const TQValueList<FilterMatch>&)), this, TQ_SLOT(updateMatches(const TQValueList<FilterMatch>&) ) ); - connect(processFilter, TQT_SIGNAL(clicked()), acceptFilters.at(index), TQT_SIGNAL(rescanFilter()) ); + connect(processFilter, TQ_SIGNAL(clicked()), acceptFilters.at(index), TQ_SIGNAL(rescanFilter()) ); } else { //title - connect(filterTitle, TQT_SIGNAL(textChanged(const TQString &)), rejectFilters.at(index), TQT_SLOT(setTitle(const TQString &) ) ); - connect(rejectFilters.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(setFilterTitle(const TQString &) ) ); + connect(filterTitle, TQ_SIGNAL(textChanged(const TQString &)), rejectFilters.at(index), TQ_SLOT(setTitle(const TQString &) ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(titleChanged(const TQString &)), this, TQ_SLOT(setFilterTitle(const TQString &) ) ); //active - connect(filterActive, TQT_SIGNAL(toggled(bool)), rejectFilters.at(index), TQT_SLOT(setActive(bool) ) ); - connect(rejectFilters.at(index), TQT_SIGNAL(activeChanged(bool)), filterActive, TQT_SLOT(setChecked(bool) ) ); + connect(filterActive, TQ_SIGNAL(toggled(bool)), rejectFilters.at(index), TQ_SLOT(setActive(bool) ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(activeChanged(bool)), filterActive, TQ_SLOT(setChecked(bool) ) ); //regExps - connect(filterRegExps, TQT_SIGNAL(changed()), this, TQT_SLOT(updateRegExps()) ); + connect(filterRegExps, TQ_SIGNAL(changed()), this, TQ_SLOT(updateRegExps()) ); //series - connect(filterSeries, TQT_SIGNAL(toggled(bool)), rejectFilters.at(index), TQT_SLOT(setSeries(bool) ) ); - connect(rejectFilters.at(index), TQT_SIGNAL(seriesChanged(bool)), filterSeries, TQT_SLOT(setChecked(bool) ) ); + connect(filterSeries, TQ_SIGNAL(toggled(bool)), rejectFilters.at(index), TQ_SLOT(setSeries(bool) ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(seriesChanged(bool)), filterSeries, TQ_SLOT(setChecked(bool) ) ); //sansEpisode - connect(filterSansEpisode, TQT_SIGNAL(toggled(bool)), rejectFilters.at(index), TQT_SLOT(setSansEpisode(bool) ) ); - connect(rejectFilters.at(index), TQT_SIGNAL(sansEpisodeChanged(bool)), filterSansEpisode, TQT_SLOT(setChecked(bool) ) ); + connect(filterSansEpisode, TQ_SIGNAL(toggled(bool)), rejectFilters.at(index), TQ_SLOT(setSansEpisode(bool) ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(sansEpisodeChanged(bool)), filterSansEpisode, TQ_SLOT(setChecked(bool) ) ); //minSeason - connect(filterMinSeason, TQT_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQT_SLOT(setMinSeason(int) ) ); - connect(rejectFilters.at(index), TQT_SIGNAL(minSeasonChanged(int)), filterMinSeason, TQT_SLOT(setValue(int) ) ); + connect(filterMinSeason, TQ_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQ_SLOT(setMinSeason(int) ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(minSeasonChanged(int)), filterMinSeason, TQ_SLOT(setValue(int) ) ); //minEpisode - connect(filterMinEpisode, TQT_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQT_SLOT(setMinEpisode(int) ) ); - connect(rejectFilters.at(index), TQT_SIGNAL(minEpisodeChanged(int)), filterMinEpisode, TQT_SLOT(setValue(int) ) ); + connect(filterMinEpisode, TQ_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQ_SLOT(setMinEpisode(int) ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(minEpisodeChanged(int)), filterMinEpisode, TQ_SLOT(setValue(int) ) ); //maxSeason - connect(filterMaxSeason, TQT_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQT_SLOT(setMaxSeason(int) ) ); - connect(rejectFilters.at(index), TQT_SIGNAL(maxSeasonChanged(int)), filterMaxSeason, TQT_SLOT(setValue(int) ) ); + connect(filterMaxSeason, TQ_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQ_SLOT(setMaxSeason(int) ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(maxSeasonChanged(int)), filterMaxSeason, TQ_SLOT(setValue(int) ) ); //maxEpisode - connect(filterMaxEpisode, TQT_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQT_SLOT(setMaxEpisode(int) ) ); - connect(rejectFilters.at(index), TQT_SIGNAL(maxEpisodeChanged(int)), filterMaxEpisode, TQT_SLOT(setValue(int) ) ); + connect(filterMaxEpisode, TQ_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQ_SLOT(setMaxEpisode(int) ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(maxEpisodeChanged(int)), filterMaxEpisode, TQ_SLOT(setValue(int) ) ); //matches - connect(rejectFilters.at(index), TQT_SIGNAL(matchesChanged(const TQValueList<FilterMatch>&)), this, TQT_SLOT(updateMatches(const TQValueList<FilterMatch>&) ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(matchesChanged(const TQValueList<FilterMatch>&)), this, TQ_SLOT(updateMatches(const TQValueList<FilterMatch>&) ) ); - connect(processFilter, TQT_SIGNAL(clicked()), rejectFilters.at(index), TQT_SIGNAL(rescanFilter()) ); + connect(processFilter, TQ_SIGNAL(clicked()), rejectFilters.at(index), TQ_SIGNAL(rescanFilter()) ); } } @@ -297,68 +297,68 @@ namespace kt if (acceptFilter) { //title - disconnect(filterTitle, TQT_SIGNAL(textChanged(const TQString &)), acceptFilters.at(index), TQT_SLOT(setTitle(const TQString &) ) ); - disconnect(acceptFilters.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(setFilterTitle(const TQString &) ) ); + disconnect(filterTitle, TQ_SIGNAL(textChanged(const TQString &)), acceptFilters.at(index), TQ_SLOT(setTitle(const TQString &) ) ); + disconnect(acceptFilters.at(index), TQ_SIGNAL(titleChanged(const TQString &)), this, TQ_SLOT(setFilterTitle(const TQString &) ) ); //active - disconnect(filterActive, TQT_SIGNAL(toggled(bool)), acceptFilters.at(index), TQT_SLOT(setActive(bool) ) ); - disconnect(acceptFilters.at(index), TQT_SIGNAL(activeChanged(bool)), filterActive, TQT_SLOT(setChecked(bool) ) ); + disconnect(filterActive, TQ_SIGNAL(toggled(bool)), acceptFilters.at(index), TQ_SLOT(setActive(bool) ) ); + disconnect(acceptFilters.at(index), TQ_SIGNAL(activeChanged(bool)), filterActive, TQ_SLOT(setChecked(bool) ) ); //regExps - disconnect(filterRegExps, TQT_SIGNAL(changed()), this, TQT_SLOT(updateRegExps()) ); + disconnect(filterRegExps, TQ_SIGNAL(changed()), this, TQ_SLOT(updateRegExps()) ); //series - disconnect(filterSeries, TQT_SIGNAL(toggled(bool)), acceptFilters.at(index), TQT_SLOT(setSeries(bool) ) ); - disconnect(acceptFilters.at(index), TQT_SIGNAL(seriesChanged(bool)), filterSeries, TQT_SLOT(setChecked(bool) ) ); + disconnect(filterSeries, TQ_SIGNAL(toggled(bool)), acceptFilters.at(index), TQ_SLOT(setSeries(bool) ) ); + disconnect(acceptFilters.at(index), TQ_SIGNAL(seriesChanged(bool)), filterSeries, TQ_SLOT(setChecked(bool) ) ); //sansEpisode - disconnect(filterSansEpisode, TQT_SIGNAL(toggled(bool)), acceptFilters.at(index), TQT_SLOT(setSansEpisode(bool) ) ); - disconnect(acceptFilters.at(index), TQT_SIGNAL(sansEpisodeChanged(bool)), filterSansEpisode, TQT_SLOT(setChecked(bool) ) ); + disconnect(filterSansEpisode, TQ_SIGNAL(toggled(bool)), acceptFilters.at(index), TQ_SLOT(setSansEpisode(bool) ) ); + disconnect(acceptFilters.at(index), TQ_SIGNAL(sansEpisodeChanged(bool)), filterSansEpisode, TQ_SLOT(setChecked(bool) ) ); //minSeason - disconnect(filterMinSeason, TQT_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQT_SLOT(setMinSeason(int) ) ); - disconnect(acceptFilters.at(index), TQT_SIGNAL(minSeasonChanged(int)), filterMinSeason, TQT_SLOT(setValue(int) ) ); + disconnect(filterMinSeason, TQ_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQ_SLOT(setMinSeason(int) ) ); + disconnect(acceptFilters.at(index), TQ_SIGNAL(minSeasonChanged(int)), filterMinSeason, TQ_SLOT(setValue(int) ) ); //minEpisode - disconnect(filterMinEpisode, TQT_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQT_SLOT(setMinEpisode(int) ) ); - disconnect(acceptFilters.at(index), TQT_SIGNAL(minEpisodeChanged(int)), filterMinEpisode, TQT_SLOT(setValue(int) ) ); + disconnect(filterMinEpisode, TQ_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQ_SLOT(setMinEpisode(int) ) ); + disconnect(acceptFilters.at(index), TQ_SIGNAL(minEpisodeChanged(int)), filterMinEpisode, TQ_SLOT(setValue(int) ) ); //maxSeason - disconnect(filterMaxSeason, TQT_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQT_SLOT(setMaxSeason(int) ) ); - disconnect(acceptFilters.at(index), TQT_SIGNAL(maxSeasonChanged(int)), filterMaxSeason, TQT_SLOT(setValue(int) ) ); + disconnect(filterMaxSeason, TQ_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQ_SLOT(setMaxSeason(int) ) ); + disconnect(acceptFilters.at(index), TQ_SIGNAL(maxSeasonChanged(int)), filterMaxSeason, TQ_SLOT(setValue(int) ) ); //maxEpisode - disconnect(filterMaxEpisode, TQT_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQT_SLOT(setMaxEpisode(int) ) ); - disconnect(acceptFilters.at(index), TQT_SIGNAL(maxEpisodeChanged(int)), filterMaxEpisode, TQT_SLOT(setValue(int) ) ); + disconnect(filterMaxEpisode, TQ_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQ_SLOT(setMaxEpisode(int) ) ); + disconnect(acceptFilters.at(index), TQ_SIGNAL(maxEpisodeChanged(int)), filterMaxEpisode, TQ_SLOT(setValue(int) ) ); //matches - disconnect(acceptFilters.at(index), TQT_SIGNAL(matchesChanged(const TQValueList<FilterMatch>&)), this, TQT_SLOT(updateMatches(const TQValueList<FilterMatch>&) ) ); + disconnect(acceptFilters.at(index), TQ_SIGNAL(matchesChanged(const TQValueList<FilterMatch>&)), this, TQ_SLOT(updateMatches(const TQValueList<FilterMatch>&) ) ); - disconnect(processFilter, TQT_SIGNAL(clicked()), acceptFilters.at(index), TQT_SIGNAL(rescanFilter()) ); + disconnect(processFilter, TQ_SIGNAL(clicked()), acceptFilters.at(index), TQ_SIGNAL(rescanFilter()) ); } else { //title - disconnect(filterTitle, TQT_SIGNAL(textChanged(const TQString &)), rejectFilters.at(index), TQT_SLOT(setTitle(const TQString &) ) ); - disconnect(rejectFilters.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(setFilterTitle(const TQString &) ) ); + disconnect(filterTitle, TQ_SIGNAL(textChanged(const TQString &)), rejectFilters.at(index), TQ_SLOT(setTitle(const TQString &) ) ); + disconnect(rejectFilters.at(index), TQ_SIGNAL(titleChanged(const TQString &)), this, TQ_SLOT(setFilterTitle(const TQString &) ) ); //active - disconnect(filterActive, TQT_SIGNAL(toggled(bool)), rejectFilters.at(index), TQT_SLOT(setActive(bool) ) ); - disconnect(rejectFilters.at(index), TQT_SIGNAL(activeChanged(bool)), filterActive, TQT_SLOT(setChecked(bool) ) ); + disconnect(filterActive, TQ_SIGNAL(toggled(bool)), rejectFilters.at(index), TQ_SLOT(setActive(bool) ) ); + disconnect(rejectFilters.at(index), TQ_SIGNAL(activeChanged(bool)), filterActive, TQ_SLOT(setChecked(bool) ) ); //regExps - disconnect(filterRegExps, TQT_SIGNAL(changed()), this, TQT_SLOT(updateRegExps()) ); + disconnect(filterRegExps, TQ_SIGNAL(changed()), this, TQ_SLOT(updateRegExps()) ); //series - disconnect(filterSeries, TQT_SIGNAL(toggled(bool)), rejectFilters.at(index), TQT_SLOT(setSeries(bool) ) ); - disconnect(rejectFilters.at(index), TQT_SIGNAL(seriesChanged(bool)), filterSeries, TQT_SLOT(setChecked(bool) ) ); + disconnect(filterSeries, TQ_SIGNAL(toggled(bool)), rejectFilters.at(index), TQ_SLOT(setSeries(bool) ) ); + disconnect(rejectFilters.at(index), TQ_SIGNAL(seriesChanged(bool)), filterSeries, TQ_SLOT(setChecked(bool) ) ); //sansEpisode - disconnect(filterSansEpisode, TQT_SIGNAL(toggled(bool)), rejectFilters.at(index), TQT_SLOT(setSansEpisode(bool) ) ); - disconnect(rejectFilters.at(index), TQT_SIGNAL(sansEpisodeChanged(bool)), filterSansEpisode, TQT_SLOT(setChecked(bool) ) ); + disconnect(filterSansEpisode, TQ_SIGNAL(toggled(bool)), rejectFilters.at(index), TQ_SLOT(setSansEpisode(bool) ) ); + disconnect(rejectFilters.at(index), TQ_SIGNAL(sansEpisodeChanged(bool)), filterSansEpisode, TQ_SLOT(setChecked(bool) ) ); //minSeason - disconnect(filterMinSeason, TQT_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQT_SLOT(setMinSeason(int) ) ); - disconnect(rejectFilters.at(index), TQT_SIGNAL(minSeasonChanged(int)), filterMinSeason, TQT_SLOT(setValue(int) ) ); + disconnect(filterMinSeason, TQ_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQ_SLOT(setMinSeason(int) ) ); + disconnect(rejectFilters.at(index), TQ_SIGNAL(minSeasonChanged(int)), filterMinSeason, TQ_SLOT(setValue(int) ) ); //minEpisode - disconnect(filterMinEpisode, TQT_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQT_SLOT(setMinEpisode(int) ) ); - disconnect(rejectFilters.at(index), TQT_SIGNAL(minEpisodeChanged(int)), filterMinEpisode, TQT_SLOT(setValue(int) ) ); + disconnect(filterMinEpisode, TQ_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQ_SLOT(setMinEpisode(int) ) ); + disconnect(rejectFilters.at(index), TQ_SIGNAL(minEpisodeChanged(int)), filterMinEpisode, TQ_SLOT(setValue(int) ) ); //maxSeason - disconnect(filterMaxSeason, TQT_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQT_SLOT(setMaxSeason(int) ) ); - disconnect(rejectFilters.at(index), TQT_SIGNAL(maxSeasonChanged(int)), filterMaxSeason, TQT_SLOT(setValue(int) ) ); + disconnect(filterMaxSeason, TQ_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQ_SLOT(setMaxSeason(int) ) ); + disconnect(rejectFilters.at(index), TQ_SIGNAL(maxSeasonChanged(int)), filterMaxSeason, TQ_SLOT(setValue(int) ) ); //maxEpisode - disconnect(filterMaxEpisode, TQT_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQT_SLOT(setMaxEpisode(int) ) ); - disconnect(rejectFilters.at(index), TQT_SIGNAL(maxEpisodeChanged(int)), filterMaxEpisode, TQT_SLOT(setValue(int) ) ); + disconnect(filterMaxEpisode, TQ_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQ_SLOT(setMaxEpisode(int) ) ); + disconnect(rejectFilters.at(index), TQ_SIGNAL(maxEpisodeChanged(int)), filterMaxEpisode, TQ_SLOT(setValue(int) ) ); //matches - disconnect(rejectFilters.at(index), TQT_SIGNAL(matchesChanged(const TQValueList<FilterMatch>&)), this, TQT_SLOT(updateMatches(const TQValueList<FilterMatch>&) ) ); + disconnect(rejectFilters.at(index), TQ_SIGNAL(matchesChanged(const TQValueList<FilterMatch>&)), this, TQ_SLOT(updateMatches(const TQValueList<FilterMatch>&) ) ); - disconnect(processFilter, TQT_SIGNAL(clicked()), rejectFilters.at(index), TQT_SIGNAL(rescanFilter()) ); + disconnect(processFilter, TQ_SIGNAL(clicked()), rejectFilters.at(index), TQ_SIGNAL(rescanFilter()) ); } } @@ -375,27 +375,27 @@ namespace kt feedlist->setCurrentItem(index); //update the feed list - connect(feeds.at(index), TQT_SIGNAL(titleChanged(const TQString&)), this, TQT_SLOT(updateFeedList()) ); + connect(feeds.at(index), TQ_SIGNAL(titleChanged(const TQString&)), this, TQ_SLOT(updateFeedList()) ); //clear the articles list when the url is changed - connect(feeds.at(index), TQT_SIGNAL(feedUrlChanged(const KURL&)), this, TQT_SLOT(clearArticles() ) ); + connect(feeds.at(index), TQ_SIGNAL(feedUrlChanged(const KURL&)), this, TQ_SLOT(clearArticles() ) ); //connect the scanArticle signal to the scanArticle slot - connect(feeds.at(index), TQT_SIGNAL(scanRssArticle(RssArticle)), this, TQT_SLOT(scanArticle(RssArticle) ) ); + connect(feeds.at(index), TQ_SIGNAL(scanRssArticle(RssArticle)), this, TQ_SLOT(scanArticle(RssArticle) ) ); //connect all the fields to the save slot //title - connect(feeds.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(saveFeedList() ) ); + connect(feeds.at(index), TQ_SIGNAL(titleChanged(const TQString &)), this, TQ_SLOT(saveFeedList() ) ); //url - connect(feeds.at(index), TQT_SIGNAL(feedUrlChanged(const KURL&)), this, TQT_SLOT(saveFeedList() ) ); + connect(feeds.at(index), TQ_SIGNAL(feedUrlChanged(const KURL&)), this, TQ_SLOT(saveFeedList() ) ); //articleAge - connect(feeds.at(index), TQT_SIGNAL(articleAgeChanged(int)), this, TQT_SLOT(saveFeedList() ) ); + connect(feeds.at(index), TQ_SIGNAL(articleAgeChanged(int)), this, TQ_SLOT(saveFeedList() ) ); //active - connect(feeds.at(index), TQT_SIGNAL(activeChanged(bool)), this, TQT_SLOT(saveFeedList() ) ); + connect(feeds.at(index), TQ_SIGNAL(activeChanged(bool)), this, TQ_SLOT(saveFeedList() ) ); //autoRefresh - connect(feeds.at(index), TQT_SIGNAL(autoRefreshChanged(const TQTime&)), this, TQT_SLOT(saveFeedList() ) ); + connect(feeds.at(index), TQ_SIGNAL(autoRefreshChanged(const TQTime&)), this, TQ_SLOT(saveFeedList() ) ); //ignoreTTL - connect(feeds.at(index), TQT_SIGNAL(ignoreTTLChanged(bool)), this, TQT_SLOT(saveFeedList() ) ); + connect(feeds.at(index), TQ_SIGNAL(ignoreTTLChanged(bool)), this, TQ_SLOT(saveFeedList() ) ); } @@ -410,52 +410,52 @@ namespace kt acceptFilterList->insertItem(acceptFilters.at(index)->title()); acceptFilterList->setCurrentItem(index); - connect(acceptFilters.at(index), TQT_SIGNAL(titleChanged(const TQString&)), this, TQT_SLOT(updateAcceptFilterList()) ); + connect(acceptFilters.at(index), TQ_SIGNAL(titleChanged(const TQString&)), this, TQ_SLOT(updateAcceptFilterList()) ); //connect all the fields to the save slot //title - connect(acceptFilters.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(saveFilterList() ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(titleChanged(const TQString &)), this, TQ_SLOT(saveFilterList() ) ); //active - connect(acceptFilters.at(index), TQT_SIGNAL(activeChanged( bool )), this, TQT_SLOT(saveFilterList() ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(activeChanged( bool )), this, TQ_SLOT(saveFilterList() ) ); //regexps - connect(acceptFilters.at(index), TQT_SIGNAL(regExpsChanged( const TQStringList& )), this, TQT_SLOT(saveFilterList() ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(regExpsChanged( const TQStringList& )), this, TQ_SLOT(saveFilterList() ) ); //series - connect(acceptFilters.at(index), TQT_SIGNAL(seriesChanged( bool )), this, TQT_SLOT(saveFilterList() ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(seriesChanged( bool )), this, TQ_SLOT(saveFilterList() ) ); //sansEpisode - connect(acceptFilters.at(index), TQT_SIGNAL(sansEpisodeChanged( bool )), this, TQT_SLOT(saveFilterList() ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(sansEpisodeChanged( bool )), this, TQ_SLOT(saveFilterList() ) ); //minSeason - connect(acceptFilters.at(index), TQT_SIGNAL(minSeasonChanged (int )), this, TQT_SLOT(saveFilterList() ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(minSeasonChanged (int )), this, TQ_SLOT(saveFilterList() ) ); //minEpisode - connect(acceptFilters.at(index), TQT_SIGNAL(minEpisodeChanged (int )), this, TQT_SLOT(saveFilterList() ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(minEpisodeChanged (int )), this, TQ_SLOT(saveFilterList() ) ); //maxSeason - connect(acceptFilters.at(index), TQT_SIGNAL(maxSeasonChanged (int )), this, TQT_SLOT(saveFilterList() ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(maxSeasonChanged (int )), this, TQ_SLOT(saveFilterList() ) ); //maxEpiosde - connect(acceptFilters.at(index), TQT_SIGNAL(maxEpisodeChanged (int )), this, TQT_SLOT(saveFilterList() ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(maxEpisodeChanged (int )), this, TQ_SLOT(saveFilterList() ) ); //matches - connect(acceptFilters.at(index), TQT_SIGNAL(matchesChanged( const TQValueList<FilterMatch>& )), this, TQT_SLOT(saveFilterList() ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(matchesChanged( const TQValueList<FilterMatch>& )), this, TQ_SLOT(saveFilterList() ) ); //connect the rescan signal to the rescan slot - connect(acceptFilters.at(index), TQT_SIGNAL(rescanFilter()), this, TQT_SLOT(rescanFilter()) ); + connect(acceptFilters.at(index), TQ_SIGNAL(rescanFilter()), this, TQ_SLOT(rescanFilter()) ); // //connect all except the matchesChanged to the rescanFilter slot // //title -// connect(acceptFilters.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(rescanFilter() ) ); +// connect(acceptFilters.at(index), TQ_SIGNAL(titleChanged(const TQString &)), this, TQ_SLOT(rescanFilter() ) ); // //active -// connect(acceptFilters.at(index), TQT_SIGNAL(activeChanged( bool )), this, TQT_SLOT(rescanFilter() ) ); +// connect(acceptFilters.at(index), TQ_SIGNAL(activeChanged( bool )), this, TQ_SLOT(rescanFilter() ) ); // //regexps -// connect(acceptFilters.at(index), TQT_SIGNAL(regExpsChanged( const TQStringList& )), this, TQT_SLOT(rescanFilter() ) ); +// connect(acceptFilters.at(index), TQ_SIGNAL(regExpsChanged( const TQStringList& )), this, TQ_SLOT(rescanFilter() ) ); // //series -// connect(acceptFilters.at(index), TQT_SIGNAL(seriesChanged( bool )), this, TQT_SLOT(rescanFilter() ) ); +// connect(acceptFilters.at(index), TQ_SIGNAL(seriesChanged( bool )), this, TQ_SLOT(rescanFilter() ) ); // //sansEpisode -// connect(acceptFilters.at(index), TQT_SIGNAL(sansEpisodeChanged( bool )), this, TQT_SLOT(rescanFilter() ) ); +// connect(acceptFilters.at(index), TQ_SIGNAL(sansEpisodeChanged( bool )), this, TQ_SLOT(rescanFilter() ) ); // //minSeason -// connect(acceptFilters.at(index), TQT_SIGNAL(minSeasonChanged (int )), this, TQT_SLOT(rescanFilter() ) ); +// connect(acceptFilters.at(index), TQ_SIGNAL(minSeasonChanged (int )), this, TQ_SLOT(rescanFilter() ) ); // //minEpisode -// connect(acceptFilters.at(index), TQT_SIGNAL(minEpisodeChanged (int )), this, TQT_SLOT(rescanFilter() ) ); +// connect(acceptFilters.at(index), TQ_SIGNAL(minEpisodeChanged (int )), this, TQ_SLOT(rescanFilter() ) ); // //maxSeason -// connect(acceptFilters.at(index), TQT_SIGNAL(maxSeasonChanged (int )), this, TQT_SLOT(rescanFilter() ) ); +// connect(acceptFilters.at(index), TQ_SIGNAL(maxSeasonChanged (int )), this, TQ_SLOT(rescanFilter() ) ); // //maxEpiosde -// connect(acceptFilters.at(index), TQT_SIGNAL(maxEpisodeChanged (int )), this, TQT_SLOT(rescanFilter() ) ); +// connect(acceptFilters.at(index), TQ_SIGNAL(maxEpisodeChanged (int )), this, TQ_SLOT(rescanFilter() ) ); } @@ -470,29 +470,29 @@ namespace kt rejectFilterList->insertItem(rejectFilters.at(index)->title()); rejectFilterList->setCurrentItem(index); - connect(rejectFilters.at(index), TQT_SIGNAL(titleChanged(const TQString&)), this, TQT_SLOT(updateRejectFilterList()) ); + connect(rejectFilters.at(index), TQ_SIGNAL(titleChanged(const TQString&)), this, TQ_SLOT(updateRejectFilterList()) ); //connect all the fields to the save slot //title - connect(rejectFilters.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(saveFilterList() ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(titleChanged(const TQString &)), this, TQ_SLOT(saveFilterList() ) ); //active - connect(rejectFilters.at(index), TQT_SIGNAL(activeChanged( bool )), this, TQT_SLOT(saveFilterList() ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(activeChanged( bool )), this, TQ_SLOT(saveFilterList() ) ); //regexps - connect(rejectFilters.at(index), TQT_SIGNAL(regExpsChanged( const TQStringList& )), this, TQT_SLOT(saveFilterList() ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(regExpsChanged( const TQStringList& )), this, TQ_SLOT(saveFilterList() ) ); //series - connect(rejectFilters.at(index), TQT_SIGNAL(seriesChanged( bool )), this, TQT_SLOT(saveFilterList() ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(seriesChanged( bool )), this, TQ_SLOT(saveFilterList() ) ); //sansEpisode - connect(rejectFilters.at(index), TQT_SIGNAL(sansEpisodeChanged( bool )), this, TQT_SLOT(saveFilterList() ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(sansEpisodeChanged( bool )), this, TQ_SLOT(saveFilterList() ) ); //minSeason - connect(rejectFilters.at(index), TQT_SIGNAL(minSeasonChanged (int )), this, TQT_SLOT(saveFilterList() ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(minSeasonChanged (int )), this, TQ_SLOT(saveFilterList() ) ); //minEpisode - connect(rejectFilters.at(index), TQT_SIGNAL(minEpisodeChanged (int )), this, TQT_SLOT(saveFilterList() ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(minEpisodeChanged (int )), this, TQ_SLOT(saveFilterList() ) ); //maxSeason - connect(rejectFilters.at(index), TQT_SIGNAL(maxSeasonChanged (int )), this, TQT_SLOT(saveFilterList() ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(maxSeasonChanged (int )), this, TQ_SLOT(saveFilterList() ) ); //maxEpiosde - connect(rejectFilters.at(index), TQT_SIGNAL(maxEpisodeChanged (int )), this, TQT_SLOT(saveFilterList() ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(maxEpisodeChanged (int )), this, TQ_SLOT(saveFilterList() ) ); //matches - connect(rejectFilters.at(index), TQT_SIGNAL(matchesChanged( const TQValueList<FilterMatch>& )), this, TQT_SLOT(saveFilterList() ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(matchesChanged( const TQValueList<FilterMatch>& )), this, TQ_SLOT(saveFilterList() ) ); } @@ -773,7 +773,7 @@ namespace kt curDownload = new RssLinkDownloader(m_core, feedArticles->text(j, 2)); for (int i=0; i<feeds.count(); i++) { - connect(curDownload, TQT_SIGNAL(linkDownloaded( TQString, int )), feeds.at(i), TQT_SLOT(setDownloaded(TQString, int)) ); + connect(curDownload, TQ_SIGNAL(linkDownloaded( TQString, int )), feeds.at(i), TQ_SLOT(setDownloaded(TQString, int)) ); } } } @@ -1232,7 +1232,7 @@ namespace kt RssLinkDownloader * curDownload = new RssLinkDownloader(m_core, article.link().prettyURL(), filter); for (int i=0; i<feeds.count(); i++) { - connect(curDownload, TQT_SIGNAL(linkDownloaded( TQString, int )), feeds.at(i), TQT_SLOT(setDownloaded(TQString, int)) ); + connect(curDownload, TQ_SIGNAL(linkDownloaded( TQString, int )), feeds.at(i), TQ_SLOT(setDownloaded(TQString, int)) ); } } } @@ -1245,7 +1245,7 @@ namespace kt RssLinkDownloader * curDownload = new RssLinkDownloader(m_core, article.link().prettyURL(), acceptFilters.at(i)); for (int i=0; i<feeds.count(); i++) { - connect(curDownload, TQT_SIGNAL(linkDownloaded( TQString, int )), feeds.at(i), TQT_SLOT(setDownloaded(TQString, int)) ); + connect(curDownload, TQ_SIGNAL(linkDownloaded( TQString, int )), feeds.at(i), TQ_SLOT(setDownloaded(TQString, int)) ); } } } @@ -1316,3 +1316,5 @@ namespace kt } } + +#include "rssfeedmanager.moc" diff --git a/plugins/rssfeed/rssfeedmanager.h b/src/plugins/rssfeed/rssfeedmanager.h index 939c460..fd6cb57 100644 --- a/plugins/rssfeed/rssfeedmanager.h +++ b/src/plugins/rssfeed/rssfeedmanager.h @@ -46,7 +46,7 @@ namespace kt */ class RssFeedManager : public RssFeedWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/rssfeed/rssfeedplugin.cpp b/src/plugins/rssfeed/rssfeedplugin.cpp index 4a60921..7899c70 100644 --- a/plugins/rssfeed/rssfeedplugin.cpp +++ b/src/plugins/rssfeed/rssfeedplugin.cpp @@ -84,3 +84,5 @@ namespace kt } + +#include "rssfeedplugin.moc" diff --git a/plugins/rssfeed/rssfeedplugin.h b/src/plugins/rssfeed/rssfeedplugin.h index 5014908..c268097 100644 --- a/plugins/rssfeed/rssfeedplugin.h +++ b/src/plugins/rssfeed/rssfeedplugin.h @@ -36,7 +36,7 @@ namespace kt */ class RssFeedPlugin : public Plugin { - Q_OBJECT + TQ_OBJECT public: RssFeedPlugin(TQObject* parent, const char* name, const TQStringList& args); diff --git a/plugins/rssfeed/rssfeedwidget.ui b/src/plugins/rssfeed/rssfeedwidget.ui index 1b34e9c..1b34e9c 100644 --- a/plugins/rssfeed/rssfeedwidget.ui +++ b/src/plugins/rssfeed/rssfeedwidget.ui diff --git a/plugins/rssfeed/rssfilter.cpp b/src/plugins/rssfeed/rssfilter.cpp index 32d13d0..794a51f 100644 --- a/plugins/rssfeed/rssfilter.cpp +++ b/src/plugins/rssfeed/rssfilter.cpp @@ -421,3 +421,5 @@ namespace kt } } + +#include "rssfilter.moc" diff --git a/plugins/rssfeed/rssfilter.h b/src/plugins/rssfeed/rssfilter.h index d557a78..eba0a21 100644 --- a/plugins/rssfeed/rssfilter.h +++ b/src/plugins/rssfeed/rssfilter.h @@ -68,7 +68,7 @@ namespace kt class RssFilter : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/rssfeed/rsslinkdownloader.cpp b/src/plugins/rssfeed/rsslinkdownloader.cpp index ee357d6..53a66de 100644 --- a/plugins/rssfeed/rsslinkdownloader.cpp +++ b/src/plugins/rssfeed/rsslinkdownloader.cpp @@ -43,14 +43,14 @@ namespace kt { // no valid URL, so just display an error message KMessageBox::error(0,i18n("Failed to find and download a valid torrent for %1").arg(curLink)); - TQTimer::singleShot(50,this,TQT_SLOT(suicide())); + TQTimer::singleShot(50,this,TQ_SLOT(suicide())); } else { //first let's download the link so we can process it to check for the actual torrent curLink = curSubLink = link; curFile = TDEIO::storedGet(link,false,false); - connect(curFile, TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(processLink( TDEIO::Job* ))); + connect(curFile, TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(processLink( TDEIO::Job* ))); } } @@ -189,7 +189,7 @@ namespace kt curSubLink = subLinks.first(); subLinks.pop_front(); curFile = TDEIO::storedGet(curSubLink,false,false); - connect(curFile, TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(processLink( TDEIO::Job* ))); + connect(curFile, TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(processLink( TDEIO::Job* ))); } } @@ -200,3 +200,5 @@ namespace kt } } + +#include "rsslinkdownloader.moc" diff --git a/plugins/rssfeed/rsslinkdownloader.h b/src/plugins/rssfeed/rsslinkdownloader.h index a496af7..486eed8 100644 --- a/plugins/rssfeed/rsslinkdownloader.h +++ b/src/plugins/rssfeed/rsslinkdownloader.h @@ -46,7 +46,7 @@ namespace kt class RssLinkDownloader : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/plugins/scanfolder/CMakeLists.txt b/src/plugins/scanfolder/CMakeLists.txt new file mode 100644 index 0000000..ed5b9f7 --- /dev/null +++ b/src/plugins/scanfolder/CMakeLists.txt @@ -0,0 +1,30 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/src/libktorrent + ${CMAKE_CURRENT_BINARY_DIR} +) + + +##### ktscanfolderplugin (kpart) + +tde_add_kpart( ktscanfolderplugin AUTOMOC + SOURCES + scanfolderplugin.cpp scanfolderpluginsettings.kcfgc scanfolderprefpage.cpp + sfprefwidgetbase.ui scanfolderprefpagewidget.cpp scanfolder.cpp + LINK + ktorrent-shared tdecore-shared tdeui-shared tdeio-shared tdeparts-shared tdehtml-shared + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other files + +install( + FILES ktscanfolderplugin.kcfg + DESTINATION ${KCFG_INSTALL_DIR} +) + +tde_create_translated_desktop( + SOURCE ktscanfolderplugin.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) diff --git a/src/plugins/scanfolder/ktscanfolderplugin.desktop b/src/plugins/scanfolder/ktscanfolderplugin.desktop new file mode 100644 index 0000000..06b51ba --- /dev/null +++ b/src/plugins/scanfolder/ktscanfolderplugin.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=ScanFolderPlugin + +Type=Service +X-TDE-Library=ktscanfolderplugin +X-TDE-ServiceTypes=KTorrent/Plugin diff --git a/plugins/scanfolder/ktscanfolderplugin.kcfg b/src/plugins/scanfolder/ktscanfolderplugin.kcfg index f9b919f..98e8099 100644 --- a/plugins/scanfolder/ktscanfolderplugin.kcfg +++ b/src/plugins/scanfolder/ktscanfolderplugin.kcfg @@ -7,17 +7,17 @@ <group name="general"> <entry name="useFolder1" type="Bool"> <label>Enable scanning of folder1?</label> - <default>FALSE</default> + <default>false</default> </entry> <entry name="useFolder2" type="Bool"> <label>Enable scanning of folder2?</label> - <default>FALSE</default> + <default>false</default> </entry> <entry name="useFolder3" type="Bool"> <label>Enable scanning of folder3?</label> - <default>FALSE</default> + <default>false</default> </entry> <entry name="folder1" type="String"> @@ -37,17 +37,17 @@ <entry name="openSilently" type="Bool"> <label>Whether to open torrent silently or not.</label> - <default>FALSE</default> + <default>false</default> </entry> <entry name="actionDelete" type="Bool"> <label>Delete action checked.</label> - <default>FALSE</default> + <default>false</default> </entry> <entry name="actionMove" type="Bool"> <label>Move action checked.</label> - <default>FALSE</default> + <default>false</default> </entry> </group> </kcfg> diff --git a/plugins/scanfolder/scanfolder.cpp b/src/plugins/scanfolder/scanfolder.cpp index dfceba0..135aea2 100644 --- a/plugins/scanfolder/scanfolder.cpp +++ b/src/plugins/scanfolder/scanfolder.cpp @@ -58,9 +58,9 @@ namespace kt m_dir->setShowingDotFiles(true); - connect(m_dir, TQT_SIGNAL(newItems( const KFileItemList& )), this, TQT_SLOT(onNewItems( const KFileItemList& ))); - connect(m_core, TQT_SIGNAL(loadingFinished( const KURL&, bool, bool )), this, TQT_SLOT(onLoadingFinished( const KURL&, bool, bool ))); - connect(&m_incomplePollingTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(onIncompletePollingTimeout())); + connect(m_dir, TQ_SIGNAL(newItems( const KFileItemList& )), this, TQ_SLOT(onNewItems( const KFileItemList& ))); + connect(m_core, TQ_SIGNAL(loadingFinished( const KURL&, bool, bool )), this, TQ_SLOT(onLoadingFinished( const KURL&, bool, bool ))); + connect(&m_incomplePollingTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(onIncompletePollingTimeout())); } diff --git a/plugins/scanfolder/scanfolder.h b/src/plugins/scanfolder/scanfolder.h index 680f74c..58fbd04 100644 --- a/plugins/scanfolder/scanfolder.h +++ b/src/plugins/scanfolder/scanfolder.h @@ -55,7 +55,7 @@ namespace kt */ class ScanFolder : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/scanfolder/scanfolderplugin.cpp b/src/plugins/scanfolder/scanfolderplugin.cpp index 710d1d0..58e1bea 100644 --- a/plugins/scanfolder/scanfolderplugin.cpp +++ b/src/plugins/scanfolder/scanfolderplugin.cpp @@ -185,3 +185,5 @@ namespace kt return version == KT_VERSION_MACRO; } } + +#include "scanfolderplugin.moc" diff --git a/plugins/scanfolder/scanfolderplugin.h b/src/plugins/scanfolder/scanfolderplugin.h index 527b36d..3ea18ce 100644 --- a/plugins/scanfolder/scanfolderplugin.h +++ b/src/plugins/scanfolder/scanfolderplugin.h @@ -37,7 +37,7 @@ namespace kt */ class ScanFolderPlugin : public Plugin { - Q_OBJECT + TQ_OBJECT public: ScanFolderPlugin(TQObject* parent, const char* name, const TQStringList& args); diff --git a/plugins/scanfolder/scanfolderpluginsettings.kcfgc b/src/plugins/scanfolder/scanfolderpluginsettings.kcfgc index 7550c9d..7550c9d 100644 --- a/plugins/scanfolder/scanfolderpluginsettings.kcfgc +++ b/src/plugins/scanfolder/scanfolderpluginsettings.kcfgc diff --git a/plugins/scanfolder/scanfolderprefpage.cpp b/src/plugins/scanfolder/scanfolderprefpage.cpp index 9fc466e..8846aa9 100644 --- a/plugins/scanfolder/scanfolderprefpage.cpp +++ b/src/plugins/scanfolder/scanfolderprefpage.cpp @@ -22,7 +22,7 @@ #include <tdelocale.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> diff --git a/plugins/scanfolder/scanfolderprefpage.h b/src/plugins/scanfolder/scanfolderprefpage.h index cb2f80c..cb2f80c 100644 --- a/plugins/scanfolder/scanfolderprefpage.h +++ b/src/plugins/scanfolder/scanfolderprefpage.h diff --git a/plugins/scanfolder/scanfolderprefpagewidget.cpp b/src/plugins/scanfolder/scanfolderprefpagewidget.cpp index 14b89ff..14b89ff 100644 --- a/plugins/scanfolder/scanfolderprefpagewidget.cpp +++ b/src/plugins/scanfolder/scanfolderprefpagewidget.cpp diff --git a/plugins/scanfolder/scanfolderprefpagewidget.h b/src/plugins/scanfolder/scanfolderprefpagewidget.h index 6468d9d..963ca40 100644 --- a/plugins/scanfolder/scanfolderprefpagewidget.h +++ b/src/plugins/scanfolder/scanfolderprefpagewidget.h @@ -26,7 +26,7 @@ namespace kt { class ScanFolderPrefPageWidget: public SfPrefPageWidgetBase { - Q_OBJECT + TQ_OBJECT public: ScanFolderPrefPageWidget(TQWidget *parent = 0, const char *name = 0); diff --git a/plugins/scanfolder/sfprefwidgetbase.ui b/src/plugins/scanfolder/sfprefwidgetbase.ui index 1e696e6..1e696e6 100644 --- a/plugins/scanfolder/sfprefwidgetbase.ui +++ b/src/plugins/scanfolder/sfprefwidgetbase.ui diff --git a/src/plugins/scheduler/CMakeLists.txt b/src/plugins/scheduler/CMakeLists.txt new file mode 100644 index 0000000..7ce787d --- /dev/null +++ b/src/plugins/scheduler/CMakeLists.txt @@ -0,0 +1,42 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/src/libktorrent + ${CMAKE_CURRENT_BINARY_DIR} +) + + +##### ktschedulerplugin (kpart) + +tde_add_kpart( ktschedulerplugin AUTOMOC + SOURCES + schedulerplugin.cpp schedulerpluginsettings.kcfgc bwscheduler.cpp schedulerprefpagewidget.cpp + schedulerpage.ui bwspage.ui bwsprefpagewidget.cpp bwswidget.cpp schedulerprefpage.cpp + LINK + ktorrent-shared tdecore-shared tdeui-shared tdeio-shared tdeparts-shared tdehtml-shared + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other files + +install( + FILES ktschedulerpluginui.rc + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME} +) + +install( + FILES + cell-a-0000.png cell-a-0001.png cell-a-0002.png cell-a-0003.png cell-a-0004.png + cell-b-0000.png cell-b-0001.png cell-b-0002.png cell-b-0003.png cell-b-0004.png + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/icons +) + +install( + FILES ktschedulerplugin.kcfg + DESTINATION ${KCFG_INSTALL_DIR} +) + +tde_create_translated_desktop( + SOURCE ktschedulerplugin.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) diff --git a/plugins/scheduler/bwscheduler.cpp b/src/plugins/scheduler/bwscheduler.cpp index 77d6b1c..5515c12 100644 --- a/plugins/scheduler/bwscheduler.cpp +++ b/src/plugins/scheduler/bwscheduler.cpp @@ -36,7 +36,7 @@ #include <tqptrlist.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> using namespace bt; diff --git a/plugins/scheduler/bwscheduler.h b/src/plugins/scheduler/bwscheduler.h index e752b1d..e752b1d 100644 --- a/plugins/scheduler/bwscheduler.h +++ b/src/plugins/scheduler/bwscheduler.h diff --git a/plugins/scheduler/bwspage.ui b/src/plugins/scheduler/bwspage.ui index 46f797e..b5e1db1 100644 --- a/plugins/scheduler/bwspage.ui +++ b/src/plugins/scheduler/bwspage.ui @@ -838,14 +838,14 @@ <tabstop>dlCat3</tabstop> <tabstop>ulCat3</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>btnOk_clicked()</slot> <slot>btnApply_clicked()</slot> <slot>btnCancel_clicked()</slot> <slot>btnSave_clicked()</slot> <slot>btnLoad_clicked()</slot> <slot>btnReset_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">bwswidget.h</include> diff --git a/plugins/scheduler/bwsprefpagewidget.cpp b/src/plugins/scheduler/bwsprefpagewidget.cpp index 38ab296..45b975a 100644 --- a/plugins/scheduler/bwsprefpagewidget.cpp +++ b/src/plugins/scheduler/bwsprefpagewidget.cpp @@ -26,7 +26,7 @@ #include <knuminput.h> #include <tdelocale.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdefiledialog.h> #include <tdemessagebox.h> #include <kiconloader.h> @@ -93,16 +93,16 @@ namespace kt pix52->setPixmap(TQPixmap(locate("data", TQString("ktorrent/icons/cell-a-0004.png")))); } - connect(radio1, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(categoryChanged(int))); - connect(radio2, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(categoryChanged(int))); - connect(radio3, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(categoryChanged(int))); - connect(radio4, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(categoryChanged(int))); - connect(radio5, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(categoryChanged(int))); - connect(radio12, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(categoryChanged(int))); - connect(radio22, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(categoryChanged(int))); - connect(radio32, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(categoryChanged(int))); - connect(radio42, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(categoryChanged(int))); - connect(radio52, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(categoryChanged(int))); + connect(radio1, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(categoryChanged(int))); + connect(radio2, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(categoryChanged(int))); + connect(radio3, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(categoryChanged(int))); + connect(radio4, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(categoryChanged(int))); + connect(radio5, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(categoryChanged(int))); + connect(radio12, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(categoryChanged(int))); + connect(radio22, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(categoryChanged(int))); + connect(radio32, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(categoryChanged(int))); + connect(radio42, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(categoryChanged(int))); + connect(radio52, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(categoryChanged(int))); //pre-check default categories (say 1 for left and 0 for right) radio2->setChecked(true); diff --git a/plugins/scheduler/bwsprefpagewidget.h b/src/plugins/scheduler/bwsprefpagewidget.h index a2e68e0..d87a2bc 100644 --- a/plugins/scheduler/bwsprefpagewidget.h +++ b/src/plugins/scheduler/bwsprefpagewidget.h @@ -33,7 +33,7 @@ namespace kt */ class BWSPrefPageWidget : public BWSPage { - Q_OBJECT + TQ_OBJECT public: BWSPrefPageWidget(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); diff --git a/plugins/scheduler/bwswidget.cpp b/src/plugins/scheduler/bwswidget.cpp index b3358a7..aa7b5e7 100644 --- a/plugins/scheduler/bwswidget.cpp +++ b/src/plugins/scheduler/bwswidget.cpp @@ -30,7 +30,7 @@ #include <tqcolor.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> namespace kt { @@ -63,7 +63,7 @@ namespace kt setColumnLabels(days); setRowLabels(hours); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); TQFont f; f.setPointSize(8); @@ -101,8 +101,8 @@ namespace kt setHScrollBarMode(TQTable::AlwaysOff); setVScrollBarMode(TQTable::AlwaysOff); - connect(this, TQT_SIGNAL(currentChanged( int, int )), this, TQT_SLOT(cellSelectionChanged( int, int ))); - connect(this, TQT_SIGNAL(pressed(int, int, int, const TQPoint&)), this, TQT_SLOT(cellMouseDown(int, int, int, const TQPoint& ))); + connect(this, TQ_SIGNAL(currentChanged( int, int )), this, TQ_SLOT(cellSelectionChanged( int, int ))); + connect(this, TQ_SIGNAL(pressed(int, int, int, const TQPoint&)), this, TQ_SLOT(cellMouseDown(int, int, int, const TQPoint& ))); } BWSWidget::~BWSWidget() @@ -332,3 +332,5 @@ namespace kt clearSelect(); } } + +#include "bwswidget.moc" diff --git a/plugins/scheduler/bwswidget.h b/src/plugins/scheduler/bwswidget.h index 79d5ccd..a6770aa 100644 --- a/plugins/scheduler/bwswidget.h +++ b/src/plugins/scheduler/bwswidget.h @@ -43,7 +43,7 @@ namespace kt */ class BWSWidget : public TQTable { - Q_OBJECT + TQ_OBJECT public: BWSWidget(TQWidget* parent = 0, const char* name = 0, bool useColors = true); @@ -63,7 +63,7 @@ namespace kt /** * Sets cell paint type. - * @param color TRUE - paints colors. FALSE - paints pixmaps. + * @param color true - paints colors. false - paints pixmaps. */ void setType(bool color); diff --git a/plugins/scheduler/cell-a-0000.png b/src/plugins/scheduler/cell-a-0000.png Binary files differindex 75326d8..75326d8 100644 --- a/plugins/scheduler/cell-a-0000.png +++ b/src/plugins/scheduler/cell-a-0000.png diff --git a/plugins/scheduler/cell-a-0001.png b/src/plugins/scheduler/cell-a-0001.png Binary files differindex 0377dea..0377dea 100644 --- a/plugins/scheduler/cell-a-0001.png +++ b/src/plugins/scheduler/cell-a-0001.png diff --git a/plugins/scheduler/cell-a-0002.png b/src/plugins/scheduler/cell-a-0002.png Binary files differindex 707f13f..707f13f 100644 --- a/plugins/scheduler/cell-a-0002.png +++ b/src/plugins/scheduler/cell-a-0002.png diff --git a/plugins/scheduler/cell-a-0003.png b/src/plugins/scheduler/cell-a-0003.png Binary files differindex 095a792..095a792 100644 --- a/plugins/scheduler/cell-a-0003.png +++ b/src/plugins/scheduler/cell-a-0003.png diff --git a/plugins/scheduler/cell-a-0004.png b/src/plugins/scheduler/cell-a-0004.png Binary files differindex 5ea2e01..5ea2e01 100644 --- a/plugins/scheduler/cell-a-0004.png +++ b/src/plugins/scheduler/cell-a-0004.png diff --git a/plugins/scheduler/cell-b-0000.png b/src/plugins/scheduler/cell-b-0000.png Binary files differindex 60607f7..60607f7 100644 --- a/plugins/scheduler/cell-b-0000.png +++ b/src/plugins/scheduler/cell-b-0000.png diff --git a/plugins/scheduler/cell-b-0001.png b/src/plugins/scheduler/cell-b-0001.png Binary files differindex 2ba0868..2ba0868 100644 --- a/plugins/scheduler/cell-b-0001.png +++ b/src/plugins/scheduler/cell-b-0001.png diff --git a/plugins/scheduler/cell-b-0002.png b/src/plugins/scheduler/cell-b-0002.png Binary files differindex 8dfbad0..8dfbad0 100644 --- a/plugins/scheduler/cell-b-0002.png +++ b/src/plugins/scheduler/cell-b-0002.png diff --git a/plugins/scheduler/cell-b-0003.png b/src/plugins/scheduler/cell-b-0003.png Binary files differindex 5d516dd..5d516dd 100644 --- a/plugins/scheduler/cell-b-0003.png +++ b/src/plugins/scheduler/cell-b-0003.png diff --git a/plugins/scheduler/cell-b-0004.png b/src/plugins/scheduler/cell-b-0004.png Binary files differindex a197546..a197546 100644 --- a/plugins/scheduler/cell-b-0004.png +++ b/src/plugins/scheduler/cell-b-0004.png diff --git a/src/plugins/scheduler/ktschedulerplugin.desktop b/src/plugins/scheduler/ktschedulerplugin.desktop new file mode 100644 index 0000000..7ec6150 --- /dev/null +++ b/src/plugins/scheduler/ktschedulerplugin.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=SchedulerPlugin + +Type=Service +X-TDE-Library=ktschedulerplugin +X-TDE-ServiceTypes=KTorrent/Plugin diff --git a/plugins/scheduler/ktschedulerplugin.kcfg b/src/plugins/scheduler/ktschedulerplugin.kcfg index 7f752b3..aca172d 100644 --- a/plugins/scheduler/ktschedulerplugin.kcfg +++ b/src/plugins/scheduler/ktschedulerplugin.kcfg @@ -8,11 +8,11 @@ <group name="general"> <entry name="enableBWS" type="Bool"> <label>Enable bandwidth scheduler?</label> - <default>FALSE</default> + <default>false</default> </entry> <entry name="useColors" type="Bool"> <label>Use colors instead of pixmaps?</label> - <default>FALSE</default> + <default>false</default> </entry> </group> </kcfg> diff --git a/plugins/scheduler/ktschedulerpluginui.rc b/src/plugins/scheduler/ktschedulerpluginui.rc index 217e103..217e103 100644 --- a/plugins/scheduler/ktschedulerpluginui.rc +++ b/src/plugins/scheduler/ktschedulerpluginui.rc diff --git a/plugins/scheduler/schedulerpage.ui b/src/plugins/scheduler/schedulerpage.ui index 0fc52b3..ce0cfb6 100644 --- a/plugins/scheduler/schedulerpage.ui +++ b/src/plugins/scheduler/schedulerpage.ui @@ -137,10 +137,10 @@ <slot>useColors_toggled(bool)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>btnEditBWS_toggled(bool)</slot> <slot>btnEditBWS_clicked()</slot> <slot>useColors_toggled(bool)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/plugins/scheduler/schedulerplugin.cpp b/src/plugins/scheduler/schedulerplugin.cpp index d0b8f68..5950cfa 100644 --- a/plugins/scheduler/schedulerplugin.cpp +++ b/src/plugins/scheduler/schedulerplugin.cpp @@ -60,7 +60,7 @@ namespace kt { setXMLFile("ktschedulerpluginui.rc"); bws_action = 0; - connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timer_triggered())); + connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timer_triggered())); } @@ -95,7 +95,7 @@ namespace kt // updateEnabledBWS(); bws_action = new TDEAction(i18n("Open Bandwidth Scheduler" ), "clock", 0, this, - TQT_SLOT(openBWS()), actionCollection(), "bwscheduler" ); + TQ_SLOT(openBWS()), actionCollection(), "bwscheduler" ); } void SchedulerPlugin::unload() @@ -135,7 +135,7 @@ namespace kt if(SchedulerPluginSettings::enableBWS()) { bws_action = new TDEAction(i18n("Open Bandwidth Scheduler" ), "clock", 0, this, - TQT_SLOT(openBWS()), actionCollection(), "bwscheduler" ); + TQ_SLOT(openBWS()), actionCollection(), "bwscheduler" ); } else { @@ -150,3 +150,5 @@ namespace kt return version == KT_VERSION_MACRO; } } + +#include "schedulerplugin.moc" diff --git a/plugins/scheduler/schedulerplugin.h b/src/plugins/scheduler/schedulerplugin.h index 6fb9733..2dec571 100644 --- a/plugins/scheduler/schedulerplugin.h +++ b/src/plugins/scheduler/schedulerplugin.h @@ -33,8 +33,6 @@ class TQString; namespace kt { - class BWSPrefPage; - /** * @author Ivan Vasic <ivasic@gmail.com> * @brief KTorrent scheduler plugin. @@ -42,7 +40,7 @@ namespace kt */ class SchedulerPlugin : public Plugin { - Q_OBJECT + TQ_OBJECT public: SchedulerPlugin(TQObject* parent, const char* name, const TQStringList& args); diff --git a/plugins/scheduler/schedulerpluginsettings.kcfgc b/src/plugins/scheduler/schedulerpluginsettings.kcfgc index 5c66442..5c66442 100644 --- a/plugins/scheduler/schedulerpluginsettings.kcfgc +++ b/src/plugins/scheduler/schedulerpluginsettings.kcfgc diff --git a/plugins/scheduler/schedulerprefpage.cpp b/src/plugins/scheduler/schedulerprefpage.cpp index 3977a14..3977a14 100644 --- a/plugins/scheduler/schedulerprefpage.cpp +++ b/src/plugins/scheduler/schedulerprefpage.cpp diff --git a/plugins/scheduler/schedulerprefpage.h b/src/plugins/scheduler/schedulerprefpage.h index 56fbe3b..56fbe3b 100644 --- a/plugins/scheduler/schedulerprefpage.h +++ b/src/plugins/scheduler/schedulerprefpage.h diff --git a/plugins/scheduler/schedulerprefpagewidget.cpp b/src/plugins/scheduler/schedulerprefpagewidget.cpp index 65d600b..7aaf61e 100644 --- a/plugins/scheduler/schedulerprefpagewidget.cpp +++ b/src/plugins/scheduler/schedulerprefpagewidget.cpp @@ -61,7 +61,7 @@ namespace kt /* force trigger since the schedule has changed but after KTorrent::apply() * Used TQTimer with fixed interval - not very nice solution... */ if(useBS->isChecked()) - TQTimer::singleShot(1000, this, TQT_SLOT(scheduler_trigger())); + TQTimer::singleShot(1000, this, TQ_SLOT(scheduler_trigger())); BWScheduler::instance().setEnabled(use_bws); } @@ -79,5 +79,4 @@ namespace kt } - - +#include "schedulerprefpagewidget.moc" diff --git a/plugins/scheduler/schedulerprefpagewidget.h b/src/plugins/scheduler/schedulerprefpagewidget.h index 271586f..5a3c5c3 100644 --- a/plugins/scheduler/schedulerprefpagewidget.h +++ b/src/plugins/scheduler/schedulerprefpagewidget.h @@ -31,7 +31,7 @@ namespace kt */ class SchedulerPrefPageWidget : public SchedulerPage { - Q_OBJECT + TQ_OBJECT public: SchedulerPrefPageWidget(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); diff --git a/src/plugins/search/CMakeLists.txt b/src/plugins/search/CMakeLists.txt new file mode 100644 index 0000000..a1b9ba0 --- /dev/null +++ b/src/plugins/search/CMakeLists.txt @@ -0,0 +1,30 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/src/libktorrent + ${CMAKE_CURRENT_BINARY_DIR} +) + + +##### ktsearchplugin (kpart) + +tde_add_kpart( ktsearchplugin AUTOMOC + SOURCES + searchplugin.cpp htmlpart.cpp searchbar.ui searchpref.ui searchwidget.cpp + searchprefpage.cpp searchpluginsettings.kcfgc searchtab.cpp searchenginelist.cpp + LINK + ktorrent-shared tdecore-shared tdeui-shared tdeio-shared tdeparts-shared tdehtml-shared + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other files + +install( + FILES ktsearchplugin.kcfg + DESTINATION ${KCFG_INSTALL_DIR} +) + +tde_create_translated_desktop( + SOURCE ktsearchplugin.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) diff --git a/plugins/search/htmlpart.cpp b/src/plugins/search/htmlpart.cpp index 2c57aeb..1f3a50d 100644 --- a/plugins/search/htmlpart.cpp +++ b/src/plugins/search/htmlpart.cpp @@ -45,8 +45,8 @@ namespace kt setPluginsEnabled(false); setStatusMessagesEnabled(false); KParts::BrowserExtension* ext = this->browserExtension(); - connect(ext,TQT_SIGNAL(openURLRequest(const KURL&,const KParts::URLArgs&)), - this,TQT_SLOT(openURLRequest(const KURL&, const KParts::URLArgs& ))); + connect(ext,TQ_SIGNAL(openURLRequest(const KURL&,const KParts::URLArgs&)), + this,TQ_SLOT(openURLRequest(const KURL&, const KParts::URLArgs& ))); ext->enableAction("copy",true); ext->enableAction("paste",true); @@ -75,11 +75,11 @@ namespace kt } TDEIO::TransferJob* j = TDEIO::get(u,false,false); - connect(j,TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray &)), - this,TQT_SLOT(dataRecieved(TDEIO::Job*, const TQByteArray& ))); - connect(j,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(jobDone(TDEIO::Job* ))); - connect(j,TQT_SIGNAL(mimetype(TDEIO::Job*, const TQString &)), - this,TQT_SLOT(mimetype(TDEIO::Job*, const TQString& ))); + connect(j,TQ_SIGNAL(data(TDEIO::Job*,const TQByteArray &)), + this,TQ_SLOT(dataRecieved(TDEIO::Job*, const TQByteArray& ))); + connect(j,TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(jobDone(TDEIO::Job* ))); + connect(j,TQ_SIGNAL(mimetype(TDEIO::Job*, const TQString &)), + this,TQ_SLOT(mimetype(TDEIO::Job*, const TQString& ))); active_job = j; curr_data.resize(0); diff --git a/plugins/search/htmlpart.h b/src/plugins/search/htmlpart.h index 091c82f..5ed8f19 100644 --- a/plugins/search/htmlpart.h +++ b/src/plugins/search/htmlpart.h @@ -36,7 +36,7 @@ namespace kt */ class HTMLPart : public TDEHTMLPart { - Q_OBJECT + TQ_OBJECT public: HTMLPart(TQWidget *parent = 0); diff --git a/src/plugins/search/ktsearchplugin.desktop b/src/plugins/search/ktsearchplugin.desktop new file mode 100644 index 0000000..c0f471b --- /dev/null +++ b/src/plugins/search/ktsearchplugin.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=SearchPlugin + +Comment=Search plugin for KTorrent + +Type=Service +X-TDE-Library=ktsearchplugin +X-TDE-ServiceTypes=KTorrent/Plugin diff --git a/plugins/search/ktsearchplugin.kcfg b/src/plugins/search/ktsearchplugin.kcfg index fdcc141..fdcc141 100644 --- a/plugins/search/ktsearchplugin.kcfg +++ b/src/plugins/search/ktsearchplugin.kcfg diff --git a/plugins/search/searchbar.ui b/src/plugins/search/searchbar.ui index 562a0dd..562a0dd 100644 --- a/plugins/search/searchbar.ui +++ b/src/plugins/search/searchbar.ui diff --git a/plugins/search/searchenginelist.cpp b/src/plugins/search/searchenginelist.cpp index 3381bf0..3381bf0 100644 --- a/plugins/search/searchenginelist.cpp +++ b/src/plugins/search/searchenginelist.cpp diff --git a/plugins/search/searchenginelist.h b/src/plugins/search/searchenginelist.h index 4b4d68e..4b4d68e 100644 --- a/plugins/search/searchenginelist.h +++ b/src/plugins/search/searchenginelist.h diff --git a/plugins/search/searchplugin.cpp b/src/plugins/search/searchplugin.cpp index e1126f5..dc62c6c 100644 --- a/plugins/search/searchplugin.cpp +++ b/src/plugins/search/searchplugin.cpp @@ -24,7 +24,7 @@ #include <kstdaction.h> #include <tdepopupmenu.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <krun.h> #include <interfaces/guiinterface.h> #include "searchplugin.h" @@ -65,8 +65,8 @@ namespace kt engines.load(TDEGlobal::dirs()->saveLocation("data","ktorrent") + "search_engines"); TDEToolBar* tb = getGUI()->addToolBar("search"); tab = new SearchTab(tb); - connect(tab,TQT_SIGNAL(search( const TQString&, int, bool )), - this,TQT_SLOT(search( const TQString&, int, bool ))); + connect(tab,TQ_SIGNAL(search( const TQString&, int, bool )), + this,TQ_SLOT(search( const TQString&, int, bool ))); pref = new SearchPrefPage(this); getGUI()->addPrefPage(pref); @@ -106,7 +106,7 @@ namespace kt KURL url = KURL::fromPathOrURL(s_url); if(SearchPluginSettings::useDefaultBrowser()) - kapp->invokeBrowser(url.url()); + tdeApp->invokeBrowser(url.url()); else KRun::runCommand(TQString("%1 \"%2\"").arg(SearchPluginSettings::customBrowser()).arg(url.url()), SearchPluginSettings::customBrowser(), "viewmag" ); @@ -118,7 +118,7 @@ namespace kt SearchWidget* search = new SearchWidget(this); getGUI()->addTabPage(search,iload->loadIconSet("viewmag", TDEIcon::Small),text,this); - TDEAction* copy_act = KStdAction::copy(TQT_TQOBJECT(search),TQT_SLOT(copy()),actionCollection()); + TDEAction* copy_act = KStdAction::copy(search,TQ_SLOT(copy()),actionCollection()); copy_act->plug(search->rightClickMenu(),0); searches.append(search); diff --git a/plugins/search/searchplugin.h b/src/plugins/search/searchplugin.h index 6d6f2dd..f7f41e7 100644 --- a/plugins/search/searchplugin.h +++ b/src/plugins/search/searchplugin.h @@ -36,7 +36,7 @@ namespace kt */ class SearchPlugin : public Plugin, public kt::CloseTabListener { - Q_OBJECT + TQ_OBJECT public: SearchPlugin(TQObject* parent, const char* name, const TQStringList& args); diff --git a/plugins/search/searchpluginsettings.kcfgc b/src/plugins/search/searchpluginsettings.kcfgc index 09cfd64..09cfd64 100644 --- a/plugins/search/searchpluginsettings.kcfgc +++ b/src/plugins/search/searchpluginsettings.kcfgc diff --git a/plugins/search/searchpref.ui b/src/plugins/search/searchpref.ui index 8f5761c..0c169bf 100644 --- a/plugins/search/searchpref.ui +++ b/src/plugins/search/searchpref.ui @@ -300,9 +300,9 @@ <slot>btnUpdate_clicked()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>btnUpdate_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kactivelabel.h</include> diff --git a/plugins/search/searchprefpage.cpp b/src/plugins/search/searchprefpage.cpp index cc9e6d3..89246bc 100644 --- a/plugins/search/searchprefpage.cpp +++ b/src/plugins/search/searchprefpage.cpp @@ -23,7 +23,7 @@ #include <tqfile.h> #include <tdelocale.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <kactivelabel.h> #include <kpushbutton.h> @@ -60,12 +60,12 @@ namespace kt TQToolTip::add(m_infoLabel,info); TQToolTip::add(m_engine_name,info); - connect(btnAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(addClicked())); - connect(btnRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeClicked())); - connect(btn_add_default, TQT_SIGNAL(clicked()), this, TQT_SLOT(addDefaultClicked())); - connect(btnRemoveAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeAllClicked())); + connect(btnAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(addClicked())); + connect(btnRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeClicked())); + connect(btn_add_default, TQ_SIGNAL(clicked()), this, TQ_SLOT(addDefaultClicked())); + connect(btnRemoveAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeAllClicked())); - connect(useCustomBrowser, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(customToggled( bool ))); + connect(useCustomBrowser, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(customToggled( bool ))); useCustomBrowser->setChecked(SearchPluginSettings::useCustomBrowser()); useDefaultBrowser->setChecked(SearchPluginSettings::useDefaultBrowser()); diff --git a/plugins/search/searchprefpage.h b/src/plugins/search/searchprefpage.h index fb2565a..add87a9 100644 --- a/plugins/search/searchprefpage.h +++ b/src/plugins/search/searchprefpage.h @@ -33,7 +33,7 @@ namespace kt class SearchPrefPageWidget : public SEPreferences { - Q_OBJECT + TQ_OBJECT public: SearchPrefPageWidget(TQWidget *parent = 0); diff --git a/plugins/search/searchtab.cpp b/src/plugins/search/searchtab.cpp index c752bc5..dc68dc4 100644 --- a/plugins/search/searchtab.cpp +++ b/src/plugins/search/searchtab.cpp @@ -51,10 +51,10 @@ namespace kt m_clear_button->setIconSet(SmallIconSet(TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase")); m_clear_button->setEnabled(false); - connect(m_search_new_tab,TQT_SIGNAL(clicked()),this,TQT_SLOT(searchNewTabPressed())); - connect(m_search_text,TQT_SIGNAL(returnPressed(const TQString&)),this,TQT_SLOT(searchBoxReturn( const TQString& ))); - connect(m_search_text,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(textChanged( const TQString& ))); - connect(m_clear_button,TQT_SIGNAL(clicked()),this,TQT_SLOT(clearButtonPressed())); + connect(m_search_new_tab,TQ_SIGNAL(clicked()),this,TQ_SLOT(searchNewTabPressed())); + connect(m_search_text,TQ_SIGNAL(returnPressed(const TQString&)),this,TQ_SLOT(searchBoxReturn( const TQString& ))); + connect(m_search_text,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(textChanged( const TQString& ))); + connect(m_clear_button,TQ_SIGNAL(clicked()),this,TQ_SLOT(clearButtonPressed())); m_search_text->setMaxCount(20); m_search_new_tab->setEnabled(false); m_search_text->setInsertionPolicy(TQComboBox::NoInsertion); diff --git a/plugins/search/searchtab.h b/src/plugins/search/searchtab.h index 2f63ab1..35fecfb 100644 --- a/plugins/search/searchtab.h +++ b/src/plugins/search/searchtab.h @@ -35,7 +35,7 @@ namespace kt */ class SearchTab : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/search/searchwidget.cpp b/src/plugins/search/searchwidget.cpp index 128ceeb..39ec574 100644 --- a/plugins/search/searchwidget.cpp +++ b/src/plugins/search/searchwidget.cpp @@ -30,7 +30,7 @@ #include <kpushbutton.h> #include <tdeglobal.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <kcombobox.h> #include <tdepopupmenu.h> @@ -69,18 +69,18 @@ namespace kt back_id = right_click_menu->insertItem( TDEGlobal::iconLoader()->loadIconSet(TQApplication::reverseLayout() ? "forward" : "back",TDEIcon::Small), - i18n("Back"),html_part,TQT_SLOT(back())); + i18n("Back"),html_part,TQ_SLOT(back())); right_click_menu->insertItem( TDEGlobal::iconLoader()->loadIconSet("reload",TDEIcon::Small), - i18n("Reload"),html_part,TQT_SLOT(reload())); + i18n("Reload"),html_part,TQ_SLOT(reload())); right_click_menu->setItemEnabled(back_id,false); sbar->m_back->setEnabled(false); - connect(sbar->m_search_button,TQT_SIGNAL(clicked()),this,TQT_SLOT(searchPressed())); - connect(sbar->m_clear_button,TQT_SIGNAL(clicked()),this,TQT_SLOT(clearPressed())); - connect(sbar->m_search_text,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(searchPressed())); - connect(sbar->m_back,TQT_SIGNAL(clicked()),html_part,TQT_SLOT(back())); - connect(sbar->m_reload,TQT_SIGNAL(clicked()),html_part,TQT_SLOT(reload())); + connect(sbar->m_search_button,TQ_SIGNAL(clicked()),this,TQ_SLOT(searchPressed())); + connect(sbar->m_clear_button,TQ_SIGNAL(clicked()),this,TQ_SLOT(clearPressed())); + connect(sbar->m_search_text,TQ_SIGNAL(returnPressed()),this,TQ_SLOT(searchPressed())); + connect(sbar->m_back,TQ_SIGNAL(clicked()),html_part,TQ_SLOT(back())); + connect(sbar->m_reload,TQ_SIGNAL(clicked()),html_part,TQ_SLOT(reload())); sbar->m_clear_button->setIconSet( TDEGlobal::iconLoader()->loadIconSet(TQApplication::reverseLayout() @@ -92,22 +92,22 @@ namespace kt TDEGlobal::iconLoader()->loadIconSet("reload",TDEIcon::Small)); - connect(html_part,TQT_SIGNAL(backAvailable(bool )), - this,TQT_SLOT(onBackAvailable(bool ))); - connect(html_part,TQT_SIGNAL(onURL(const TQString& )), - this,TQT_SLOT(onURLHover(const TQString& ))); - connect(html_part,TQT_SIGNAL(openTorrent(const KURL& )), - this,TQT_SLOT(onOpenTorrent(const KURL& ))); - connect(html_part,TQT_SIGNAL(popupMenu(const TQString&, const TQPoint& )), - this,TQT_SLOT(showPopupMenu(const TQString&, const TQPoint& ))); - connect(html_part,TQT_SIGNAL(searchFinished()),this,TQT_SLOT(onFinished())); - connect(html_part,TQT_SIGNAL(saveTorrent(const KURL& )), - this,TQT_SLOT(onSaveTorrent(const KURL& ))); + connect(html_part,TQ_SIGNAL(backAvailable(bool )), + this,TQ_SLOT(onBackAvailable(bool ))); + connect(html_part,TQ_SIGNAL(onURL(const TQString& )), + this,TQ_SLOT(onURLHover(const TQString& ))); + connect(html_part,TQ_SIGNAL(openTorrent(const KURL& )), + this,TQ_SLOT(onOpenTorrent(const KURL& ))); + connect(html_part,TQ_SIGNAL(popupMenu(const TQString&, const TQPoint& )), + this,TQ_SLOT(showPopupMenu(const TQString&, const TQPoint& ))); + connect(html_part,TQ_SIGNAL(searchFinished()),this,TQ_SLOT(onFinished())); + connect(html_part,TQ_SIGNAL(saveTorrent(const KURL& )), + this,TQ_SLOT(onSaveTorrent(const KURL& ))); KParts::PartManager* pman = html_part->partManager(); - connect(pman,TQT_SIGNAL(partAdded(KParts::Part*)),this,TQT_SLOT(onFrameAdded(KParts::Part* ))); + connect(pman,TQ_SIGNAL(partAdded(KParts::Part*)),this,TQ_SLOT(onFrameAdded(KParts::Part* ))); - connect(html_part->browserExtension(),TQT_SIGNAL(loadingProgress(int)),this,TQT_SLOT(loadingProgress(int))); + connect(html_part->browserExtension(),TQ_SIGNAL(loadingProgress(int)),this,TQ_SLOT(loadingProgress(int))); prog = 0; } @@ -143,8 +143,8 @@ namespace kt TDEHTMLPart* frame = dynamic_cast<TDEHTMLPart*>(p); if (frame) { - connect(frame,TQT_SIGNAL(popupMenu(const TQString&, const TQPoint& )), - this,TQT_SLOT(showPopupMenu(const TQString&, const TQPoint& ))); + connect(frame,TQ_SIGNAL(popupMenu(const TQString&, const TQPoint& )), + this,TQ_SLOT(showPopupMenu(const TQString&, const TQPoint& ))); } } diff --git a/plugins/search/searchwidget.h b/src/plugins/search/searchwidget.h index 9d42b93..e556f10 100644 --- a/plugins/search/searchwidget.h +++ b/src/plugins/search/searchwidget.h @@ -47,7 +47,7 @@ namespace kt */ class SearchWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: SearchWidget(SearchPlugin* sp); diff --git a/src/plugins/stats/CMakeLists.txt b/src/plugins/stats/CMakeLists.txt new file mode 100644 index 0000000..3589eb6 --- /dev/null +++ b/src/plugins/stats/CMakeLists.txt @@ -0,0 +1,31 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/src/libktorrent + ${CMAKE_CURRENT_BINARY_DIR} +) + + +##### ktstatsplugin (kpart) + +tde_add_kpart( ktstatsplugin AUTOMOC + SOURCES + ChartDrawerData.cpp ChartDrawer.cpp statsspdwgt.ui statsconwgt.ui StatsSpd.cpp + StatsCon.cpp sprefwgt.ui statspluginsettings.kcfgc StatsPluginPrefsPage.cpp + StatsPluginPrefs.cpp statsplugin.cpp + LINK + ktorrent-shared tdecore-shared tdeui-shared tdeio-shared tdeparts-shared tdehtml-shared + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other files + +install( + FILES ktstatsplugin.kcfg + DESTINATION ${KCFG_INSTALL_DIR} +) + +tde_create_translated_desktop( + SOURCE ktstatsplugin.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) diff --git a/plugins/stats/ChartDrawer.cpp b/src/plugins/stats/ChartDrawer.cpp index 6eb08b4..ad4ff67 100644 --- a/plugins/stats/ChartDrawer.cpp +++ b/src/plugins/stats/ChartDrawer.cpp @@ -190,7 +190,7 @@ void ChartDrawer::DrawChart(TQPainter & rPnt) // ------------ TQPen myop(rPnt.pen()); TQPen topl(myop); - topl.setStyle(Qt::DotLine); + topl.setStyle(TQt::DotLine); rPnt.setPen(topl); rPnt.drawLine(0, TrY(FindYScreenCoords(mEls[i].pmVals -> at(mEls[i].pmVals -> size() - 1))), width(), TrY(FindYScreenCoords(mEls[i].pmVals -> at(mEls[i].pmVals -> size() - 1))) ); rPnt.setPen(myop); diff --git a/plugins/stats/ChartDrawer.h b/src/plugins/stats/ChartDrawer.h index d7211b0..83a4e32 100644 --- a/plugins/stats/ChartDrawer.h +++ b/src/plugins/stats/ChartDrawer.h @@ -48,7 +48,7 @@ namespace kt { */ class ChartDrawer : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/stats/ChartDrawerData.cpp b/src/plugins/stats/ChartDrawerData.cpp index ba03261..ba03261 100644 --- a/plugins/stats/ChartDrawerData.cpp +++ b/src/plugins/stats/ChartDrawerData.cpp diff --git a/plugins/stats/ChartDrawerData.h b/src/plugins/stats/ChartDrawerData.h index 19d16e5..19d16e5 100644 --- a/plugins/stats/ChartDrawerData.h +++ b/src/plugins/stats/ChartDrawerData.h diff --git a/plugins/stats/PeerMonitor.cpp b/src/plugins/stats/PeerMonitor.cpp index 083e158..083e158 100644 --- a/plugins/stats/PeerMonitor.cpp +++ b/src/plugins/stats/PeerMonitor.cpp diff --git a/plugins/stats/PeerMonitor.h b/src/plugins/stats/PeerMonitor.h index 3489378..3489378 100644 --- a/plugins/stats/PeerMonitor.h +++ b/src/plugins/stats/PeerMonitor.h diff --git a/plugins/stats/StatsCon.cpp b/src/plugins/stats/StatsCon.cpp index 568005d..d2f8d5f 100644 --- a/plugins/stats/StatsCon.cpp +++ b/src/plugins/stats/StatsCon.cpp @@ -25,13 +25,13 @@ namespace kt { StatsCon::StatsCon(TQWidget * p) : StatsConWgt(p), pmPeersConCht(new ChartDrawer(PeersConGbw, StatsPluginSettings::connectionsMeasurements())), pmDHTCht(new ChartDrawer(DHTGbw, StatsPluginSettings::dHTMeasurements())) { - PeersConGbw->setColumnLayout(0, Qt::Vertical ); + PeersConGbw->setColumnLayout(0, TQt::Vertical ); PeersConGbw->layout()->setSpacing( 6 ); PeersConGbw->layout()->setMargin( 11 ); pmPeersConLay = new TQVBoxLayout(PeersConGbw -> layout()); - DHTGbw->setColumnLayout(0, Qt::Vertical ); + DHTGbw->setColumnLayout(0, TQt::Vertical ); DHTGbw->layout()->setSpacing( 6 ); DHTGbw->layout()->setMargin( 11 ); diff --git a/plugins/stats/StatsCon.h b/src/plugins/stats/StatsCon.h index 53371a2..00deae5 100644 --- a/plugins/stats/StatsCon.h +++ b/src/plugins/stats/StatsCon.h @@ -34,7 +34,7 @@ namespace kt { class StatsCon : public StatsConWgt { - Q_OBJECT + TQ_OBJECT private: ///Layout of peers connections diff --git a/plugins/stats/StatsPluginPrefs.cpp b/src/plugins/stats/StatsPluginPrefs.cpp index e9becd6..e9becd6 100644 --- a/plugins/stats/StatsPluginPrefs.cpp +++ b/src/plugins/stats/StatsPluginPrefs.cpp diff --git a/plugins/stats/StatsPluginPrefs.h b/src/plugins/stats/StatsPluginPrefs.h index 43c524d..047b921 100644 --- a/plugins/stats/StatsPluginPrefs.h +++ b/src/plugins/stats/StatsPluginPrefs.h @@ -42,7 +42,7 @@ namespace kt { */ class StatsPluginPrefs : public TQObject, public PrefPageInterface { - Q_OBJECT + TQ_OBJECT private: diff --git a/plugins/stats/StatsPluginPrefsPage.cpp b/src/plugins/stats/StatsPluginPrefsPage.cpp index e641349..e641349 100644 --- a/plugins/stats/StatsPluginPrefsPage.cpp +++ b/src/plugins/stats/StatsPluginPrefsPage.cpp diff --git a/plugins/stats/StatsPluginPrefsPage.h b/src/plugins/stats/StatsPluginPrefsPage.h index eca849f..eca849f 100644 --- a/plugins/stats/StatsPluginPrefsPage.h +++ b/src/plugins/stats/StatsPluginPrefsPage.h diff --git a/plugins/stats/StatsSpd.cpp b/src/plugins/stats/StatsSpd.cpp index c8cb157..d48e2fd 100644 --- a/plugins/stats/StatsSpd.cpp +++ b/src/plugins/stats/StatsSpd.cpp @@ -28,19 +28,19 @@ StatsSpd::StatsSpd(TQWidget *p) : StatsSpdWgt(p), pmUpCht(new ChartDrawer(UpSpeedGbw, StatsPluginSettings::uploadMeasurements())) { - DownSpeedGbw->setColumnLayout(0, Qt::Vertical ); + DownSpeedGbw->setColumnLayout(0, TQt::Vertical ); DownSpeedGbw->layout()->setSpacing( 6 ); DownSpeedGbw->layout()->setMargin( 11 ); pmDSpdLay = new TQVBoxLayout(DownSpeedGbw -> layout()); - UpSpeedGbw->setColumnLayout(0, Qt::Vertical ); + UpSpeedGbw->setColumnLayout(0, TQt::Vertical ); UpSpeedGbw->layout()->setSpacing( 6 ); UpSpeedGbw->layout()->setMargin( 11 ); pmUSpdLay = new TQVBoxLayout(UpSpeedGbw -> layout()); - PeersSpdGbw->setColumnLayout(0, Qt::Vertical ); + PeersSpdGbw->setColumnLayout(0, TQt::Vertical ); PeersSpdGbw->layout()->setSpacing( 6 ); PeersSpdGbw->layout()->setMargin( 11 ); diff --git a/plugins/stats/StatsSpd.h b/src/plugins/stats/StatsSpd.h index 4f75161..5ec2578 100644 --- a/plugins/stats/StatsSpd.h +++ b/src/plugins/stats/StatsSpd.h @@ -38,7 +38,7 @@ namespace kt { */ class StatsSpd : public StatsSpdWgt { - Q_OBJECT + TQ_OBJECT private: diff --git a/src/plugins/stats/ktstatsplugin.desktop b/src/plugins/stats/ktstatsplugin.desktop new file mode 100644 index 0000000..a67ca35 --- /dev/null +++ b/src/plugins/stats/ktstatsplugin.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=StatsPlugin + +Type=Service +X-TDE-Library=ktstatsplugin +X-TDE-ServiceTypes=KTorrent/Plugin diff --git a/plugins/stats/ktstatsplugin.kcfg b/src/plugins/stats/ktstatsplugin.kcfg index 43c5dd4..43c5dd4 100644 --- a/plugins/stats/ktstatsplugin.kcfg +++ b/src/plugins/stats/ktstatsplugin.kcfg diff --git a/plugins/stats/sprefwgt.ui b/src/plugins/stats/sprefwgt.ui index b6ce139..b6ce139 100644 --- a/plugins/stats/sprefwgt.ui +++ b/src/plugins/stats/sprefwgt.ui diff --git a/plugins/stats/statsconwgt.ui b/src/plugins/stats/statsconwgt.ui index 3565a3c..3565a3c 100644 --- a/plugins/stats/statsconwgt.ui +++ b/src/plugins/stats/statsconwgt.ui diff --git a/plugins/stats/statsplugin.cpp b/src/plugins/stats/statsplugin.cpp index 2980cb3..6693ebd 100644 --- a/plugins/stats/statsplugin.cpp +++ b/src/plugins/stats/statsplugin.cpp @@ -51,13 +51,13 @@ void StatsPlugin::load() pmPrefsUi = new StatsPluginPrefs(); pmUpdTmr = new TQTimer(this); - connect(pmUpdTmr, TQT_SIGNAL(timeout () ), this, TQT_SLOT(UpdateData())); - connect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(RestartTimer())); - connect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(TogglePeersSpdCht())); - connect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(ToggleLchInSwmDrawing())); - connect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(ToggleSdrInSwmDrawing())); - connect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(ChangeMsmtsCounts())); - connect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(ChangeMaxMode())); + connect(pmUpdTmr, TQ_SIGNAL(timeout () ), this, TQ_SLOT(UpdateData())); + connect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(RestartTimer())); + connect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(TogglePeersSpdCht())); + connect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(ToggleLchInSwmDrawing())); + connect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(ToggleSdrInSwmDrawing())); + connect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(ChangeMsmtsCounts())); + connect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(ChangeMaxMode())); TogglePeersSpdCht(); ChangeMaxMode(); @@ -76,13 +76,13 @@ void StatsPlugin::unload() getGUI() -> removeToolWidget(pmUiCon); getGUI() -> removePrefPage(pmPrefsUi); - disconnect(pmUpdTmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(UpdateData())); - disconnect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(RestartTimer())); - disconnect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(TogglePeersSpdCht())); - disconnect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(ToggleLchInSwmDrawing())); - disconnect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(ToggleSdrInSwmDrawing())); - disconnect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(ChangeMsmtsCounts())); - disconnect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(ChangeMaxMode())); + disconnect(pmUpdTmr, TQ_SIGNAL(timeout()), this, TQ_SLOT(UpdateData())); + disconnect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(RestartTimer())); + disconnect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(TogglePeersSpdCht())); + disconnect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(ToggleLchInSwmDrawing())); + disconnect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(ToggleSdrInSwmDrawing())); + disconnect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(ChangeMsmtsCounts())); + disconnect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(ChangeMaxMode())); delete pmUiSpd; delete pmUiCon; diff --git a/plugins/stats/statsplugin.h b/src/plugins/stats/statsplugin.h index 8cdf345..4abb9eb 100644 --- a/plugins/stats/statsplugin.h +++ b/src/plugins/stats/statsplugin.h @@ -51,7 +51,7 @@ namespace kt { */ class StatsPlugin : public Plugin { - Q_OBJECT + TQ_OBJECT private: diff --git a/plugins/stats/statspluginsettings.kcfgc b/src/plugins/stats/statspluginsettings.kcfgc index 034322e..034322e 100644 --- a/plugins/stats/statspluginsettings.kcfgc +++ b/src/plugins/stats/statspluginsettings.kcfgc diff --git a/plugins/stats/statsspdwgt.ui b/src/plugins/stats/statsspdwgt.ui index b04e19a..b04e19a 100644 --- a/plugins/stats/statsspdwgt.ui +++ b/src/plugins/stats/statsspdwgt.ui diff --git a/src/plugins/upnp/CMakeLists.txt b/src/plugins/upnp/CMakeLists.txt new file mode 100644 index 0000000..c68b2e4 --- /dev/null +++ b/src/plugins/upnp/CMakeLists.txt @@ -0,0 +1,36 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/src/libktorrent + ${CMAKE_CURRENT_BINARY_DIR} +) + + +##### ktupnpplugin (kpart) + +tde_add_library( ktupnp STATIC_PIC AUTOMOC + SOURCES + soap.cpp upnpdescriptionparser.cpp upnpmcastsocket.cpp upnprouter.cpp +) + +tde_add_kpart( ktupnpplugin AUTOMOC + SOURCES + upnpplugin.cpp upnpprefpage.cpp upnpwidget.ui upnpprefwidget.cpp upnppluginsettings.kcfgc + EMBED + ktupnp-static + LINK + ktorrent-shared tdecore-shared tdeui-shared tdeio-shared tdeparts-shared tdehtml-shared + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other files + +install( + FILES ktupnpplugin.kcfg + DESTINATION ${KCFG_INSTALL_DIR} +) + +tde_create_translated_desktop( + SOURCE ktupnpplugin.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) diff --git a/src/plugins/upnp/ktupnpplugin.desktop b/src/plugins/upnp/ktupnpplugin.desktop new file mode 100644 index 0000000..f2a529a --- /dev/null +++ b/src/plugins/upnp/ktupnpplugin.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=UPnPPlugin + +Type=Service +X-TDE-Library=ktupnpplugin +X-TDE-ServiceTypes=KTorrent/Plugin diff --git a/plugins/upnp/ktupnpplugin.kcfg b/src/plugins/upnp/ktupnpplugin.kcfg index acce783..acce783 100644 --- a/plugins/upnp/ktupnpplugin.kcfg +++ b/src/plugins/upnp/ktupnpplugin.kcfg diff --git a/plugins/upnp/soap.cpp b/src/plugins/upnp/soap.cpp index c44ab1e..c44ab1e 100644 --- a/plugins/upnp/soap.cpp +++ b/src/plugins/upnp/soap.cpp diff --git a/plugins/upnp/soap.h b/src/plugins/upnp/soap.h index 6632342..6632342 100644 --- a/plugins/upnp/soap.h +++ b/src/plugins/upnp/soap.h diff --git a/plugins/upnp/upnpdescriptionparser.cpp b/src/plugins/upnp/upnpdescriptionparser.cpp index 1e73362..eb9d360 100644 --- a/plugins/upnp/upnpdescriptionparser.cpp +++ b/src/plugins/upnp/upnpdescriptionparser.cpp @@ -73,7 +73,7 @@ namespace kt if (!fptr.open(IO_ReadOnly)) return false; - TQXmlInputSource input(TQT_TQIODEVICE(&fptr)); + TQXmlInputSource input(&fptr); XMLContentHandler chandler(router); TQXmlSimpleReader reader; diff --git a/plugins/upnp/upnpdescriptionparser.h b/src/plugins/upnp/upnpdescriptionparser.h index 2aaacfe..2aaacfe 100644 --- a/plugins/upnp/upnpdescriptionparser.h +++ b/src/plugins/upnp/upnpdescriptionparser.h diff --git a/plugins/upnp/upnpmcastsocket.cpp b/src/plugins/upnp/upnpmcastsocket.cpp index 0172ed2..91c9dd9 100644 --- a/plugins/upnp/upnpmcastsocket.cpp +++ b/src/plugins/upnp/upnpmcastsocket.cpp @@ -47,8 +47,8 @@ namespace kt UPnPMCastSocket::UPnPMCastSocket(bool verbose) : verbose(verbose) { routers.setAutoDelete(true); - TQObject::connect(this,TQT_SIGNAL(readyRead()),this,TQT_SLOT(onReadyRead())); - TQObject::connect(this,TQT_SIGNAL(gotError(int)),this,TQT_SLOT(onError(int))); + TQObject::connect(this,TQ_SIGNAL(readyRead()),this,TQ_SLOT(onReadyRead())); + TQObject::connect(this,TQ_SIGNAL(gotError(int)),this,TQ_SLOT(onError(int))); setAddressReuseable(true); setFamily(KNetwork::KResolver::IPv4Family); setBlocking(true); @@ -67,8 +67,8 @@ namespace kt UPnPMCastSocket::~UPnPMCastSocket() { leaveUPnPMCastGroup(); - TQObject::disconnect(this,TQT_SIGNAL(readyRead()),this,TQT_SLOT(onReadyRead())); - TQObject::disconnect(this,TQT_SIGNAL(gotError(int)),this,TQT_SLOT(onError(int))); + TQObject::disconnect(this,TQ_SIGNAL(readyRead()),this,TQ_SLOT(onReadyRead())); + TQObject::disconnect(this,TQ_SIGNAL(gotError(int)),this,TQ_SLOT(onError(int))); } void UPnPMCastSocket::discover() @@ -142,8 +142,8 @@ namespace kt UPnPRouter* r = parseResponse(p.data()); if (r) { - TQObject::connect(r,TQT_SIGNAL(xmlFileDownloaded( UPnPRouter*, bool )), - this,TQT_SLOT(onXmlFileDownloaded( UPnPRouter*, bool ))); + TQObject::connect(r,TQ_SIGNAL(xmlFileDownloaded( UPnPRouter*, bool )), + this,TQ_SLOT(onXmlFileDownloaded( UPnPRouter*, bool ))); // download it's xml file r->downloadXMLFile(); @@ -269,7 +269,7 @@ namespace kt { UPnPRouter* r = new UPnPRouter(server,location); // download it's xml file - TQObject::connect(r,TQT_SIGNAL(xmlFileDownloaded( UPnPRouter*, bool )),this,TQT_SLOT(onXmlFileDownloaded( UPnPRouter*, bool ))); + TQObject::connect(r,TQ_SIGNAL(xmlFileDownloaded( UPnPRouter*, bool )),this,TQ_SLOT(onXmlFileDownloaded( UPnPRouter*, bool ))); r->downloadXMLFile(); } } diff --git a/plugins/upnp/upnpmcastsocket.h b/src/plugins/upnp/upnpmcastsocket.h index f072531..fbd63df 100644 --- a/plugins/upnp/upnpmcastsocket.h +++ b/src/plugins/upnp/upnpmcastsocket.h @@ -39,7 +39,7 @@ namespace kt */ class UPnPMCastSocket : public KNetwork::KDatagramSocket { - Q_OBJECT + TQ_OBJECT public: UPnPMCastSocket(bool verbose = false); diff --git a/plugins/upnp/upnpplugin.cpp b/src/plugins/upnp/upnpplugin.cpp index a370966..4b57b37 100644 --- a/plugins/upnp/upnpplugin.cpp +++ b/src/plugins/upnp/upnpplugin.cpp @@ -21,7 +21,7 @@ #include <tdeglobal.h> #include <tdelocale.h> #include <kiconloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstdaction.h> #include <tdepopupmenu.h> #include <interfaces/guiinterface.h> diff --git a/plugins/upnp/upnpplugin.h b/src/plugins/upnp/upnpplugin.h index a81a51c..5f4700f 100644 --- a/plugins/upnp/upnpplugin.h +++ b/src/plugins/upnp/upnpplugin.h @@ -32,7 +32,7 @@ namespace kt */ class UPnPPlugin : public Plugin { - Q_OBJECT + TQ_OBJECT public: UPnPPlugin(TQObject* parent, const char* name, const TQStringList& args); diff --git a/plugins/upnp/upnppluginsettings.kcfgc b/src/plugins/upnp/upnppluginsettings.kcfgc index 8917f80..8917f80 100644 --- a/plugins/upnp/upnppluginsettings.kcfgc +++ b/src/plugins/upnp/upnppluginsettings.kcfgc diff --git a/plugins/upnp/upnpprefpage.cpp b/src/plugins/upnp/upnpprefpage.cpp index 1d3a6da..067cbef 100644 --- a/plugins/upnp/upnpprefpage.cpp +++ b/src/plugins/upnp/upnpprefpage.cpp @@ -46,8 +46,8 @@ namespace kt void UPnPPrefPage::createWidget(TQWidget* parent) { widget = new UPnPPrefWidget(parent); - TQObject::connect(sock,TQT_SIGNAL(discovered(UPnPRouter* )),widget,TQT_SLOT(addDevice(UPnPRouter* ))); - TQObject::connect(widget,TQT_SIGNAL(rescan()),sock,TQT_SLOT(discover())); + TQObject::connect(sock,TQ_SIGNAL(discovered(UPnPRouter* )),widget,TQ_SLOT(addDevice(UPnPRouter* ))); + TQObject::connect(widget,TQ_SIGNAL(rescan()),sock,TQ_SLOT(discover())); } void UPnPPrefPage::deleteWidget() diff --git a/plugins/upnp/upnpprefpage.h b/src/plugins/upnp/upnpprefpage.h index b66576e..b66576e 100644 --- a/plugins/upnp/upnpprefpage.h +++ b/src/plugins/upnp/upnpprefpage.h diff --git a/plugins/upnp/upnpprefwidget.cpp b/src/plugins/upnp/upnpprefwidget.cpp index ab84a2e..dd61a3c 100644 --- a/plugins/upnp/upnpprefwidget.cpp +++ b/src/plugins/upnp/upnpprefwidget.cpp @@ -41,9 +41,9 @@ namespace kt : UPnPWidget(parent,name,fl) { def_router = 0; - connect(m_forward_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onForwardBtnClicked())); - connect(m_undo_forward_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onUndoForwardBtnClicked())); - connect(m_rescan,TQT_SIGNAL(clicked()),this,TQT_SLOT(onRescanClicked())); + connect(m_forward_btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(onForwardBtnClicked())); + connect(m_undo_forward_btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(onUndoForwardBtnClicked())); + connect(m_rescan,TQ_SIGNAL(clicked()),this,TQ_SLOT(onRescanClicked())); bt::Globals::instance().getPortList().setListener(this); } @@ -72,7 +72,7 @@ namespace kt void UPnPPrefWidget::addDevice(UPnPRouter* r) { - connect(r,TQT_SIGNAL(updateGUI()),this,TQT_SLOT(updatePortMappings())); + connect(r,TQ_SIGNAL(updateGUI()),this,TQ_SLOT(updatePortMappings())); TDEListViewItem* item = new TDEListViewItem(m_device_list,r->getDescription().friendlyName); item->setMultiLinesEnabled(true); itemmap[item] = r; diff --git a/plugins/upnp/upnpprefwidget.h b/src/plugins/upnp/upnpprefwidget.h index 272e0a2..bcd9ac1 100644 --- a/plugins/upnp/upnpprefwidget.h +++ b/src/plugins/upnp/upnpprefwidget.h @@ -40,7 +40,7 @@ namespace kt */ class UPnPPrefWidget : public UPnPWidget,public net::PortListener { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/upnp/upnprouter.cpp b/src/plugins/upnp/upnprouter.cpp index 0e18e92..c3ece93 100644 --- a/plugins/upnp/upnprouter.cpp +++ b/src/plugins/upnp/upnprouter.cpp @@ -20,7 +20,7 @@ #include <stdlib.h> #include <tdelocale.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqstringlist.h> #include <tdeio/netaccess.h> #include <tdeio/job.h> @@ -171,7 +171,7 @@ namespace kt { // downlaod XML description into a temporary file in /tmp TDEIO::Job* job = TDEIO::file_copy(location,tmp_file,-1,true,false,false); - connect(job,TQT_SIGNAL(result(TDEIO::Job *)),this,TQT_SLOT(downloadFinished( TDEIO::Job* ))); + connect(job,TQ_SIGNAL(result(TDEIO::Job *)),this,TQ_SLOT(downloadFinished( TDEIO::Job* ))); } void UPnPRouter::debugPrintData() @@ -339,12 +339,12 @@ namespace kt HTTPRequest* r = new HTTPRequest(http_hdr,query,location.host(),location.port(),verbose); - connect(r,TQT_SIGNAL(replyError(bt::HTTPRequest* ,const TQString& )), - this,TQT_SLOT(onReplyError(bt::HTTPRequest* ,const TQString& ))); - connect(r,TQT_SIGNAL(replyOK(bt::HTTPRequest* ,const TQString& )), - this,TQT_SLOT(onReplyOK(bt::HTTPRequest* ,const TQString& ))); - connect(r,TQT_SIGNAL(error(bt::HTTPRequest*, bool )), - this,TQT_SLOT(onError(bt::HTTPRequest*, bool ))); + connect(r,TQ_SIGNAL(replyError(bt::HTTPRequest* ,const TQString& )), + this,TQ_SLOT(onReplyError(bt::HTTPRequest* ,const TQString& ))); + connect(r,TQ_SIGNAL(replyOK(bt::HTTPRequest* ,const TQString& )), + this,TQ_SLOT(onReplyOK(bt::HTTPRequest* ,const TQString& ))); + connect(r,TQ_SIGNAL(error(bt::HTTPRequest*, bool )), + this,TQ_SLOT(onError(bt::HTTPRequest*, bool ))); r->start(); if (!at_exit) active_reqs.append(r); diff --git a/plugins/upnp/upnprouter.h b/src/plugins/upnp/upnprouter.h index 081d958..6dbf828 100644 --- a/plugins/upnp/upnprouter.h +++ b/src/plugins/upnp/upnprouter.h @@ -104,7 +104,7 @@ namespace kt */ class UPnPRouter : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/upnp/upnpwidget.ui b/src/plugins/upnp/upnpwidget.ui index 6879d86..6879d86 100644 --- a/plugins/upnp/upnpwidget.ui +++ b/src/plugins/upnp/upnpwidget.ui diff --git a/src/plugins/webinterface/CMakeLists.txt b/src/plugins/webinterface/CMakeLists.txt new file mode 100644 index 0000000..28925a4 --- /dev/null +++ b/src/plugins/webinterface/CMakeLists.txt @@ -0,0 +1,40 @@ + +##### subfolders + +add_subdirectory( www ) + + +##### current folder + +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/src/libktorrent + ${CMAKE_BINARY_DIR}/src/libktorrent +) + + +##### ktwebinterfaceplugin (kpart) + +tde_add_kpart( ktwebinterfaceplugin AUTOMOC + SOURCES + webinterfaceplugin.cpp httpserver.cpp php_handler.cpp php_interface.cpp webinterfacepref.ui + webinterfacepluginsettings.kcfgc webinterfaceprefwidget.cpp webinterfaceprefpage.cpp + httpclienthandler.cpp httpresponseheader.cpp + LINK + ktorrent-shared tdecore-shared tdeui-shared tdeio-shared tdeparts-shared tdehtml-shared + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other files + +install( + FILES ktwebinterfaceplugin.kcfg + DESTINATION ${KCFG_INSTALL_DIR} +) + +tde_create_translated_desktop( + SOURCE ktwebinterfaceplugin.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) diff --git a/plugins/webinterface/httpclienthandler.cpp b/src/plugins/webinterface/httpclienthandler.cpp index cba0372..bc2a4f6 100644 --- a/plugins/webinterface/httpclienthandler.cpp +++ b/src/plugins/webinterface/httpclienthandler.cpp @@ -212,7 +212,7 @@ namespace kt else { php_response_hdr = hdr; - connect(php,TQT_SIGNAL(finished()),this,TQT_SLOT(onPHPFinished())); + connect(php,TQ_SIGNAL(finished()),this,TQ_SLOT(onPHPFinished())); state = PROCESSING_PHP; } } diff --git a/plugins/webinterface/httpclienthandler.h b/src/plugins/webinterface/httpclienthandler.h index 01d3913..8afbc39 100644 --- a/plugins/webinterface/httpclienthandler.h +++ b/src/plugins/webinterface/httpclienthandler.h @@ -40,7 +40,7 @@ namespace kt */ class HttpClientHandler : public TQObject { - Q_OBJECT + TQ_OBJECT enum State { diff --git a/plugins/webinterface/httpresponseheader.cpp b/src/plugins/webinterface/httpresponseheader.cpp index 3056f79..3056f79 100644 --- a/plugins/webinterface/httpresponseheader.cpp +++ b/src/plugins/webinterface/httpresponseheader.cpp diff --git a/plugins/webinterface/httpresponseheader.h b/src/plugins/webinterface/httpresponseheader.h index 417fe6b..417fe6b 100644 --- a/plugins/webinterface/httpresponseheader.h +++ b/src/plugins/webinterface/httpresponseheader.h diff --git a/plugins/webinterface/httpserver.cpp b/src/plugins/webinterface/httpserver.cpp index 24e847f..0860903 100644 --- a/plugins/webinterface/httpserver.cpp +++ b/src/plugins/webinterface/httpserver.cpp @@ -23,7 +23,7 @@ #include <tdeapplication.h> #include <kgenericfactory.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kmdcodec.h> #include <tdetempfile.h> @@ -75,9 +75,9 @@ namespace kt TQSocket* socket = new TQSocket(this); socket->setSocket(s); - connect(socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotSocketReadyToRead())); - connect(socket, TQT_SIGNAL(delayedCloseFinished()), this, TQT_SLOT(slotConnectionClosed())); - connect(socket, TQT_SIGNAL(connectionClosed()), this, TQT_SLOT(slotConnectionClosed())); + connect(socket, TQ_SIGNAL(readyRead()), this, TQ_SLOT(slotSocketReadyToRead())); + connect(socket, TQ_SIGNAL(delayedCloseFinished()), this, TQ_SLOT(slotConnectionClosed())); + connect(socket, TQ_SIGNAL(connectionClosed()), this, TQ_SLOT(slotConnectionClosed())); HttpClientHandler* handler = new HttpClientHandler(this,socket); clients.insert(socket,handler); @@ -248,7 +248,7 @@ namespace kt void HttpServer::setDefaultResponseHeaders(HttpResponseHeader & hdr,const TQString & content_type,bool with_session_info) { hdr.setValue("Server","KTorrent/" KT_VERSION_MACRO); - hdr.setValue("Date",DateTimeToString(TQDateTime::currentDateTime(Qt::UTC),false)); + hdr.setValue("Date",DateTimeToString(TQDateTime::currentDateTime(TQt::UTC),false)); hdr.setValue("Content-Type",content_type); hdr.setValue("Connection","keep-alive"); if (with_session_info && session.sessionId && session.logged_in) @@ -351,7 +351,7 @@ namespace kt setDefaultResponseHeaders(rhdr,"text/html",true); rhdr.setValue("Cache-Control","max-age=0"); rhdr.setValue("Last-Modified",DateTimeToString(fi.lastModified(),false)); - rhdr.setValue("Expires",DateTimeToString(TQDateTime::currentDateTime(Qt::UTC).addSecs(3600),false)); + rhdr.setValue("Expires",DateTimeToString(TQDateTime::currentDateTime(TQt::UTC).addSecs(3600),false)); hdlr->sendResponse(rhdr); return; } @@ -361,7 +361,7 @@ namespace kt HttpResponseHeader rhdr(200); setDefaultResponseHeaders(rhdr,ExtensionToContentType(ext),true); rhdr.setValue("Last-Modified",DateTimeToString(fi.lastModified(),false)); - rhdr.setValue("Expires",DateTimeToString(TQDateTime::currentDateTime(Qt::UTC).addSecs(3600),false)); + rhdr.setValue("Expires",DateTimeToString(TQDateTime::currentDateTime(TQt::UTC).addSecs(3600),false)); rhdr.setValue("Cache-Control","private"); if (!hdlr->sendFile(rhdr,path)) { @@ -381,7 +381,7 @@ namespace kt { // first send back login page redirectToLoginPage(hdlr); - TQTimer::singleShot(1000,kapp,TQT_SLOT(quit())); + TQTimer::singleShot(1000,tdeApp,TQ_SLOT(quit())); } else if (redirect) { @@ -505,7 +505,7 @@ namespace kt d.setYMD(sl[3].toInt(),m,sl[1].toInt()); - TQTime t = TQTime::fromString(sl[4],Qt::ISODate); + TQTime t = TQTime::fromString(sl[4],TQt::ISODate); return TQDateTime(d,t); } else if (sl.count() == 4) @@ -524,7 +524,7 @@ namespace kt d.setYMD(2000 + dl[2].toInt(),m,dl[0].toInt()); - TQTime t = TQTime::fromString(sl[2],Qt::ISODate); + TQTime t = TQTime::fromString(sl[2],TQt::ISODate); return TQDateTime(d,t); } else if (sl.count() == 5) @@ -539,7 +539,7 @@ namespace kt d.setYMD(sl[4].toInt(),m,sl[2].toInt()); - TQTime t = TQTime::fromString(sl[3],Qt::ISODate); + TQTime t = TQTime::fromString(sl[3],TQt::ISODate); return TQDateTime(d,t); } else diff --git a/plugins/webinterface/httpserver.h b/src/plugins/webinterface/httpserver.h index a5eaa3b..33eeddf 100644 --- a/plugins/webinterface/httpserver.h +++ b/src/plugins/webinterface/httpserver.h @@ -64,7 +64,7 @@ namespace kt class HttpServer : public TQServerSocket { - Q_OBJECT + TQ_OBJECT public: HttpServer(CoreInterface *core, int port); diff --git a/src/plugins/webinterface/ktwebinterfaceplugin.desktop b/src/plugins/webinterface/ktwebinterfaceplugin.desktop new file mode 100644 index 0000000..8e65383 --- /dev/null +++ b/src/plugins/webinterface/ktwebinterfaceplugin.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=WebInterface + +Type=Service +X-TDE-Library=ktwebinterfaceplugin +X-TDE-ServiceTypes=KTorrent/Plugin diff --git a/plugins/webinterface/ktwebinterfaceplugin.kcfg b/src/plugins/webinterface/ktwebinterfaceplugin.kcfg index cbfd5e7..cbfd5e7 100644 --- a/plugins/webinterface/ktwebinterfaceplugin.kcfg +++ b/src/plugins/webinterface/ktwebinterfaceplugin.kcfg diff --git a/plugins/webinterface/php_handler.cpp b/src/plugins/webinterface/php_handler.cpp index cd8fd63..6586f7e 100644 --- a/plugins/webinterface/php_handler.cpp +++ b/src/plugins/webinterface/php_handler.cpp @@ -37,8 +37,8 @@ namespace kt PhpHandler::PhpHandler(const TQString & php_exe,PhpInterface *php) : TQProcess(php_exe),php_i(php) { - connect(this,TQT_SIGNAL(readyReadStdout()),this,TQT_SLOT(onReadyReadStdout())); - connect(this,TQT_SIGNAL(processExited()),this,TQT_SLOT(onExited())); + connect(this,TQ_SIGNAL(readyReadStdout()),this,TQ_SLOT(onReadyReadStdout())); + connect(this,TQ_SIGNAL(processExited()),this,TQ_SLOT(onExited())); } PhpHandler::~PhpHandler() @@ -101,7 +101,7 @@ namespace kt return launch(data); } - bool PhpHandler::containsDelimiters(const QString & str) + bool PhpHandler::containsDelimiters(const TQString & str) { return str.contains("\"") || str.contains("'"); } diff --git a/plugins/webinterface/php_handler.h b/src/plugins/webinterface/php_handler.h index 37a87e6..e817b51 100644 --- a/plugins/webinterface/php_handler.h +++ b/src/plugins/webinterface/php_handler.h @@ -31,7 +31,7 @@ namespace kt class PhpHandler : public TQProcess { - Q_OBJECT + TQ_OBJECT public: PhpHandler(const TQString & php_exe,PhpInterface *php); @@ -48,7 +48,7 @@ namespace kt void finished(); private: - bool containsDelimiters(const QString & str); + bool containsDelimiters(const TQString & str); private: TQByteArray output; diff --git a/plugins/webinterface/php_interface.cpp b/src/plugins/webinterface/php_interface.cpp index eb42684..eb42684 100644 --- a/plugins/webinterface/php_interface.cpp +++ b/src/plugins/webinterface/php_interface.cpp diff --git a/plugins/webinterface/php_interface.h b/src/plugins/webinterface/php_interface.h index acfd8c7..acfd8c7 100644 --- a/plugins/webinterface/php_interface.h +++ b/src/plugins/webinterface/php_interface.h diff --git a/plugins/webinterface/webinterfaceplugin.cpp b/src/plugins/webinterface/webinterfaceplugin.cpp index fb47d03..fb47d03 100644 --- a/plugins/webinterface/webinterfaceplugin.cpp +++ b/src/plugins/webinterface/webinterfaceplugin.cpp diff --git a/plugins/webinterface/webinterfaceplugin.h b/src/plugins/webinterface/webinterfaceplugin.h index 260aa00..0edb5ed 100644 --- a/plugins/webinterface/webinterfaceplugin.h +++ b/src/plugins/webinterface/webinterfaceplugin.h @@ -32,7 +32,7 @@ namespace kt class WebInterfacePlugin : public Plugin { - Q_OBJECT + TQ_OBJECT public: WebInterfacePlugin(TQObject* parent, const char* name, const TQStringList& args); diff --git a/plugins/webinterface/webinterfacepluginsettings.kcfgc b/src/plugins/webinterface/webinterfacepluginsettings.kcfgc index 1306161..1306161 100644 --- a/plugins/webinterface/webinterfacepluginsettings.kcfgc +++ b/src/plugins/webinterface/webinterfacepluginsettings.kcfgc diff --git a/plugins/webinterface/webinterfacepref.ui b/src/plugins/webinterface/webinterfacepref.ui index 8e6e7c2..5830b0c 100644 --- a/plugins/webinterface/webinterfacepref.ui +++ b/src/plugins/webinterface/webinterfacepref.ui @@ -239,10 +239,10 @@ <slot>changeLedState()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>btnUpdate_clicked()</slot> <slot>changeLedState()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kled.h</include> diff --git a/plugins/webinterface/webinterfaceprefpage.cpp b/src/plugins/webinterface/webinterfaceprefpage.cpp index ecc7a62..ecc7a62 100644 --- a/plugins/webinterface/webinterfaceprefpage.cpp +++ b/src/plugins/webinterface/webinterfaceprefpage.cpp diff --git a/plugins/webinterface/webinterfaceprefpage.h b/src/plugins/webinterface/webinterfaceprefpage.h index f05c723..f05c723 100644 --- a/plugins/webinterface/webinterfaceprefpage.h +++ b/src/plugins/webinterface/webinterfaceprefpage.h diff --git a/plugins/webinterface/webinterfaceprefwidget.cpp b/src/plugins/webinterface/webinterfaceprefwidget.cpp index 33cef5a..92b983a 100644 --- a/plugins/webinterface/webinterfaceprefwidget.cpp +++ b/src/plugins/webinterface/webinterfaceprefwidget.cpp @@ -24,7 +24,7 @@ #include <tdelocale.h> #include <tdeglobal.h> #include <kiconloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqwidget.h> #include <tqstring.h> diff --git a/plugins/webinterface/webinterfaceprefwidget.h b/src/plugins/webinterface/webinterfaceprefwidget.h index 3d3b5e4..0f227ee 100644 --- a/plugins/webinterface/webinterfaceprefwidget.h +++ b/src/plugins/webinterface/webinterfaceprefwidget.h @@ -27,7 +27,7 @@ namespace kt class WebInterfacePrefWidget:public WebInterfacePreference { - Q_OBJECT + TQ_OBJECT public: WebInterfacePrefWidget(TQWidget *parent = 0, const char *name = 0); diff --git a/src/plugins/webinterface/www/CMakeLists.txt b/src/plugins/webinterface/www/CMakeLists.txt new file mode 100644 index 0000000..42b186a --- /dev/null +++ b/src/plugins/webinterface/www/CMakeLists.txt @@ -0,0 +1 @@ +tde_auto_add_subdirectories() diff --git a/src/plugins/webinterface/www/coldmilk/CMakeLists.txt b/src/plugins/webinterface/www/coldmilk/CMakeLists.txt new file mode 100644 index 0000000..0e62c03 --- /dev/null +++ b/src/plugins/webinterface/www/coldmilk/CMakeLists.txt @@ -0,0 +1,14 @@ + +##### subfolders + +add_subdirectory( icons ) + + +##### other files + +install( + FILES + favicon.ico icon.png interface.js interface.php login.html + page_update.js rest.php shutdown.php style.css + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/www/coldmilk +) diff --git a/plugins/webinterface/www/coldmilk/favicon.ico b/src/plugins/webinterface/www/coldmilk/favicon.ico Binary files differindex 3213b23..3213b23 100644 --- a/plugins/webinterface/www/coldmilk/favicon.ico +++ b/src/plugins/webinterface/www/coldmilk/favicon.ico diff --git a/plugins/webinterface/www/coldmilk/icon.png b/src/plugins/webinterface/www/coldmilk/icon.png Binary files differindex fbe2294..fbe2294 100644 --- a/plugins/webinterface/www/coldmilk/icon.png +++ b/src/plugins/webinterface/www/coldmilk/icon.png diff --git a/src/plugins/webinterface/www/coldmilk/icons/16x16/CMakeLists.txt b/src/plugins/webinterface/www/coldmilk/icons/16x16/CMakeLists.txt new file mode 100644 index 0000000..890999c --- /dev/null +++ b/src/plugins/webinterface/www/coldmilk/icons/16x16/CMakeLists.txt @@ -0,0 +1,7 @@ + +##### icon files + +install( + FILES edit_user.png high_priority.png low_priority.png normal_priority.png only_seed.png + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/www/coldmilk/icons/16x16 +) diff --git a/plugins/webinterface/www/coldmilk/icons/16x16/edit_user.png b/src/plugins/webinterface/www/coldmilk/icons/16x16/edit_user.png Binary files differindex c8135c8..c8135c8 100644 --- a/plugins/webinterface/www/coldmilk/icons/16x16/edit_user.png +++ b/src/plugins/webinterface/www/coldmilk/icons/16x16/edit_user.png diff --git a/plugins/webinterface/www/coldmilk/icons/16x16/high_priority.png b/src/plugins/webinterface/www/coldmilk/icons/16x16/high_priority.png Binary files differindex 3bb3d2c..3bb3d2c 100644 --- a/plugins/webinterface/www/coldmilk/icons/16x16/high_priority.png +++ b/src/plugins/webinterface/www/coldmilk/icons/16x16/high_priority.png diff --git a/plugins/webinterface/www/coldmilk/icons/16x16/low_priority.png b/src/plugins/webinterface/www/coldmilk/icons/16x16/low_priority.png Binary files differindex e6bea7d..e6bea7d 100644 --- a/plugins/webinterface/www/coldmilk/icons/16x16/low_priority.png +++ b/src/plugins/webinterface/www/coldmilk/icons/16x16/low_priority.png diff --git a/plugins/webinterface/www/coldmilk/icons/16x16/normal_priority.png b/src/plugins/webinterface/www/coldmilk/icons/16x16/normal_priority.png Binary files differindex d4dcb20..d4dcb20 100644 --- a/plugins/webinterface/www/coldmilk/icons/16x16/normal_priority.png +++ b/src/plugins/webinterface/www/coldmilk/icons/16x16/normal_priority.png diff --git a/plugins/webinterface/www/coldmilk/icons/16x16/only_seed.png b/src/plugins/webinterface/www/coldmilk/icons/16x16/only_seed.png Binary files differindex fae2635..fae2635 100644 --- a/plugins/webinterface/www/coldmilk/icons/16x16/only_seed.png +++ b/src/plugins/webinterface/www/coldmilk/icons/16x16/only_seed.png diff --git a/src/plugins/webinterface/www/coldmilk/icons/22x22/CMakeLists.txt b/src/plugins/webinterface/www/coldmilk/icons/22x22/CMakeLists.txt new file mode 100644 index 0000000..fc75d62 --- /dev/null +++ b/src/plugins/webinterface/www/coldmilk/icons/22x22/CMakeLists.txt @@ -0,0 +1,7 @@ + +##### icon files + +install( + FILES exit.png ktstart_all.png ktstop_all.png remove.png start.png stop.png + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/www/coldmilk/icons/22x22 +) diff --git a/plugins/webinterface/www/coldmilk/icons/22x22/exit.png b/src/plugins/webinterface/www/coldmilk/icons/22x22/exit.png Binary files differindex 8c8cbd4..8c8cbd4 100644 --- a/plugins/webinterface/www/coldmilk/icons/22x22/exit.png +++ b/src/plugins/webinterface/www/coldmilk/icons/22x22/exit.png diff --git a/plugins/webinterface/www/coldmilk/icons/22x22/ktstart_all.png b/src/plugins/webinterface/www/coldmilk/icons/22x22/ktstart_all.png Binary files differindex f46ed84..f46ed84 100644 --- a/plugins/webinterface/www/coldmilk/icons/22x22/ktstart_all.png +++ b/src/plugins/webinterface/www/coldmilk/icons/22x22/ktstart_all.png diff --git a/plugins/webinterface/www/coldmilk/icons/22x22/ktstop_all.png b/src/plugins/webinterface/www/coldmilk/icons/22x22/ktstop_all.png Binary files differindex 73b548b..73b548b 100644 --- a/plugins/webinterface/www/coldmilk/icons/22x22/ktstop_all.png +++ b/src/plugins/webinterface/www/coldmilk/icons/22x22/ktstop_all.png diff --git a/plugins/webinterface/www/coldmilk/icons/22x22/remove.png b/src/plugins/webinterface/www/coldmilk/icons/22x22/remove.png Binary files differindex 7df1928..7df1928 100644 --- a/plugins/webinterface/www/coldmilk/icons/22x22/remove.png +++ b/src/plugins/webinterface/www/coldmilk/icons/22x22/remove.png diff --git a/plugins/webinterface/www/coldmilk/icons/22x22/start.png b/src/plugins/webinterface/www/coldmilk/icons/22x22/start.png Binary files differindex a55e49c..a55e49c 100644 --- a/plugins/webinterface/www/coldmilk/icons/22x22/start.png +++ b/src/plugins/webinterface/www/coldmilk/icons/22x22/start.png diff --git a/plugins/webinterface/www/coldmilk/icons/22x22/stop.png b/src/plugins/webinterface/www/coldmilk/icons/22x22/stop.png Binary files differindex 9c464de..9c464de 100644 --- a/plugins/webinterface/www/coldmilk/icons/22x22/stop.png +++ b/src/plugins/webinterface/www/coldmilk/icons/22x22/stop.png diff --git a/src/plugins/webinterface/www/coldmilk/icons/32x32/CMakeLists.txt b/src/plugins/webinterface/www/coldmilk/icons/32x32/CMakeLists.txt new file mode 100644 index 0000000..50cbc0f --- /dev/null +++ b/src/plugins/webinterface/www/coldmilk/icons/32x32/CMakeLists.txt @@ -0,0 +1,7 @@ + +##### icon files + +install( + FILES configure.png extender_opened.png fileopen.png folder1.png + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/www/coldmilk/icons/32x32 +) diff --git a/plugins/webinterface/www/coldmilk/icons/32x32/configure.png b/src/plugins/webinterface/www/coldmilk/icons/32x32/configure.png Binary files differindex d0e5539..d0e5539 100644 --- a/plugins/webinterface/www/coldmilk/icons/32x32/configure.png +++ b/src/plugins/webinterface/www/coldmilk/icons/32x32/configure.png diff --git a/plugins/webinterface/www/coldmilk/icons/32x32/extender_opened.png b/src/plugins/webinterface/www/coldmilk/icons/32x32/extender_opened.png Binary files differindex 9488d81..9488d81 100644 --- a/plugins/webinterface/www/coldmilk/icons/32x32/extender_opened.png +++ b/src/plugins/webinterface/www/coldmilk/icons/32x32/extender_opened.png diff --git a/plugins/webinterface/www/coldmilk/icons/32x32/fileopen.png b/src/plugins/webinterface/www/coldmilk/icons/32x32/fileopen.png Binary files differindex 9d19a5a..9d19a5a 100644 --- a/plugins/webinterface/www/coldmilk/icons/32x32/fileopen.png +++ b/src/plugins/webinterface/www/coldmilk/icons/32x32/fileopen.png diff --git a/plugins/webinterface/www/coldmilk/icons/32x32/folder1.png b/src/plugins/webinterface/www/coldmilk/icons/32x32/folder1.png Binary files differindex d719405..d719405 100644 --- a/plugins/webinterface/www/coldmilk/icons/32x32/folder1.png +++ b/src/plugins/webinterface/www/coldmilk/icons/32x32/folder1.png diff --git a/src/plugins/webinterface/www/coldmilk/icons/48x48/CMakeLists.txt b/src/plugins/webinterface/www/coldmilk/icons/48x48/CMakeLists.txt new file mode 100644 index 0000000..24ecf55 --- /dev/null +++ b/src/plugins/webinterface/www/coldmilk/icons/48x48/CMakeLists.txt @@ -0,0 +1,7 @@ + +##### icon files + +install( + FILES exit.png switchuser.png + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/www/coldmilk/icons/48x48 +) diff --git a/plugins/webinterface/www/coldmilk/icons/48x48/exit.png b/src/plugins/webinterface/www/coldmilk/icons/48x48/exit.png Binary files differindex 1b2e5eb..1b2e5eb 100644 --- a/plugins/webinterface/www/coldmilk/icons/48x48/exit.png +++ b/src/plugins/webinterface/www/coldmilk/icons/48x48/exit.png diff --git a/plugins/webinterface/www/coldmilk/icons/48x48/switchuser.png b/src/plugins/webinterface/www/coldmilk/icons/48x48/switchuser.png Binary files differindex a1f5b80..a1f5b80 100644 --- a/plugins/webinterface/www/coldmilk/icons/48x48/switchuser.png +++ b/src/plugins/webinterface/www/coldmilk/icons/48x48/switchuser.png diff --git a/src/plugins/webinterface/www/coldmilk/icons/64x64/CMakeLists.txt b/src/plugins/webinterface/www/coldmilk/icons/64x64/CMakeLists.txt new file mode 100644 index 0000000..f5f01d8 --- /dev/null +++ b/src/plugins/webinterface/www/coldmilk/icons/64x64/CMakeLists.txt @@ -0,0 +1,7 @@ + +##### icon files + +install( + FILES down.png folder1_man.png looknfeel.png + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/www/coldmilk/icons/64x64 +) diff --git a/plugins/webinterface/www/coldmilk/icons/64x64/down.png b/src/plugins/webinterface/www/coldmilk/icons/64x64/down.png Binary files differindex cb1d047..cb1d047 100644 --- a/plugins/webinterface/www/coldmilk/icons/64x64/down.png +++ b/src/plugins/webinterface/www/coldmilk/icons/64x64/down.png diff --git a/plugins/webinterface/www/coldmilk/icons/64x64/folder1_man.png b/src/plugins/webinterface/www/coldmilk/icons/64x64/folder1_man.png Binary files differindex 3861718..3861718 100644 --- a/plugins/webinterface/www/coldmilk/icons/64x64/folder1_man.png +++ b/src/plugins/webinterface/www/coldmilk/icons/64x64/folder1_man.png diff --git a/plugins/webinterface/www/coldmilk/icons/64x64/looknfeel.png b/src/plugins/webinterface/www/coldmilk/icons/64x64/looknfeel.png Binary files differindex 51c28fe..51c28fe 100644 --- a/plugins/webinterface/www/coldmilk/icons/64x64/looknfeel.png +++ b/src/plugins/webinterface/www/coldmilk/icons/64x64/looknfeel.png diff --git a/src/plugins/webinterface/www/coldmilk/icons/CMakeLists.txt b/src/plugins/webinterface/www/coldmilk/icons/CMakeLists.txt new file mode 100644 index 0000000..9a574a7 --- /dev/null +++ b/src/plugins/webinterface/www/coldmilk/icons/CMakeLists.txt @@ -0,0 +1,13 @@ +##### install icons for each size + +file( GLOB icon_sizes RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*" ) + +foreach( icon_size IN LISTS icon_sizes ) + if( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${icon_size} ) + file( GLOB icons RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${icon_size}/*.png" ) + install( + FILES ${icons} + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/www/coldmilk/icons/${icon_size} + ) + endif() +endforeach() diff --git a/plugins/webinterface/www/coldmilk/interface.js b/src/plugins/webinterface/www/coldmilk/interface.js index 2f361a5..2f361a5 100644 --- a/plugins/webinterface/www/coldmilk/interface.js +++ b/src/plugins/webinterface/www/coldmilk/interface.js diff --git a/plugins/webinterface/www/coldmilk/interface.php b/src/plugins/webinterface/www/coldmilk/interface.php index 246f347..246f347 100644 --- a/plugins/webinterface/www/coldmilk/interface.php +++ b/src/plugins/webinterface/www/coldmilk/interface.php diff --git a/plugins/webinterface/www/coldmilk/login.html b/src/plugins/webinterface/www/coldmilk/login.html index fa95faf..fa95faf 100644 --- a/plugins/webinterface/www/coldmilk/login.html +++ b/src/plugins/webinterface/www/coldmilk/login.html diff --git a/plugins/webinterface/www/coldmilk/page_update.js b/src/plugins/webinterface/www/coldmilk/page_update.js index c004456..c004456 100644 --- a/plugins/webinterface/www/coldmilk/page_update.js +++ b/src/plugins/webinterface/www/coldmilk/page_update.js diff --git a/plugins/webinterface/www/coldmilk/rest.php b/src/plugins/webinterface/www/coldmilk/rest.php index bab7e68..bab7e68 100644 --- a/plugins/webinterface/www/coldmilk/rest.php +++ b/src/plugins/webinterface/www/coldmilk/rest.php diff --git a/plugins/webinterface/www/coldmilk/shutdown.php b/src/plugins/webinterface/www/coldmilk/shutdown.php index 92862c4..92862c4 100644 --- a/plugins/webinterface/www/coldmilk/shutdown.php +++ b/src/plugins/webinterface/www/coldmilk/shutdown.php diff --git a/plugins/webinterface/www/coldmilk/style.css b/src/plugins/webinterface/www/coldmilk/style.css index 69010dc..69010dc 100644 --- a/plugins/webinterface/www/coldmilk/style.css +++ b/src/plugins/webinterface/www/coldmilk/style.css diff --git a/src/plugins/webinterface/www/default/CMakeLists.txt b/src/plugins/webinterface/www/default/CMakeLists.txt new file mode 100644 index 0000000..671fda7 --- /dev/null +++ b/src/plugins/webinterface/www/default/CMakeLists.txt @@ -0,0 +1,11 @@ + +##### other files + +install( + FILES + details.php only_seed.png favicon.ico grad1.jpg grad2.jpg menu_bg.png + header_tile.png high_priority.png icon.png interface.php ktorrentwebinterfacelogo.png + login.html low_priority.png normal_priority.png remove.png shutdown.php start.png + stop.png style.css stylen.css wz_tooltip.js + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/www/default +) diff --git a/plugins/webinterface/www/default/details.php b/src/plugins/webinterface/www/default/details.php index a19d57e..a19d57e 100644 --- a/plugins/webinterface/www/default/details.php +++ b/src/plugins/webinterface/www/default/details.php diff --git a/plugins/webinterface/www/default/favicon.ico b/src/plugins/webinterface/www/default/favicon.ico Binary files differindex 3213b23..3213b23 100644 --- a/plugins/webinterface/www/default/favicon.ico +++ b/src/plugins/webinterface/www/default/favicon.ico diff --git a/plugins/webinterface/www/default/grad1.jpg b/src/plugins/webinterface/www/default/grad1.jpg Binary files differindex 762baa0..762baa0 100644 --- a/plugins/webinterface/www/default/grad1.jpg +++ b/src/plugins/webinterface/www/default/grad1.jpg diff --git a/plugins/webinterface/www/default/grad2.jpg b/src/plugins/webinterface/www/default/grad2.jpg Binary files differindex bc4d77e..bc4d77e 100644 --- a/plugins/webinterface/www/default/grad2.jpg +++ b/src/plugins/webinterface/www/default/grad2.jpg diff --git a/plugins/webinterface/www/default/header_tile.png b/src/plugins/webinterface/www/default/header_tile.png Binary files differindex 9dd45b6..9dd45b6 100644 --- a/plugins/webinterface/www/default/header_tile.png +++ b/src/plugins/webinterface/www/default/header_tile.png diff --git a/plugins/webinterface/www/default/high_priority.png b/src/plugins/webinterface/www/default/high_priority.png Binary files differindex 3bb3d2c..3bb3d2c 100644 --- a/plugins/webinterface/www/default/high_priority.png +++ b/src/plugins/webinterface/www/default/high_priority.png diff --git a/plugins/webinterface/www/default/icon.png b/src/plugins/webinterface/www/default/icon.png Binary files differindex fbe2294..fbe2294 100644 --- a/plugins/webinterface/www/default/icon.png +++ b/src/plugins/webinterface/www/default/icon.png diff --git a/plugins/webinterface/www/default/interface.php b/src/plugins/webinterface/www/default/interface.php index 6432798..6432798 100644 --- a/plugins/webinterface/www/default/interface.php +++ b/src/plugins/webinterface/www/default/interface.php diff --git a/plugins/webinterface/www/default/ktorrentwebinterfacelogo.png b/src/plugins/webinterface/www/default/ktorrentwebinterfacelogo.png Binary files differindex 6146fb1..6146fb1 100644 --- a/plugins/webinterface/www/default/ktorrentwebinterfacelogo.png +++ b/src/plugins/webinterface/www/default/ktorrentwebinterfacelogo.png diff --git a/plugins/webinterface/www/default/login.html b/src/plugins/webinterface/www/default/login.html index 93ac1e6..93ac1e6 100644 --- a/plugins/webinterface/www/default/login.html +++ b/src/plugins/webinterface/www/default/login.html diff --git a/plugins/webinterface/www/default/low_priority.png b/src/plugins/webinterface/www/default/low_priority.png Binary files differindex e6bea7d..e6bea7d 100644 --- a/plugins/webinterface/www/default/low_priority.png +++ b/src/plugins/webinterface/www/default/low_priority.png diff --git a/plugins/webinterface/www/default/menu_bg.png b/src/plugins/webinterface/www/default/menu_bg.png Binary files differindex 298fef1..298fef1 100644 --- a/plugins/webinterface/www/default/menu_bg.png +++ b/src/plugins/webinterface/www/default/menu_bg.png diff --git a/plugins/webinterface/www/default/normal_priority.png b/src/plugins/webinterface/www/default/normal_priority.png Binary files differindex d4dcb20..d4dcb20 100644 --- a/plugins/webinterface/www/default/normal_priority.png +++ b/src/plugins/webinterface/www/default/normal_priority.png diff --git a/plugins/webinterface/www/default/only_seed.png b/src/plugins/webinterface/www/default/only_seed.png Binary files differindex fae2635..fae2635 100644 --- a/plugins/webinterface/www/default/only_seed.png +++ b/src/plugins/webinterface/www/default/only_seed.png diff --git a/plugins/webinterface/www/default/remove.png b/src/plugins/webinterface/www/default/remove.png Binary files differindex 5b30781..5b30781 100644 --- a/plugins/webinterface/www/default/remove.png +++ b/src/plugins/webinterface/www/default/remove.png diff --git a/plugins/webinterface/www/default/shutdown.php b/src/plugins/webinterface/www/default/shutdown.php index f87a199..f87a199 100644 --- a/plugins/webinterface/www/default/shutdown.php +++ b/src/plugins/webinterface/www/default/shutdown.php diff --git a/plugins/webinterface/www/default/start.png b/src/plugins/webinterface/www/default/start.png Binary files differindex 31a78ca..31a78ca 100644 --- a/plugins/webinterface/www/default/start.png +++ b/src/plugins/webinterface/www/default/start.png diff --git a/plugins/webinterface/www/default/stop.png b/src/plugins/webinterface/www/default/stop.png Binary files differindex 82afb10..82afb10 100644 --- a/plugins/webinterface/www/default/stop.png +++ b/src/plugins/webinterface/www/default/stop.png diff --git a/plugins/webinterface/www/default/style.css b/src/plugins/webinterface/www/default/style.css index 3af4bb5..3af4bb5 100644 --- a/plugins/webinterface/www/default/style.css +++ b/src/plugins/webinterface/www/default/style.css diff --git a/plugins/webinterface/www/default/stylen.css b/src/plugins/webinterface/www/default/stylen.css index 68966fd..68966fd 100644 --- a/plugins/webinterface/www/default/stylen.css +++ b/src/plugins/webinterface/www/default/stylen.css diff --git a/plugins/webinterface/www/default/wz_tooltip.js b/src/plugins/webinterface/www/default/wz_tooltip.js index 1329a1b..1329a1b 100644 --- a/plugins/webinterface/www/default/wz_tooltip.js +++ b/src/plugins/webinterface/www/default/wz_tooltip.js diff --git a/src/plugins/webinterface/www/mobile/CMakeLists.txt b/src/plugins/webinterface/www/mobile/CMakeLists.txt new file mode 100644 index 0000000..920c4d8 --- /dev/null +++ b/src/plugins/webinterface/www/mobile/CMakeLists.txt @@ -0,0 +1,9 @@ + +##### other files + +install( + FILES + favicon.ico interface.php ktorrentwebinterfacelogo.png login.html + remove.png start.png stop.png settings.php torrent.php + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/www/mobile +) diff --git a/plugins/webinterface/www/mobile/favicon.ico b/src/plugins/webinterface/www/mobile/favicon.ico Binary files differindex 3213b23..3213b23 100644 --- a/plugins/webinterface/www/mobile/favicon.ico +++ b/src/plugins/webinterface/www/mobile/favicon.ico diff --git a/plugins/webinterface/www/mobile/interface.php b/src/plugins/webinterface/www/mobile/interface.php index 57582de..57582de 100644 --- a/plugins/webinterface/www/mobile/interface.php +++ b/src/plugins/webinterface/www/mobile/interface.php diff --git a/plugins/webinterface/www/mobile/ktorrentwebinterfacelogo.png b/src/plugins/webinterface/www/mobile/ktorrentwebinterfacelogo.png Binary files differindex 6146fb1..6146fb1 100644 --- a/plugins/webinterface/www/mobile/ktorrentwebinterfacelogo.png +++ b/src/plugins/webinterface/www/mobile/ktorrentwebinterfacelogo.png diff --git a/plugins/webinterface/www/mobile/login.html b/src/plugins/webinterface/www/mobile/login.html index 359c44c..359c44c 100644 --- a/plugins/webinterface/www/mobile/login.html +++ b/src/plugins/webinterface/www/mobile/login.html diff --git a/plugins/webinterface/www/mobile/remove.png b/src/plugins/webinterface/www/mobile/remove.png Binary files differindex 281edd3..281edd3 100644 --- a/plugins/webinterface/www/mobile/remove.png +++ b/src/plugins/webinterface/www/mobile/remove.png diff --git a/plugins/webinterface/www/mobile/settings.php b/src/plugins/webinterface/www/mobile/settings.php index b763bb1..b763bb1 100644 --- a/plugins/webinterface/www/mobile/settings.php +++ b/src/plugins/webinterface/www/mobile/settings.php diff --git a/plugins/webinterface/www/mobile/start.png b/src/plugins/webinterface/www/mobile/start.png Binary files differindex d071181..d071181 100644 --- a/plugins/webinterface/www/mobile/start.png +++ b/src/plugins/webinterface/www/mobile/start.png diff --git a/plugins/webinterface/www/mobile/stop.png b/src/plugins/webinterface/www/mobile/stop.png Binary files differindex 3c6942a..3c6942a 100644 --- a/plugins/webinterface/www/mobile/stop.png +++ b/src/plugins/webinterface/www/mobile/stop.png diff --git a/plugins/webinterface/www/mobile/torrent.php b/src/plugins/webinterface/www/mobile/torrent.php index a1e451d..a1e451d 100644 --- a/plugins/webinterface/www/mobile/torrent.php +++ b/src/plugins/webinterface/www/mobile/torrent.php diff --git a/src/plugins/zeroconf/CMakeLists.txt b/src/plugins/zeroconf/CMakeLists.txt new file mode 100644 index 0000000..c70392b --- /dev/null +++ b/src/plugins/zeroconf/CMakeLists.txt @@ -0,0 +1,25 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/src/libktorrent + ${CMAKE_CURRENT_BINARY_DIR} +) + + +##### ktzeroconfplugin (kpart) + +tde_add_kpart( ktzeroconfplugin AUTOMOC + SOURCES + localbrowser.cpp avahiservice.cpp zeroconfplugin.cpp + LINK + ktorrent-shared tdecore-shared tdeui-shared tdeio-shared tdeparts-shared tdehtml-shared + ${AVAHI_TQT_LIBRARIES} ${AVAHI_CLIENT_LIBRARIES} + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other files + +tde_create_translated_desktop( + SOURCE ktzeroconfplugin.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) diff --git a/plugins/zeroconf/avahiservice.cpp b/src/plugins/zeroconf/avahiservice.cpp index aebaa00..aebaa00 100644 --- a/plugins/zeroconf/avahiservice.cpp +++ b/src/plugins/zeroconf/avahiservice.cpp diff --git a/plugins/zeroconf/avahiservice.h b/src/plugins/zeroconf/avahiservice.h index 02dde11..f85062f 100644 --- a/plugins/zeroconf/avahiservice.h +++ b/src/plugins/zeroconf/avahiservice.h @@ -44,7 +44,7 @@ namespace kt class AvahiService : public kt::PeerSource { - Q_OBJECT + TQ_OBJECT public: AvahiService(const bt::PeerID&, bt::Uint16, const bt::SHA1Hash&); diff --git a/src/plugins/zeroconf/ktzeroconfplugin.desktop b/src/plugins/zeroconf/ktzeroconfplugin.desktop new file mode 100644 index 0000000..069048e --- /dev/null +++ b/src/plugins/zeroconf/ktzeroconfplugin.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=ZeroConfPlugin + +Type=Service +X-TDE-Library=ktzeroconfplugin +X-TDE-ServiceTypes=KTorrent/Plugin diff --git a/plugins/zeroconf/localbrowser.cpp b/src/plugins/zeroconf/localbrowser.cpp index 6306788..6306788 100644 --- a/plugins/zeroconf/localbrowser.cpp +++ b/src/plugins/zeroconf/localbrowser.cpp diff --git a/plugins/zeroconf/localbrowser.h b/src/plugins/zeroconf/localbrowser.h index 0e06b99..0e06b99 100644 --- a/plugins/zeroconf/localbrowser.h +++ b/src/plugins/zeroconf/localbrowser.h diff --git a/plugins/zeroconf/zeroconfplugin.cpp b/src/plugins/zeroconf/zeroconfplugin.cpp index d7e68d5..6307bdd 100644 --- a/plugins/zeroconf/zeroconfplugin.cpp +++ b/src/plugins/zeroconf/zeroconfplugin.cpp @@ -50,10 +50,10 @@ namespace kt void ZeroConfPlugin::load() { CoreInterface* core = getCore(); - connect(core,TQT_SIGNAL(torrentAdded( kt::TorrentInterface* )), - this,TQT_SLOT(torrentAdded( kt::TorrentInterface* ))); - connect(core,TQT_SIGNAL(torrentRemoved( kt::TorrentInterface* )), - this,TQT_SLOT(torrentRemoved( kt::TorrentInterface* ))); + connect(core,TQ_SIGNAL(torrentAdded( kt::TorrentInterface* )), + this,TQ_SLOT(torrentAdded( kt::TorrentInterface* ))); + connect(core,TQ_SIGNAL(torrentRemoved( kt::TorrentInterface* )), + this,TQ_SLOT(torrentRemoved( kt::TorrentInterface* ))); // go over existing torrents and add them bt::QueueManager* qman = core->getQueueManager(); @@ -66,10 +66,10 @@ namespace kt void ZeroConfPlugin::unload() { CoreInterface* core = getCore(); - disconnect(core,TQT_SIGNAL(torrentAdded( kt::TorrentInterface* )), - this,TQT_SLOT(torrentAdded( kt::TorrentInterface* ))); - disconnect(core,TQT_SIGNAL(torrentRemoved( kt::TorrentInterface* )), - this,TQT_SLOT(torrentRemoved( kt::TorrentInterface*))); + disconnect(core,TQ_SIGNAL(torrentAdded( kt::TorrentInterface* )), + this,TQ_SLOT(torrentAdded( kt::TorrentInterface* ))); + disconnect(core,TQ_SIGNAL(torrentRemoved( kt::TorrentInterface* )), + this,TQ_SLOT(torrentRemoved( kt::TorrentInterface*))); bt::PtrMap<kt::TorrentInterface*,AvahiService>::iterator i = services.begin(); while (i != services.end()) @@ -93,8 +93,8 @@ namespace kt tc->addPeerSource(av); Out(SYS_ZCO|LOG_NOTICE) << "ZeroConf service added for " << tc->getStats().torrent_name << endl; - connect(av,TQT_SIGNAL(serviceDestroyed( AvahiService* )), - this,TQT_SLOT(avahiServiceDestroyed( AvahiService* ))); + connect(av,TQ_SIGNAL(serviceDestroyed( AvahiService* )), + this,TQ_SLOT(avahiServiceDestroyed( AvahiService* ))); } diff --git a/plugins/zeroconf/zeroconfplugin.h b/src/plugins/zeroconf/zeroconfplugin.h index de91c53..5fabfab 100644 --- a/plugins/zeroconf/zeroconfplugin.h +++ b/src/plugins/zeroconf/zeroconfplugin.h @@ -35,7 +35,7 @@ namespace kt */ class ZeroConfPlugin : public Plugin { - Q_OBJECT + TQ_OBJECT public: ZeroConfPlugin(TQObject* parent, const char* name, const TQStringList& args); diff --git a/src/scripts/CMakeLists.txt b/src/scripts/CMakeLists.txt new file mode 100644 index 0000000..dad1ddf --- /dev/null +++ b/src/scripts/CMakeLists.txt @@ -0,0 +1,7 @@ + +##### other files + +install( + PROGRAMS ktshell + DESTINATION ${BIN_INSTALL_DIR} +) diff --git a/scripts/ktshell b/src/scripts/ktshell index 45979e0..45979e0 100755 --- a/scripts/ktshell +++ b/src/scripts/ktshell diff --git a/src/utests/CMakeLists.txt b/src/utests/CMakeLists.txt new file mode 100644 index 0000000..7eebbbe --- /dev/null +++ b/src/utests/CMakeLists.txt @@ -0,0 +1,18 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/src + ${CMAKE_SOURCE_DIR}/src/libktorrent +) + + +##### ktorrent (executable) + +tde_add_check_executable( ktutester AUTOMOC + SOURCES + unittest.cpp testrunner.cpp main.cpp upnpparsedescriptiontest.cpp upnpparseresponsetest.cpp + dhtmsgparsetest.cpp biginttest.cpp rc4test.cpp difflehellmantest.cpp + LINK + ktupnp-static + ktorrent-shared tdecore-shared tdeui-shared tdeio-shared DCOP-shared +) diff --git a/utests/biginttest.cpp b/src/utests/biginttest.cpp index 514663e..514663e 100644 --- a/utests/biginttest.cpp +++ b/src/utests/biginttest.cpp diff --git a/utests/biginttest.h b/src/utests/biginttest.h index 2e4073b..2e4073b 100644 --- a/utests/biginttest.h +++ b/src/utests/biginttest.h diff --git a/utests/dhtmsgparsetest.cpp b/src/utests/dhtmsgparsetest.cpp index 38a0deb..38a0deb 100644 --- a/utests/dhtmsgparsetest.cpp +++ b/src/utests/dhtmsgparsetest.cpp diff --git a/utests/dhtmsgparsetest.h b/src/utests/dhtmsgparsetest.h index 8e2c774..8e2c774 100644 --- a/utests/dhtmsgparsetest.h +++ b/src/utests/dhtmsgparsetest.h diff --git a/utests/difflehellmantest.cpp b/src/utests/difflehellmantest.cpp index b261d5a..b261d5a 100644 --- a/utests/difflehellmantest.cpp +++ b/src/utests/difflehellmantest.cpp diff --git a/utests/difflehellmantest.h b/src/utests/difflehellmantest.h index c065894..c065894 100644 --- a/utests/difflehellmantest.h +++ b/src/utests/difflehellmantest.h diff --git a/utests/main.cpp b/src/utests/main.cpp index 7618cac..f9feb89 100644 --- a/utests/main.cpp +++ b/src/utests/main.cpp @@ -28,6 +28,7 @@ #include "biginttest.h" #include "rc4test.h" #include "difflehellmantest.h" +#include <tqfile.h> using namespace kt; using namespace bt; @@ -38,6 +39,7 @@ using namespace utest; int main(int argc,char** argv) { Globals::instance().setDebugMode(true); + TQFile::remove("ktutester.log"); Globals::instance().initLog("ktutester.log"); TestRunner tr; tr.addTest(new UPnPParseDescriptionTest()); diff --git a/utests/rc4test.cpp b/src/utests/rc4test.cpp index add45ff..add45ff 100644 --- a/utests/rc4test.cpp +++ b/src/utests/rc4test.cpp diff --git a/utests/rc4test.h b/src/utests/rc4test.h index b92afae..b92afae 100644 --- a/utests/rc4test.h +++ b/src/utests/rc4test.h diff --git a/utests/testrunner.cpp b/src/utests/testrunner.cpp index 3e0c2aa..3e0c2aa 100644 --- a/utests/testrunner.cpp +++ b/src/utests/testrunner.cpp diff --git a/utests/testrunner.h b/src/utests/testrunner.h index edc56b4..edc56b4 100644 --- a/utests/testrunner.h +++ b/src/utests/testrunner.h diff --git a/utests/unittest.cpp b/src/utests/unittest.cpp index 2aaa2d6..2aaa2d6 100644 --- a/utests/unittest.cpp +++ b/src/utests/unittest.cpp diff --git a/utests/unittest.h b/src/utests/unittest.h index 02889a5..02889a5 100644 --- a/utests/unittest.h +++ b/src/utests/unittest.h diff --git a/utests/upnpparsedescriptiontest.cpp b/src/utests/upnpparsedescriptiontest.cpp index 787378f..787378f 100644 --- a/utests/upnpparsedescriptiontest.cpp +++ b/src/utests/upnpparsedescriptiontest.cpp diff --git a/utests/upnpparsedescriptiontest.h b/src/utests/upnpparsedescriptiontest.h index 29d4e1e..29d4e1e 100644 --- a/utests/upnpparsedescriptiontest.h +++ b/src/utests/upnpparsedescriptiontest.h diff --git a/utests/upnpparseresponsetest.cpp b/src/utests/upnpparseresponsetest.cpp index 97102cf..a096b59 100644 --- a/utests/upnpparseresponsetest.cpp +++ b/src/utests/upnpparseresponsetest.cpp @@ -38,7 +38,7 @@ namespace utest bool UPnPParseResponseTest::doTest() { - static const char* test_ps = "M-SEARCH * HTTP/1.1\r\n" + static const char* test_ps = "HTTP/1.1\r\n" "HOST: 239.255.255.250:1900\r\n" "ST:urn:schemas-upnp-org:device:InternetGatewayDevice:1\r\n" "MAN:\"ssdp:discover\"\r\n" diff --git a/utests/upnpparseresponsetest.h b/src/utests/upnpparseresponsetest.h index 5186fd5..5186fd5 100644 --- a/utests/upnpparseresponsetest.h +++ b/src/utests/upnpparseresponsetest.h diff --git a/stamp-h.in b/stamp-h.in deleted file mode 100644 index e69de29..0000000 --- a/stamp-h.in +++ /dev/null diff --git a/subdirs b/subdirs deleted file mode 100644 index 8fcd62e..0000000 --- a/subdirs +++ /dev/null @@ -1,6 +0,0 @@ -apps -doc -libktorrent -plugins -scripts -translations diff --git a/templates/cpp b/templates/cpp deleted file mode 100644 index c4b5141..0000000 --- a/templates/cpp +++ /dev/null @@ -1,19 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2005 by Joris Guisson * - * joris.guisson@gmail.com * - * * - * 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 of the License, 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., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ diff --git a/templates/h b/templates/h deleted file mode 100644 index c4b5141..0000000 --- a/templates/h +++ /dev/null @@ -1,19 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2005 by Joris Guisson * - * joris.guisson@gmail.com * - * * - * 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 of the License, 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., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ diff --git a/translations/Makefile.am b/translations/Makefile.am deleted file mode 100644 index bd618b4..0000000 --- a/translations/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= ar bg br ca cs cy da de el en_GB es et fa fr gl hu it ja ka lt ms nb nds nl pa pl pt pt_BR ru rw sk sr sr@Latn sv tr uk zh_CN zh_TW diff --git a/translations/ar/Makefile.am b/translations/ar/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/ar/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/ar/messages/Makefile.am b/translations/ar/messages/Makefile.am deleted file mode 100644 index f01035c..0000000 --- a/translations/ar/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = ar -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/bg/Makefile.am b/translations/bg/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/bg/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/bg/messages/Makefile.am b/translations/bg/messages/Makefile.am deleted file mode 100644 index 869f213..0000000 --- a/translations/bg/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = bg -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/br/Makefile.am b/translations/br/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/br/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/br/messages/Makefile.am b/translations/br/messages/Makefile.am deleted file mode 100644 index db05612..0000000 --- a/translations/br/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = br -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/ca/Makefile.am b/translations/ca/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/ca/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/ca/messages/Makefile.am b/translations/ca/messages/Makefile.am deleted file mode 100644 index 8f8e4c6..0000000 --- a/translations/ca/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = ca -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/cs/Makefile.am b/translations/cs/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/cs/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/cs/messages/Makefile.am b/translations/cs/messages/Makefile.am deleted file mode 100644 index af45f6a..0000000 --- a/translations/cs/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = cs -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/cy/Makefile.am b/translations/cy/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/cy/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/cy/messages/Makefile.am b/translations/cy/messages/Makefile.am deleted file mode 100644 index 93f71da..0000000 --- a/translations/cy/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = cy -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/da/Makefile.am b/translations/da/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/da/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/da/messages/Makefile.am b/translations/da/messages/Makefile.am deleted file mode 100644 index 8452929..0000000 --- a/translations/da/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = da -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/de/Makefile.am b/translations/de/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/de/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/de/messages/Makefile.am b/translations/de/messages/Makefile.am deleted file mode 100644 index b15dd61..0000000 --- a/translations/de/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = de -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/desktop_files/ar.po b/translations/desktop_files/ar.po new file mode 100644 index 0000000..4a17bb9 --- /dev/null +++ b/translations/desktop_files/ar.po @@ -0,0 +1,113 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\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" +"Language: ar\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +#, fuzzy +msgid "KTorrent" +msgstr "قابس KTorrent" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "زبون BitTorrent" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "برنامِج BitTorrent لِــ TDE" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +msgid "KTorrent Plugin" +msgstr "قابس KTorrent" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +msgid "BitTorrent Download" +msgstr "تنزيل BitTorrent" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +msgid "InfoWidgetPlugin" +msgstr "" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +msgid "IPFilterPlugin" +msgstr "" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "قابس مرشح IP لِــ KTorrent" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +msgid "LogViewerPlugin" +msgstr "" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +msgid "ScanFolderPlugin" +msgstr "" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +msgid "SchedulerPlugin" +msgstr "" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "قابس البحث لِــ KTorrent" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +msgid "StatsPlugin" +msgstr "" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +msgid "ZeroConfPlugin" +msgstr "" diff --git a/translations/desktop_files/bg.po b/translations/desktop_files/bg.po new file mode 100644 index 0000000..76c58f1 --- /dev/null +++ b/translations/desktop_files/bg.po @@ -0,0 +1,114 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\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" +"Language: bg\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +#, fuzzy +msgid "KTorrent" +msgstr "Приставка за KTorrent" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "Бит Торент клиент" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "Бит Торент клиент за TDE" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +msgid "KTorrent Plugin" +msgstr "Приставка за KTorrent" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +msgid "BitTorrent Download" +msgstr "Сваляне на Бит Торент" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +#, fuzzy +msgid "InfoWidgetPlugin" +msgstr "Приставка за сканиране" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +msgid "IPFilterPlugin" +msgstr "Приставка за IP-филтриране" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "Приставка за IP-филтриране (KTorrent)" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +msgid "LogViewerPlugin" +msgstr "Приставка за преглед на журнални файлове" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "Приставка за частично импортиране на файлове" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "Приставка за RssFeed" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +msgid "ScanFolderPlugin" +msgstr "Приставка за сканиране" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +msgid "SchedulerPlugin" +msgstr "Приставка за график" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "Приставка за търсене" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "Приставка за търсене (KTorrent)" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +msgid "StatsPlugin" +msgstr "Приставка за статистика" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "Приставка UPnP" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "Уеб интерфейс" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +msgid "ZeroConfPlugin" +msgstr "Приставка ZeroConf" diff --git a/translations/desktop_files/br.po b/translations/desktop_files/br.po new file mode 100644 index 0000000..6e45451 --- /dev/null +++ b/translations/desktop_files/br.po @@ -0,0 +1,120 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\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" +"Language: br\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +#, fuzzy +msgid "KTorrent" +msgstr "Lugent KTorrent" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "Kliant BitTorrent" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "Ur programm BitTorrent evit TDE" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +msgid "KTorrent Plugin" +msgstr "Lugent KTorrent" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +#, fuzzy +msgid "BitTorrent Download" +msgstr "Kliant BitTorrent" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +msgid "InfoWidgetPlugin" +msgstr "" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +msgid "IPFilterPlugin" +msgstr "Lugent Sil IP" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "Lugent sil IP evit KTorrentt" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +#, fuzzy +msgid "LogViewerPlugin" +msgstr "Lugent Sil IP" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +#, fuzzy +msgid "PartialFileImportPlugin" +msgstr "Lugent Sil IP" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +#, fuzzy +msgid "ScanFolderPlugin" +msgstr "Lugent Sil IP" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +#, fuzzy +msgid "SchedulerPlugin" +msgstr "Lugent klask" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "Lugent klask" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "Lugent klask evit KTorrent" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +#, fuzzy +msgid "StatsPlugin" +msgstr "Lugent klask" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "Lugent UPnP" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +#, fuzzy +msgid "ZeroConfPlugin" +msgstr "Lugent klask" diff --git a/translations/desktop_files/ca.po b/translations/desktop_files/ca.po new file mode 100644 index 0000000..8ca303e --- /dev/null +++ b/translations/desktop_files/ca.po @@ -0,0 +1,113 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\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" +"Language: ca\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +#, fuzzy +msgid "KTorrent" +msgstr "Connector KTorrent" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "Client de BitTorrent" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "Un programa de BitTorrent per TDE" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +msgid "KTorrent Plugin" +msgstr "Connector KTorrent" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +msgid "BitTorrent Download" +msgstr "Una baixada BitTorrent" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +msgid "InfoWidgetPlugin" +msgstr "" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +msgid "IPFilterPlugin" +msgstr "" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "Connector de filtres d'IP per a Ktorrent" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +msgid "LogViewerPlugin" +msgstr "" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +msgid "ScanFolderPlugin" +msgstr "" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +msgid "SchedulerPlugin" +msgstr "" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "Connector de cerca per a KTorrent" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +msgid "StatsPlugin" +msgstr "" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +msgid "ZeroConfPlugin" +msgstr "" diff --git a/translations/desktop_files/cs.po b/translations/desktop_files/cs.po new file mode 100644 index 0000000..5c3afe0 --- /dev/null +++ b/translations/desktop_files/cs.po @@ -0,0 +1,117 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\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" +"Language: cs\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +#, fuzzy +msgid "KTorrent" +msgstr "KTorrent modul" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "BitTorrent klient" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "BitTorrent pro TDE" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +msgid "KTorrent Plugin" +msgstr "KTorrent modul" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +msgid "BitTorrent Download" +msgstr "Stažení BitTorrent" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +#, fuzzy +msgid "InfoWidgetPlugin" +msgstr "Modul prohledávání složek" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +#, fuzzy +msgid "IPFilterPlugin" +msgstr "Modul prohledávání složek" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "IP filtr modul pro KTorrent" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +#, fuzzy +msgid "LogViewerPlugin" +msgstr "Modul plánování" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +msgid "ScanFolderPlugin" +msgstr "Modul prohledávání složek" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +msgid "SchedulerPlugin" +msgstr "Modul plánování" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +#, fuzzy +msgid "SearchPlugin" +msgstr "Modul plánování" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "Vyhledávací modul pro KTorrent" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +msgid "StatsPlugin" +msgstr "" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +msgid "ZeroConfPlugin" +msgstr "" diff --git a/translations/desktop_files/cy.po b/translations/desktop_files/cy.po new file mode 100644 index 0000000..9bd409b --- /dev/null +++ b/translations/desktop_files/cy.po @@ -0,0 +1,113 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\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" +"Language: cy\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +msgid "KTorrent" +msgstr "" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +#, fuzzy +msgid "BitTorrent Client" +msgstr "Lawrlwythiad BitTorrent" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +msgid "KTorrent Plugin" +msgstr "" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +msgid "BitTorrent Download" +msgstr "Lawrlwythiad BitTorrent" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +msgid "InfoWidgetPlugin" +msgstr "" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +msgid "IPFilterPlugin" +msgstr "" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +msgid "LogViewerPlugin" +msgstr "" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +msgid "ScanFolderPlugin" +msgstr "" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +msgid "SchedulerPlugin" +msgstr "" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +msgid "StatsPlugin" +msgstr "" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +msgid "ZeroConfPlugin" +msgstr "" diff --git a/translations/desktop_files/da.po b/translations/desktop_files/da.po new file mode 100644 index 0000000..d05d61e --- /dev/null +++ b/translations/desktop_files/da.po @@ -0,0 +1,119 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\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" +"Language: da\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +#, fuzzy +msgid "KTorrent" +msgstr "KTorrent-plugin" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "BitTorrent klient" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "Et BitTorrent program for TDE" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +msgid "KTorrent Plugin" +msgstr "KTorrent-plugin" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +msgid "BitTorrent Download" +msgstr "BitTorrent-download" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +#, fuzzy +msgid "InfoWidgetPlugin" +msgstr "Plugin for mappesøgning" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +#, fuzzy +msgid "IPFilterPlugin" +msgstr "Plugin for mappesøgning" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +#, fuzzy +msgid "IP filter plugin for KTorrent" +msgstr "Søge-plugin for KTorrent" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +#, fuzzy +msgid "LogViewerPlugin" +msgstr "Skemalægger-Plugin" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +msgid "ScanFolderPlugin" +msgstr "Plugin for mappesøgning" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +msgid "SchedulerPlugin" +msgstr "Skemalægger-Plugin" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "SøgePlugin" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "Søge-plugin for KTorrent" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +#, fuzzy +msgid "StatsPlugin" +msgstr "SøgePlugin" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "Web-grænseflade" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +#, fuzzy +msgid "ZeroConfPlugin" +msgstr "SøgePlugin" diff --git a/translations/desktop_files/de.po b/translations/desktop_files/de.po new file mode 100644 index 0000000..04cb309 --- /dev/null +++ b/translations/desktop_files/de.po @@ -0,0 +1,114 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\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" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +#, fuzzy +msgid "KTorrent" +msgstr "KTorrent-Modul" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "BitTorrent-Programm" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "Ein BitTorrent-Programm für TDE" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +msgid "KTorrent Plugin" +msgstr "KTorrent-Modul" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +msgid "BitTorrent Download" +msgstr "BitTorrent-Herunterladevorgang" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +#, fuzzy +msgid "InfoWidgetPlugin" +msgstr "Ordner-Durchsuchen-Modul" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +msgid "IPFilterPlugin" +msgstr "IP-Filter-Modul" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "IP-Filter-Modul für KTorrent" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +msgid "LogViewerPlugin" +msgstr "Modul zur Anzeige von Protokolldateien" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "Teildatei-Import-Modul" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "RSS-Nachrichtenquellen-Modul" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +msgid "ScanFolderPlugin" +msgstr "Ordner-Durchsuchen-Modul" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +msgid "SchedulerPlugin" +msgstr "Planer-Modul" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "Suche-Modul" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "Suche-Modul für KTorrent" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +msgid "StatsPlugin" +msgstr "Statistik-Modul" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "UPnP-Modul" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "Web-Schnittstelle" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +msgid "ZeroConfPlugin" +msgstr "ZeroConf-Modul" diff --git a/translations/desktop_files/el.po b/translations/desktop_files/el.po new file mode 100644 index 0000000..6da447b --- /dev/null +++ b/translations/desktop_files/el.po @@ -0,0 +1,116 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\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" +"Language: el\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +#, fuzzy +msgid "KTorrent" +msgstr "Πρόσθετο KTorrent" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "Πελάτης BitTorrent" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "Μία εφαρμογή BitTorrent για το TDE" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +msgid "KTorrent Plugin" +msgstr "Πρόσθετο KTorrent" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +msgid "BitTorrent Download" +msgstr "Λήψη BitTorrent" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +#, fuzzy +msgid "InfoWidgetPlugin" +msgstr "Πρόσθετο σάρωσης φακέλων" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +msgid "IPFilterPlugin" +msgstr "Πρόσθετο φίλτρου IP" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "Πρόσθετο φίλτρου IP για το KTorrent" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +msgid "LogViewerPlugin" +msgstr "Πρόσθετο προβολής καταγραφής" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "Πρόσθετο εισαγωγής μερικής λήψης" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "Πρόσθετο ροών Rss" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +msgid "ScanFolderPlugin" +msgstr "Πρόσθετο σάρωσης φακέλων" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +msgid "SchedulerPlugin" +msgstr "Πρόσθετο προγραμματισμού" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "Πρόσθετο αναζήτησης" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "Πρόσθετο αναζήτησης για το KTorrent" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +#, fuzzy +msgid "StatsPlugin" +msgstr "Πρόσθετο αναζήτησης" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "Πρόσθετο UPnP" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +#, fuzzy +msgid "ZeroConfPlugin" +msgstr "Πρόσθετο αναζήτησης" diff --git a/translations/desktop_files/es.po b/translations/desktop_files/es.po new file mode 100644 index 0000000..50d7f76 --- /dev/null +++ b/translations/desktop_files/es.po @@ -0,0 +1,115 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\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" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +#, fuzzy +msgid "KTorrent" +msgstr "Complemento de KTorrent" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "Cliente de BitTorrent" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "Un programa de BitTorrent para TDE" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +msgid "KTorrent Plugin" +msgstr "Complemento de KTorrent" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +msgid "BitTorrent Download" +msgstr "Descarga de BitTorrent" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +msgid "InfoWidgetPlugin" +msgstr "" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +msgid "IPFilterPlugin" +msgstr "Filtro de IP" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "Complemento de filtro de IP de KTorrent" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +msgid "LogViewerPlugin" +msgstr "Visualizador del registro" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "Importación de ficheros parciales" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +#, fuzzy +msgid "ScanFolderPlugin" +msgstr "Filtro de IP" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +#, fuzzy +msgid "SchedulerPlugin" +msgstr "Complemento de búsqueda" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "Complemento de búsqueda" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "Complemento de búsqueda para KTorrent" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +msgid "StatsPlugin" +msgstr "Complemento de estadísticas" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "Complemento UPnP" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +msgid "ZeroConfPlugin" +msgstr "Complemento de ZeroConf" diff --git a/translations/desktop_files/et.po b/translations/desktop_files/et.po new file mode 100644 index 0000000..3b54201 --- /dev/null +++ b/translations/desktop_files/et.po @@ -0,0 +1,114 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\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" +"Language: et\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +#, fuzzy +msgid "KTorrent" +msgstr "KTorrenti plugin" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "BitTorrenti klient" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "TDE BitTorrenti rakendus" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +msgid "KTorrent Plugin" +msgstr "KTorrenti plugin" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +msgid "BitTorrent Download" +msgstr "BitTorrenti allalaadimine" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +#, fuzzy +msgid "InfoWidgetPlugin" +msgstr "Kataloogi uurimise plugin" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +msgid "IPFilterPlugin" +msgstr "IP-filtri plugin" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "KTorrenti IP-filtri plugin" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +msgid "LogViewerPlugin" +msgstr "Loginäitaja plugin" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "Osalise faili impordi plugin" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "RSS-kanali plugin" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +msgid "ScanFolderPlugin" +msgstr "Kataloogi uurimise plugin" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +msgid "SchedulerPlugin" +msgstr "Ajastamisplugin" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "Otsimisplugin" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "KTorrenti otsimisplugin" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +msgid "StatsPlugin" +msgstr "Statistikaplugin" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "UPnP plugin" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "Veebiliides" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +msgid "ZeroConfPlugin" +msgstr "ZeroConfi plugin" diff --git a/translations/desktop_files/fa.po b/translations/desktop_files/fa.po new file mode 100644 index 0000000..38929ba --- /dev/null +++ b/translations/desktop_files/fa.po @@ -0,0 +1,118 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\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" +"Language: fa\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +#, fuzzy +msgid "KTorrent" +msgstr "وصلۀ KTorrent" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "کارخواه BitTorrent" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "یک برنامۀ BitTorrent برای TDE" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +msgid "KTorrent Plugin" +msgstr "وصلۀ KTorrent" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +msgid "BitTorrent Download" +msgstr "بارگیری BitTorrent" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +msgid "InfoWidgetPlugin" +msgstr "" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +#, fuzzy +msgid "IPFilterPlugin" +msgstr "وصلۀ جستجو" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "وصلۀ پالایۀ IP برای KTorrent" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +msgid "LogViewerPlugin" +msgstr "" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +#, fuzzy +msgid "ScanFolderPlugin" +msgstr "وصلۀ جستجو" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +#, fuzzy +msgid "SchedulerPlugin" +msgstr "وصلۀ جستجو" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "وصلۀ جستجو" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "وصلۀ جستجو برای KTorrent" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +#, fuzzy +msgid "StatsPlugin" +msgstr "وصلۀ جستجو" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +#, fuzzy +msgid "ZeroConfPlugin" +msgstr "وصلۀ جستجو" diff --git a/translations/desktop_files/fr.po b/translations/desktop_files/fr.po new file mode 100644 index 0000000..9da6fd8 --- /dev/null +++ b/translations/desktop_files/fr.po @@ -0,0 +1,114 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\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" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +msgid "KTorrent" +msgstr "" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "Client BitTorrent" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "Un programme BitTorrent pour TDE" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +#, fuzzy +msgid "KTorrent Plugin" +msgstr "Client BitTorrent" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +#, fuzzy +msgid "BitTorrent Download" +msgstr "Client BitTorrent" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +msgid "InfoWidgetPlugin" +msgstr "" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +msgid "IPFilterPlugin" +msgstr "" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +msgid "LogViewerPlugin" +msgstr "" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +msgid "ScanFolderPlugin" +msgstr "" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +msgid "SchedulerPlugin" +msgstr "" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +msgid "StatsPlugin" +msgstr "" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +msgid "ZeroConfPlugin" +msgstr "" diff --git a/translations/desktop_files/gl.po b/translations/desktop_files/gl.po new file mode 100644 index 0000000..352a0c3 --- /dev/null +++ b/translations/desktop_files/gl.po @@ -0,0 +1,113 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\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" +"Language: gl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +#, fuzzy +msgid "KTorrent" +msgstr "Plugin KTorrent" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "Cliente BitTorrent" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "Programa de BitTorrent para TDE" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +msgid "KTorrent Plugin" +msgstr "Plugin KTorrent" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +msgid "BitTorrent Download" +msgstr "Descarga de BitTorrent" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +msgid "InfoWidgetPlugin" +msgstr "" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +msgid "IPFilterPlugin" +msgstr "" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "Plugin de filtrado de IPs para KTorrent" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +msgid "LogViewerPlugin" +msgstr "" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +msgid "ScanFolderPlugin" +msgstr "" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +msgid "SchedulerPlugin" +msgstr "" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "Plugin de procuras para KTorrent" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +msgid "StatsPlugin" +msgstr "" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +msgid "ZeroConfPlugin" +msgstr "" diff --git a/translations/desktop_files/it.po b/translations/desktop_files/it.po new file mode 100644 index 0000000..d17c9cd --- /dev/null +++ b/translations/desktop_files/it.po @@ -0,0 +1,113 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Michele Calgaro <michele.calgaro@yahoo.it>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\n" +"PO-Revision-Date: 2025-07-07 09:59+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/applications/ktorrent-desktop-files/it/>\n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.18.2\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +msgid "KTorrent" +msgstr "KTorrent" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "Client BitTorrent" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "Un programma BitTorrent per TDE" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +msgid "KTorrent Plugin" +msgstr "Plugin KTorrent" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +msgid "BitTorrent Download" +msgstr "Scaricamento BitTorrent" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +msgid "InfoWidgetPlugin" +msgstr "InfoWidgetPlugin" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +msgid "IPFilterPlugin" +msgstr "Plugin filtro ip" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "Plugin filtro ip per KTorrent" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +msgid "LogViewerPlugin" +msgstr "Plugin visore registro" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "Plugin importazione file parziali" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "Plugin Fonti notizie" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +msgid "ScanFolderPlugin" +msgstr "Plugin scansione cartella" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +msgid "SchedulerPlugin" +msgstr "Plugin pianificatore" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "Plugin di ricerca" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "Plugin di ricerca per KTorrent" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +msgid "StatsPlugin" +msgstr "Plugin statistiche" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "Plugin UPnP" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "Interfaccia Web" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +msgid "ZeroConfPlugin" +msgstr "Plugin ZeroConf" diff --git a/translations/desktop_files/ja.po b/translations/desktop_files/ja.po new file mode 100644 index 0000000..34bd5e5 --- /dev/null +++ b/translations/desktop_files/ja.po @@ -0,0 +1,113 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\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" +"Language: ja\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +#, fuzzy +msgid "KTorrent" +msgstr "KTorrent プラグイン" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "BitTorrent クライアント" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "TDE のための BitTorrent プログラム" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +msgid "KTorrent Plugin" +msgstr "KTorrent プラグイン" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +msgid "BitTorrent Download" +msgstr "BitTorrent ダウンロード" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +msgid "InfoWidgetPlugin" +msgstr "" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +msgid "IPFilterPlugin" +msgstr "" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "KTorrent のための IP フィルタプラグイン" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +msgid "LogViewerPlugin" +msgstr "" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +msgid "ScanFolderPlugin" +msgstr "" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +msgid "SchedulerPlugin" +msgstr "" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "KTorrent のための検索プラグイン" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +msgid "StatsPlugin" +msgstr "" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +msgid "ZeroConfPlugin" +msgstr "" diff --git a/translations/desktop_files/ka.po b/translations/desktop_files/ka.po new file mode 100644 index 0000000..4b68aff --- /dev/null +++ b/translations/desktop_files/ka.po @@ -0,0 +1,113 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\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" +"Language: ka\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +#, fuzzy +msgid "KTorrent" +msgstr "KTorrent-ის მოდული" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "BitTorrent-ის კლიენტი" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "BitTorrent-ის პროგრამა TDE-თვის" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +msgid "KTorrent Plugin" +msgstr "KTorrent-ის მოდული" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +msgid "BitTorrent Download" +msgstr "BitTorrent-ით ჩამოტვირვა" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +msgid "InfoWidgetPlugin" +msgstr "" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +msgid "IPFilterPlugin" +msgstr "" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "KTorrent-ის IP ფილტრაციის მოდული" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +msgid "LogViewerPlugin" +msgstr "" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +msgid "ScanFolderPlugin" +msgstr "" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +msgid "SchedulerPlugin" +msgstr "" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "ძებნის მოდული KTorrent-თვის" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +msgid "StatsPlugin" +msgstr "" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +msgid "ZeroConfPlugin" +msgstr "" diff --git a/translations/desktop_files/ktorrent-desktops.pot b/translations/desktop_files/ktorrent-desktops.pot new file mode 100644 index 0000000..655e352 --- /dev/null +++ b/translations/desktop_files/ktorrent-desktops.pot @@ -0,0 +1,112 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\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" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +msgid "KTorrent" +msgstr "" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +msgid "KTorrent Plugin" +msgstr "" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +msgid "BitTorrent Download" +msgstr "" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +msgid "InfoWidgetPlugin" +msgstr "" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +msgid "IPFilterPlugin" +msgstr "" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +msgid "LogViewerPlugin" +msgstr "" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +msgid "ScanFolderPlugin" +msgstr "" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +msgid "SchedulerPlugin" +msgstr "" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +msgid "StatsPlugin" +msgstr "" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +msgid "ZeroConfPlugin" +msgstr "" diff --git a/translations/desktop_files/lt.po b/translations/desktop_files/lt.po new file mode 100644 index 0000000..65fac29 --- /dev/null +++ b/translations/desktop_files/lt.po @@ -0,0 +1,114 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\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" +"Language: lt\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +msgid "KTorrent" +msgstr "" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "BitTorrent klientas" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "BitTorrent programa skirta TDE aplinkai" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +#, fuzzy +msgid "KTorrent Plugin" +msgstr "BitTorrent klientas" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +#, fuzzy +msgid "BitTorrent Download" +msgstr "BitTorrent klientas" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +msgid "InfoWidgetPlugin" +msgstr "" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +msgid "IPFilterPlugin" +msgstr "" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +msgid "LogViewerPlugin" +msgstr "" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +msgid "ScanFolderPlugin" +msgstr "" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +msgid "SchedulerPlugin" +msgstr "" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +msgid "StatsPlugin" +msgstr "" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +msgid "ZeroConfPlugin" +msgstr "" diff --git a/translations/desktop_files/ms.po b/translations/desktop_files/ms.po new file mode 100644 index 0000000..2ea8d1b --- /dev/null +++ b/translations/desktop_files/ms.po @@ -0,0 +1,114 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\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" +"Language: ms\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +msgid "KTorrent" +msgstr "" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "Klien BitTorrent" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "Program BitTorrent untuk TDE" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +#, fuzzy +msgid "KTorrent Plugin" +msgstr "Klien BitTorrent" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +#, fuzzy +msgid "BitTorrent Download" +msgstr "Klien BitTorrent" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +msgid "InfoWidgetPlugin" +msgstr "" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +msgid "IPFilterPlugin" +msgstr "" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +msgid "LogViewerPlugin" +msgstr "" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +msgid "ScanFolderPlugin" +msgstr "" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +msgid "SchedulerPlugin" +msgstr "" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +msgid "StatsPlugin" +msgstr "" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +msgid "ZeroConfPlugin" +msgstr "" diff --git a/translations/desktop_files/nb.po b/translations/desktop_files/nb.po new file mode 100644 index 0000000..2df0bc8 --- /dev/null +++ b/translations/desktop_files/nb.po @@ -0,0 +1,115 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\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" +"Language: nb\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +#, fuzzy +msgid "KTorrent" +msgstr "KTorrent-modul" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "BitTorrent-klient" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "Et BitTorrent-program for TDE" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +msgid "KTorrent Plugin" +msgstr "KTorrent-modul" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +msgid "BitTorrent Download" +msgstr "BitTorrent-nedlasting" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +#, fuzzy +msgid "InfoWidgetPlugin" +msgstr "Katalogundersøkingsmdoul" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +msgid "IPFilterPlugin" +msgstr "IP-filtermodul" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "IP-filtermodul for KTorrent" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +msgid "LogViewerPlugin" +msgstr "Logvisningsmodul" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "Filimportmodul" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "RSS-modul" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +msgid "ScanFolderPlugin" +msgstr "Katalogundersøkingsmdoul" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +msgid "SchedulerPlugin" +msgstr "Planleggermodul" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "Søkemodul" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "Søkemodul for KTorrent" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +#, fuzzy +msgid "StatsPlugin" +msgstr "Søkemodul" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "UPnP-modul" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "Internettgrensesnitt" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +msgid "ZeroConfPlugin" +msgstr "ZeroConf-modul" diff --git a/translations/desktop_files/nds.po b/translations/desktop_files/nds.po new file mode 100644 index 0000000..5d48819 --- /dev/null +++ b/translations/desktop_files/nds.po @@ -0,0 +1,114 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\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" +"Language: nds\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +#, fuzzy +msgid "KTorrent" +msgstr "KTorrent-Moduul" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "Bittorrent-Programm" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "En Bittorrent-Programm för TDE" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +msgid "KTorrent Plugin" +msgstr "KTorrent-Moduul" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +msgid "BitTorrent Download" +msgstr "Bittorrent-Daalladen" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +#, fuzzy +msgid "InfoWidgetPlugin" +msgstr "Moduul för't Dörkieken vun Ornern" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +msgid "IPFilterPlugin" +msgstr "\"IP-Filter\"-Moduul" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "\"IP-Filter\"-Moduul för KTorrent" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +msgid "LogViewerPlugin" +msgstr "Logbookkieker-Moduul" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "Importmoduul för Deeldateien" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "RSS-Moduul" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +msgid "ScanFolderPlugin" +msgstr "Moduul för't Dörkieken vun Ornern" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +msgid "SchedulerPlugin" +msgstr "Planer-Moduul" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "Söök-Moduul" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "Söök-Moduul för KTorrent" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +msgid "StatsPlugin" +msgstr "Statistik-Moduul" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "UPnP-Moduul" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "Nettkoppelsteed" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +msgid "ZeroConfPlugin" +msgstr "ZeroConf-Moduul" diff --git a/translations/desktop_files/nl.po b/translations/desktop_files/nl.po new file mode 100644 index 0000000..427f453 --- /dev/null +++ b/translations/desktop_files/nl.po @@ -0,0 +1,113 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Heimen Stoffels <vistausss@fastmail.com>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\n" +"PO-Revision-Date: 2025-07-03 09:59+0000\n" +"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n" +"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/" +"applications/ktorrent-desktop-files/nl/>\n" +"Language: nl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.18.2\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +msgid "KTorrent" +msgstr "KTorrent" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "BitTorrent-cliënt" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "Een BitTorrent-programma voor TDE" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +msgid "KTorrent Plugin" +msgstr "KTorrent-plugin" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +msgid "BitTorrent Download" +msgstr "BitTorrent-download" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +msgid "InfoWidgetPlugin" +msgstr "Informatiewidgetplug-in" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +msgid "IPFilterPlugin" +msgstr "IPFilter-plugin" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "Plugin om op IP-adressen te filteren in KTorrent" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +msgid "LogViewerPlugin" +msgstr "Logweergaveplugin" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "Import gedeeltelijke bestanden" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "Rss-feedplug-in" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +msgid "ScanFolderPlugin" +msgstr "Mapscanplugin" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +msgid "SchedulerPlugin" +msgstr "Plannerplugin" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "Zoekplugin" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "Zoekplugin voor KTorrent" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +msgid "StatsPlugin" +msgstr "Statistiekenplugin" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "UPnP-plugin" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "Webinterface" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +msgid "ZeroConfPlugin" +msgstr "ZeroConf-plug-in" diff --git a/translations/desktop_files/pa.po b/translations/desktop_files/pa.po new file mode 100644 index 0000000..5e59bba --- /dev/null +++ b/translations/desktop_files/pa.po @@ -0,0 +1,114 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\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" +"Language: pa\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +msgid "KTorrent" +msgstr "" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "BitTorrent ਕਲਾਂਇਟ" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "TDE ਲਈ BitTorrent ਕਾਰਜ" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +#, fuzzy +msgid "KTorrent Plugin" +msgstr "BitTorrent ਕਲਾਂਇਟ" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +#, fuzzy +msgid "BitTorrent Download" +msgstr "BitTorrent ਕਲਾਂਇਟ" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +msgid "InfoWidgetPlugin" +msgstr "" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +msgid "IPFilterPlugin" +msgstr "" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +msgid "LogViewerPlugin" +msgstr "" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +msgid "ScanFolderPlugin" +msgstr "" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +msgid "SchedulerPlugin" +msgstr "" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +msgid "StatsPlugin" +msgstr "" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +msgid "ZeroConfPlugin" +msgstr "" diff --git a/translations/desktop_files/pl.po b/translations/desktop_files/pl.po new file mode 100644 index 0000000..7715bdd --- /dev/null +++ b/translations/desktop_files/pl.po @@ -0,0 +1,114 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\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" +"Language: pl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +#, fuzzy +msgid "KTorrent" +msgstr "Wtyczka KTorrent" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "Klient BitTorrenta" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "Program BitTorrent dla TDE" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +msgid "KTorrent Plugin" +msgstr "Wtyczka KTorrent" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +msgid "BitTorrent Download" +msgstr "Pobieranie plików BitTorrent" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +#, fuzzy +msgid "InfoWidgetPlugin" +msgstr "Wtyczka przeszukiwania katalogów" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +msgid "IPFilterPlugin" +msgstr "Wtyczka filtru IP" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "Wtyczka filtru IP dla KTorrent" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +msgid "LogViewerPlugin" +msgstr "Wtyczka wyświetlania dziennika" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "Wtyczka importu części plików" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "Wtyczka kanały RSS" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +msgid "ScanFolderPlugin" +msgstr "Wtyczka przeszukiwania katalogów" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +msgid "SchedulerPlugin" +msgstr "Wtyczka planowanie transferu" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "Wtyczka wyszukiwania" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "Wtyczka wyszukiwania dla KTorrent" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +msgid "StatsPlugin" +msgstr "Wtyczka statystyk" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "Wtyczka UPnP" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "Interfejs WWW" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +msgid "ZeroConfPlugin" +msgstr "Wtyczka ZeroConf" diff --git a/translations/desktop_files/pt.po b/translations/desktop_files/pt.po new file mode 100644 index 0000000..801a845 --- /dev/null +++ b/translations/desktop_files/pt.po @@ -0,0 +1,115 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\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" +"Language: pt\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +#, fuzzy +msgid "KTorrent" +msgstr "'Plugin' do KTorrent" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "Cliente de BitTorrent" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "Um programa de BitTorrent para o TDE" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +msgid "KTorrent Plugin" +msgstr "'Plugin' do KTorrent" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +msgid "BitTorrent Download" +msgstr "Transferência do BitTorrent" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +msgid "InfoWidgetPlugin" +msgstr "" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +msgid "IPFilterPlugin" +msgstr "Filtro de IPs" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "'Plugin' de filtragem de IPs do KTorrent" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +msgid "LogViewerPlugin" +msgstr "Visualizador do Registo" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "Importação de Ficheiros Parciais" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +#, fuzzy +msgid "ScanFolderPlugin" +msgstr "Filtro de IPs" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +#, fuzzy +msgid "SchedulerPlugin" +msgstr "'Plugin' de Procura" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "'Plugin' de Procura" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "'Plugin' de procura para o KTorrent" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +msgid "StatsPlugin" +msgstr "'Plugin' de Estatísticas" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "'Plugin' UPnP" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "Interface Web" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +msgid "ZeroConfPlugin" +msgstr "'Plugin' do ZeroConf" diff --git a/translations/desktop_files/pt_BR.po b/translations/desktop_files/pt_BR.po new file mode 100644 index 0000000..82515b3 --- /dev/null +++ b/translations/desktop_files/pt_BR.po @@ -0,0 +1,114 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\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" +"Language: pt_BR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +#, fuzzy +msgid "KTorrent" +msgstr "Plugin KTorrent" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "Cliente BitTorrent" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "Um programa BitTorrent para o TDE" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +msgid "KTorrent Plugin" +msgstr "Plugin KTorrent" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +msgid "BitTorrent Download" +msgstr "Um programa BitTorrent para download" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +#, fuzzy +msgid "InfoWidgetPlugin" +msgstr "Plugins de Busca" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +msgid "IPFilterPlugin" +msgstr "Plugin de Filtro de IP" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "Plugin de Filtro de IP para o KTorrent" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +msgid "LogViewerPlugin" +msgstr "Plugin de Vizualização de Log" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "Plugin de Importação Parcial de Arquivo" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "Plugin de RssFeed" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +msgid "ScanFolderPlugin" +msgstr "Plugins de Busca" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +msgid "SchedulerPlugin" +msgstr "Plugin de agendamento" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "Plugin de Busca" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "Busca de plug-in para o KTorrent" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +msgid "StatsPlugin" +msgstr "Plugin de Estatísticas" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "Plugin UPnP" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +msgid "ZeroConfPlugin" +msgstr "Plugin ZeroConf" diff --git a/translations/desktop_files/ru.po b/translations/desktop_files/ru.po new file mode 100644 index 0000000..29a1f42 --- /dev/null +++ b/translations/desktop_files/ru.po @@ -0,0 +1,114 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Alexander Golubev <fatzer2@gmail.com>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\n" +"PO-Revision-Date: 2025-07-03 09:59+0000\n" +"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/applications/ktorrent-desktop-files/ru/>\n" +"Language: ru\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.18.2\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +msgid "KTorrent" +msgstr "KTorrent" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "Клиент BitTorrent" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "Клиент BitTorrent для TDE" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +msgid "KTorrent Plugin" +msgstr "Модуль KTorrent" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +msgid "BitTorrent Download" +msgstr "Скачать через BitTorrent" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +msgid "InfoWidgetPlugin" +msgstr "Модуль виджета информации" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +msgid "IPFilterPlugin" +msgstr "Модуль IP-фильтра" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "Модуль IP-фильтра для KTorrent" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +msgid "LogViewerPlugin" +msgstr "Модуль просмотра журнала" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "Модуль частичного импорта файлов" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "Модуль RSS-ленты" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +msgid "ScanFolderPlugin" +msgstr "Модуль сканирования папок" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +msgid "SchedulerPlugin" +msgstr "Модуль планировщика" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "Модуль поиска" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "Модуль поиска для KTorrent" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +msgid "StatsPlugin" +msgstr "Модуль статистики" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "Модуль UPnP" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "Веб-интерфейс" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +msgid "ZeroConfPlugin" +msgstr "Модуль ZeroConf" diff --git a/translations/desktop_files/sk.po b/translations/desktop_files/sk.po new file mode 100644 index 0000000..1be123e --- /dev/null +++ b/translations/desktop_files/sk.po @@ -0,0 +1,116 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\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" +"Language: sk\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +msgid "KTorrent" +msgstr "" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "BitTorrent Klient" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "BitTorrent klient pre TDE" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +#, fuzzy +msgid "KTorrent Plugin" +msgstr "BitTorrent Klient" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +msgid "BitTorrent Download" +msgstr "Sťahovanie BitTorrent" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +#, fuzzy +msgid "InfoWidgetPlugin" +msgstr "ScanFolder Plugin" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +msgid "IPFilterPlugin" +msgstr "IPFilter Plugin" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "IP filter plugin pre KTorrent" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +msgid "LogViewerPlugin" +msgstr "LogViewer Plugin" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "PartialFileImport Plugin" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "RssFeed Plugin" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +msgid "ScanFolderPlugin" +msgstr "ScanFolder Plugin" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +msgid "SchedulerPlugin" +msgstr "Scheduler Plugin" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "Vyhľadávací Plugin" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "Vyhľadávací plugin pre KTorrent" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +#, fuzzy +msgid "StatsPlugin" +msgstr "Vyhľadávací Plugin" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "UPnP Plugin" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +#, fuzzy +msgid "ZeroConfPlugin" +msgstr "Vyhľadávací Plugin" diff --git a/translations/desktop_files/sr.po b/translations/desktop_files/sr.po new file mode 100644 index 0000000..53be4d3 --- /dev/null +++ b/translations/desktop_files/sr.po @@ -0,0 +1,114 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\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" +"Language: sr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +#, fuzzy +msgid "KTorrent" +msgstr "KTorrent прикључак" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "BitTorrent клијент" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "BitTorrent програм за TDE" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +msgid "KTorrent Plugin" +msgstr "KTorrent прикључак" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +msgid "BitTorrent Download" +msgstr "BitTorrent преузимање" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +#, fuzzy +msgid "InfoWidgetPlugin" +msgstr "Прикључак прегледа фасцикле" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +msgid "IPFilterPlugin" +msgstr "Прикључак IP филтера" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "Прикључак IP филтера за KTorrent" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +msgid "LogViewerPlugin" +msgstr "Прикључак приказа дневника" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "Прикључак за увоз недовршених фајлова" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "Прикључак Rss довода" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +msgid "ScanFolderPlugin" +msgstr "Прикључак прегледа фасцикле" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +msgid "SchedulerPlugin" +msgstr "Прикључак распоређивања" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "Прикључак претраге" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "Прикључак претраге за KTorrent" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +msgid "StatsPlugin" +msgstr "Прикључак за статистику" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "Прикључак за UPnP" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "Веб интерфејс" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +msgid "ZeroConfPlugin" +msgstr "ZeroConf прикључак" diff --git a/translations/desktop_files/sr@Latn.po b/translations/desktop_files/sr@Latn.po new file mode 100644 index 0000000..6f59ff9 --- /dev/null +++ b/translations/desktop_files/sr@Latn.po @@ -0,0 +1,114 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\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" +"Language: sr@Latn\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +#, fuzzy +msgid "KTorrent" +msgstr "KTorrent priključak" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "BitTorrent klijent" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "BitTorrent program za TDE" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +msgid "KTorrent Plugin" +msgstr "KTorrent priključak" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +msgid "BitTorrent Download" +msgstr "BitTorrent preuzimanje" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +#, fuzzy +msgid "InfoWidgetPlugin" +msgstr "Priključak pregleda fascikle" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +msgid "IPFilterPlugin" +msgstr "Priključak IP filtera" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "Priključak IP filtera za KTorrent" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +msgid "LogViewerPlugin" +msgstr "Priključak prikaza dnevnika" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "Priključak za uvoz nedovršenih fajlova" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "Priključak Rss dovoda" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +msgid "ScanFolderPlugin" +msgstr "Priključak pregleda fascikle" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +msgid "SchedulerPlugin" +msgstr "Priključak raspoređivanja" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "Priključak pretrage" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "Priključak pretrage za KTorrent" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +msgid "StatsPlugin" +msgstr "Priključak za statistiku" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "Priključak za UPnP" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "Veb interfejs" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +msgid "ZeroConfPlugin" +msgstr "ZeroConf priključak" diff --git a/translations/desktop_files/sv.po b/translations/desktop_files/sv.po new file mode 100644 index 0000000..530b2c1 --- /dev/null +++ b/translations/desktop_files/sv.po @@ -0,0 +1,113 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\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" +"Language: sv\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +msgid "KTorrent" +msgstr "Ktorrent" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "BitTorrent-klient" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "Ett BitTorrent-program för TDE" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +msgid "KTorrent Plugin" +msgstr "Ktorrent-insticksprogram" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +msgid "BitTorrent Download" +msgstr "BitTorrent-nerladdning" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +#, fuzzy +msgid "InfoWidgetPlugin" +msgstr "Insticksprogram för katalogsökning" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +msgid "IPFilterPlugin" +msgstr "IP-filterinsticksprogram" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "IP-filterinsticksprogram för Ktorrent" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +msgid "LogViewerPlugin" +msgstr "Loggvisningsinsticksprogram" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "Insticksprogram för partiell filimport" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "RSS-kanalinsticksprogram" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +msgid "ScanFolderPlugin" +msgstr "Insticksprogram för katalogsökning" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +msgid "SchedulerPlugin" +msgstr "Insticksprogram för schemaläggning" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "Sökinsticksprogram" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "Sökinsticksprogram för Ktorrent" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +msgid "StatsPlugin" +msgstr "Statistikinsticksprogram" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "UPnP-insticksprogram" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "Webb-gränssnitt" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +msgid "ZeroConfPlugin" +msgstr "Zeroconf-insticksprogram" diff --git a/translations/desktop_files/tr.po b/translations/desktop_files/tr.po new file mode 100644 index 0000000..8f5b114 --- /dev/null +++ b/translations/desktop_files/tr.po @@ -0,0 +1,114 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\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" +"Language: tr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +#, fuzzy +msgid "KTorrent" +msgstr "KTorrent Eklentisi" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "BitTorrent İstemcisi" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "TDE için BitTorrent uygulaması" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +msgid "KTorrent Plugin" +msgstr "KTorrent Eklentisi" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +msgid "BitTorrent Download" +msgstr "BitTorrent İndirme" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +#, fuzzy +msgid "InfoWidgetPlugin" +msgstr "Dizin Tarama Eklentisi" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +msgid "IPFilterPlugin" +msgstr "IP Filtre Eklentisi" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "KTorrent için IP filtre eklentisi" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +msgid "LogViewerPlugin" +msgstr "Kayıt Görüntü Eklentisi" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "Tamamlanmamış Dosya Alma Eklentisi" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "RSS Besleme Eklentisi" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +msgid "ScanFolderPlugin" +msgstr "Dizin Tarama Eklentisi" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +msgid "SchedulerPlugin" +msgstr "Zamanlayıcı Eklentisi" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "Arama Eklentisi" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "KTorrent için arama eklentisi" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +msgid "StatsPlugin" +msgstr "Arama Eklentisi" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "UPnP Eklentisi" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "Ağ Arayüzü" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +msgid "ZeroConfPlugin" +msgstr "ZeroConf Eklentisi" diff --git a/translations/desktop_files/uk.po b/translations/desktop_files/uk.po new file mode 100644 index 0000000..ed94904 --- /dev/null +++ b/translations/desktop_files/uk.po @@ -0,0 +1,115 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\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" +"Language: uk\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +#, fuzzy +msgid "KTorrent" +msgstr "Втулок KTorrent" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "Клієнт BitTorrent" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "Програма BitTorrent для TDE" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +msgid "KTorrent Plugin" +msgstr "Втулок KTorrent" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +msgid "BitTorrent Download" +msgstr "Звантаження BitTorrent" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +#, fuzzy +msgid "InfoWidgetPlugin" +msgstr "Втулок сканування тек" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +#, fuzzy +msgid "IPFilterPlugin" +msgstr "Втулок сканування тек" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "Втулок фільтрування IP для KTorrent" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +msgid "LogViewerPlugin" +msgstr "Втулок перегляду журналу" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "Втулок подач RSS" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +msgid "ScanFolderPlugin" +msgstr "Втулок сканування тек" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +msgid "SchedulerPlugin" +msgstr "Втулок розкладу" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "Втулок пошуку" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "Втулок пошуку для KTorrent" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +msgid "StatsPlugin" +msgstr "Втулок статистики" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "Веб-інтерфейс" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +msgid "ZeroConfPlugin" +msgstr "Втулок ZeroConf" diff --git a/translations/desktop_files/zh_CN.po b/translations/desktop_files/zh_CN.po new file mode 100644 index 0000000..2b9543e --- /dev/null +++ b/translations/desktop_files/zh_CN.po @@ -0,0 +1,114 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\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" +"Language: zh_CN\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +#, fuzzy +msgid "KTorrent" +msgstr "KTorrent 插件" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "BitTorrent 客户端" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "一个 TDE 的 BitTorrent 程序" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +msgid "KTorrent Plugin" +msgstr "KTorrent 插件" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +msgid "BitTorrent Download" +msgstr "BitTorrent 下载" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +#, fuzzy +msgid "InfoWidgetPlugin" +msgstr "扫描文件夹插件" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +msgid "IPFilterPlugin" +msgstr "IP 过滤器插件" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "KTorrent 的 IP 过滤器插件" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +msgid "LogViewerPlugin" +msgstr "日志查看器插件" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "部分文件导入插件" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "RSS 种子插件" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +msgid "ScanFolderPlugin" +msgstr "扫描文件夹插件" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +msgid "SchedulerPlugin" +msgstr "带宽规划器插件" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "搜索插件" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "KTorrent 的搜索插件" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +msgid "StatsPlugin" +msgstr "统计插件" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "UPnP 插件" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "Web 界面" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +msgid "ZeroConfPlugin" +msgstr "ZeroConf 插件" diff --git a/translations/desktop_files/zh_TW.po b/translations/desktop_files/zh_TW.po new file mode 100644 index 0000000..4f1d564 --- /dev/null +++ b/translations/desktop_files/zh_TW.po @@ -0,0 +1,116 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-30 19:08+0200\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" +"Language: zh_TW\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: apps/ktorrent/ktorrent.desktop:2 +#, fuzzy +msgid "KTorrent" +msgstr "KTorrent 外掛程式" + +#. GenericName +#: apps/ktorrent/ktorrent.desktop:4 +msgid "BitTorrent Client" +msgstr "BitTorrent 客戶端程式" + +#. Comment +#: apps/ktorrent/ktorrent.desktop:6 +msgid "A BitTorrent program for TDE" +msgstr "TDE 的 BitTorrent 程式" + +#. Name +#: apps/ktorrent/ktorrentplugin.desktop:2 +msgid "KTorrent Plugin" +msgstr "KTorrent 外掛程式" + +#. Comment +#: apps/ktorrent/x-bittorrent.desktop:2 +msgid "BitTorrent Download" +msgstr "BitTorrent 下載" + +#. Name +#: plugins/infowidget/ktinfowidgetplugin.desktop:2 +#, fuzzy +msgid "InfoWidgetPlugin" +msgstr "掃描資料夾外掛程式" + +#. Name +#: plugins/ipfilter/ktipfilterplugin.desktop:2 +msgid "IPFilterPlugin" +msgstr "IPFilter外掛程式" + +#. Comment +#: plugins/ipfilter/ktipfilterplugin.desktop:4 +msgid "IP filter plugin for KTorrent" +msgstr "KTorrent IP 過濾器外掛程式" + +#. Name +#: plugins/logviewer/ktlogviewerplugin.desktop:2 +msgid "LogViewerPlugin" +msgstr "紀錄檢視器外掛程式" + +#. Name +#: plugins/partfileimport/ktpartfileimportplugin.desktop:2 +msgid "PartialFileImportPlugin" +msgstr "PartialFileImport外掛程式" + +#. Name +#: plugins/rssfeed/ktrssfeedplugin.desktop:2 +msgid "RssFeedPlugin" +msgstr "" + +#. Name +#: plugins/scanfolder/ktscanfolderplugin.desktop:2 +msgid "ScanFolderPlugin" +msgstr "掃描資料夾外掛程式" + +#. Name +#: plugins/scheduler/ktschedulerplugin.desktop:2 +msgid "SchedulerPlugin" +msgstr "排程器外掛程式" + +#. Name +#: plugins/search/ktsearchplugin.desktop:2 +msgid "SearchPlugin" +msgstr "搜尋外掛程式" + +#. Comment +#: plugins/search/ktsearchplugin.desktop:4 +msgid "Search plugin for KTorrent" +msgstr "KTorrent 搜尋外掛程式" + +#. Name +#: plugins/stats/ktstatsplugin.desktop:2 +#, fuzzy +msgid "StatsPlugin" +msgstr "搜尋外掛程式" + +#. Name +#: plugins/upnp/ktupnpplugin.desktop:2 +msgid "UPnPPlugin" +msgstr "UPnP外掛程式" + +#. Name +#: plugins/webinterface/ktwebinterfaceplugin.desktop:2 +msgid "WebInterface" +msgstr "" + +#. Name +#: plugins/zeroconf/ktzeroconfplugin.desktop:2 +#, fuzzy +msgid "ZeroConfPlugin" +msgstr "搜尋外掛程式" diff --git a/translations/el/Makefile.am b/translations/el/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/el/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/el/messages/Makefile.am b/translations/el/messages/Makefile.am deleted file mode 100644 index da7e49a..0000000 --- a/translations/el/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = el -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/en_GB/Makefile.am b/translations/en_GB/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/en_GB/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/en_GB/messages/Makefile.am b/translations/en_GB/messages/Makefile.am deleted file mode 100644 index ce472fa..0000000 --- a/translations/en_GB/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = en_GB -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/es/Makefile.am b/translations/es/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/es/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/es/messages/Makefile.am b/translations/es/messages/Makefile.am deleted file mode 100644 index d3df28d..0000000 --- a/translations/es/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = es -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/et/Makefile.am b/translations/et/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/et/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/et/messages/Makefile.am b/translations/et/messages/Makefile.am deleted file mode 100644 index 21009b2..0000000 --- a/translations/et/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = et -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/fa/Makefile.am b/translations/fa/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/fa/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/fa/messages/Makefile.am b/translations/fa/messages/Makefile.am deleted file mode 100644 index 7155ae2..0000000 --- a/translations/fa/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = fa -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/fr/Makefile.am b/translations/fr/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/fr/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/fr/messages/Makefile.am b/translations/fr/messages/Makefile.am deleted file mode 100644 index 1e563b7..0000000 --- a/translations/fr/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = fr -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/gl/Makefile.am b/translations/gl/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/gl/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/gl/messages/Makefile.am b/translations/gl/messages/Makefile.am deleted file mode 100644 index 73c415d..0000000 --- a/translations/gl/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = gl -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/hu/Makefile.am b/translations/hu/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/hu/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/hu/messages/Makefile.am b/translations/hu/messages/Makefile.am deleted file mode 100644 index a60c4c4..0000000 --- a/translations/hu/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = hu -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/it/Makefile.am b/translations/it/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/it/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/it/messages/Makefile.am b/translations/it/messages/Makefile.am deleted file mode 100644 index 0d5c097..0000000 --- a/translations/it/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = it -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/ja/Makefile.am b/translations/ja/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/ja/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/ja/messages/Makefile.am b/translations/ja/messages/Makefile.am deleted file mode 100644 index f18f0ca..0000000 --- a/translations/ja/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = ja -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/ka/Makefile.am b/translations/ka/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/ka/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/ka/messages/Makefile.am b/translations/ka/messages/Makefile.am deleted file mode 100644 index 8d1a798..0000000 --- a/translations/ka/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = ka -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/lt/Makefile.am b/translations/lt/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/lt/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/lt/messages/Makefile.am b/translations/lt/messages/Makefile.am deleted file mode 100644 index 833d56d..0000000 --- a/translations/lt/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = lt -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/ar/messages/ktorrent.po b/translations/messages/ar.po index ddc8a88..3a03e80 100644 --- a/translations/ar/messages/ktorrent.po +++ b/translations/messages/ar.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: ktorrent\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" "PO-Revision-Date: 2006-12-21 15:38+0100\n" "Last-Translator: محمد سعد Mohamed SAAD <metehyi@free.fr>\n" "Language-Team: Arabic <doc@arabeyes.org>\n" @@ -63,7 +63,7 @@ msgid " short!" msgstr "" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 msgid "All Torrents" msgstr "كل السيول" @@ -76,73 +76,73 @@ msgid "Case sensitive" msgstr "" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 #, fuzzy msgid "Active downloads" msgstr "منزل:" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 #, fuzzy msgid "Active torrents" msgstr "كل السيول" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 #, fuzzy msgid "Active uploads" msgstr "المحملة" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "المنزلة" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 msgid "Uploads" msgstr "المحملة" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 #, fuzzy msgid "Queued downloads" msgstr "عدد التنزيلات الأقصى:" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 #, fuzzy msgid "Queued uploads" msgstr "مصفوف" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 #, fuzzy msgid "User downloads" msgstr "منزل:" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 #, fuzzy msgid "User uploads" msgstr "المحملة" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 #, fuzzy msgid "Inactive torrents" msgstr "أنشئ سيل" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 #, fuzzy msgid "Inactive downloads" msgstr "منزل:" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 #, fuzzy msgid "Inactive uploads" diff --git a/translations/bg/messages/ktorrent.po b/translations/messages/bg.po index 73f118c..2a737b6 100644 --- a/translations/bg/messages/ktorrent.po +++ b/translations/messages/bg.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ktorrent\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" "PO-Revision-Date: 2008-06-12 21:29+0000\n" "Last-Translator: Zlatko Popov <zlatkopopov@fsa-bg.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" @@ -69,7 +69,7 @@ msgid " short!" msgstr " не достигат!" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 msgid "All Torrents" msgstr "Всички торенти" @@ -82,64 +82,64 @@ msgid "Case sensitive" msgstr "Чувствителен регистър" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 msgid "Active downloads" msgstr "Активни сваляния" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 msgid "Active torrents" msgstr "Активни торенти" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 msgid "Active uploads" msgstr "Активни качвания" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "Сваляния" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 msgid "Uploads" msgstr "Качвания" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 msgid "Queued downloads" msgstr "На опашката за сваляне" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 msgid "Queued uploads" msgstr "На опашката" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 msgid "User downloads" msgstr "Сваляния (потр.)" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 msgid "User uploads" msgstr "Качвания (потр.)" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 msgid "Inactive torrents" msgstr "Неактивни торенти" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 msgid "Inactive downloads" msgstr "Неактивни сваляния" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 msgid "Inactive uploads" msgstr "Неактивни качвания" diff --git a/translations/br/messages/ktorrent.po b/translations/messages/br.po index 3b97572..1ee1397 100644 --- a/translations/br/messages/ktorrent.po +++ b/translations/messages/br.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: all2.po\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" "PO-Revision-Date: 2004-09-20 15:44+0200\n" "Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n" "Language-Team: br <LL@li.org>\n" @@ -60,7 +60,7 @@ msgid " short!" msgstr "" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 #, fuzzy msgid "All Torrents" msgstr "Ster-froud" @@ -74,74 +74,74 @@ msgid "Case sensitive" msgstr "" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 #, fuzzy msgid "Active downloads" msgstr "Enkargañ" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 #, fuzzy msgid "Active torrents" msgstr "Ster-froud" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 #, fuzzy msgid "Active uploads" msgstr "Ezkarget" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 #, fuzzy msgid "Uploads" msgstr "Ezkarget" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 #, fuzzy msgid "Queued downloads" msgstr "An arlun enkargañ" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 #, fuzzy msgid "Queued uploads" msgstr "El lost" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 #, fuzzy msgid "User downloads" msgstr "Enkargañ" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 #, fuzzy msgid "User uploads" msgstr "Ezkarget" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 #, fuzzy msgid "Inactive torrents" msgstr "Krouiñ ar ster-froud" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 #, fuzzy msgid "Inactive downloads" msgstr "Enkargañ" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 #, fuzzy msgid "Inactive uploads" diff --git a/translations/ca/messages/ktorrent.po b/translations/messages/ca.po index aa4ee28..31b01e1 100644 --- a/translations/ca/messages/ktorrent.po +++ b/translations/messages/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ktorrent\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" "PO-Revision-Date: 2008-06-03 21:57+0200\n" "Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n" "Language-Team: Catalan <kde-i18n-ca@kde.org>\n" @@ -70,7 +70,7 @@ msgid " short!" msgstr " curt!" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 msgid "All Torrents" msgstr "Tots els torrents" @@ -83,64 +83,64 @@ msgid "Case sensitive" msgstr "Distingeix majúscules" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 msgid "Active downloads" msgstr "Baixades actives" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 msgid "Active torrents" msgstr "Torrents actius" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 msgid "Active uploads" msgstr "Pujades actives" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "Baixades" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 msgid "Uploads" msgstr "Pujades" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 msgid "Queued downloads" msgstr "Cua de baixades" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 msgid "Queued uploads" msgstr "Cua de pujades" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 msgid "User downloads" msgstr "Baixades de l'usuari" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 msgid "User uploads" msgstr "Pujades de l'usuari" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 msgid "Inactive torrents" msgstr "Torrents inactius" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 msgid "Inactive downloads" msgstr "Baixades inactives" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 msgid "Inactive uploads" msgstr "Pujades inactives" diff --git a/translations/cs/messages/ktorrent.po b/translations/messages/cs.po index 3778099..85027e3 100644 --- a/translations/cs/messages/ktorrent.po +++ b/translations/messages/cs.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: ktorrent\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" "PO-Revision-Date: 2020-10-11 18:30+0000\n" "Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n" "Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/" @@ -77,7 +77,7 @@ msgid " short!" msgstr "chybí!" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 msgid "All Torrents" msgstr "Všechny torrenty" @@ -90,64 +90,64 @@ msgid "Case sensitive" msgstr "" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 msgid "Active downloads" msgstr "Aktivní stahování" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 msgid "Active torrents" msgstr "Aktivní torrenty" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 msgid "Active uploads" msgstr "Aktivní odesílání" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "Stahování" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 msgid "Uploads" msgstr "Odesílání" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 msgid "Queued downloads" msgstr "Fronta stahování" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 msgid "Queued uploads" msgstr "Fronta odesílání" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 msgid "User downloads" msgstr "Uživatelem řízené" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 msgid "User uploads" msgstr "Uživatelem řízené" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 msgid "Inactive torrents" msgstr "Neaktivní torrenty" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 msgid "Inactive downloads" msgstr "Neaktivní stahování" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 msgid "Inactive uploads" msgstr "Neaktivní odesílání" diff --git a/translations/cy/messages/ktorrent.po b/translations/messages/cy.po index 0ecad81..b21b2a1 100644 --- a/translations/cy/messages/ktorrent.po +++ b/translations/messages/cy.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\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" @@ -61,7 +61,7 @@ msgid " short!" msgstr "" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 #, fuzzy msgid "All Torrents" msgstr "KTorrent" @@ -76,73 +76,73 @@ msgid "Case sensitive" msgstr "" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 #, fuzzy msgid "Active downloads" msgstr "Lawrlwytho" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 #, fuzzy msgid "Active torrents" msgstr "KTorrent" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 #, fuzzy msgid "Active uploads" msgstr "Lawrlwytho" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "Lawrlwythiadau" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 #, fuzzy msgid "Uploads" msgstr "Lawrlwytho" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 #, fuzzy msgid "Queued downloads" msgstr "Lawrlwytho" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 #, fuzzy msgid "Queued uploads" msgstr "Mewn Ciw" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 #, fuzzy msgid "User downloads" msgstr "Lawrlwytho" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 #, fuzzy msgid "User uploads" msgstr "Lawrlwytho" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 msgid "Inactive torrents" msgstr "" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 #, fuzzy msgid "Inactive downloads" msgstr "Lawrlwytho" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 #, fuzzy msgid "Inactive uploads" @@ -4507,6 +4507,7 @@ msgstr "" #~ msgid "DownloadPref" #~ msgstr "Lawrlwytho" +#~ msgid "Form1" #~ msgstr "Ffurf1" #, fuzzy diff --git a/translations/da/messages/ktorrent.po b/translations/messages/da.po index 0ab8d9e..d91ed84 100644 --- a/translations/da/messages/ktorrent.po +++ b/translations/messages/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ktorrent\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" "PO-Revision-Date: 2008-01-24 16:36+0100\n" "Last-Translator: Martin Schlander <suse@linuxin.dk>\n" "Language-Team: <dansk@dansk-gruppen.dk>\n" @@ -68,7 +68,7 @@ msgid " short!" msgstr " kort!" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 msgid "All Torrents" msgstr "Alle torrenter" @@ -81,64 +81,64 @@ msgid "Case sensitive" msgstr "Versalfølsom" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 msgid "Active downloads" msgstr "Aktive downloads" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 msgid "Active torrents" msgstr "Aktive torrents" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 msgid "Active uploads" msgstr "Aktive uploads" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "Download" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 msgid "Uploads" msgstr "Overførsler" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 msgid "Queued downloads" msgstr "Download i kø" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 msgid "Queued uploads" msgstr "Upload i kø" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 msgid "User downloads" msgstr "Bruger-download" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 msgid "User uploads" msgstr "Bruger-upload" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 msgid "Inactive torrents" msgstr "Inaktive torrents" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 msgid "Inactive downloads" msgstr "Inaktive downloads" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 msgid "Inactive uploads" msgstr "Inaktive uploads" diff --git a/translations/de/messages/ktorrent.po b/translations/messages/de.po index a2dca4c..0731c4b 100644 --- a/translations/de/messages/ktorrent.po +++ b/translations/messages/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: ktorrent\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" "PO-Revision-Date: 2019-12-22 13:51+0000\n" "Last-Translator: Chris <xchrisx@uber.space>\n" "Language-Team: German <https://mirror.git.trinitydesktop.org/weblate/" @@ -76,7 +76,7 @@ msgid " short!" msgstr " fehlen!" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 msgid "All Torrents" msgstr "Alle Torrents" @@ -89,64 +89,64 @@ msgid "Case sensitive" msgstr "Groß-/Kleinschreibung beachten" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 msgid "Active downloads" msgstr "Aktive Downloads" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 msgid "Active torrents" msgstr "Aktive Torrents" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 msgid "Active uploads" msgstr "Aktive Verteilvorgänge" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "Downloads" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 msgid "Uploads" msgstr "Uploads" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 msgid "Queued downloads" msgstr "Eingereihte Downloads" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 msgid "Queued uploads" msgstr "Eingereihte Verteilvorgänge" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 msgid "User downloads" msgstr "Benutzer-Downloads" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 msgid "User uploads" msgstr "Benutzer-Verteilvorgänge" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 msgid "Inactive torrents" msgstr "Inaktive Torrents" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 msgid "Inactive downloads" msgstr "Inaktive Downloads" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 msgid "Inactive uploads" msgstr "Inaktive Verteilvorgänge" diff --git a/translations/el/messages/ktorrent.po b/translations/messages/el.po index e47bf65..17fef91 100644 --- a/translations/el/messages/ktorrent.po +++ b/translations/messages/el.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: ktorrent\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" "PO-Revision-Date: 2007-08-12 20:48+0300\n" "Last-Translator: Spiros Georgaras <sng@hellug.gr>\n" "Language-Team: Greek <i18ngr@lists.hellug.gr>\n" @@ -68,7 +68,7 @@ msgid " short!" msgstr " λείπουν από το δίσκο!" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 msgid "All Torrents" msgstr "Όλα τα Torrents" @@ -81,64 +81,64 @@ msgid "Case sensitive" msgstr "" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 msgid "Active downloads" msgstr "Ενεργές λήψεις αρχείων" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 msgid "Active torrents" msgstr "Ενεργά torrents" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 msgid "Active uploads" msgstr "Ενεργές αποστολές αρχείων" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "Λήψεις" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 msgid "Uploads" msgstr "Αποστολές" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 msgid "Queued downloads" msgstr "Λήψεις σε αναμονή" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 msgid "Queued uploads" msgstr "Αποστολές σε αναμονή" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 msgid "User downloads" msgstr "Λήψεις χρήστη" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 msgid "User uploads" msgstr "Αποστολές χρήστη" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 msgid "Inactive torrents" msgstr "Ανενεργά torrents" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 msgid "Inactive downloads" msgstr "Ανενεργές λήψεις αρχείων" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 msgid "Inactive uploads" msgstr "Ανενεργές αποστολές αρχείων" diff --git a/translations/en_GB/messages/ktorrent.po b/translations/messages/en_GB.po index 261fb54..0705bb3 100644 --- a/translations/en_GB/messages/ktorrent.po +++ b/translations/messages/en_GB.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ktorrent\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" "PO-Revision-Date: 2006-01-16 22:31+0000\n" "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n" "Language-Team: British English <kde-en-gb@kde.me.uk>\n" @@ -67,7 +67,7 @@ msgid " short!" msgstr "" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 #, fuzzy msgid "All Torrents" msgstr "Torrent" @@ -81,73 +81,73 @@ msgid "Case sensitive" msgstr "" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 #, fuzzy msgid "Active downloads" msgstr "Download" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 #, fuzzy msgid "Active torrents" msgstr "Torrent" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 #, fuzzy msgid "Active uploads" msgstr "Uploaded" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "Downloads" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 #, fuzzy msgid "Uploads" msgstr "Uploaded" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 #, fuzzy msgid "Queued downloads" msgstr "The downloads icon" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 msgid "Queued uploads" msgstr "" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 #, fuzzy msgid "User downloads" msgstr "Download" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 #, fuzzy msgid "User uploads" msgstr "Uploaded" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 #, fuzzy msgid "Inactive torrents" msgstr "Create Torrent" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 #, fuzzy msgid "Inactive downloads" msgstr "Download" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 #, fuzzy msgid "Inactive uploads" diff --git a/translations/es/messages/ktorrent.po b/translations/messages/es.po index 0b269f8..8b9cbbf 100644 --- a/translations/es/messages/ktorrent.po +++ b/translations/messages/es.po @@ -6,18 +6,21 @@ # Pablo de Vicente <pablo.devicente@gmail.com>, 2005. # Enrique Matias Sanchez (aka Quique) <cronopios@gmail.com>, 2005, 2006, 2007, 2008. # Jaime Robles <jaime@kde.org>, 2007. +# Juan M Ayala <linux.zero@yahoo.com>, 2025. msgid "" msgstr "" "Project-Id-Version: ktorrent\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" -"PO-Revision-Date: 2008-09-09 14:37+0200\n" -"Last-Translator: Enrique Matias Sanchez <cronopios@gmail.com>\n" -"Language-Team: Spanish <kde-l10n-es@kde.org>\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" +"PO-Revision-Date: 2025-01-21 08:21+0000\n" +"Last-Translator: Juan M Ayala <linux.zero@yahoo.com>\n" +"Language-Team: Spanish <https://mirror.git.trinitydesktop.org/weblate/" +"projects/applications/ktorrent/es/>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Instead of a literal translation, add your name to the end of the list (separated by a comma). msgid "" @@ -72,7 +75,7 @@ msgid " short!" msgstr " corto." #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 msgid "All Torrents" msgstr "Todos los torrents" @@ -85,64 +88,64 @@ msgid "Case sensitive" msgstr "Diferenciar mayúsculas y minúsculas" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 msgid "Active downloads" msgstr "Descargas activas" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 msgid "Active torrents" msgstr "Torrents activos" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 msgid "Active uploads" msgstr "Envíos activos" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "Descargas" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 msgid "Uploads" msgstr "Envíos" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 msgid "Queued downloads" msgstr "Descargas en espera" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 msgid "Queued uploads" msgstr "Envíos en espera" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 msgid "User downloads" msgstr "Descargas del usuario" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 msgid "User uploads" msgstr "Envíos del usuario" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 msgid "Inactive torrents" msgstr "Torrents inactivos" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 msgid "Inactive downloads" msgstr "Descargas inactivas" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 msgid "Inactive uploads" msgstr "Envíos inactivos" @@ -4153,9 +4156,9 @@ msgid "Custom browser executable path" msgstr "Ruta del ejecutable del navegador personalizado" #: plugins/search/searchbar.ui:78 -#, fuzzy, no-c-format +#, no-c-format msgid "Engine:" -msgstr " Motor: " +msgstr "Motor:" #: plugins/search/searchpref.ui:30 plugins/webinterface/webinterfacepref.ui:30 #, no-c-format diff --git a/translations/et/messages/ktorrent.po b/translations/messages/et.po index 1049a09..4d2086b 100644 --- a/translations/et/messages/ktorrent.po +++ b/translations/messages/et.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ktorrent\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" "PO-Revision-Date: 2008-03-23 22:27+0300\n" "Last-Translator: Marek Laane <bald@starman.ee>\n" "Language-Team: Estonian <kde-et@linux.ee>\n" @@ -68,7 +68,7 @@ msgid " short!" msgstr " lühike!" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 msgid "All Torrents" msgstr "Kõik torrentid" @@ -81,64 +81,64 @@ msgid "Case sensitive" msgstr "Tõstutundlik" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 msgid "Active downloads" msgstr "Aktiivsed allalaadimised" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 msgid "Active torrents" msgstr "Aktiivsed torrentid" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 msgid "Active uploads" msgstr "Aktiivsed üleslaadimised" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "Allalaadimised" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 msgid "Uploads" msgstr "Üleslaadimised" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 msgid "Queued downloads" msgstr "Järjekorras allalaadimised" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 msgid "Queued uploads" msgstr "Järjekorras üleslaadimised" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 msgid "User downloads" msgstr "Kasutaja allalaadimised" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 msgid "User uploads" msgstr "Kasutaja üleslaadimised" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 msgid "Inactive torrents" msgstr "Mitteaktiivsed torrentid" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 msgid "Inactive downloads" msgstr "Mitteaktiivsed allalaadimised" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 msgid "Inactive uploads" msgstr "Mitteaktiivsed üleslaadimised" diff --git a/translations/fa/messages/ktorrent.po b/translations/messages/fa.po index add53cb..0a3bfd6 100644 --- a/translations/fa/messages/ktorrent.po +++ b/translations/messages/fa.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: ktorrent\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" "PO-Revision-Date: 2007-01-15 14:30+0330\n" "Last-Translator: Nasim Daniarzadeh <daniarzadeh@itland.ir>\n" "Language-Team: Persian <kde-i18n-fa@kde.org>\n" @@ -68,7 +68,7 @@ msgid " short!" msgstr "" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 #, fuzzy msgid "All Torrents" msgstr "Torrent بارگیری" @@ -82,73 +82,73 @@ msgid "Case sensitive" msgstr "" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 #, fuzzy msgid "Active downloads" msgstr "بارگیری:" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 #, fuzzy msgid "Active torrents" msgstr "Torrent بارگیری" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 #, fuzzy msgid "Active uploads" msgstr "بارگذاریها" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "بارگیریها" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 msgid "Uploads" msgstr "بارگذاریها" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 #, fuzzy msgid "Queued downloads" msgstr "شمایل بارگیریها" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 #, fuzzy msgid "Queued uploads" msgstr "صفشده" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 #, fuzzy msgid "User downloads" msgstr "بارگیری:" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 #, fuzzy msgid "User uploads" msgstr "بارگذاریها" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 #, fuzzy msgid "Inactive torrents" msgstr "ایجاد Torrent" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 #, fuzzy msgid "Inactive downloads" msgstr "بارگیری:" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 #, fuzzy msgid "Inactive uploads" diff --git a/translations/fr/messages/ktorrent.po b/translations/messages/fr.po index 7992d14..14e4357 100644 --- a/translations/fr/messages/ktorrent.po +++ b/translations/messages/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ktorrent\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" "PO-Revision-Date: 2005-08-12 11:06+0100\n" "Last-Translator: Matthieu Robin <kde@macolu.org>\n" "Language-Team: <kde-francophone@kde.org>\n" @@ -66,7 +66,7 @@ msgid " short!" msgstr "" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 #, fuzzy msgid "All Torrents" msgstr "KTorrent" @@ -80,73 +80,73 @@ msgid "Case sensitive" msgstr "" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 #, fuzzy msgid "Active downloads" msgstr "Télécharger" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 #, fuzzy msgid "Active torrents" msgstr "KTorrent" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 #, fuzzy msgid "Active uploads" msgstr "Envoyé" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "Téléchargements" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 #, fuzzy msgid "Uploads" msgstr "Envoyé" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 #, fuzzy msgid "Queued downloads" msgstr "L'icône de téléchargement" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 msgid "Queued uploads" msgstr "" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 #, fuzzy msgid "User downloads" msgstr "Télécharger" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 #, fuzzy msgid "User uploads" msgstr "Envoyé" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 #, fuzzy msgid "Inactive torrents" msgstr "Créer un torrent" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 #, fuzzy msgid "Inactive downloads" msgstr "Télécharger" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 #, fuzzy msgid "Inactive uploads" diff --git a/translations/gl/messages/ktorrent.po b/translations/messages/gl.po index e2b9c69..416f6e0 100644 --- a/translations/gl/messages/ktorrent.po +++ b/translations/messages/gl.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: ktorrent\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" "PO-Revision-Date: 2006-09-02 12:55+0200\n" "Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n" "Language-Team: Galician <trasno@ceu.fi.udc.es>\n" @@ -66,7 +66,7 @@ msgid " short!" msgstr "" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 msgid "All Torrents" msgstr "Todos os Torrentes" @@ -79,73 +79,73 @@ msgid "Case sensitive" msgstr "" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 #, fuzzy msgid "Active downloads" msgstr "obtenzón:" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 #, fuzzy msgid "Active torrents" msgstr "Todos os Torrentes" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 #, fuzzy msgid "Active uploads" msgstr "Envios" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "Recepzóns" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 msgid "Uploads" msgstr "Envios" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 #, fuzzy msgid "Queued downloads" msgstr "O ícone de transferéncias" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 #, fuzzy msgid "Queued uploads" msgstr "En espera" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 #, fuzzy msgid "User downloads" msgstr "obtenzón:" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 #, fuzzy msgid "User uploads" msgstr "Envios" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 #, fuzzy msgid "Inactive torrents" msgstr "Criar Torrente" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 #, fuzzy msgid "Inactive downloads" msgstr "obtenzón:" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 #, fuzzy msgid "Inactive uploads" diff --git a/translations/hu/messages/ktorrent.po b/translations/messages/hu.po index 2a578c7..4895724 100644 --- a/translations/hu/messages/ktorrent.po +++ b/translations/messages/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: KTorrent \n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" "PO-Revision-Date: 2008-01-06 17:30+0100\n" "Last-Translator: Tamas Szanto <tszanto@interware.hu>\n" "Language-Team: Hungarian <hu@li.org>\n" @@ -71,7 +71,7 @@ msgid " short!" msgstr " hiányzik!" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 msgid "All Torrents" msgstr "Minden torrent" @@ -84,64 +84,64 @@ msgid "Case sensitive" msgstr "Nagybetűérzékeny" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 msgid "Active downloads" msgstr "Aktív letöltések" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 msgid "Active torrents" msgstr "Aktív torrentek" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 msgid "Active uploads" msgstr "Aktív feltöltések" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "Letöltések" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 msgid "Uploads" msgstr "Feltöltések" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 msgid "Queued downloads" msgstr "Sorkezelős letöltések" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 msgid "Queued uploads" msgstr "Sorkezelős feltöltések" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 msgid "User downloads" msgstr "Egyedi vezérlésű letöltések" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 msgid "User uploads" msgstr "Egyedi vezérlésű feltöltések" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 msgid "Inactive torrents" msgstr "Inaktív torrentek" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 msgid "Inactive downloads" msgstr "Inaktív letöltések" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 msgid "Inactive uploads" msgstr "Inaktív letöltések" diff --git a/translations/it/messages/ktorrent.po b/translations/messages/it.po index 312a6ff..65bfec4 100644 --- a/translations/it/messages/ktorrent.po +++ b/translations/messages/it.po @@ -2,18 +2,21 @@ # # Nicola Ruggero <nixprog.adsl@tiscali.it>, 2005, 2006. # Nicola Ruggero <nicola@nxnt.org>, 2006, 2007, 2008. +# Michele Calgaro <michele.calgaro@yahoo.it>, 2024. msgid "" msgstr "" "Project-Id-Version: ktorrent\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" -"PO-Revision-Date: 2008-08-18 14:39+0200\n" -"Last-Translator: Nicola Ruggero <nicola@nxnt.org>\n" -"Language-Team: Italian <kde-i18n-it@kde.org>\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" +"PO-Revision-Date: 2024-01-16 03:06+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/applications/ktorrent/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Instead of a literal translation, add your name to the end of the list (separated by a comma). msgid "" @@ -66,7 +69,7 @@ msgid " short!" msgstr " breve!" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 msgid "All Torrents" msgstr "Tutti i torrent" @@ -79,64 +82,64 @@ msgid "Case sensitive" msgstr "Distringui maiuscole" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 msgid "Active downloads" msgstr "Scaricamenti attivi" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 msgid "Active torrents" msgstr "Torrent attivi" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 msgid "Active uploads" msgstr "Invii attivi" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "Scaricamenti" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 msgid "Uploads" msgstr "Invii" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 msgid "Queued downloads" msgstr "Scaricamenti in coda" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 msgid "Queued uploads" msgstr "Invii in coda" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 msgid "User downloads" msgstr "Scaricamenti utente" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 msgid "User uploads" msgstr "Invii utente" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 msgid "Inactive torrents" msgstr "Torrent inattivi" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 msgid "Inactive downloads" msgstr "Scaricamenti inattivi" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 msgid "Inactive uploads" msgstr "Invii inattivi" @@ -459,8 +462,8 @@ msgid "" "_n: and 1 seed. \n" "and %n seeds. " msgstr "" -" e 1 nodo. \n" -" e %n nodi. " +"e 1 nodo. \n" +"e %n nodi. " #: apps/ktorrent/ktorrentview.cpp:286 apps/ktorrent/trayicon.cpp:258 msgid "Go to Settings -> Configure KTorrent, if you want to change the limits." @@ -1258,7 +1261,7 @@ msgstr "Il torrent non ha il campo annuncio o il campo nodi" #: libktorrent/torrent/torrent.cpp:103 msgid " Unable to open torrent file %1 : %2" -msgstr "Impossibile aprire il file torrent %1: %2" +msgstr " Impossibile aprire il file torrent %1: %2" #: libktorrent/torrent/torrentcontrol.cpp:508 #, c-format @@ -1351,7 +1354,7 @@ msgstr "Controllo dati" #: libktorrent/torrent/torrentcontrol.cpp:1386 msgid "Stopped. No space left on device." -msgstr "Fermato. Non c'è spazio rimanente sul dispositivo" +msgstr "Fermato. Non c'è spazio rimanente sul dispositivo." #: libktorrent/torrent/torrentcreator.cpp:123 #: libktorrent/torrent/torrentcreator.cpp:239 @@ -1891,7 +1894,6 @@ msgid "Search for torrents on several popular torrent search engines" msgstr "Cerca i torrent in diversi motori di ricerca per torrent famosi" #: plugins/search/searchprefpage.cpp:52 -#, fuzzy msgid "" "Use your web browser to search for the string %1 (capital letters) on the " "search engine you want to add. <br> Then copy the URL in the addressbar " @@ -2192,7 +2194,7 @@ msgstr "" "media<br>\n" "<b>Algoritmo finestra di X:</b> Tempo trascorso calcolato da X campioni di " "velocità<br>\n" -"<b>Algoritmo media commovente:</b> Media commovente velocità calcolata da X " +"<b>Algoritmo media commovente:</b> Media commovente velocità calcolata da X " "campioni" #: apps/ktorrent/advancedpref.ui:64 @@ -3028,7 +3030,7 @@ msgstr "Numero massimo di connessioni per torrent (0 = illimitate)" #: libktorrent/ktorrent.kcfg:29 #, no-c-format msgid "Maximum number of connections for all torrents (0 = no limit) " -msgstr "Numero massimo di connessioni per tutti i torrent (0 = illimitate)" +msgstr "Numero massimo di connessioni per tutti i torrent (0 = illimitate) " #: libktorrent/ktorrent.kcfg:34 #, no-c-format @@ -4151,9 +4153,9 @@ msgid "Custom browser executable path" msgstr "Percorso eseguibile browser personalizzato" #: plugins/search/searchbar.ui:78 -#, fuzzy, no-c-format +#, no-c-format msgid "Engine:" -msgstr " Motore: " +msgstr "Motore:" #: plugins/search/searchpref.ui:30 plugins/webinterface/webinterfacepref.ui:30 #, no-c-format diff --git a/translations/ja/messages/ktorrent.po b/translations/messages/ja.po index 82af3d2..a35b07b 100644 --- a/translations/ja/messages/ktorrent.po +++ b/translations/messages/ja.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: ktorrent\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" "PO-Revision-Date: 2007-11-25 22:00+0900\n" "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n" "Language-Team: Japanese <Kdeveloper@kde.gr.jp>\n" @@ -66,7 +66,7 @@ msgid " short!" msgstr " 不足!" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 msgid "All Torrents" msgstr "すべての torrent" @@ -79,64 +79,64 @@ msgid "Case sensitive" msgstr "大文字小文字を区別する" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 msgid "Active downloads" msgstr "アクティブなダウンロード" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 msgid "Active torrents" msgstr "アクティブな torrent" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 msgid "Active uploads" msgstr "アクティブなアップロード" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "ダウンロード" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 msgid "Uploads" msgstr "アップロード" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 msgid "Queued downloads" msgstr "キューのダウンロード" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 msgid "Queued uploads" msgstr "キューのアップロード" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 msgid "User downloads" msgstr "ユーザのダウンロード" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 msgid "User uploads" msgstr "ユーザのアップロード" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 msgid "Inactive torrents" msgstr "非アクティブな torrent" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 msgid "Inactive downloads" msgstr "非アクティブなダウンロード" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 msgid "Inactive uploads" msgstr "非アクティブなアップロード" diff --git a/translations/ka/messages/ktorrent.po b/translations/messages/ka.po index 13897f1..d57dd68 100644 --- a/translations/ka/messages/ktorrent.po +++ b/translations/messages/ka.po @@ -3,40 +3,43 @@ # Rusudan Tsiskreli <tsiskreli@gmail.com>, 2006. # რუსუდან ცისკრელი <tsiskreli@gmail.com>, 2006. # Rusudan Tsiskreli <r_tsiskreli@caucasus.net>, 2006. +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024, 2025. msgid "" msgstr "" "Project-Id-Version: ktorrent\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" -"PO-Revision-Date: 2006-03-28 01:25+0400\n" -"Last-Translator: Giasher <giasher@telenet.ge>\n" -"Language-Team: <www.gia.ge>\n" -"Language: \n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" +"PO-Revision-Date: 2025-03-26 06:44+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/applications/ktorrent/ka/>\n" +"Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.2\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Instead of a literal translation, add your name to the end of the list (separated by a comma). msgid "" "_: NAME OF TRANSLATORS\n" "Your names" -msgstr "რუსუდან ცისკრელი" +msgstr "თემური დოღონაძე" #. Instead of a literal translation, add your email to the end of the list (separated by a comma). msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" -msgstr "tsiskreli@gmail.com" +msgstr "temuri.doghonadze@gmail.com" #: apps/ktcachecheck/cachechecker.cpp:47 apps/ktcachecheck/cachechecker.cpp:76 #: libktorrent/torrent/chunkmanager.cpp:207 #: libktorrent/torrent/chunkmanager.cpp:432 msgid "Cannot open index file %1 : %2" -msgstr "%1 ინდექსის ფაილის გახსნა ვერ განხორციელდა: %2" +msgstr "ვერ გავხსენი ინდექსის ფაილი %1: %2" #: apps/ktorrent/addpeerwidget.cpp:67 msgid "Torrent does not exist. Report this bug to KTorrent developers." -msgstr "" +msgstr "ტორენტი არ არსებობს. მისწერეთ ამის შესახებ KTorrent-ის პროგრამისტებს." #: apps/ktorrent/addpeerwidget.cpp:102 msgid "Potential peer added." @@ -63,90 +66,88 @@ msgstr "" #: apps/ktorrent/fileselectdlg.cpp:220 msgid " short!" -msgstr "" +msgstr " მოკლე!" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 -#, fuzzy +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 msgid "All Torrents" -msgstr "Torrent" +msgstr "ყველა ტორენტი" #: apps/ktorrent/filterbar.cpp:52 msgid "Find:" -msgstr "" +msgstr "ძებნა:" #: apps/ktorrent/filterbar.cpp:65 msgid "Case sensitive" -msgstr "" +msgstr "დიდი და პატარა ასოების განსხვავება" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 #, fuzzy msgid "Active downloads" msgstr "ჩამოტვირთვა" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 #, fuzzy msgid "Active torrents" msgstr "Torrent" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 #, fuzzy msgid "Active uploads" msgstr "ატვირთული" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "ჩამოქაჩვები" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 -#, fuzzy msgid "Uploads" -msgstr "ატვირთული" +msgstr "ატვირთვები" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 #, fuzzy msgid "Queued downloads" msgstr "ჩამოქაჩვათა ხატულა" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 msgid "Queued uploads" msgstr "" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 #, fuzzy msgid "User downloads" msgstr "ჩამოტვირთვა" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 #, fuzzy msgid "User uploads" msgstr "ატვირთული" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 #, fuzzy msgid "Inactive torrents" msgstr "Torrent შექმნა" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 #, fuzzy msgid "Inactive downloads" msgstr "ჩამოტვირთვა" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 #, fuzzy msgid "Inactive uploads" @@ -154,7 +155,7 @@ msgstr "ატვირთული" #: apps/ktorrent/groups/groupview.cpp:76 apps/ktorrent/ktorrent.cpp:215 msgid "Groups" -msgstr "" +msgstr "ჯგუფები" #: apps/ktorrent/groups/groupview.cpp:107 #, fuzzy @@ -171,9 +172,8 @@ msgid "Edit Name" msgstr "სახელი" #: apps/ktorrent/groups/groupview.cpp:144 -#, fuzzy msgid "Remove Group" -msgstr "IP -სკენ -სკენ" +msgstr "ჯგუფის წაშლა" #: apps/ktorrent/groups/groupview.cpp:147 msgid "Open Tab" @@ -266,26 +266,23 @@ msgstr "QueueManager-ის გახსნა..." #: apps/ktorrent/ktorrent.cpp:548 apps/ktorrent/ktorrentviewmenu.cpp:53 msgid "Enqueue/Dequeue" -msgstr "" +msgstr "რიგში ჩამატება/რიგიდან ამოღება" #: apps/ktorrent/ktorrent.cpp:553 -#, fuzzy msgid "IPFilter" -msgstr "IP ფილტრის ფაილი:" +msgstr "IP-ის ფილტრი" #: apps/ktorrent/ktorrent.cpp:558 apps/ktorrent/ktorrentviewmenu.cpp:96 msgid "Check Data Integrity" msgstr "" #: apps/ktorrent/ktorrent.cpp:571 -#, fuzzy msgid "Set max upload rate" -msgstr "მაქსიმალური აქაჩვის დონე:" +msgstr "დააყენეთ მაქს. ატვირთვის სიჩქარე" #: apps/ktorrent/ktorrent.cpp:574 -#, fuzzy msgid "Set max download rate" -msgstr "მაქსიმალური ჩამოქაჩვის დონე:" +msgstr "დააყენეთ მაქს. გადმოწერის სიჩქარე" #: apps/ktorrent/ktorrent.cpp:626 msgid "Torrent Files" @@ -315,7 +312,7 @@ msgstr "" #: apps/ktorrent/ktorrent.cpp:823 msgid "DHT: off" -msgstr "" +msgstr "DHT: გამორთ" #: apps/ktorrent/ktorrentcore.cpp:115 #, fuzzy @@ -344,9 +341,8 @@ msgid "" msgstr "" #: apps/ktorrent/ktorrentcore.cpp:1031 apps/ktorrent/ktorrentcore.cpp:1069 -#, fuzzy msgid "Recreate" -msgstr "შე&ქმნა" +msgstr "თავიდან შექმნა" #: apps/ktorrent/ktorrentcore.cpp:1031 plugins/infowidget/fileview.cpp:61 #, fuzzy @@ -433,23 +429,20 @@ msgid "Time Left" msgstr "დარჩენილი დრო" #: apps/ktorrent/ktorrentview.cpp:142 -#, fuzzy msgid "Seeders" -msgstr "მარცვლები:" +msgstr "წყაროები" #: apps/ktorrent/ktorrentview.cpp:143 -#, fuzzy msgid "Leechers" -msgstr "წურბელები:" +msgstr "წურბელები" #: apps/ktorrent/ktorrentview.cpp:144 plugins/infowidget/fileview.cpp:51 msgid "% Complete" msgstr "% დასრულდა" #: apps/ktorrent/ktorrentview.cpp:145 -#, fuzzy msgid "Share Ratio" -msgstr "საზიარო სკალა:" +msgstr "გაზიარების კოეფიციენტი" #: apps/ktorrent/ktorrentview.cpp:146 #, fuzzy @@ -475,11 +468,13 @@ msgid "" msgstr "" #: apps/ktorrent/ktorrentview.cpp:285 -#, fuzzy, c-format +#, c-format msgid "" "_n: and 1 seed. \n" "and %n seeds. " -msgstr "%n " +msgstr "" +"და 1 თესლი. \n" +"და %n თესლი. " #: apps/ktorrent/ktorrentview.cpp:286 apps/ktorrent/trayicon.cpp:258 msgid "Go to Settings -> Configure KTorrent, if you want to change the limits." @@ -516,14 +511,13 @@ msgid "Remove Torrent" msgstr "Torrent შექმნა" #: apps/ktorrent/ktorrentview.cpp:631 -#, fuzzy msgid "You are already checking the data of the torrent %1 !" -msgstr "თქვენ უკვე ქაჩავთ ამ ტორენტს." +msgstr "თქვენ უკვე ამოწმებთ მონაცემებს ტორენტისთვის %1 !" #: apps/ktorrent/ktorrentview.cpp:751 -#, fuzzy, c-format +#, c-format msgid "Choose download location for %1" -msgstr "ჩამოქაჩვათა ხატულა" +msgstr "აირჩიეთ გადმოწერის მდებარეობა %1-სთვის" #: apps/ktorrent/ktorrentviewitem.cpp:153 #: apps/ktorrent/ktorrentviewitem.cpp:159 @@ -558,7 +552,7 @@ msgstr "" #: plugins/stats/statsconwgt.ui:40 #, no-c-format msgid "DHT" -msgstr "" +msgstr "DHT" #: apps/ktorrent/ktorrentviewmenu.cpp:67 msgid "Peer Exchange" @@ -629,9 +623,8 @@ msgid "KTorrent" msgstr "KTorrent" #: apps/ktorrent/main.cpp:124 -#, fuzzy msgid "RSS Plugin" -msgstr "მოდულები" +msgstr "RSS დამატება" #: apps/ktorrent/main.cpp:125 #, fuzzy @@ -765,11 +758,11 @@ msgstr "%1 ტორენტ ფაილის გახსნა ვერ � #: apps/ktorrent/newui/button.cpp:58 msgid "Assign Accelerator..." -msgstr "" +msgstr "აქსელერატორის მინიჭება..." #: apps/ktorrent/newui/button.cpp:60 msgid "Clear Accelerator" -msgstr "" +msgstr "აქსელერატორის გასუფთავება" #: apps/ktorrent/newui/button.cpp:319 msgid "Change Button Number" @@ -832,7 +825,7 @@ msgstr "" #: apps/ktorrent/pref.cpp:411 msgid "Advanced" -msgstr "" +msgstr "დამატებით" #: apps/ktorrent/advancedpref.ui:27 apps/ktorrent/pref.cpp:411 #, fuzzy, no-c-format @@ -859,9 +852,8 @@ msgid "Error scanning data: %1" msgstr "%1-ში ჩაწერის შეცდომა" #: apps/ktorrent/scandialog.cpp:77 -#, fuzzy msgid "Scanning data of <b>%1</b> :" -msgstr "%1-ში ჩაწერის შეცდომა" +msgstr "<b>%1</b>-ის მონაცემების სკანირება :" #: apps/ktorrent/speedlimitsdlg.cpp:36 msgid "Speed limits for <b>%1</b>:" @@ -1002,7 +994,7 @@ msgstr "" #: apps/ktorrent/trayicon.cpp:304 apps/ktorrent/trayicon.cpp:306 #: apps/ktorrent/trayicon.cpp:359 msgid "Unlimited" -msgstr "" +msgstr "შეუზღუდავი" #: apps/ktupnptest/main.cpp:35 msgid "A TDE KPart Application" @@ -1010,7 +1002,7 @@ msgstr "" #: apps/ktupnptest/main.cpp:51 msgid "KTUPnPTest" -msgstr "" +msgstr "KTUPnPTest" #: libktorrent/datachecker/singledatachecker.cpp:50 msgid "Cannot open file : %1 : %2" @@ -1050,13 +1042,13 @@ msgid "%1 KB/s" msgstr "%1 კბ/წმ" #: libktorrent/interfaces/functions.cpp:58 -#, fuzzy, c-format +#, c-format msgid "" "_n: 1 day \n" "%n days " msgstr "" -"1 day \n" -"%n დღე" +"1 დღე\n" +"%n დღე " #: libktorrent/migrate/ccmigrate.cpp:119 libktorrent/migrate/ccmigrate.cpp:125 #: libktorrent/torrent/multifilecache.cpp:595 @@ -1151,7 +1143,7 @@ msgstr "შეცდომა: წაკითხვა გადაცდა %1 #: libktorrent/torrent/cachefile.cpp:361 #, c-format msgid "Error reading from %1" -msgstr "%1-ს წაკითხვის შეცდომა" +msgstr "%1-დან წაკითხვის შეცდომა" #: libktorrent/torrent/cachefile.cpp:403 msgid "Error writing to %1 : %2" @@ -1173,7 +1165,9 @@ msgstr "ინდეხ ფაილის შექმნა ვერ გა� msgid "" "_n: 1 peer\n" "%n peers" -msgstr "%n " +msgstr "" +"1 პარტნიორი\n" +"%n პარტნიორი" #: libktorrent/torrent/dndfile.cpp:108 #, fuzzy @@ -1219,7 +1213,7 @@ msgstr "გაჩერებულია" #: libktorrent/torrent/peersourcemanager.cpp:458 msgid "Announcing" -msgstr "" +msgstr "გამოცხადება" #: libktorrent/torrent/queuemanager.cpp:136 msgid "" @@ -1271,17 +1265,18 @@ msgstr "" #: libktorrent/torrent/torrent.cpp:103 msgid " Unable to open torrent file %1 : %2" -msgstr "%1 ტორენტ ფაილის გახსნა ვერ განხორციელდა: %2" +msgstr " ვერ გავხსენი ტორენტის ფაილი %1 : %2" #: libktorrent/torrent/torrentcontrol.cpp:508 -#, fuzzy, c-format +#, c-format msgid "" "An error occurred while loading the torrent. The torrent is probably corrupt " "or is not a torrent file.\n" "%1" msgstr "" "ტორენტის ჩატვირთვისას შეცდომა მოხდა. ტორენტი ან დაზიანებულია, ან ეს არაა " -"ტორენტ ფაილი." +"ტორენტ ფაილი.\n" +"%1" #: libktorrent/torrent/torrentcontrol.cpp:537 msgid "" @@ -1303,9 +1298,9 @@ msgid "" msgstr "" #: libktorrent/torrent/torrentcontrol.cpp:566 -#, fuzzy, c-format +#, c-format msgid "You are already downloading the torrent %1" -msgstr "თქვენ უკვე ქაჩავთ ამ ტორენტს." +msgstr "თქვენ უკვე ქაჩავთ ტორენტს %1" #: libktorrent/torrent/torrentcontrol.cpp:672 msgid "Cannot migrate %1 : %2" @@ -1345,7 +1340,7 @@ msgstr "გაყინულია" #: libktorrent/torrent/torrentcontrol.cpp:1378 msgid "Error: " -msgstr "შეცდომა:" +msgstr "შეცდომა: " #: libktorrent/torrent/torrentcontrol.cpp:1380 msgid "Allocating diskspace" @@ -1353,7 +1348,7 @@ msgstr "" #: libktorrent/torrent/torrentcontrol.cpp:1382 msgid "Queued" -msgstr "" +msgstr "რიგშია" #: libktorrent/torrent/torrentcontrol.cpp:1384 msgid "Checking data" @@ -1524,7 +1519,7 @@ msgstr "" #: plugins/stats/statsspdwgt.ui:40 #, no-c-format msgid "Peers" -msgstr "" +msgstr "პარტნიორები" #: plugins/infowidget/chunkdownloadviewbase.ui:16 #: plugins/infowidget/infowidgetplugin.cpp:194 @@ -1538,7 +1533,7 @@ msgstr "ჯაჭვის ნაწილები" #: plugins/infowidget/trackerviewbase.ui:105 #, no-c-format msgid "Trackers" -msgstr "" +msgstr "ტრეკერები" #: plugins/infowidget/infowidgetprefpage.cpp:34 msgid "Information Widget Options" @@ -1549,9 +1544,8 @@ msgid "IP" msgstr "IP" #: plugins/infowidget/peerview.cpp:214 -#, fuzzy msgid "Country" -msgstr "კონტროლირებადია" +msgstr "ქვეყანა" #: plugins/infowidget/peerview.cpp:215 msgid "Client" @@ -1563,7 +1557,7 @@ msgstr "დახჩობა" #: plugins/infowidget/peerview.cpp:219 msgid "Snubbed" -msgstr "" +msgstr "დაეკიდა" #: plugins/infowidget/peerview.cpp:220 msgid "Availability" @@ -1571,7 +1565,7 @@ msgstr "მისაწვდომობა" #: plugins/infowidget/peerview.cpp:222 msgid "Score" -msgstr "" +msgstr "ქულა" #: plugins/infowidget/peerview.cpp:223 #, fuzzy @@ -1580,7 +1574,7 @@ msgstr "ყველას ამოტვირთვა" #: plugins/infowidget/peerview.cpp:224 msgid "Requests" -msgstr "" +msgstr "მოთხოვნები" #: plugins/infowidget/peerview.cpp:249 msgid "" @@ -1604,9 +1598,8 @@ msgid "Cannot add a tracker to a private torrent." msgstr "" #: plugins/infowidget/trackerview.cpp:96 -#, fuzzy msgid "Cannot remove torrent default tracker." -msgstr "torrent შექმნა შეუძლებელია: %1" +msgstr "ნაგულისხმევ ტრეკერს ვერ წაშლით." #: plugins/infowidget/trackerview.cpp:214 msgid "You cannot add trackers to a private torrent" @@ -1649,7 +1642,7 @@ msgstr "სტატუსი: ჩატვირთულია და გა� #: plugins/ipfilter/ipblockingprefpage.cpp:76 #: plugins/ipfilter/ipblockingprefpage.cpp:99 msgid "Status: Not loaded." -msgstr "სტატუსი: არაა ჩატვირთული" +msgstr "სტატუსი: ჩატვირთული არაა." #: plugins/ipfilter/ipblockingprefpage.cpp:96 msgid "" @@ -1687,13 +1680,12 @@ msgid "Filters out unwanted peers based on their IP address" msgstr "" #: plugins/ipfilter/ipfilterplugin.cpp:46 -#, fuzzy msgid "IP Filter" -msgstr "IP ფილტრის ფაილი:" +msgstr "IP ფილტრი" #: plugins/logviewer/logprefpage.cpp:31 msgid "LogViewer" -msgstr "" +msgstr "ჟურნალის დათვალიერება" #: plugins/logviewer/logprefpage.cpp:31 #: plugins/logviewer/logprefwidgetbase.ui:16 @@ -1720,9 +1712,9 @@ msgid "All files" msgstr "ყველა ფაილი" #: plugins/partfileimport/importdialog.cpp:100 -#, fuzzy, c-format +#, c-format msgid "Cannot verify data : %1" -msgstr "მონაცემთა შემოწმება შეუძლებელია : %s" +msgstr "მონაცემთა გადამოწმება შეუძლებელია : %1" #: plugins/partfileimport/importdialog.cpp:207 #: plugins/partfileimport/importdialog.cpp:243 @@ -1747,7 +1739,7 @@ msgstr "" #: plugins/rssfeed/rssfeedmanager.cpp:78 msgid "Title" -msgstr "" +msgstr "სათაური" #: plugins/rssfeed/rssfeedmanager.cpp:78 msgid "Description" @@ -1755,21 +1747,19 @@ msgstr "აღწერა" #: plugins/rssfeed/rssfeedmanager.cpp:78 plugins/rssfeed/rssfeedmanager.cpp:87 msgid "Link" -msgstr "" +msgstr "ბმული" #: plugins/rssfeed/rssfeedmanager.cpp:87 -#, fuzzy msgid "Season" -msgstr "საზიარო სკალა:" +msgstr "სეზონი" #: plugins/rssfeed/rssfeedmanager.cpp:87 msgid "Episode" -msgstr "" +msgstr "ეპიზოდი" #: plugins/rssfeed/rssfeedmanager.cpp:87 -#, fuzzy msgid "Time" -msgstr "დარჩენილი დრო" +msgstr "დრო" #: plugins/rssfeed/rssfeedplugin.cpp:48 msgid "" @@ -1789,9 +1779,8 @@ msgstr "" #: plugins/scanfolder/scanfolder.cpp:150 plugins/scanfolder/scanfolder.cpp:188 #: plugins/scanfolder/scanfolder.cpp:189 -#, fuzzy msgid "loaded" -msgstr "ატვირთული" +msgstr "ჩატვირთულია" #: plugins/scanfolder/scanfolderplugin.cpp:49 msgid "Automatically scans directories for torrent files and loads them." @@ -1803,9 +1792,8 @@ msgid "Scan Folder" msgstr "ფა&ილები" #: plugins/scanfolder/scanfolderprefpage.cpp:34 -#, fuzzy msgid "ScanFolder" -msgstr "ფა&ილები" +msgstr "საქაღალდის სკანირება" #: plugins/scanfolder/scanfolderprefpage.cpp:34 #, fuzzy @@ -1833,31 +1821,31 @@ msgstr "" #: plugins/scheduler/bwswidget.cpp:45 msgid "MON" -msgstr "" +msgstr "ორშ" #: plugins/scheduler/bwswidget.cpp:45 msgid "TUE" -msgstr "" +msgstr "სამშ" #: plugins/scheduler/bwswidget.cpp:45 msgid "WED" -msgstr "" +msgstr "ოთხშ" #: plugins/scheduler/bwswidget.cpp:45 msgid "THU" -msgstr "" +msgstr "ხუთშ" #: plugins/scheduler/bwswidget.cpp:45 msgid "FRI" -msgstr "" +msgstr "პარ" #: plugins/scheduler/bwswidget.cpp:45 msgid "SAT" -msgstr "" +msgstr "შაბ" #: plugins/scheduler/bwswidget.cpp:45 msgid "SUN" -msgstr "" +msgstr "კვი" #: plugins/scheduler/schedulerplugin.cpp:56 #, fuzzy @@ -1882,7 +1870,7 @@ msgstr "" #: plugins/scheduler/schedulerprefpage.cpp:35 msgid "Scheduler" -msgstr "" +msgstr "დამგეგმავი" #: plugins/scheduler/schedulerprefpage.cpp:35 #, fuzzy @@ -1937,7 +1925,7 @@ msgstr "" #: plugins/search/searchprefpage.cpp:124 msgid "You must enter the search engine's name and URL" -msgstr "თქვენ უნდა შეიყვანოთ საძიებო სისტემის სახელი და URL." +msgstr "თქვენ უნდა შეიყვანოთ საძიებო სისტემის სახელი და URL" #: plugins/search/searchprefpage.cpp:137 msgid "" @@ -1965,9 +1953,8 @@ msgid "Search Engine Options" msgstr "ძიების პარამეტრები" #: plugins/search/searchtab.cpp:65 -#, fuzzy msgid " Engine: " -msgstr "სისტემები" +msgstr " ძრავა: " #: plugins/search/searchwidget.cpp:178 #, fuzzy @@ -1984,12 +1971,11 @@ msgstr "ძიება დასრულდა" #: plugins/stats/ChartDrawer.cpp:419 msgid "Legend" -msgstr "" +msgstr "აღწერა" #: plugins/stats/StatsCon.cpp:49 -#, fuzzy msgid "Leechers connected" -msgstr "წურბელები:" +msgstr "მიერთებული ლიჩერები" #: plugins/stats/StatsCon.cpp:50 #, fuzzy @@ -2007,14 +1993,12 @@ msgid "Seeders in swarms" msgstr "სისტემური &პანელის ხატულის ჩვენება" #: plugins/stats/StatsCon.cpp:53 -#, fuzzy msgid "Average connected leechers per torrent" -msgstr "მაქსიმალური კავშირები ჩამოქაჩვისას:" +msgstr "საშუალო მიერთებული წურბელა თითოეული ტორენტისთვის" #: plugins/stats/StatsCon.cpp:54 -#, fuzzy msgid "Average connected seeders per torrent" -msgstr "მაქსიმალური კავშირები ჩამოქაჩვისას:" +msgstr "საშუალოდ მოერთებული პარტიორები თითოეული ტორენტისტვის" #: plugins/stats/StatsCon.cpp:55 msgid "Average connected leechers per running torrent" @@ -2025,36 +2009,32 @@ msgid "Average connected seeders per running torrent" msgstr "" #: plugins/stats/StatsCon.cpp:61 -#, fuzzy msgid "Nodes" -msgstr "სახელი:" +msgstr "კვანძები" #: plugins/stats/StatsCon.cpp:62 msgid "Tasks" -msgstr "" +msgstr "ამოცანები" #: plugins/stats/StatsPluginPrefs.cpp:25 plugins/stats/statsplugin.cpp:29 -#, fuzzy msgid "Statistics" -msgstr "სტატუსი" +msgstr "სტატისტიკა" #: plugins/stats/StatsPluginPrefs.cpp:25 msgid "Statistics options" msgstr "" #: plugins/stats/StatsSpd.cpp:57 plugins/stats/StatsSpd.cpp:58 -#, fuzzy msgid "Current" -msgstr "Torrent" +msgstr "მიმდინარე" #: plugins/stats/StatsSpd.cpp:60 plugins/stats/StatsSpd.cpp:61 msgid "Average" -msgstr "" +msgstr "საშუალო" #: plugins/stats/StatsSpd.cpp:63 plugins/stats/StatsSpd.cpp:64 -#, fuzzy msgid "Limit" -msgstr "(0 = შეზღუდვის გარეშე)" +msgstr "შეზღუდვა" #: plugins/stats/StatsSpd.cpp:71 #, fuzzy @@ -2072,9 +2052,8 @@ msgid "Average from seeder" msgstr "საშუალო სიჩქარე" #: plugins/stats/StatsSpd.cpp:74 -#, fuzzy msgid "From leechers" -msgstr "წურბელები:" +msgstr "წურბელებისგან" #: plugins/stats/StatsSpd.cpp:75 #, fuzzy @@ -2123,7 +2102,7 @@ msgstr "" #: plugins/webinterface/webinterfaceprefpage.cpp:27 msgid "WebInterface" -msgstr "" +msgstr "ვებინტერფეისი" #: plugins/webinterface/webinterfaceprefpage.cpp:27 #, fuzzy @@ -2162,7 +2141,7 @@ msgstr "" #: plugins/zeroconf/zeroconfplugin.cpp:41 msgid "Zeroconf" -msgstr "" +msgstr "Zeroconf" #: plugins/zeroconf/zeroconfplugin.cpp:41 msgid "" @@ -2183,7 +2162,7 @@ msgstr "" #: apps/ktorrent/ipfilterwidgetbase.ui:107 #, no-c-format msgid "127.0.0.1" -msgstr "" +msgstr "127.0.0.1" #: apps/ktorrent/addpeerwidgetbase.ui:51 apps/ktorrent/downloadpref.ui:338 #: apps/ktorrent/torrentcreatordlgbase.ui:343 @@ -2266,9 +2245,9 @@ msgid "Filesystem specific" msgstr "" #: apps/ktorrent/advancedpref.ui:174 -#, fuzzy, no-c-format +#, no-c-format msgid "Performance" -msgstr "პარამეტრები" +msgstr "წარმადობა" #: apps/ktorrent/advancedpref.ui:193 #, no-c-format @@ -2353,12 +2332,12 @@ msgstr "" #: apps/ktorrent/advancedpref.ui:478 #, no-c-format msgid "Networking" -msgstr "" +msgstr "ქსელი" #: apps/ktorrent/advancedpref.ui:505 -#, fuzzy, no-c-format +#, no-c-format msgid "Maximum number of connection setups:" -msgstr "ჩამოქაჩვისას კავშირთა მაქსიმალური რაოდენობა (0 = შეზღუდვის გარეშე)" +msgstr "კავშირის მორგებების მაქსიმალური რაოდენობა:" #: apps/ktorrent/advancedpref.ui:527 #, no-c-format @@ -2413,7 +2392,7 @@ msgstr "არაა დაწყებული" #: apps/ktorrent/downloadpref.ui:208 #, no-c-format msgid "MB" -msgstr "" +msgstr "მბ" #: apps/ktorrent/downloadpref.ui:236 apps/ktorrent/downloadpref.ui:263 #: apps/ktorrent/downloadpref.ui:560 apps/ktorrent/downloadpref.ui:568 @@ -2497,14 +2476,14 @@ msgid "Select Which Files You Want to Download" msgstr "აირჩიეთ რომელ ფაილთა ჩამოტვირთვა გსურთ" #: apps/ktorrent/fileselectdlgbase.ui:35 -#, fuzzy, no-c-format +#, no-c-format msgid "Download to:" -msgstr "ჩამოტვირთვა" +msgstr "გადმოწერა სად:" #: apps/ktorrent/fileselectdlgbase.ui:74 #, no-c-format msgid "Group:" -msgstr "" +msgstr "ჯგუფი:" #: apps/ktorrent/fileselectdlgbase.ui:97 #, fuzzy, no-c-format @@ -2547,14 +2526,14 @@ msgid "Free disk space:" msgstr "" #: apps/ktorrent/fileselectdlgbase.ui:276 -#, fuzzy, no-c-format +#, no-c-format msgid "After download:" -msgstr "ჩამოტვირთვა" +msgstr "გადმოწერის შემდეგ:" #: apps/ktorrent/generalpref.ui:44 -#, fuzzy, no-c-format +#, no-c-format msgid "Encryption" -msgstr "აღწერა" +msgstr "დაშიფვრა" #: apps/ktorrent/generalpref.ui:58 libktorrent/ktorrent.kcfg:158 #, no-c-format @@ -2643,9 +2622,9 @@ msgid "Download bandwidth (in KB/sec):" msgstr "" #: apps/ktorrent/generalpref.ui:299 -#, fuzzy, no-c-format +#, no-c-format msgid "Folders" -msgstr "ფა&ილები" +msgstr "საქაღალდეები" #: apps/ktorrent/generalpref.ui:318 #, no-c-format @@ -2653,9 +2632,9 @@ msgid "Folder to store temporary files:" msgstr "საქაღალდე დროებითი ფაილებისთვის:" #: apps/ktorrent/generalpref.ui:336 -#, fuzzy, no-c-format +#, no-c-format msgid "Move completed downloads to:" -msgstr "ჩამოტვირთვა" +msgstr "გადმოწერილი ფაილების გადატანა საქაღალდეში:" #: apps/ktorrent/generalpref.ui:344 #, no-c-format @@ -2663,9 +2642,9 @@ msgid "&Automatically save downloads to:" msgstr "ჩამოქაჩვების &ავრომატურად აქ შენახვა:" #: apps/ktorrent/generalpref.ui:386 -#, fuzzy, no-c-format +#, no-c-format msgid "Copy .torrent files to:" -msgstr "torrent ფაილები" +msgstr ".torrent ფაილების კოპირება საქაღალდეში:" #: apps/ktorrent/ipfilterwidgetbase.ui:16 #, fuzzy, no-c-format @@ -2707,7 +2686,7 @@ msgstr "" #: apps/ktorrent/ipfilterwidgetbase.ui:170 #, no-c-format msgid "C&lear" -msgstr "" +msgstr "გა&წმენდა" #: apps/ktorrent/ipfilterwidgetbase.ui:176 #, no-c-format @@ -2766,13 +2745,13 @@ msgstr "მდგომარეობა:" #: plugins/logviewer/logprefwidgetbase.ui:461 #, no-c-format msgid "Tracker:" -msgstr "" +msgstr "ტრეკერი:" #: apps/ktorrent/queuedlg.ui:93 apps/ktorrent/queuedlg.ui:309 #: plugins/logviewer/logprefwidgetbase.ui:453 #, no-c-format msgid "DHT:" -msgstr "" +msgstr "DHT:" #: apps/ktorrent/queuedlg.ui:109 apps/ktorrent/queuedlg.ui:325 #: plugins/infowidget/statustabbase.ui:495 @@ -2788,7 +2767,7 @@ msgstr "" #: apps/ktorrent/queuedlg.ui:177 apps/ktorrent/queuedlg.ui:223 #, no-c-format msgid "Torrent" -msgstr "Torrent" +msgstr "ტორენტი" #: apps/ktorrent/queuedlg.ui:188 apps/ktorrent/queuedlg.ui:234 #, no-c-format @@ -2796,14 +2775,14 @@ msgid "Controlled by" msgstr "კონტროლირებადია" #: apps/ktorrent/queuedlg.ui:214 -#, fuzzy, no-c-format +#, no-c-format msgid "Upload&s" -msgstr "ატვირთული" +msgstr "&ატვირთვები" #: apps/ktorrent/queuedlg.ui:333 -#, fuzzy, no-c-format +#, no-c-format msgid "Uploaded:" -msgstr "ატვირთული" +msgstr "ატვირთული:" #: apps/ktorrent/queuedlg.ui:486 #, fuzzy, no-c-format @@ -2858,7 +2837,7 @@ msgstr "" #: apps/ktorrent/scandlgbase.ui:97 apps/ktorrent/scandlgbase.ui:120 #, no-c-format msgid "0" -msgstr "" +msgstr "0" #: apps/ktorrent/speedlimitsdlgbase.ui:27 #, fuzzy, no-c-format @@ -2939,17 +2918,17 @@ msgstr "1024" #: apps/ktorrent/torrentcreatordlgbase.ui:116 #, no-c-format msgid "2048" -msgstr "" +msgstr "2048" #: apps/ktorrent/torrentcreatordlgbase.ui:121 #, no-c-format msgid "4096" -msgstr "" +msgstr "4096" #: apps/ktorrent/torrentcreatordlgbase.ui:126 #, no-c-format msgid "8192" -msgstr "" +msgstr "8192" #: apps/ktorrent/torrentcreatordlgbase.ui:165 #, no-c-format @@ -2972,7 +2951,7 @@ msgid "Comments:" msgstr "კომენტარები:" #: apps/ktorrent/torrentcreatordlgbase.ui:248 -#, fuzzy, no-c-format +#, no-c-format msgid "&Create" msgstr "შე&ქმნა" @@ -2988,14 +2967,14 @@ msgid "DHT nodes" msgstr "" #: apps/ktorrent/torrentcreatordlgbase.ui:330 -#, fuzzy, no-c-format +#, no-c-format msgid "Node:" -msgstr "სახელი:" +msgstr "კვანძი:" #: apps/ktorrent/torrentcreatordlgbase.ui:382 -#, fuzzy, no-c-format +#, no-c-format msgid "IP or hostname" -msgstr "სხვა IP ან ჰოსტის სახელი:" +msgstr "IP ან ჰოსტის სახელი" #: apps/ktorrent/torrentcreatordlgbase.ui:393 libktorrent/ktorrent.kcfg:54 #: libktorrent/ktorrent.kcfg:60 @@ -3013,7 +2992,7 @@ msgstr "" #: apps/ktupnptest/mainwidget.ui:54 #, no-c-format msgid "Test" -msgstr "" +msgstr "შემოწმება" #: libktorrent/ktorrent.kcfg:10 #, no-c-format @@ -3036,9 +3015,9 @@ msgid "Maximum number of connections per torrent (0 = no limit)" msgstr "ჩამოქაჩვისას კავშირთა მაქსიმალური რაოდენობა (0 = შეზღუდვის გარეშე)" #: libktorrent/ktorrent.kcfg:29 -#, fuzzy, no-c-format +#, no-c-format msgid "Maximum number of connections for all torrents (0 = no limit) " -msgstr "ჩამოქაჩვისას კავშირთა მაქსიმალური რაოდენობა (0 = შეზღუდვის გარეშე)" +msgstr "ჩამოქაჩვისას კავშირთა მაქსიმალური რაოდენობა (0 = შეზღუდვის გარეშე) " #: libktorrent/ktorrent.kcfg:34 #, no-c-format @@ -3096,9 +3075,9 @@ msgid "Folder to store temporary files" msgstr "დროებითი ფაილების შესანახი საქაღალდე" #: libktorrent/ktorrent.kcfg:98 -#, fuzzy, no-c-format +#, no-c-format msgid "Whether to automatically save downloads to saveDir" -msgstr "ჩამოქაჩვების &ავრომატურად აქ შენახვა:" +msgstr "გადმოწერილი ფაილების ავტომატური შენახვა გადმოწერების საქაღალდეში" #: libktorrent/ktorrent.kcfg:102 #, no-c-format @@ -3106,9 +3085,11 @@ msgid "Folder to store downloaded files" msgstr "ჩამოქაჩული ფაილების შესანახი საქაღალდე" #: libktorrent/ktorrent.kcfg:106 -#, fuzzy, no-c-format +#, no-c-format msgid "Whether to automatically move completed downloads to completedDir" -msgstr "ჩამოქაჩვების &ავრომატურად აქ შენახვა:" +msgstr "" +"მოხდება თუ არა დასრულებული გადმოწერილი ფაილების გადატანა შესაბამის " +"საქაღალდეში" #: libktorrent/ktorrent.kcfg:110 #, fuzzy, no-c-format @@ -3116,9 +3097,9 @@ msgid "Folder to move completed downloaded files to" msgstr "ჩამოქაჩული ფაილების შესანახი საქაღალდე" #: libktorrent/ktorrent.kcfg:114 -#, fuzzy, no-c-format +#, no-c-format msgid "Whether to automatically copy .torrent files to torrentCopyDir" -msgstr "ჩამოქაჩვების &ავრომატურად აქ შენახვა:" +msgstr "მოხდება თუ არა .torrent ფაილების ავტომატური კოპირება torrentCopyDir-ში" #: libktorrent/ktorrent.kcfg:118 #, fuzzy, no-c-format @@ -3126,9 +3107,9 @@ msgid "Folder to copy .torrent files to" msgstr "დროებითი ფაილების შესანახი საქაღალდე" #: libktorrent/ktorrent.kcfg:122 -#, fuzzy, no-c-format +#, no-c-format msgid "Whether to use a custom IP to pass to the tracker" -msgstr "IP -სკენ -სკენ" +msgstr "გამოიყენება, თუ არა მორგებული IP ტრეკერისთვის გადასაცემად" #: libktorrent/ktorrent.kcfg:126 #, no-c-format @@ -3138,7 +3119,7 @@ msgstr "" #: libktorrent/ktorrent.kcfg:130 #, no-c-format msgid "IP to pass to the tracker" -msgstr "IP -სკენ -სკენ" +msgstr "IP ტრეკერისთივს გადასაცემად" #: libktorrent/ktorrent.kcfg:134 #, no-c-format @@ -3185,12 +3166,12 @@ msgstr "" #: libktorrent/labelviewitembase.ui:49 #, no-c-format msgid "textLabel2" -msgstr "" +msgstr "textLabel2" #: libktorrent/labelviewitembase.ui:65 #, no-c-format msgid "textLabel3" -msgstr "" +msgstr "textLabel3" #: libktorrent/pluginmanagerwidget.ui:16 #, no-c-format @@ -3240,12 +3221,12 @@ msgstr "გამორიცხულია:" #: plugins/infowidget/chunkdownloadviewbase.ui:195 #, no-c-format msgid "Left:" -msgstr "" +msgstr "მარცხენა:" #: plugins/infowidget/chunkdownloadviewbase.ui:233 -#, fuzzy, no-c-format +#, no-c-format msgid "Size:" -msgstr "ზომა" +msgstr "ზომა:" #: plugins/infowidget/chunkdownloadviewbase.ui:280 #, no-c-format @@ -3260,7 +3241,7 @@ msgstr "პროგრესი" #: plugins/infowidget/chunkdownloadviewbase.ui:302 #, no-c-format msgid "Peer" -msgstr "" +msgstr "პარტნიორი" #: plugins/infowidget/chunkdownloadviewbase.ui:324 #, no-c-format @@ -3308,14 +3289,14 @@ msgid "Leechers:" msgstr "წურბელები:" #: plugins/infowidget/statustabbase.ui:129 -#, fuzzy, no-c-format +#, no-c-format msgid "Average Down Speed:" -msgstr "საშუალო სიჩქარე" +msgstr "გადმოწერის საშუალო სიჩქარე:" #: plugins/infowidget/statustabbase.ui:177 -#, fuzzy, no-c-format +#, no-c-format msgid "Average Up Speed:" -msgstr "საშუალო სიჩქარე" +msgstr "ატვირთვის საშუალო სიჩქარე:" #: plugins/infowidget/statustabbase.ui:195 #: plugins/infowidget/trackerviewbase.ui:246 @@ -3358,7 +3339,7 @@ msgstr "" #: plugins/infowidget/statustabbase.ui:533 #, no-c-format msgid "Hours" -msgstr "" +msgstr "საათი" #: plugins/infowidget/statustabbase.ui:543 #, no-c-format @@ -3376,9 +3357,9 @@ msgid "Time &limit:" msgstr "" #: plugins/infowidget/trackerviewbase.ui:37 -#, fuzzy, no-c-format +#, no-c-format msgid "&Update Tracker" -msgstr "IP -სკენ -სკენ" +msgstr "ტრეკერის განა&ხლება" #: plugins/infowidget/trackerviewbase.ui:40 #, no-c-format @@ -3386,19 +3367,19 @@ msgid "Minimum update interval - 60 seconds" msgstr "" #: plugins/infowidget/trackerviewbase.ui:48 -#, fuzzy, no-c-format +#, no-c-format msgid "Add Trac&ker" -msgstr "IP -სკენ -სკენ" +msgstr "ტრე&კერის დამატება" #: plugins/infowidget/trackerviewbase.ui:64 -#, fuzzy, no-c-format +#, no-c-format msgid "Remove Tracker" -msgstr "IP -სკენ -სკენ" +msgstr "ტრეკერის წაშლა" #: plugins/infowidget/trackerviewbase.ui:72 -#, fuzzy, no-c-format +#, no-c-format msgid "Ch&ange Tracker" -msgstr "IP -სკენ -სკენ" +msgstr "ტრეკერის შეცვლ&ა" #: plugins/infowidget/trackerviewbase.ui:97 #, fuzzy, no-c-format @@ -3419,9 +3400,9 @@ msgid "IPBlocking Preferences" msgstr "IPBlocking პარამეტრები" #: plugins/ipfilter/ipblockingpref.ui:47 -#, fuzzy, no-c-format +#, no-c-format msgid "Select PeerGuardian Filter File " -msgstr "გსურთ KTorrent ფილტრის გამოყენება?" +msgstr "აირჩიეთ PeerGuardian-ის ფილტრის ფაილი " #: plugins/ipfilter/ipblockingpref.ui:58 #, fuzzy, no-c-format @@ -3551,7 +3532,7 @@ msgstr "მოდულის პარამეტრები" #: plugins/logviewer/logprefwidgetbase.ui:595 #, no-c-format msgid "All" -msgstr "" +msgstr "ყველა" #: plugins/logviewer/logprefwidgetbase.ui:58 #: plugins/logviewer/logprefwidgetbase.ui:99 @@ -3567,9 +3548,9 @@ msgstr "" #: plugins/logviewer/logprefwidgetbase.ui:532 #: plugins/logviewer/logprefwidgetbase.ui:570 #: plugins/logviewer/logprefwidgetbase.ui:600 -#, fuzzy, no-c-format +#, no-c-format msgid "Debug" -msgstr "განბზიკვის რეჟიმი" +msgstr "გამართვა" #: plugins/logviewer/logprefwidgetbase.ui:63 #: plugins/logviewer/logprefwidgetbase.ui:104 @@ -3587,7 +3568,7 @@ msgstr "განბზიკვის რეჟიმი" #: plugins/logviewer/logprefwidgetbase.ui:605 #, no-c-format msgid "Notice" -msgstr "" +msgstr "გაფრთხილება" #: plugins/logviewer/logprefwidgetbase.ui:68 #: plugins/logviewer/logprefwidgetbase.ui:109 @@ -3603,9 +3584,9 @@ msgstr "" #: plugins/logviewer/logprefwidgetbase.ui:542 #: plugins/logviewer/logprefwidgetbase.ui:580 #: plugins/logviewer/logprefwidgetbase.ui:610 -#, fuzzy, no-c-format +#, no-c-format msgid "Important" -msgstr "იმპო&რტი" +msgstr "მნისვნელოვანი" #: plugins/logviewer/logprefwidgetbase.ui:73 #: plugins/logviewer/logprefwidgetbase.ui:114 @@ -3623,42 +3604,42 @@ msgstr "იმპო&რტი" #: plugins/logviewer/logprefwidgetbase.ui:615 #, no-c-format msgid "None" -msgstr "" +msgstr "არცერთი" #: plugins/logviewer/logprefwidgetbase.ui:85 -#, fuzzy, no-c-format +#, no-c-format msgid "IPFilter:" -msgstr "IP ფილტრის ფაილი:" +msgstr "IP ფილტრი:" #: plugins/logviewer/logprefwidgetbase.ui:126 -#, fuzzy, no-c-format +#, no-c-format msgid "Search:" -msgstr "ძიება" +msgstr "ძებნა:" #: plugins/logviewer/logprefwidgetbase.ui:167 -#, fuzzy, no-c-format +#, no-c-format msgid "UPnP:" -msgstr "UPnP" +msgstr "UPnP:" #: plugins/logviewer/logprefwidgetbase.ui:178 -#, fuzzy, no-c-format +#, no-c-format msgid "ScanFolder:" -msgstr "ფა&ილები" +msgstr "საქაღალდის სკანირება:" #: plugins/logviewer/logprefwidgetbase.ui:249 -#, fuzzy, no-c-format +#, no-c-format msgid "Scheduler:" -msgstr "მარცვლები:" +msgstr "დამგეგმავი:" #: plugins/logviewer/logprefwidgetbase.ui:290 #, no-c-format msgid "PartFileImport:" -msgstr "" +msgstr "არასრული ფაილების შემოტანა:" #: plugins/logviewer/logprefwidgetbase.ui:301 -#, fuzzy, no-c-format +#, no-c-format msgid "InfoWidget:" -msgstr "ინფორმაციის ელემენტი" +msgstr "ინფორმაციის ვიჯეტი:" #: plugins/logviewer/logprefwidgetbase.ui:342 #, no-c-format @@ -3666,24 +3647,24 @@ msgid "RSS plugin:" msgstr "" #: plugins/logviewer/logprefwidgetbase.ui:413 -#, fuzzy, no-c-format +#, no-c-format msgid "WebInterface plugin:" -msgstr "საერთო პარამეტრები" +msgstr "ვებინტერფეისის დამატება:" #: plugins/logviewer/logprefwidgetbase.ui:426 #, no-c-format msgid "System" -msgstr "" +msgstr "სისტემა" #: plugins/logviewer/logprefwidgetbase.ui:437 -#, fuzzy, no-c-format +#, no-c-format msgid "General:" -msgstr "საერთო" +msgstr "ზოგადი:" #: plugins/logviewer/logprefwidgetbase.ui:445 #, no-c-format msgid "Connections:" -msgstr "" +msgstr "მიერთებები:" #: plugins/logviewer/logprefwidgetbase.ui:559 #, no-c-format @@ -3701,14 +3682,14 @@ msgid "Import an existing download" msgstr "არსებული ჩამოქაჩვის იმპორტირება" #: plugins/partfileimport/importdlgbase.ui:49 -#, fuzzy, no-c-format +#, no-c-format msgid "Torrent:" -msgstr "Torrent" +msgstr "ტორენტი:" #: plugins/partfileimport/importdlgbase.ui:63 -#, fuzzy, no-c-format +#, no-c-format msgid "Data:" -msgstr "მონაცემები" +msgstr "მონაცემები:" #: plugins/partfileimport/importdlgbase.ui:95 #, no-c-format @@ -3718,14 +3699,14 @@ msgstr "" "გთხოვთ განსაზღვროთ ტორენტი და ამ ტორენტისთვის უკვე ჩამოქაჩული მონაცემები." #: plugins/partfileimport/importdlgbase.ui:133 -#, fuzzy, no-c-format +#, no-c-format msgid "&Import" -msgstr "იმპო&რტი" +msgstr "&შემოტანა" #: plugins/rssfeed/ktrssfeedplugin.kcfg:10 -#, fuzzy, no-c-format +#, no-c-format msgid "default" -msgstr "ნაგულისხმევის &დამატება" +msgstr "ნაგულისხმევი" #: plugins/rssfeed/rssfeedwidget.ui:18 #, no-c-format @@ -3733,35 +3714,35 @@ msgid "Rss Feeds" msgstr "" #: plugins/rssfeed/rssfeedwidget.ui:36 -#, fuzzy, no-c-format +#, no-c-format msgid "Feeds" -msgstr "მარცვლები:" +msgstr "ლენტები" #: plugins/rssfeed/rssfeedwidget.ui:78 #, no-c-format msgid "De&lete" -msgstr "" +msgstr "წა&შლა" #: plugins/rssfeed/rssfeedwidget.ui:86 plugins/rssfeed/rssfeedwidget.ui:410 #: plugins/rssfeed/rssfeedwidget.ui:458 #, no-c-format msgid "&New" -msgstr "" +msgstr "&ახალი" #: plugins/rssfeed/rssfeedwidget.ui:117 -#, fuzzy, no-c-format +#, no-c-format msgid "&URL" -msgstr "URL" +msgstr "&URL" #: plugins/rssfeed/rssfeedwidget.ui:139 #, no-c-format msgid "Articles" -msgstr "" +msgstr "სტატიები" #: plugins/rssfeed/rssfeedwidget.ui:213 #, no-c-format msgid "Auto&refresh" -msgstr "" +msgstr "ავტოგანა&ხლება" #: plugins/rssfeed/rssfeedwidget.ui:239 #, no-c-format @@ -3771,12 +3752,12 @@ msgstr "" #: plugins/rssfeed/rssfeedwidget.ui:267 #, no-c-format msgid "Refresh" -msgstr "" +msgstr "განახლება" #: plugins/rssfeed/rssfeedwidget.ui:293 plugins/rssfeed/rssfeedwidget.ui:494 #, no-c-format msgid "&Title" -msgstr "" +msgstr "&სათაური" #: plugins/rssfeed/rssfeedwidget.ui:317 #, no-c-format @@ -3786,12 +3767,12 @@ msgstr "" #: plugins/rssfeed/rssfeedwidget.ui:341 plugins/rssfeed/rssfeedwidget.ui:510 #, no-c-format msgid "&Active" -msgstr "" +msgstr "&აქტიური" #: plugins/rssfeed/rssfeedwidget.ui:356 -#, fuzzy, no-c-format +#, no-c-format msgid "Filters" -msgstr "IP ფილტრის ფაილი:" +msgstr "ფილტრები" #: plugins/rssfeed/rssfeedwidget.ui:383 #, fuzzy, no-c-format @@ -3814,9 +3795,9 @@ msgid "Treat as &Series" msgstr "" #: plugins/rssfeed/rssfeedwidget.ui:612 -#, fuzzy, no-c-format +#, no-c-format msgid "Process" -msgstr "პროგრესი" +msgstr "პროცესი" #: plugins/rssfeed/rssfeedwidget.ui:628 #, no-c-format @@ -3834,9 +3815,9 @@ msgid "Max Episode" msgstr "" #: plugins/rssfeed/rssfeedwidget.ui:721 -#, fuzzy, no-c-format +#, no-c-format msgid "Max Season" -msgstr "საზიარო სკალა:" +msgstr "მაქს. სესია" #: plugins/rssfeed/rssfeedwidget.ui:740 #, no-c-format @@ -3856,7 +3837,7 @@ msgstr "" #: plugins/rssfeed/rssfeedwidget.ui:822 #, no-c-format msgid "Te&st" -msgstr "" +msgstr "შ&ემოწმება" #: plugins/rssfeed/rssfeedwidget.ui:840 #, fuzzy, no-c-format @@ -3894,9 +3875,9 @@ msgid "Folder3 path" msgstr "ფა&ილები" #: plugins/scanfolder/ktscanfolderplugin.kcfg:39 -#, fuzzy, no-c-format +#, no-c-format msgid "Whether to open torrent silently or not." -msgstr "%1 ტორენტ ფაილის გახსნა ვერ განხორციელდა: %2" +msgstr "ტორენტი ჩუმად გაიხსნება, თუ არა." #: plugins/scanfolder/ktscanfolderplugin.kcfg:44 #, no-c-format @@ -3964,19 +3945,19 @@ msgid "Folders to scan" msgstr "ფა&ილები" #: plugins/scanfolder/sfprefwidgetbase.ui:142 -#, fuzzy, no-c-format +#, no-c-format msgid "Folder 1:" -msgstr "ფა&ილები" +msgstr "საქაღალდე 1:" #: plugins/scanfolder/sfprefwidgetbase.ui:153 -#, fuzzy, no-c-format +#, no-c-format msgid "Folder 2:" -msgstr "ფა&ილები" +msgstr "საქაღალდე 2:" #: plugins/scanfolder/sfprefwidgetbase.ui:164 -#, fuzzy, no-c-format +#, no-c-format msgid "Folder 3:" -msgstr "ფა&ილები" +msgstr "საქაღალდე 3:" #: plugins/scheduler/bwspage.ui:28 #, no-c-format @@ -4001,7 +3982,7 @@ msgstr "" #: plugins/scheduler/bwspage.ui:165 plugins/scheduler/bwspage.ui:328 #, no-c-format msgid "&Normal" -msgstr "" +msgstr "&ნორმალური" #: plugins/scheduler/bwspage.ui:195 #, no-c-format @@ -4031,7 +4012,7 @@ msgstr "" #: plugins/scheduler/bwspage.ui:378 #, no-c-format msgid "Categories" -msgstr "" +msgstr "კატეგორიები" #: plugins/scheduler/bwspage.ui:389 #, no-c-format @@ -4045,15 +4026,15 @@ msgstr "" #: plugins/scheduler/bwspage.ui:413 plugins/scheduler/bwspage.ui:463 #: plugins/scheduler/bwspage.ui:513 -#, fuzzy, no-c-format +#, no-c-format msgid "download:" -msgstr "ჩამოტვირთვა" +msgstr "ჩამოტვირთვა:" #: plugins/scheduler/bwspage.ui:429 plugins/scheduler/bwspage.ui:479 #: plugins/scheduler/bwspage.ui:529 -#, fuzzy, no-c-format +#, no-c-format msgid "upload:" -msgstr "ატვირთული" +msgstr "ატვირვა:" #: plugins/scheduler/bwspage.ui:445 plugins/scheduler/bwspage.ui:495 #: plugins/scheduler/bwspage.ui:545 @@ -4087,9 +4068,9 @@ msgid "Reset schedule" msgstr "" #: plugins/scheduler/bwspage.ui:739 -#, fuzzy, no-c-format +#, no-c-format msgid "O&k" -msgstr "&ოკ" +msgstr "&დიახ" #: plugins/scheduler/ktschedulerplugin.kcfg:10 #, no-c-format @@ -4147,9 +4128,9 @@ msgid "Custom browser executable path" msgstr "" #: plugins/search/searchbar.ui:78 -#, fuzzy, no-c-format +#, no-c-format msgid "Engine:" -msgstr "სისტემები" +msgstr "ძრავა:" #: plugins/search/searchpref.ui:30 plugins/webinterface/webinterfacepref.ui:30 #, no-c-format @@ -4167,9 +4148,9 @@ msgid "Open searches in external browser" msgstr "" #: plugins/search/searchpref.ui:76 -#, fuzzy, no-c-format +#, no-c-format msgid "Custom browser path:" -msgstr "სხვა IP" +msgstr "მორგებული ბრაუზერის ბილიკი:" #: plugins/search/searchpref.ui:110 #, no-c-format @@ -4274,7 +4255,7 @@ msgstr "" #: plugins/stats/sprefwgt.ui:27 #, no-c-format msgid "Update" -msgstr "" +msgstr "განახლება" #: plugins/stats/sprefwgt.ui:71 #, fuzzy, no-c-format @@ -4284,12 +4265,12 @@ msgstr "GUI-ს განახლების ინტერვალი" #: plugins/stats/sprefwgt.ui:120 #, no-c-format msgid "miliseconds" -msgstr "" +msgstr "მილიწამი" #: plugins/stats/sprefwgt.ui:135 -#, fuzzy, no-c-format +#, no-c-format msgid "Maximum" -msgstr "მაქსიმალური მარცვლები:" +msgstr "მაქსიმუმი" #: plugins/stats/sprefwgt.ui:154 #, fuzzy, no-c-format @@ -4299,7 +4280,7 @@ msgstr "მაქსიმალური მარცვლები:" #: plugins/stats/sprefwgt.ui:165 #, no-c-format msgid "Exact" -msgstr "" +msgstr "ზუსტი" #: plugins/stats/sprefwgt.ui:175 #, no-c-format @@ -4365,14 +4346,14 @@ msgid "Measurements count" msgstr "" #: plugins/stats/sprefwgt.ui:392 plugins/stats/statsspdwgt.ui:48 -#, fuzzy, no-c-format +#, no-c-format msgid "Upload" -msgstr "ატვირთული" +msgstr "ატვირთვა" #: plugins/stats/sprefwgt.ui:424 #, no-c-format msgid "Connections" -msgstr "" +msgstr "კავშირები" #: plugins/upnp/ktupnpplugin.kcfg:10 #, no-c-format @@ -4442,12 +4423,12 @@ msgstr "" #: plugins/webinterface/ktwebinterfaceplugin.kcfg:33 #, no-c-format msgid "username" -msgstr "" +msgstr "მომხმარებლის სახელი" #: plugins/webinterface/ktwebinterfaceplugin.kcfg:37 #, no-c-format msgid "password" -msgstr "" +msgstr "პაროლი" #: plugins/webinterface/webinterfacepref.ui:41 #, no-c-format @@ -4465,14 +4446,14 @@ msgid "Session TTL (in sec):" msgstr "" #: plugins/webinterface/webinterfacepref.ui:142 -#, fuzzy, no-c-format +#, no-c-format msgid "Select interface:" -msgstr "&არაფრის ამორჩევა" +msgstr "აირჩიეთ ინტერფეისი:" #: plugins/webinterface/webinterfacepref.ui:173 -#, fuzzy, no-c-format +#, no-c-format msgid "Username:" -msgstr "მომხმარებელი" +msgstr "მომხმარებლის სახელი:" #: plugins/webinterface/webinterfacepref.ui:188 #, no-c-format diff --git a/translations/ktorrent.pot b/translations/messages/ktorrent.pot index 8f5b181..727ef8f 100644 --- a/translations/ktorrent.pot +++ b/translations/messages/ktorrent.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\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" @@ -64,7 +64,7 @@ msgid " short!" msgstr "" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 msgid "All Torrents" msgstr "" @@ -77,64 +77,64 @@ msgid "Case sensitive" msgstr "" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 msgid "Active downloads" msgstr "" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 msgid "Active torrents" msgstr "" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 msgid "Active uploads" msgstr "" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 msgid "Uploads" msgstr "" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 msgid "Queued downloads" msgstr "" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 msgid "Queued uploads" msgstr "" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 msgid "User downloads" msgstr "" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 msgid "User uploads" msgstr "" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 msgid "Inactive torrents" msgstr "" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 msgid "Inactive downloads" msgstr "" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 msgid "Inactive uploads" msgstr "" diff --git a/translations/lt/messages/ktorrent.po b/translations/messages/lt.po index eac2427..8b05a95 100644 --- a/translations/lt/messages/ktorrent.po +++ b/translations/messages/lt.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: ktorrent\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" "PO-Revision-Date: 2007-09-03 13:21+0300\n" "Last-Translator: Donatas Glodenis <dgvirtual@akl.lt>\n" "Language-Team: Lithuanian <kde-i18n-lt@kde.org>\n" @@ -69,7 +69,7 @@ msgid " short!" msgstr "" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 #, fuzzy msgid "All Torrents" msgstr "Visi torentai" @@ -83,73 +83,73 @@ msgid "Case sensitive" msgstr "" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 #, fuzzy msgid "Active downloads" msgstr "Parsisiųsti" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 #, fuzzy msgid "Active torrents" msgstr "Esama byla" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 #, fuzzy msgid "Active uploads" msgstr "Parsisiųsti" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "Atsiuntimai" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 #, fuzzy msgid "Uploads" msgstr "Parsisiųsti" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 #, fuzzy msgid "Queued downloads" msgstr "Tik atsiųsti" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 msgid "Queued uploads" msgstr "" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 #, fuzzy msgid "User downloads" msgstr "Parsisiųsti" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 #, fuzzy msgid "User uploads" msgstr "Parsisiųsti" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 #, fuzzy msgid "Inactive torrents" msgstr "Sukurtas:" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 #, fuzzy msgid "Inactive downloads" msgstr "Parsisiųsti" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 #, fuzzy msgid "Inactive uploads" diff --git a/translations/ms/messages/ktorrent.po b/translations/messages/ms.po index e995f4b..ae33cd3 100644 --- a/translations/ms/messages/ktorrent.po +++ b/translations/messages/ms.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" "PO-Revision-Date: 2007-02-13 12:57+0730\n" "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n" "Language-Team: LANGUAGE <kde-i18n-doc@kde.org>\n" @@ -70,7 +70,7 @@ msgid " short!" msgstr "" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 #, fuzzy msgid "All Torrents" msgstr "Laras Semua..." @@ -84,73 +84,73 @@ msgid "Case sensitive" msgstr "" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 #, fuzzy msgid "Active downloads" msgstr "Muat Turun" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 #, fuzzy msgid "Active torrents" msgstr "Torrent" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 #, fuzzy msgid "Active uploads" msgstr "Tetapan berjaya dimuatnaik" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 #, fuzzy msgid "Uploads" msgstr "Tetapan berjaya dimuatnaik" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 #, fuzzy msgid "Queued downloads" msgstr "Tiada icon" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 msgid "Queued uploads" msgstr "" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 #, fuzzy msgid "User downloads" msgstr "Muat Turun" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 #, fuzzy msgid "User uploads" msgstr "Tetapan berjaya dimuatnaik" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 #, fuzzy msgid "Inactive torrents" msgstr "Pemilih torrent" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 #, fuzzy msgid "Inactive downloads" msgstr "Muat Turun" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 #, fuzzy msgid "Inactive uploads" diff --git a/translations/nb/messages/ktorrent.po b/translations/messages/nb.po index d48adb0..e89b2b2 100644 --- a/translations/nb/messages/ktorrent.po +++ b/translations/messages/nb.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: ktorrent\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" "PO-Revision-Date: 2007-10-23 01:56+0200\n" "Last-Translator: Alexander Nicolaysen Sørnes <alex@thehandofagony.com>\n" "Language-Team: <nb@li.org>\n" @@ -65,7 +65,7 @@ msgid " short!" msgstr " for lite!" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 msgid "All Torrents" msgstr "Alle strømmer" @@ -78,64 +78,64 @@ msgid "Case sensitive" msgstr "" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 msgid "Active downloads" msgstr "Aktive nedlastinger" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 msgid "Active torrents" msgstr "Aktive strømmer" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 msgid "Active uploads" msgstr "Aktive opplastinger" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "Nedlastinger" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 msgid "Uploads" msgstr "Opplastinger" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 msgid "Queued downloads" msgstr "Nedlastinger i kø" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 msgid "Queued uploads" msgstr "Opplastinger i kø" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 msgid "User downloads" msgstr "Nedlastinger fra brukere" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 msgid "User uploads" msgstr "Opplastinger fra brukere" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 msgid "Inactive torrents" msgstr "Inaktive strømmer" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 msgid "Inactive downloads" msgstr "Inaktive nedlastinger" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 msgid "Inactive uploads" msgstr "Inaktive opplastinger" diff --git a/translations/nds/messages/ktorrent.po b/translations/messages/nds.po index 1f6a21a..fa9693b 100644 --- a/translations/nds/messages/ktorrent.po +++ b/translations/messages/nds.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: ktorrent\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" "PO-Revision-Date: 2007-12-07 22:58+0100\n" "Last-Translator: Sönke Dibbern <s_dibbern@web.de>\n" "Language-Team: Low Saxon <kde-i18n-nds@kde.org>\n" @@ -69,7 +69,7 @@ msgid " short!" msgstr " kort!" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 msgid "All Torrents" msgstr "All Torrents" @@ -82,64 +82,64 @@ msgid "Case sensitive" msgstr "Op Groot-/Lüttschrieven oppassen" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 msgid "Active downloads" msgstr "Aktive Daalladen" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 msgid "Active torrents" msgstr "Aktive Torrents" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 msgid "Active uploads" msgstr "Aktive Hoochladen" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "Daalladen" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 msgid "Uploads" msgstr "Hoochladen" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 msgid "Queued downloads" msgstr "Inreegt Daalladen" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 msgid "Queued uploads" msgstr "Inreegt Hoochladen" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 msgid "User downloads" msgstr "Bruker-Daalladen" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 msgid "User uploads" msgstr "Bruker-Hoochladen" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 msgid "Inactive torrents" msgstr "Nich aktive Torrents" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 msgid "Inactive downloads" msgstr "Nich aktive Daalladen" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 msgid "Inactive uploads" msgstr "Nich aktive Hoochladen" diff --git a/translations/nl/messages/ktorrent.po b/translations/messages/nl.po index b5cccd9..171b37e 100644 --- a/translations/nl/messages/ktorrent.po +++ b/translations/messages/nl.po @@ -4,19 +4,21 @@ # Bram Schoenmakers <bramschoenmakers@kde.nl>, 2005, 2006, 2008. # Martijn van Vliet <mvanvliet@gmail.com>, 2006, 2007. # Rinse de Vries <RinseDeVries@home.nl>, 2006. +# Heimen Stoffels <vistausss@fastmail.com>, 2025. msgid "" msgstr "" "Project-Id-Version: ktorrent\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" -"PO-Revision-Date: 2008-03-10 13:43+0100\n" -"Last-Translator: Bram Schoenmakers <bramschoenmakers@kde.nl>\n" -"Language-Team: Nederlands <kde-i18n-nl@kde.org>\n" -"Language: \n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" +"PO-Revision-Date: 2025-03-30 11:44+0000\n" +"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n" +"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/" +"applications/ktorrent/nl/>\n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Instead of a literal translation, add your name to the end of the list (separated by a comma). msgid "" @@ -73,7 +75,7 @@ msgid " short!" msgstr " te weinig!" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 msgid "All Torrents" msgstr "Alle torrents" @@ -86,64 +88,64 @@ msgid "Case sensitive" msgstr "Hoofdlettergevoelig" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 msgid "Active downloads" msgstr "Actieve downloads" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 msgid "Active torrents" msgstr "Actieve torrents" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 msgid "Active uploads" msgstr "Actieve uploads" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "Downloads" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 msgid "Uploads" msgstr "Uploads" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 msgid "Queued downloads" msgstr "Downloads@wachtrij" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 msgid "Queued uploads" msgstr "Uploads@wachtrij" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 msgid "User downloads" msgstr "Downloads@gebruiker" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 msgid "User uploads" msgstr "Uploads@gebruiker" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 msgid "Inactive torrents" msgstr "Inactieve torrents" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 msgid "Inactive downloads" msgstr "Inactieve downloads" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 msgid "Inactive uploads" msgstr "Inactieve uploads" @@ -4168,9 +4170,9 @@ msgid "Custom browser executable path" msgstr "Uitvoerbaar pad naar aangepaste browser" #: plugins/search/searchbar.ui:78 -#, fuzzy, no-c-format +#, no-c-format msgid "Engine:" -msgstr "Machine:" +msgstr "Aandrijving:" #: plugins/search/searchpref.ui:30 plugins/webinterface/webinterfacepref.ui:30 #, no-c-format diff --git a/translations/pa/messages/ktorrent.po b/translations/messages/pa.po index ad6dc6b..ad6fb5a 100644 --- a/translations/pa/messages/ktorrent.po +++ b/translations/messages/pa.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ktorrent\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" "PO-Revision-Date: 2005-10-30 12:32+0530\n" "Last-Translator: Amanpreet Singh Alam <amanpreetalam@yahoo.com>\n" "Language-Team: Punjabi <fedora-trans-pa@redhat.com>\n" @@ -67,7 +67,7 @@ msgid " short!" msgstr "" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 #, fuzzy msgid "All Torrents" msgstr "ਕੇ-ਟੋਰੈਂਟ" @@ -81,73 +81,73 @@ msgid "Case sensitive" msgstr "" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 #, fuzzy msgid "Active downloads" msgstr "ਡਾਊਨਲੋਡ" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 #, fuzzy msgid "Active torrents" msgstr "ਕੇ-ਟੋਰੈਂਟ" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 #, fuzzy msgid "Active uploads" msgstr "ਅੱਪਲੋਡ" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "ਡਾਊਨਲੋਡ" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 #, fuzzy msgid "Uploads" msgstr "ਅੱਪਲੋਡ" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 #, fuzzy msgid "Queued downloads" msgstr "ਡਾਊਨਲੋਡ ਚੋਣ" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 msgid "Queued uploads" msgstr "" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 #, fuzzy msgid "User downloads" msgstr "ਡਾਊਨਲੋਡ" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 #, fuzzy msgid "User uploads" msgstr "ਅੱਪਲੋਡ" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 #, fuzzy msgid "Inactive torrents" msgstr "ਇੱਕ ਟੋਰੈਂਟ ਬਣਾਓ" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 #, fuzzy msgid "Inactive downloads" msgstr "ਡਾਊਨਲੋਡ" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 #, fuzzy msgid "Inactive uploads" diff --git a/translations/pl/messages/ktorrent.po b/translations/messages/pl.po index fc38ca9..11aeac0 100644 --- a/translations/pl/messages/ktorrent.po +++ b/translations/messages/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ktorrent\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" "PO-Revision-Date: 2020-04-15 13:28+0000\n" "Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n" "Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/" @@ -75,7 +75,7 @@ msgid " short!" msgstr " za mało!" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 msgid "All Torrents" msgstr "Wszystkie torrenty" @@ -88,64 +88,64 @@ msgid "Case sensitive" msgstr "Rozróżnianie wielkości liter" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 msgid "Active downloads" msgstr "Aktywne pobierania" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 msgid "Active torrents" msgstr "Aktywne torrenty" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 msgid "Active uploads" msgstr "Aktywne wysyłania" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "Pobierane" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 msgid "Uploads" msgstr "Wysyłane" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 msgid "Queued downloads" msgstr "W kolejce do pobrania" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 msgid "Queued uploads" msgstr "W kolejce do wysłania" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 msgid "User downloads" msgstr "Pobierane przez użytkownika" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 msgid "User uploads" msgstr "Wysyłane przez użytkownika" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 msgid "Inactive torrents" msgstr "Nieaktywne torrenty" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 msgid "Inactive downloads" msgstr "Nieaktywne pobierania" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 msgid "Inactive uploads" msgstr "Nieaktywne wysyłania" diff --git a/translations/pt/messages/ktorrent.po b/translations/messages/pt.po index fd4ee33..ab3e70e 100644 --- a/translations/pt/messages/ktorrent.po +++ b/translations/messages/pt.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: ktorrent\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" "PO-Revision-Date: 2007-12-14 18:05+0000\n" "Last-Translator: José Nuno Coelho Pires <jncp@netcabo.pt>\n" "Language-Team: LANGUAGE <kde-i18n-doc@kde.org>\n" @@ -78,7 +78,7 @@ msgid " short!" msgstr " curto!" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 msgid "All Torrents" msgstr "Todas as Torrentes" @@ -91,64 +91,64 @@ msgid "Case sensitive" msgstr "Distinguir capitalização" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 msgid "Active downloads" msgstr "Recepções activas" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 msgid "Active torrents" msgstr "Torrentes activas" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 msgid "Active uploads" msgstr "Envios activos" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "Recepções" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 msgid "Uploads" msgstr "Envios" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 msgid "Queued downloads" msgstr "Recepções em espera" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 msgid "Queued uploads" msgstr "Envios em espera" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 msgid "User downloads" msgstr "Recepções do utilizador" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 msgid "User uploads" msgstr "Envios do utilizador" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 msgid "Inactive torrents" msgstr "Torrentes inactivas" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 msgid "Inactive downloads" msgstr "Recepções inactivas" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 msgid "Inactive uploads" msgstr "Envios inactivos" diff --git a/translations/pt_BR/messages/ktorrent.po b/translations/messages/pt_BR.po index 4312f10..eb5bd52 100644 --- a/translations/pt_BR/messages/ktorrent.po +++ b/translations/messages/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ktorrent\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" "PO-Revision-Date: 2007-08-10 20:52-0300\n" "Last-Translator: doutor.zero <doutor.zero@gmail.com>\n" "Language-Team: Português do Brasil <kde-i18n-pt_br@kde.org>\n" @@ -72,7 +72,7 @@ msgid " short!" msgstr " curto!" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 msgid "All Torrents" msgstr "Todos os Torrents" @@ -85,64 +85,64 @@ msgid "Case sensitive" msgstr "" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 msgid "Active downloads" msgstr "Downloads ativos" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 msgid "Active torrents" msgstr "Torrents ativos" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 msgid "Active uploads" msgstr "Uploads ativos" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "Downloads" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 msgid "Uploads" msgstr "Uploads" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 msgid "Queued downloads" msgstr "Downloads na fila" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 msgid "Queued uploads" msgstr "Uploads na fila" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 msgid "User downloads" msgstr "Downloads do usuário" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 msgid "User uploads" msgstr "Uploads do usuário" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 msgid "Inactive torrents" msgstr "Torrents inativos" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 msgid "Inactive downloads" msgstr "Downloads inativos" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 msgid "Inactive uploads" msgstr "Uploads inativos" diff --git a/translations/ru/messages/ktorrent.po b/translations/messages/ru.po index e614355..18842ad 100644 --- a/translations/ru/messages/ktorrent.po +++ b/translations/messages/ru.po @@ -2,12 +2,13 @@ # # Nick Shaforostoff <shafff@ukr.net>, 2005-2007. # Gregory Mokhin <mok@kde.ru>, 2005. +# Andrei Stepanov <adem4ik@gmail.com>, 2023, 2024. msgid "" msgstr "" "Project-Id-Version: ktorrent\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" -"PO-Revision-Date: 2020-01-04 14:07+0000\n" -"Last-Translator: Serg Bormant <bormant@mail.ru>\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" +"PO-Revision-Date: 2024-11-18 20:11+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" "projects/applications/ktorrent/ru/>\n" "Language: ru\n" @@ -16,19 +17,19 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 3.10\n" +"X-Generator: Weblate 4.17\n" #. Instead of a literal translation, add your name to the end of the list (separated by a comma). msgid "" "_: NAME OF TRANSLATORS\n" "Your names" -msgstr "Николай Шафоростов,Станислав Ланин" +msgstr "Николай Шафоростов,Станислав Ланин,Андрей Степанов" #. Instead of a literal translation, add your email to the end of the list (separated by a comma). msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" -msgstr "shafff@ukr.net,SSTL@inbox.ru" +msgstr "shafff@ukr.net,SSTL@inbox.ru,adem4ik@gmail.com" #: apps/ktcachecheck/cachechecker.cpp:47 apps/ktcachecheck/cachechecker.cpp:76 #: libktorrent/torrent/chunkmanager.cpp:207 @@ -66,82 +67,80 @@ msgstr "Нет, оставить файлы" #: apps/ktorrent/fileselectdlg.cpp:220 msgid " short!" -msgstr "" +msgstr " короткий!" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 msgid "All Torrents" msgstr "Все торренты" #: apps/ktorrent/filterbar.cpp:52 msgid "Find:" -msgstr "" +msgstr "Найти:" #: apps/ktorrent/filterbar.cpp:65 msgid "Case sensitive" -msgstr "" +msgstr "С учётом регистра" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 msgid "Active downloads" msgstr "Активные загрузки" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 msgid "Active torrents" msgstr "Активные торренты" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 msgid "Active uploads" msgstr "Текущие раздачи" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "Загрузки" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 msgid "Uploads" msgstr "Раздачи" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 msgid "Queued downloads" msgstr "Загрузки в очереди" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 msgid "Queued uploads" msgstr "Раздачи в очереди" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 -#, fuzzy msgid "User downloads" -msgstr "Ваши загрузки" +msgstr "Загрузки пользователя" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 -#, fuzzy msgid "User uploads" -msgstr "Ваши раздачи" +msgstr "Раздачи пользователя" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 msgid "Inactive torrents" msgstr "Неактивные торренты" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 msgid "Inactive downloads" msgstr "Неактивные загрузки" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 msgid "Inactive uploads" msgstr "Неактивные раздачи" @@ -151,9 +150,8 @@ msgid "Groups" msgstr "Группы" #: apps/ktorrent/groups/groupview.cpp:107 -#, fuzzy msgid "Custom Groups" -msgstr "Свои Группы" +msgstr "Свои группы" #: apps/ktorrent/groups/groupview.cpp:138 msgid "New Group" @@ -199,13 +197,12 @@ msgstr "Выберите файл" #: apps/ktorrent/ipfilterwidget.cpp:100 #: plugins/scheduler/bwsprefpagewidget.cpp:119 -#, fuzzy msgid "Choose a filename to save under" -msgstr "Выберите имя сохраняемого файла" +msgstr "Выберите имя файла для сохранения" #: apps/ktorrent/ktorrent.cpp:167 msgid "No incoming connections (possibly firewalled)" -msgstr "Нет входящих соединений (возможно их блокирует брандмауэр)." +msgstr "Нет входящих соединений (возможно, их блокирует брандмауэр)" #: apps/ktorrent/ktorrent.cpp:184 apps/ktorrent/queuedlg.ui:42 #: apps/ktorrent/queuedlg.ui:258 plugins/infowidget/statustabbase.ui:39 @@ -290,9 +287,8 @@ msgid "Open Location" msgstr "Открыть расположение" #: apps/ktorrent/ktorrent.cpp:793 -#, fuzzy msgid "Speed down: %1 / up: %2" -msgstr "Отдача: %1 / Приём: %2" +msgstr "Загрузка: %1 / отдача: %2" #: apps/ktorrent/ktorrent.cpp:799 msgid "Transferred down: %1 / up: %2" @@ -307,7 +303,6 @@ msgid "DHT: off" msgstr "DHT: выкл" #: apps/ktorrent/ktorrentcore.cpp:115 -#, fuzzy msgid "" "Specified port (%1) is unavailable or in use by another application. " "KTorrent is now using port %2." @@ -323,16 +318,16 @@ msgstr "" "Не удалось получить в использование порты с %1 по %2 так как они уже заняты." #: apps/ktorrent/ktorrentcore.cpp:767 -#, fuzzy, c-format +#, c-format msgid "Cannot create torrent: %1" -msgstr "Не удалось создать торрент %1: %2" +msgstr "Не удаётся создать торрент: %1" #: apps/ktorrent/ktorrentcore.cpp:1028 msgid "" "Several data files of the torrent \"%1\" are missing, do you want to " "recreate them, or do you want to not download them?" msgstr "" -"Некоторые файлы из торрента \"%1\" отсутствуют. Пересоздать их или запретить " +"Некоторые файлы из торрента «%1» отсутствуют. Пересоздать их или запретить " "их загрузку?" #: apps/ktorrent/ktorrentcore.cpp:1031 apps/ktorrent/ktorrentcore.cpp:1069 @@ -344,7 +339,7 @@ msgid "Do Not Download" msgstr "Не загружать" #: apps/ktorrent/ktorrentcore.cpp:1041 -#, fuzzy, c-format +#, c-format msgid "Cannot recreate missing files: %1" msgstr "Не удаётся пересоздать недостающие файлы: %1" @@ -354,9 +349,9 @@ msgid "Data files are missing" msgstr "Файлы данных отсутствуют" #: apps/ktorrent/ktorrentcore.cpp:1055 -#, fuzzy, c-format +#, c-format msgid "Cannot deselect missing files: %1" -msgstr "Не удаётся отменить загрузку недостающих файлов: %1" +msgstr "Не удаётся отменить выбор недостающих файлов: %1" #: apps/ktorrent/ktorrentcore.cpp:1068 msgid "" @@ -365,12 +360,11 @@ msgid "" msgstr "Файл хранящий данные торрента \"%1\" отсутствует. Пересоздать его?" #: apps/ktorrent/ktorrentcore.cpp:1069 -#, fuzzy msgid "Do Not Recreate" -msgstr "Пересоздать" +msgstr "Не пересоздавать" #: apps/ktorrent/ktorrentcore.cpp:1078 -#, fuzzy, c-format +#, c-format msgid "Cannot recreate data file: %1" msgstr "Не удаётся пересоздать файл данных: %1" @@ -391,11 +385,11 @@ msgstr "Видимые столбцы" #: plugins/infowidget/statustabbase.ui:16 #, no-c-format msgid "Status" -msgstr "Статус" +msgstr "Состояние" #: apps/ktorrent/ktorrentview.cpp:136 plugins/infowidget/peerview.cpp:225 msgid "Downloaded" -msgstr "Получено" +msgstr "Загружено" #: apps/ktorrent/fileselectdlgbase.ui:149 apps/ktorrent/ktorrentview.cpp:137 #: plugins/infowidget/fileview.cpp:48 @@ -473,7 +467,7 @@ msgstr "" #: apps/ktorrent/ktorrentview.cpp:286 apps/ktorrent/trayicon.cpp:258 msgid "Go to Settings -> Configure KTorrent, if you want to change the limits." -msgstr "Изменить ограничения: Настройки -> Настроить KTorrent " +msgstr "Изменить ограничения: Настройки -> Настроить KTorrent." #: apps/ktorrent/ktorrentview.cpp:375 msgid "" @@ -528,18 +522,16 @@ msgid "Remove Torrent and Data" msgstr "Удалить торрент и данные" #: apps/ktorrent/ktorrentviewmenu.cpp:59 -#, fuzzy msgid "Add Peers" -msgstr "Добавить адреса источников..." +msgstr "Добавить пиров" #: apps/ktorrent/ktorrentviewmenu.cpp:63 msgid "Additional Peer Sources" msgstr "Дополнительные источники" #: apps/ktorrent/ktorrentviewmenu.cpp:64 -#, fuzzy msgid "Torrent Peer Sources:" -msgstr "Торрентов на источники:" +msgstr "Источник пиров торрента:" #: apps/ktorrent/generalpref.ui:82 apps/ktorrent/ktorrentviewmenu.cpp:66 #: plugins/infowidget/peerview.cpp:221 plugins/stats/sprefwgt.ui:456 @@ -558,12 +550,11 @@ msgstr "Принудительное объявление" #: apps/ktorrent/ktorrentviewmenu.cpp:76 plugins/infowidget/fileview.cpp:50 msgid "Preview" -msgstr "Просмотр" +msgstr "Предпросмотр" #: apps/ktorrent/ktorrentviewmenu.cpp:81 -#, fuzzy msgid "Open Directory" -msgstr "Открыть папку..." +msgstr "Открыть каталог" #: apps/ktorrent/ktorrentviewmenu.cpp:82 msgid "Data Directory" @@ -574,9 +565,8 @@ msgid "Temporary Directory" msgstr "Временная папка" #: apps/ktorrent/ktorrentviewmenu.cpp:87 -#, fuzzy msgid "Set Download Location" -msgstr "Каталог загрузки..." +msgstr "Указать место загрузки" #: apps/ktorrent/ktorrentviewmenu.cpp:90 msgid "Remove From Group" @@ -602,7 +592,7 @@ msgstr "Режим отладки" #: apps/ktorrent/main.cpp:109 msgid "Silently save torrent given on URL" -msgstr "" +msgstr "Тихо сохранить торрент с указанной ссылки" #: apps/ktorrent/main.cpp:110 msgid "Document to open" @@ -641,18 +631,19 @@ msgstr "Значок для 1.0" msgid "ChunkBar's tooltip and IWFileTreeItem sorting" msgstr "" "Визуальное представление загруженных частей и отображение загружаемых файлов " -"в виде древовидной структуры." +"в виде древовидной структуры" #: apps/ktorrent/main.cpp:142 msgid "" "Country locator for InfoWidget plugin (This product includes GeoLite data " "created by MaxMind, available from http://www.maxmind.com/). " msgstr "" +"Обнаружитель стран для плагина InfoWidget (этот продукт включает данные " +"GeoLite, созданные MaxMind и доступные на сайте http://www.maxmind.com/). " #: apps/ktorrent/main.cpp:143 -#, fuzzy msgid "Country flags" -msgstr "Страна" +msgstr "Флаги стран" #: apps/ktorrent/main.cpp:144 msgid "File prioritization" @@ -688,11 +679,11 @@ msgstr "Обнаружены 2 уязвимости (обе исправлены #: apps/ktorrent/main.cpp:153 msgid "Patch to load silently with a save location" -msgstr "Патч для загрузки в стандартное место сохранения." +msgstr "Патч для загрузки в стандартное место сохранения" #: apps/ktorrent/main.cpp:154 msgid "Fixes in PHP code of webinterface" -msgstr "Исправление PHP кода Веб-интерфейса." +msgstr "Исправление кода PHP веб-интерфейса" #: apps/ktorrent/main.cpp:155 msgid "XFS specific disk preallocation" @@ -704,46 +695,44 @@ msgstr "Патч, исправляющий отображение очень н� #: apps/ktorrent/main.cpp:157 msgid "Patch to show potentially firewalled status" -msgstr "Патч для обнаружения включенного брандмауэра." +msgstr "Патч для обнаружения включённого брандмауэра" #: apps/ktorrent/main.cpp:158 msgid "Several patches" -msgstr "Несколько патчей." +msgstr "Несколько патчей" #: apps/ktorrent/main.cpp:159 msgid "Patch to hide the menubar" -msgstr "" +msgstr "Патч для скрытия меню" #: apps/ktorrent/main.cpp:160 msgid "Patch to modify file priorities in the webgui" -msgstr "" +msgstr "Патч для смены приоритетов файлов в веб-интерфейсе" #: apps/ktorrent/main.cpp:161 -#, fuzzy msgid "Several webgui patches" -msgstr "Несколько патчей." +msgstr "Несколько патчей веб-интерфейса" #: apps/ktorrent/main.cpp:162 -#, fuzzy msgid "Filterbar patch" -msgstr "Путь Folder1" +msgstr "Патч панели фильтров" #: apps/ktorrent/main.cpp:163 msgid "Non threaded fileview update patch" -msgstr "" +msgstr "Патч для обновления непотокового просмотра файлов" #: apps/ktorrent/main.cpp:164 msgid "Optimization to SHA1 hash generation" -msgstr "" +msgstr "Оптимизация генерации хеша SHA1" #: apps/ktorrent/main.cpp:165 msgid "Patch to fix free diskspace calculation on FreeBSD" msgstr "" +"Патч для исправления вычисления свободного дискового пространства на FreeBSD" #: apps/ktorrent/main.cpp:166 -#, fuzzy msgid "Patch to load torrents silently from the command line" -msgstr "Патч для загрузки в стандартное место сохранения." +msgstr "Патч для тихой загрузки торрентов из командной строки" #: apps/ktorrent/newui/button.cpp:58 msgid "Assign Accelerator..." @@ -789,7 +778,7 @@ msgstr "Параметры загрузки" #: apps/ktorrent/pref.cpp:179 apps/ktorrent/pref.cpp:294 msgid "The DHT port needs to be different from the UDP tracker port!" -msgstr "Порт DHT должен отличаться от порта UDP." +msgstr "Порт DHT должен отличаться от порта UDP-трекера!" #: apps/ktorrent/pref.cpp:216 msgid "General" @@ -831,9 +820,9 @@ msgid "No (private torrent)" msgstr "Нет (частный торрент)" #: apps/ktorrent/scandialog.cpp:70 -#, fuzzy, c-format +#, c-format msgid "Error scanning data: %1" -msgstr "Ошибка при сканировании данных: %1" +msgstr "Ошибка сканирования данных: %1" #: apps/ktorrent/scandialog.cpp:77 msgid "Scanning data of <b>%1</b> :" @@ -853,9 +842,8 @@ msgid "" msgstr "Вы не указали трекер. Создать торрент без трекера?" #: apps/ktorrent/torrentcreatordlg.cpp:79 -#, fuzzy msgid "You must add at least one node." -msgstr "Добавьте хотя бы один трекер." +msgstr "Вы должны добавить хотя бы один узел." #: apps/ktorrent/torrentcreatordlg.cpp:98 msgid "Torrent Files (*.torrent)" @@ -1026,11 +1014,11 @@ msgstr "Да, последний" #: libktorrent/interfaces/functions.cpp:35 msgid "%1 GB" -msgstr "%1 Гб" +msgstr "%1 ГБ" #: libktorrent/interfaces/functions.cpp:37 msgid "%1 MB" -msgstr "%1 Мб" +msgstr "%1 МБ" #: libktorrent/interfaces/functions.cpp:39 msgid "%1 KB" @@ -1125,14 +1113,12 @@ msgid "Cannot open %1 for writing : readonly filesystem" msgstr "Не удалось открыть %1 для записи: файловая система только для чтения." #: libktorrent/torrent/cachefile.cpp:240 -#, fuzzy msgid "Cannot expand file %1 : %2" -msgstr "Не удалось увеличить размер файла: %1" +msgstr "Не удалось увеличить файл %1: %2" #: libktorrent/torrent/cachefile.cpp:242 -#, fuzzy msgid "Cannot expand file %1 : incomplete write" -msgstr "Не удалось увеличить размер файла %1" +msgstr "Не удалось увеличить файла %1: неполная запись" #: libktorrent/torrent/cachefile.cpp:255 #, c-format @@ -1228,18 +1214,16 @@ msgid "Insufficient disk space for %1" msgstr "Недостаточно дискового пространства для %1" #: libktorrent/torrent/queuemanager.cpp:158 -#, fuzzy msgid "" "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and " "start seeding anyway?" msgstr "" -"Торрент \"%1\" достиг своего максимума ратио. Игнорировать и продолжить " -"сидирование?" +"Торрент «%1» достиг своего максимума рейтинга раздачи. Игнорировать предел и " +"начать раздачу всё равно?" #: libktorrent/torrent/queuemanager.cpp:158 -#, fuzzy msgid "Maximum share ratio limit reached." -msgstr "Максимум ратио достигнут." +msgstr "Достигнут максимум рейтинга раздачи." #: libktorrent/torrent/queuemanager.cpp:237 #: libktorrent/torrent/queuemanager.cpp:763 @@ -1448,6 +1432,9 @@ msgid "" "\"unavailable_color\"> - Unavailable Chunks<br><img src=" "\"excluded_color\"> - Excluded Chunks" msgstr "" +"<img src=\"available_color\"> - Доступные части<br><img src=" +"\"unavailable_color\"> - Недоступные части<br><img src=\"excluded_color" +"\"> - Исключённые части" #: plugins/infowidget/chunkbar.cpp:98 msgid "" @@ -1455,6 +1442,9 @@ msgid "" "\"unavailable_color\"> - Chunks to Download<br><img src=" "\"excluded_color\"> - Excluded Chunks" msgstr "" +"<img src=\"available_color\"> - Загруженные части<br><img src=" +"\"unavailable_color\"> - Части для загрузки<br><img src=" +"\"excluded_color\"> - Исключённые части" #: apps/ktorrent/fileselectdlgbase.ui:160 plugins/infowidget/fileview.cpp:49 #: plugins/rssfeed/rssfeedwidget.ui:170 plugins/rssfeed/rssfeedwidget.ui:879 @@ -1494,6 +1484,9 @@ msgid "" "_n: You will lose all data in this file, are you sure you want to do this ?\n" "You will lose all data in these files, are you sure you want to do this ?" msgstr "" +"Вы потеряете все данные в этом файле, уверены, что хотите этого?\n" +"Вы потеряете все данные в этих файлах, уверены, что хотите этого?\n" +"Вы потеряете все данные в этих файлах, уверены, что хотите этого?" #: plugins/infowidget/infowidgetplugin.cpp:51 #: plugins/infowidget/infowidgetprefpage.cpp:34 @@ -1505,6 +1498,8 @@ msgid "" "Shows additional information about a download. Like which chunks have been " "downloaded, how many seeders and leechers ..." msgstr "" +"Показывает дополнительные сведения о загрузке. Например, какие фрагменты " +"были загружены, сколько сидов и личей…" #: plugins/infowidget/infowidgetplugin.cpp:173 plugins/stats/statsconwgt.ui:32 #: plugins/stats/statsspdwgt.ui:40 @@ -1528,7 +1523,7 @@ msgstr "Трекеры" #: plugins/infowidget/infowidgetprefpage.cpp:34 msgid "Information Widget Options" -msgstr "" +msgstr "Параметры виджета информации" #: plugins/infowidget/peerview.cpp:213 msgid "IP" @@ -1570,7 +1565,7 @@ msgstr "Запросы" msgid "" "_: to kick\n" "Kick peer" -msgstr "" +msgstr "Выкинуть пира" #: plugins/infowidget/peerview.cpp:250 msgid "" @@ -1579,22 +1574,20 @@ msgid "" msgstr "Блокировать участника" #: plugins/infowidget/statustab.cpp:55 -#, fuzzy msgid "No limit" -msgstr "&Включить ограничение?" +msgstr "Без ограничений" #: plugins/infowidget/trackerview.cpp:71 msgid "Cannot add a tracker to a private torrent." -msgstr "" +msgstr "Не удаётся добавить трекер в частный торрент." #: plugins/infowidget/trackerview.cpp:96 -#, fuzzy msgid "Cannot remove torrent default tracker." -msgstr "Не удаётся создать каталог %1: %2" +msgstr "Невозможно удалить стандартный трекер торрента." #: plugins/infowidget/trackerview.cpp:214 msgid "You cannot add trackers to a private torrent" -msgstr "" +msgstr "Вы не можете добавлять трекеры в частный торрент" #: plugins/ipfilter/convertdialog.cpp:81 msgid "Convert" @@ -1668,10 +1661,9 @@ msgstr "Параметры IP-фильтра" #: plugins/ipfilter/ipfilterplugin.cpp:43 msgid "Filters out unwanted peers based on their IP address" -msgstr "" +msgstr "Отсеивает нежелательных пиров на основе их адресов IP" #: plugins/ipfilter/ipfilterplugin.cpp:46 -#, fuzzy msgid "IP Filter" msgstr "Фильтр IP" @@ -1683,17 +1675,16 @@ msgstr "Просмотр протоколов" #: plugins/logviewer/logprefwidgetbase.ui:16 #, no-c-format msgid "LogViewer Options" -msgstr "" +msgstr "Параметры просмотра журнала" #: plugins/logviewer/logviewerplugin.cpp:44 #: plugins/logviewer/logviewerplugin.cpp:58 -#, fuzzy msgid "Log Viewer" -msgstr "Просмотр протоколов" +msgstr "Просмотр журнала" #: plugins/logviewer/logviewerplugin.cpp:45 msgid "Displays ktorrent logging output" -msgstr "" +msgstr "Отображает вывод журнала kTorrent" #: plugins/partfileimport/importdialog.cpp:50 msgid "Torrent files" @@ -1704,9 +1695,9 @@ msgid "All files" msgstr "Все файлы" #: plugins/partfileimport/importdialog.cpp:100 -#, fuzzy, c-format +#, c-format msgid "Cannot verify data : %1" -msgstr "Не удалось проверить данные %1: %2" +msgstr "Не удаётся проверить данные: %1" #: plugins/partfileimport/importdialog.cpp:207 #: plugins/partfileimport/importdialog.cpp:243 @@ -1717,19 +1708,19 @@ msgstr "Не удалось загрузить торрент: %1" #: plugins/partfileimport/partfileimportplugin.cpp:43 msgid "Imports partially or fully downloaded torrents from other clients" msgstr "" +"Импортирует частично или полностью загруженные торренты из других клиентов" #: plugins/partfileimport/partfileimportplugin.cpp:56 -#, fuzzy msgid "Import existing download" -msgstr "Импортировать существующую закачку" +msgstr "Импорт существующей загрузки" #: plugins/rssfeed/rss/testlibrss.cpp:14 msgid "URL of feed" -msgstr "" +msgstr "Адрес ленты" #: plugins/rssfeed/rssfeedmanager.cpp:78 msgid "Title" -msgstr "" +msgstr "Заголовок" #: plugins/rssfeed/rssfeedmanager.cpp:78 msgid "Description" @@ -1737,37 +1728,37 @@ msgstr "Описание" #: plugins/rssfeed/rssfeedmanager.cpp:78 plugins/rssfeed/rssfeedmanager.cpp:87 msgid "Link" -msgstr "" +msgstr "Ссылка" #: plugins/rssfeed/rssfeedmanager.cpp:87 -#, fuzzy msgid "Season" -msgstr "Коэффициент передачи:" +msgstr "Сезон" #: plugins/rssfeed/rssfeedmanager.cpp:87 msgid "Episode" -msgstr "" +msgstr "Эпизод" #: plugins/rssfeed/rssfeedmanager.cpp:87 -#, fuzzy msgid "Time" -msgstr "Осталось" +msgstr "Время" #: plugins/rssfeed/rssfeedplugin.cpp:48 msgid "" "Automatically scans RSS feeds for torrent matching regular expressions and " "loads them." msgstr "" +"Автоматически сканирует RSS-ленты на наличие торрентов по регулярным " +"выражениям и загружает их." #: plugins/rssfeed/rssfeedplugin.cpp:51 plugins/rssfeed/rssfeedplugin.cpp:68 msgid "RSS Feeds" -msgstr "" +msgstr "Ленты RSS" #: plugins/rssfeed/rsslinkdownloader.cpp:45 #: plugins/rssfeed/rsslinkdownloader.cpp:183 #, c-format msgid "Failed to find and download a valid torrent for %1" -msgstr "" +msgstr "Не удалось найти и загрузить действительный торрент для %1" #: plugins/scanfolder/scanfolder.cpp:150 plugins/scanfolder/scanfolder.cpp:188 #: plugins/scanfolder/scanfolder.cpp:189 @@ -1779,9 +1770,8 @@ msgid "Automatically scans directories for torrent files and loads them." msgstr "Автоматически сканирует каталоги в поисках торрентов и загружает их." #: plugins/scanfolder/scanfolderplugin.cpp:52 -#, fuzzy msgid "Scan Folder" -msgstr "Сканнер каталогов" +msgstr "Сканировать каталог" #: plugins/scanfolder/scanfolderprefpage.cpp:34 msgid "ScanFolder" @@ -1801,15 +1791,15 @@ msgstr "" #: plugins/scheduler/bwsprefpagewidget.cpp:165 msgid "Schedule saved." -msgstr "" +msgstr "Расписание сохранено." #: plugins/scheduler/bwsprefpagewidget.cpp:174 msgid "File not found." -msgstr "" +msgstr "Файл не найден." #: plugins/scheduler/bwsprefpagewidget.cpp:208 msgid "Schedule loaded." -msgstr "" +msgstr "Расписание загружено." #: plugins/scheduler/bwswidget.cpp:45 msgid "MON" @@ -1891,10 +1881,9 @@ msgstr "Поиск" #: plugins/search/searchplugin.cpp:51 msgid "Search for torrents on several popular torrent search engines" -msgstr "" +msgstr "Поиск торрентов в нескольких популярных поисковых системах торрентов" #: plugins/search/searchprefpage.cpp:52 -#, fuzzy msgid "" "Use your web browser to search for the string %1 (capital letters) on the " "search engine you want to add. <br> Then copy the URL in the addressbar " @@ -1904,16 +1893,19 @@ msgid "" "search using Google." msgstr "" "В браузере запустите поиск строки %1 (заглавными буквами) в поисковике, " -"который вы хотите добавить. Затем, когда поиск завершится, скопируйте URL из " -"адресной строки и вставьте его сюда. <br>Поиск %2 в Google, например, даст " -"результат в виде http://www.google.com/search?q=FOOBAR&ie=UTF-8&oe=UTF-8. " -"Если вы вставите сюда этот URL, KTorrent будет искать через Google." +"который вы хотите добавить. <br> Затем, когда поиск завершится, скопируйте " +"ссылку из адресной строки и вставьте её сюда.<br><br>Поиск %2 в Google, " +"например, даст результат в виде http://www.google.com/search?" +"q=FOOBAR&ie=UTF-8&oe=UTF-8. <br> Если вы добавите сюда эту ссылку, то " +"KTorrent сможет искать в Google." #: plugins/search/searchprefpage.cpp:57 msgid "" "Use your web browser to search for the string %1 (capital letters) on the " "search engine you want to add. Use the resulting URL below." msgstr "" +"С помощью веб-браузера найдите строку %1 (заглавными буквами) в поисковой " +"системе, которую вы хотите добавить. Используйте полученный адрес ниже." #: plugins/search/searchprefpage.cpp:124 msgid "You must enter the search engine's name and URL" @@ -1943,9 +1935,8 @@ msgid "Search Engine Options" msgstr "Параметры поиска" #: plugins/search/searchtab.cpp:65 -#, fuzzy msgid " Engine: " -msgstr "Поисковики" +msgstr " Движок " #: plugins/search/searchwidget.cpp:178 msgid "Searching for %1..." @@ -1961,117 +1952,99 @@ msgstr "Поиск окончен" #: plugins/stats/ChartDrawer.cpp:419 msgid "Legend" -msgstr "" +msgstr "Легенда" #: plugins/stats/StatsCon.cpp:49 -#, fuzzy msgid "Leechers connected" -msgstr "Соединения:" +msgstr "Подключённые личи" #: plugins/stats/StatsCon.cpp:50 -#, fuzzy msgid "Leechers in swarms" -msgstr "Выводить &значок в системном лотке" +msgstr "Личи в роях" #: plugins/stats/StatsCon.cpp:51 -#, fuzzy msgid "Seeders connected" -msgstr "Соединения:" +msgstr "Подключённые сиды" #: plugins/stats/StatsCon.cpp:52 -#, fuzzy msgid "Seeders in swarms" -msgstr "Выводить &значок в системном лотке" +msgstr "Сиды в роях" #: plugins/stats/StatsCon.cpp:53 -#, fuzzy msgid "Average connected leechers per torrent" -msgstr "Максимум соединений на один торрент:" +msgstr "Подключённые личи в среднем на торрент" #: plugins/stats/StatsCon.cpp:54 -#, fuzzy msgid "Average connected seeders per torrent" -msgstr "Максимум соединений на один торрент:" +msgstr "Подключённые сиды в среднем на торрент" #: plugins/stats/StatsCon.cpp:55 msgid "Average connected leechers per running torrent" -msgstr "" +msgstr "Подключённые личи в среднем на запущенный торрент" #: plugins/stats/StatsCon.cpp:56 msgid "Average connected seeders per running torrent" -msgstr "" +msgstr "Подключённые сиды в среднем на запущенный торрент" #: plugins/stats/StatsCon.cpp:61 -#, fuzzy msgid "Nodes" -msgstr "Папки" +msgstr "Узлы" #: plugins/stats/StatsCon.cpp:62 -#, fuzzy msgid "Tasks" -msgstr "Трекеры" +msgstr "Задания" #: plugins/stats/StatsPluginPrefs.cpp:25 plugins/stats/statsplugin.cpp:29 -#, fuzzy msgid "Statistics" -msgstr "Статус" +msgstr "Статистика" #: plugins/stats/StatsPluginPrefs.cpp:25 msgid "Statistics options" -msgstr "" +msgstr "Параметры статистики" #: plugins/stats/StatsSpd.cpp:57 plugins/stats/StatsSpd.cpp:58 -#, fuzzy msgid "Current" -msgstr "Торрент" +msgstr "Текущий" #: plugins/stats/StatsSpd.cpp:60 plugins/stats/StatsSpd.cpp:61 msgid "Average" -msgstr "" +msgstr "Средняя" #: plugins/stats/StatsSpd.cpp:63 plugins/stats/StatsSpd.cpp:64 -#, fuzzy msgid "Limit" -msgstr "&Включить ограничение?" +msgstr "Ограничение" #: plugins/stats/StatsSpd.cpp:71 -#, fuzzy msgid "Average from leecher" -msgstr "Средняя скорость загрузки:" +msgstr "В среднем к личу" #: plugins/stats/StatsSpd.cpp:72 -#, fuzzy msgid "Average to leecher" -msgstr "Средняя скорость загрузки:" +msgstr "В среднем от лича" #: plugins/stats/StatsSpd.cpp:73 -#, fuzzy msgid "Average from seeder" -msgstr "Средняя скорость загрузки:" +msgstr "В среднем от сида" #: plugins/stats/StatsSpd.cpp:74 -#, fuzzy msgid "From leechers" -msgstr "Загружающие:" +msgstr "От личей" #: plugins/stats/StatsSpd.cpp:75 -#, fuzzy msgid "From seeders" -msgstr "Папки" +msgstr "От сидов" #: plugins/stats/statsplugin.cpp:29 msgid "Shows transfers statistics" -msgstr "" +msgstr "Показывает статистику передачи" #: plugins/stats/statsplugin.cpp:67 -#, fuzzy msgid "Speed statistics" -msgstr "Ограничение скорости, кб/с" +msgstr "Статистика скорости" #: plugins/stats/statsplugin.cpp:68 -#, fuzzy msgid "Connection statistics" -msgstr "Соединения:" +msgstr "Статистика связи" #: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 #: plugins/upnp/upnpwidget.ui:16 @@ -2093,9 +2066,8 @@ msgid "Cannot find port forwarding service in the device's description!" msgstr "Не удалось найти сервис транслирования в описании устройства." #: plugins/webinterface/webinterfaceplugin.cpp:44 -#, fuzzy msgid "Web Interface" -msgstr "Модуль Веб-интерфейса" +msgstr "Веб-интерфейс" #: plugins/webinterface/webinterfaceplugin.cpp:44 msgid "Allow to control ktorrent through browser" @@ -2103,16 +2075,17 @@ msgstr "Позволять контролировать KTorrent из брауз #: plugins/webinterface/webinterfaceprefpage.cpp:27 msgid "WebInterface" -msgstr "" +msgstr "Веб-интерфейс" #: plugins/webinterface/webinterfaceprefpage.cpp:27 msgid "WebInterface Options" msgstr "Параметры Web-интерфейса" #: plugins/webinterface/webinterfaceprefwidget.cpp:70 -#, fuzzy msgid "Php executable is not in default path, please enter the path manually" -msgstr "Нестандартный путь к PHP. Введите путь вручную." +msgstr "" +"Исполняемого файла PHP нет в пути по умолчанию, пожалуйста, укажите путь " +"вручную" #: plugins/webinterface/webinterfaceprefwidget.cpp:106 msgid "Please enter a new password for the web interface." @@ -2123,12 +2096,10 @@ msgid "%1 exists and it is executable" msgstr "%1 существует и является исполняемым" #: plugins/webinterface/webinterfaceprefwidget.cpp:120 -#, fuzzy msgid "%1 does not exist" msgstr "%1 не существует" #: plugins/webinterface/webinterfaceprefwidget.cpp:124 -#, fuzzy msgid "%1 is not executable" msgstr "%1 не является исполняемым" @@ -2137,18 +2108,17 @@ msgid "%1 is a directory" msgstr "%1 - каталог" #: plugins/webinterface/webinterfaceprefwidget.cpp:132 -#, fuzzy msgid "%1 is not php executable path" -msgstr "%1 не исполняемый файл PHP" +msgstr "%1 не путь исполняемого файла PHP" #: plugins/zeroconf/zeroconfplugin.cpp:41 msgid "Zeroconf" -msgstr "" +msgstr "Zeroconf" #: plugins/zeroconf/zeroconfplugin.cpp:41 msgid "" "Finds peers running ktorrent on the local network to share torrents with" -msgstr "" +msgstr "Находит в локальной сети пиров с KTorrent для обмена торрентами" #: apps/ktorrent/addpeerwidgetbase.ui:16 #, no-c-format @@ -2186,10 +2156,10 @@ msgstr "Дополнительные параметры" #: apps/ktorrent/advancedpref.ui:46 #, no-c-format msgid "Time left estimation algorithm:" -msgstr "" +msgstr "Алгоритм оценки оставшегося времени:" #: apps/ktorrent/advancedpref.ui:49 apps/ktorrent/advancedpref.ui:86 -#, fuzzy, no-c-format +#, no-c-format msgid "" "<b>KTorrent algorithm:</b> Default algorithm using combination of other " "algorithms based on our tests.<br>\n" @@ -2200,15 +2170,15 @@ msgid "" "<b>Moving average algorithm:</b> Moving average speed calculated from X " "samples" msgstr "" -"<b>Стандартный метод:</b> алгоритм по-умолчанию, использующий эмпирическую " -"комбинацию нескольких методов<br>\n" -"<b>Вычисление по текущей скорости:</b> отношение оставшегося размера и " -"текущей скорости. <br>\n" -"<b>Вычисление по общей средней скорости:</b> отношение оставшегося размера и " -"средней скорости. <br>\n" -"<b>Window of X алгоритм:</b> ET вычисленный из X образцов скорости. <br>\n" -"<b>Усредненная скорость перемещения:</b> Вычисленная усредненная скорость из " -"X образцов." +"<b>Алгоритм KTorrent:</b> способ по-умолчанию, использующий эмпирическую " +"комбинацию нескольких алгоритмов.br>\n" +"<b>Алгоритм текущей скорости:</b> простейший алгоритм — отношение оставшихся " +"байтов к текущей скорости<br>\n" +"<b>Алгоритм общей средней скорости:</b> отношение оставшихся байт к средней " +"скорости <br>\n" +"<b>Алгоритм окна по X:</b> ET вычисляется из X образцов скорости<br>\n" +"<b>Алгоритм скользящего среднего:</b> Скорость скользящего среднего " +"вычисляется по X образцам" #: apps/ktorrent/advancedpref.ui:64 #, no-c-format @@ -2223,12 +2193,12 @@ msgstr "По общей средней скорости" #: apps/ktorrent/advancedpref.ui:74 #, no-c-format msgid "Window of X" -msgstr "" +msgstr "Окно по X" #: apps/ktorrent/advancedpref.ui:79 #, no-c-format msgid "Moving average" -msgstr "" +msgstr "Скользящая средняя" #: apps/ktorrent/advancedpref.ui:98 #, no-c-format @@ -2346,15 +2316,14 @@ msgid "Networking" msgstr "Сеть" #: apps/ktorrent/advancedpref.ui:505 -#, fuzzy, no-c-format +#, no-c-format msgid "Maximum number of connection setups:" -msgstr "" -"Максимальное количество соединений на один торрент (0 - без ограничений)" +msgstr "Максимум установленных соединений:" #: apps/ktorrent/advancedpref.ui:527 #, no-c-format msgid "DSCP for IP packets:" -msgstr "" +msgstr "DSCP для пакетов IP:" #: apps/ktorrent/advancedpref.ui:570 #, no-c-format @@ -2475,13 +2444,13 @@ msgid "Attention" msgstr "Внимание" #: apps/ktorrent/downloadpref.ui:685 -#, fuzzy, no-c-format +#, no-c-format msgid "" "The above ports must also be forwarded if you are behind a router. The UPnP " "plugin can do this for you." msgstr "" "Ели вы работаете через маршрутизатор, указанные порты должны быть " -"перенаправлены, .Это может выполнить автоматически модуль UPnP." +"перенаправлены. Это может выполнить автоматически модуль UPnP." #: apps/ktorrent/fileselectdlgbase.ui:16 #, no-c-format @@ -2499,9 +2468,9 @@ msgid "Group:" msgstr "Группа:" #: apps/ktorrent/fileselectdlgbase.ui:97 -#, fuzzy, no-c-format +#, no-c-format msgid "&User controlled" -msgstr "&Управляется пользователем" +msgstr "Уп&равляется пользователем" #: apps/ktorrent/fileselectdlgbase.ui:116 #, no-c-format @@ -2607,9 +2576,9 @@ msgid "Se&nd the tracker a custom IP address or hostname" msgstr "Посылать трекеру указанный вручную IP-адрес или имя хоста." #: apps/ktorrent/generalpref.ui:185 -#, fuzzy, no-c-format +#, no-c-format msgid "Custom IP address or hostname:" -msgstr "Особый IP или имя хоста:" +msgstr "Настраиваемые адрес IP или имя хоста:" #: apps/ktorrent/generalpref.ui:202 #, no-c-format @@ -2644,7 +2613,7 @@ msgstr "Скорость загрузки (в КБ/с):" #: apps/ktorrent/generalpref.ui:299 #, no-c-format msgid "Folders" -msgstr "Папки" +msgstr "Каталоги" #: apps/ktorrent/generalpref.ui:318 #, no-c-format @@ -2693,7 +2662,7 @@ msgstr "IP-адрес клиента" #: apps/ktorrent/ipfilterwidgetbase.ui:96 #, no-c-format msgid "Add peer:" -msgstr "Добавить источник:" +msgstr "Добавить пира:" #: apps/ktorrent/ipfilterwidgetbase.ui:131 #, no-c-format @@ -2761,7 +2730,7 @@ msgstr "Диалог очереди KT" #: plugins/infowidget/trackerviewbase.ui:197 #, no-c-format msgid "Status:" -msgstr "Статус:" +msgstr "Состояние:" #: apps/ktorrent/queuedlg.ui:85 apps/ktorrent/queuedlg.ui:301 #: plugins/logviewer/logprefwidgetbase.ui:461 @@ -2827,7 +2796,7 @@ msgid "Move to &bottom" msgstr "В конец" #: apps/ktorrent/queuedlg.ui:552 -#, fuzzy, no-c-format +#, no-c-format msgid "&QM Controlled" msgstr "&Управляется автоматически" @@ -2973,7 +2942,7 @@ msgid "Comments:" msgstr "Комментарии:" #: apps/ktorrent/torrentcreatordlgbase.ui:248 -#, fuzzy, no-c-format +#, no-c-format msgid "&Create" msgstr "&Создать" @@ -3055,14 +3024,14 @@ msgid "Maximum download speed in KB/sec (0 = no limit)" msgstr "Максимальная скорость приёма, КБ/с (0 - без ограничений)" #: libktorrent/ktorrent.kcfg:44 -#, fuzzy, no-c-format +#, no-c-format msgid "Maximum share ratio(0 = no limit)" -msgstr "Максимальное количество полных источников (0 - без ограничений)" +msgstr "Максимум рейтинга раздачи (0 — без ограничений)" #: libktorrent/ktorrent.kcfg:49 -#, fuzzy, no-c-format +#, no-c-format msgid "Maximum seed time in hours (0 = no limit)" -msgstr "Максимальное количество полных источников (0 - без ограничений)" +msgstr "Максимальное время сида в часах (0 — без ограничений)" #: libktorrent/ktorrent.kcfg:66 #, no-c-format @@ -3190,12 +3159,12 @@ msgstr "" #: libktorrent/labelviewitembase.ui:49 #, no-c-format msgid "textLabel2" -msgstr "" +msgstr "textLabel2" #: libktorrent/labelviewitembase.ui:65 #, no-c-format msgid "textLabel3" -msgstr "" +msgstr "textLabel3" #: libktorrent/pluginmanagerwidget.ui:16 #, no-c-format @@ -3208,19 +3177,19 @@ msgid "Load" msgstr "Включить" #: libktorrent/pluginmanagerwidget.ui:56 -#, fuzzy, no-c-format +#, no-c-format msgid "U&nload" -msgstr "&Отключить" +msgstr "Выгрузи&ть" #: libktorrent/pluginmanagerwidget.ui:64 -#, fuzzy, no-c-format +#, no-c-format msgid "Load &All" -msgstr "Включить все" +msgstr "&Прогрузить все" #: libktorrent/pluginmanagerwidget.ui:72 -#, fuzzy, no-c-format +#, no-c-format msgid "&Unload All" -msgstr "Отключить все" +msgstr "Вы&грузить все" #: plugins/infowidget/chunkdownloadviewbase.ui:43 #, no-c-format @@ -3329,9 +3298,9 @@ msgid "Next update in:" msgstr "Следующее обновление:" #: plugins/infowidget/statustabbase.ui:203 -#, fuzzy, no-c-format +#, no-c-format msgid "Tracker Status:" -msgstr "Взаимодействие с трекером" +msgstr "Состояние трекера:" #: plugins/infowidget/statustabbase.ui:332 #, no-c-format @@ -3369,9 +3338,9 @@ msgid "Hours" msgstr "ч" #: plugins/infowidget/statustabbase.ui:543 -#, fuzzy, no-c-format +#, no-c-format msgid "Ratio limit:" -msgstr "Общее ограничение на число соединений" +msgstr "Ограничение рейтинга:" #: plugins/infowidget/statustabbase.ui:546 #, no-c-format @@ -3414,15 +3383,15 @@ msgid "Restore Defaults" msgstr "Сбросить" #: plugins/ipfilter/convert_dlg.ui:41 -#, fuzzy, no-c-format +#, no-c-format msgid "" "Click on the 'convert' button to start converting antip2p file. NOTE: This " "process could take a while even on fast machines and during that time you " "will not be able to use KTorrent." msgstr "" -"Нажмите на кнопку \"Преобразовать\", чтобы начать преобразование antip2p " -"файл. ЗАМЕТКА: Процесс может занять некоторое время даже на быстрых " -"компьютерах и в это время вы не сможете пользоваться KTorrent." +"Щёлкните кнопку «Преобразовать», чтобы начать конвертацию файла antip2p. " +"ЗАМЕТКА: Этот процесс может занять некоторое время даже на быстрых " +"компьютерах, и в это время вы не сможете использовать KTorrent." #: plugins/ipfilter/ipblockingpref.ui:16 #, no-c-format @@ -3476,77 +3445,77 @@ msgstr "Использовать фильтр первого уровня?" #: plugins/logviewer/ktlogviewerplugin.kcfg:10 #, no-c-format msgid "Use rich log text" -msgstr "" +msgstr "Использовать расширенный текст журнала" #: plugins/logviewer/ktlogviewerplugin.kcfg:15 #, no-c-format msgid "General info messages flag" -msgstr "" +msgstr "Флаг общих информационных сообщений" #: plugins/logviewer/ktlogviewerplugin.kcfg:19 #, no-c-format msgid "Connections messages flag" -msgstr "" +msgstr "Флаг сообщений о соединениях" #: plugins/logviewer/ktlogviewerplugin.kcfg:23 #, no-c-format msgid "DHT messages flag" -msgstr "" +msgstr "Флаг сообщений DHT" #: plugins/logviewer/ktlogviewerplugin.kcfg:27 #, no-c-format msgid "Tracker info messages flag" -msgstr "" +msgstr "Флаг информационных сообщений трекера" #: plugins/logviewer/ktlogviewerplugin.kcfg:31 #, no-c-format msgid "Disk IO info messages flag" -msgstr "" +msgstr "Флаг информационных сообщений дискового ввода-вывода" #: plugins/logviewer/ktlogviewerplugin.kcfg:35 #, no-c-format msgid "IPFilter plugin messages flag" -msgstr "" +msgstr "Флаг сообщений модуля IP-фильтра" #: plugins/logviewer/ktlogviewerplugin.kcfg:39 #, no-c-format msgid "Search plugin messages flag" -msgstr "" +msgstr "Флаг сообщений модуля поиска" #: plugins/logviewer/ktlogviewerplugin.kcfg:43 #, no-c-format msgid "PartFileImport plugin messages flag" -msgstr "" +msgstr "Флаг сообщений модуля PartFileImport" #: plugins/logviewer/ktlogviewerplugin.kcfg:47 #, no-c-format msgid "InfoWidget plugin messages flag" -msgstr "" +msgstr "Флаг сообщений модуля InfoWidget" #: plugins/logviewer/ktlogviewerplugin.kcfg:51 #, no-c-format msgid "UPnP plugin messages flag" -msgstr "" +msgstr "Флаг сообщений модуля UPnP" #: plugins/logviewer/ktlogviewerplugin.kcfg:55 #, no-c-format msgid "ScanFolder plugin messages flag" -msgstr "" +msgstr "Флаг сообщений модуля ScanFolder" #: plugins/logviewer/ktlogviewerplugin.kcfg:59 #, no-c-format msgid "Scheduler plugin messages flag" -msgstr "" +msgstr "Флаг сообщений модуля планировщика" #: plugins/logviewer/ktlogviewerplugin.kcfg:63 #, no-c-format msgid "RSS plugin messages flag" -msgstr "" +msgstr "Флаг сообщений модуля RSS" #: plugins/logviewer/ktlogviewerplugin.kcfg:67 -#, fuzzy, no-c-format +#, no-c-format msgid "WebInterface plugin messages flag" -msgstr "Общие параметры" +msgstr "Флаг сообщений модуля веб-интерфейса" #: plugins/logviewer/logprefwidgetbase.ui:53 #: plugins/logviewer/logprefwidgetbase.ui:94 @@ -3681,10 +3650,10 @@ msgstr "Модуль RSS:" #: plugins/logviewer/logprefwidgetbase.ui:413 #, no-c-format msgid "WebInterface plugin:" -msgstr "Модуль Веб-интерфейса" +msgstr "Модуль веб-интерфейса:" #: plugins/logviewer/logprefwidgetbase.ui:426 -#, fuzzy, no-c-format +#, no-c-format msgid "System" msgstr "Система" @@ -3758,14 +3727,14 @@ msgstr "Удалить" #: plugins/rssfeed/rssfeedwidget.ui:86 plugins/rssfeed/rssfeedwidget.ui:410 #: plugins/rssfeed/rssfeedwidget.ui:458 -#, fuzzy, no-c-format +#, no-c-format msgid "&New" -msgstr "Добавить" +msgstr "&Новый" #: plugins/rssfeed/rssfeedwidget.ui:117 -#, fuzzy, no-c-format +#, no-c-format msgid "&URL" -msgstr "URL" +msgstr "Ссы&лка" #: plugins/rssfeed/rssfeedwidget.ui:139 #, no-c-format @@ -3808,14 +3777,14 @@ msgid "Filters" msgstr "Фильтры" #: plugins/rssfeed/rssfeedwidget.ui:383 -#, fuzzy, no-c-format +#, no-c-format msgid "Accept Filters" -msgstr "Принимать фильтры" +msgstr "Принять фильтры" #: plugins/rssfeed/rssfeedwidget.ui:431 -#, fuzzy, no-c-format +#, no-c-format msgid "Reject Filters" -msgstr "Отклонять фильтры" +msgstr "Отклонить фильтры" #: plugins/rssfeed/rssfeedwidget.ui:545 #, no-c-format @@ -3828,54 +3797,54 @@ msgid "Treat as &Series" msgstr "Рассматривать как серию" #: plugins/rssfeed/rssfeedwidget.ui:612 -#, fuzzy, no-c-format +#, no-c-format msgid "Process" msgstr "Выполнение" #: plugins/rssfeed/rssfeedwidget.ui:628 #, no-c-format msgid "Series Criteria" -msgstr "" +msgstr "Критерии серий" #: plugins/rssfeed/rssfeedwidget.ui:664 #, no-c-format msgid "Match Without Episode" -msgstr "" +msgstr "Совпадение без эпизода" #: plugins/rssfeed/rssfeedwidget.ui:695 #, no-c-format msgid "Max Episode" -msgstr "" +msgstr "Максимальный эпизод" #: plugins/rssfeed/rssfeedwidget.ui:721 -#, fuzzy, no-c-format +#, no-c-format msgid "Max Season" -msgstr "Коэффициент передачи:" +msgstr "Максимальный сезон" #: plugins/rssfeed/rssfeedwidget.ui:740 #, no-c-format msgid "Min Season" -msgstr "" +msgstr "Минимальный сезон" #: plugins/rssfeed/rssfeedwidget.ui:764 #, no-c-format msgid "Min Episode" -msgstr "" +msgstr "Минимальный эпизод" #: plugins/rssfeed/rssfeedwidget.ui:796 #, no-c-format msgid "Test te&xt" -msgstr "" +msgstr "Тек&ст проверки" #: plugins/rssfeed/rssfeedwidget.ui:822 #, no-c-format msgid "Te&st" -msgstr "" +msgstr "Про&верка" #: plugins/rssfeed/rssfeedwidget.ui:840 -#, fuzzy, no-c-format +#, no-c-format msgid "Filter Matches" -msgstr "Путь Folder1" +msgstr "Совпадения фильтра" #: plugins/scanfolder/ktscanfolderplugin.kcfg:9 #, no-c-format @@ -3908,9 +3877,9 @@ msgid "Folder3 path" msgstr "Путь Folder3" #: plugins/scanfolder/ktscanfolderplugin.kcfg:39 -#, fuzzy, no-c-format +#, no-c-format msgid "Whether to open torrent silently or not." -msgstr "Предлагать ли выборочную загрузку открываемых торрентов" +msgstr "Открывать ли торрент тихо или нет." #: plugins/scanfolder/ktscanfolderplugin.kcfg:44 #, no-c-format @@ -3958,9 +3927,9 @@ msgid "Open torrents silentl&y" msgstr "&Не предлагать выборочную загрузку открываемых торрентов" #: plugins/scanfolder/sfprefwidgetbase.ui:86 -#, fuzzy, no-c-format +#, no-c-format msgid "Do not show 'Select files to download' dialog" -msgstr "Не показывать диалог выбора файлов в торренте для загрузки" +msgstr "Не показывать окно «Выбрать файлы для загрузки»" #: plugins/scanfolder/sfprefwidgetbase.ui:94 #, no-c-format @@ -3980,17 +3949,17 @@ msgstr "Сканируемые папки" #: plugins/scanfolder/sfprefwidgetbase.ui:142 #, no-c-format msgid "Folder 1:" -msgstr "Папка 1:" +msgstr "Каталог 1:" #: plugins/scanfolder/sfprefwidgetbase.ui:153 #, no-c-format msgid "Folder 2:" -msgstr "Папка 2:" +msgstr "Каталог 2:" #: plugins/scanfolder/sfprefwidgetbase.ui:164 #, no-c-format msgid "Folder 3:" -msgstr "Папка 3:" +msgstr "Каталог 3:" #: plugins/scheduler/bwspage.ui:28 #, no-c-format @@ -4000,7 +3969,7 @@ msgstr "Планирование использования канала" #: plugins/scheduler/bwspage.ui:50 #, no-c-format msgid "Left click category" -msgstr "" +msgstr "Категория левого щелчка" #: plugins/scheduler/bwspage.ui:61 #, no-c-format @@ -4030,7 +3999,7 @@ msgstr "Категория &2" #: plugins/scheduler/bwspage.ui:213 #, no-c-format msgid "Right click category" -msgstr "" +msgstr "Категория правого щелчка" #: plugins/scheduler/bwspage.ui:224 #, no-c-format @@ -4096,7 +4065,7 @@ msgid "&Load from file" msgstr "&Загрузить из файла" #: plugins/scheduler/bwspage.ui:676 -#, fuzzy, no-c-format +#, no-c-format msgid "Reset schedule" msgstr "Сбросить задание" @@ -4116,9 +4085,9 @@ msgid "Use colors instead of pixmaps?" msgstr "Использовать цвета вместо изображений?" #: plugins/scheduler/schedulerpage.ui:16 -#, fuzzy, no-c-format +#, no-c-format msgid "Scheduler Plugin Pref Page" -msgstr "Страница параметров модуля задач" +msgstr "Страница параметров модуля заданий" #: plugins/scheduler/schedulerpage.ui:27 #, no-c-format @@ -4136,9 +4105,9 @@ msgid "(Recommended for slower systems)" msgstr "(рекомендуется для медленных компьютеров)" #: plugins/scheduler/schedulerpage.ui:62 -#, fuzzy, no-c-format +#, no-c-format msgid "Edit s&chedule" -msgstr "Изменить задание" +msgstr "Из&менить задание" #: plugins/search/ktsearchplugin.kcfg:10 #, no-c-format @@ -4161,9 +4130,9 @@ msgid "Custom browser executable path" msgstr "Путь к браузеру" #: plugins/search/searchbar.ui:78 -#, fuzzy, no-c-format +#, no-c-format msgid "Engine:" -msgstr "Поисковики" +msgstr "Движок:" #: plugins/search/searchpref.ui:30 plugins/webinterface/webinterfacepref.ui:30 #, no-c-format @@ -4208,7 +4177,7 @@ msgstr "Поисковики" #: plugins/search/searchpref.ui:200 #, no-c-format msgid "URL" -msgstr "URL" +msgstr "Ссылка" #: plugins/search/searchpref.ui:251 #, no-c-format @@ -4236,9 +4205,9 @@ msgid "Gather data every" msgstr "Собирать данные каждые" #: plugins/stats/ktstatsplugin.kcfg:18 -#, fuzzy, no-c-format +#, no-c-format msgid "Toggle peers speed charts" -msgstr "Переключение таблиц скоростей клиентов" +msgstr "Переключить таблицы скоростей пиров" #: plugins/stats/ktstatsplugin.kcfg:22 #, no-c-format @@ -4246,39 +4215,39 @@ msgid "Interval between getting data about peers speed" msgstr "Интервал между получением данных о скорости у участников" #: plugins/stats/ktstatsplugin.kcfg:26 -#, fuzzy, no-c-format +#, no-c-format msgid "Toggle drawing of leechers in swarms" -msgstr "Переключение прорисовки скачивающих в списке" +msgstr "Переключить отрисовку личей в роях" #: plugins/stats/ktstatsplugin.kcfg:30 -#, fuzzy, no-c-format +#, no-c-format msgid "Toggle drawing of seeders in swarms" -msgstr "Переключение прорисовки сидов в списке" +msgstr "Переключить отрисовку сидов в роях" #: plugins/stats/ktstatsplugin.kcfg:35 -#, fuzzy, no-c-format +#, no-c-format msgid "Download mesurments count" -msgstr "Расчет значения загрузки" +msgstr "Расчёт измерений загрузки" #: plugins/stats/ktstatsplugin.kcfg:39 -#, fuzzy, no-c-format +#, no-c-format msgid "Peers speed mesurments count" -msgstr "Расчет значения скорости клиентов" +msgstr "Расчёт измерений скорости пиров" #: plugins/stats/ktstatsplugin.kcfg:43 -#, fuzzy, no-c-format +#, no-c-format msgid "Upload mesurments count" -msgstr "Расчет значения отдачи" +msgstr "Расчёт измерений отдачи" #: plugins/stats/ktstatsplugin.kcfg:47 -#, fuzzy, no-c-format +#, no-c-format msgid "Connections mesurments count" -msgstr "Расчет значения соединений" +msgstr "Расчёт измерений соединений" #: plugins/stats/ktstatsplugin.kcfg:51 -#, fuzzy, no-c-format +#, no-c-format msgid "DHT mesurments count" -msgstr "Расчет значений DHT" +msgstr "Расчёт измерений DHT" #: plugins/stats/ktstatsplugin.kcfg:56 #, no-c-format @@ -4364,19 +4333,19 @@ msgid "Peers connections" msgstr "Соединения с участниками:" #: plugins/stats/sprefwgt.ui:270 -#, fuzzy, no-c-format +#, no-c-format msgid "Large values can obscure charts of connected peers" -msgstr "Большие значения могут заслонять колонки с соединенными клиентами" +msgstr "Большие значения могут исказить графики подключённых пиров" #: plugins/stats/sprefwgt.ui:289 -#, fuzzy, no-c-format +#, no-c-format msgid "Show seeders in swarms" -msgstr "Показывать сидов в списке" +msgstr "Показывать сидов в роях" #: plugins/stats/sprefwgt.ui:297 -#, fuzzy, no-c-format +#, no-c-format msgid "Show leechers in swarms" -msgstr "Показывать скачивающих в списке" +msgstr "Показывать личей в роях" #: plugins/stats/sprefwgt.ui:309 #, no-c-format @@ -4439,9 +4408,9 @@ msgid "Port number" msgstr "Номер порта:" #: plugins/webinterface/ktwebinterfaceplugin.kcfg:15 -#, fuzzy, no-c-format +#, no-c-format msgid "forward Port" -msgstr "Перенаправление портов" +msgstr "проброшенный порт" #: plugins/webinterface/ktwebinterfaceplugin.kcfg:20 #, no-c-format @@ -4449,9 +4418,9 @@ msgid "Session time to live" msgstr "Время жизни сеанса" #: plugins/webinterface/ktwebinterfaceplugin.kcfg:24 -#, fuzzy, no-c-format +#, no-c-format msgid "interface skin" -msgstr "Общие параметры" +msgstr "обложка интерфейса" #: plugins/webinterface/ktwebinterfaceplugin.kcfg:28 #, no-c-format @@ -4474,9 +4443,9 @@ msgid "Web Server" msgstr "Веб-сервер" #: plugins/webinterface/webinterfacepref.ui:82 -#, fuzzy, no-c-format +#, no-c-format msgid "Forward port" -msgstr "Перенаправление портов" +msgstr "Пробросить порт" #: plugins/webinterface/webinterfacepref.ui:107 #, no-c-format diff --git a/translations/rw/messages/ktorrent.po b/translations/messages/rw.po index efe6e32..41aac97 100644 --- a/translations/rw/messages/ktorrent.po +++ b/translations/messages/rw.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: ktorrent 3.4\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" "PO-Revision-Date: 2005-05-25 18:43-0600\n" "Last-Translator: Steve Murphy <murf@e-tools.com>\n" "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n" @@ -79,7 +79,7 @@ msgid " short!" msgstr "" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 #, fuzzy msgid "All Torrents" msgstr "Ikinyakoreya" @@ -94,73 +94,73 @@ msgid "Case sensitive" msgstr "" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 #, fuzzy msgid "Active downloads" msgstr "Iyimura" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 #, fuzzy msgid "Active torrents" msgstr "Ikinyakoreya" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 #, fuzzy msgid "Active uploads" msgstr "Gushyiraho" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "Iyimura" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 #, fuzzy msgid "Uploads" msgstr "Gushyiraho" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 #, fuzzy msgid "Queued downloads" msgstr "Iyimura Agashushondanga " -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 msgid "Queued uploads" msgstr "" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 #, fuzzy msgid "User downloads" msgstr "Iyimura" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 #, fuzzy msgid "User uploads" msgstr "Gushyiraho" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 #, fuzzy msgid "Inactive torrents" msgstr "Gukora inyandiko" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 #, fuzzy msgid "Inactive downloads" msgstr "Iyimura" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 #, fuzzy msgid "Inactive uploads" diff --git a/translations/sk/messages/ktorrent.po b/translations/messages/sk.po index 2476d32..4841f57 100644 --- a/translations/sk/messages/ktorrent.po +++ b/translations/messages/sk.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: ktorrent\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" "PO-Revision-Date: 2019-12-04 23:59+0000\n" "Last-Translator: Marek Mlynar <marek.inq.mlynar@gmail.com>\n" "Language-Team: Slovak <https://mirror.git.trinitydesktop.org/weblate/" @@ -71,7 +71,7 @@ msgid " short!" msgstr "" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 #, fuzzy msgid "All Torrents" msgstr "Torrent" @@ -85,73 +85,73 @@ msgid "Case sensitive" msgstr "" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 #, fuzzy msgid "Active downloads" msgstr "sťahovanie:" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 #, fuzzy msgid "Active torrents" msgstr "Torrent" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 #, fuzzy msgid "Active uploads" msgstr "Uploady" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "Downloady" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 msgid "Uploads" msgstr "Uploady" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 #, fuzzy msgid "Queued downloads" msgstr "Ikona sťahovania" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 #, fuzzy msgid "Queued uploads" msgstr "Vo fronte" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 #, fuzzy msgid "User downloads" msgstr "sťahovanie:" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 #, fuzzy msgid "User uploads" msgstr "Uploady" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 #, fuzzy msgid "Inactive torrents" msgstr "Vytvoriť Torrent" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 #, fuzzy msgid "Inactive downloads" msgstr "sťahovanie:" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 #, fuzzy msgid "Inactive uploads" diff --git a/translations/sr/messages/ktorrent.po b/translations/messages/sr.po index c72ff31..26be92f 100644 --- a/translations/sr/messages/ktorrent.po +++ b/translations/messages/sr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ktorrent\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" "PO-Revision-Date: 2008-02-26 13:59+0100\n" "Last-Translator: Slobodan Simic <simicsl@verat.net>\n" "Language-Team: Serbian <kde-i18n-sr@kde.org>\n" @@ -69,7 +69,7 @@ msgid " short!" msgstr " недостаје!" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 msgid "All Torrents" msgstr "Сви торенти" @@ -82,64 +82,64 @@ msgid "Case sensitive" msgstr "Разликуј мала и велика слова" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 msgid "Active downloads" msgstr "Активна преузимања" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 msgid "Active torrents" msgstr "Активни торенти" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 msgid "Active uploads" msgstr "Активна слања" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "Преузимања" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 msgid "Uploads" msgstr "Слања" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 msgid "Queued downloads" msgstr "Наредна преузимања" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 msgid "Queued uploads" msgstr "Наредна слања" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 msgid "User downloads" msgstr "Корисничка преузимања" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 msgid "User uploads" msgstr "Корисничка слања" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 msgid "Inactive torrents" msgstr "Неактивни торенти" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 msgid "Inactive downloads" msgstr "Неактивна преузимања" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 msgid "Inactive uploads" msgstr "Неактивна слања" diff --git a/translations/sr@Latn/messages/ktorrent.po b/translations/messages/sr@Latn.po index 245dd64..9c52b40 100644 --- a/translations/sr@Latn/messages/ktorrent.po +++ b/translations/messages/sr@Latn.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ktorrent\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" "PO-Revision-Date: 2008-02-26 13:59+0100\n" "Last-Translator: Slobodan Simic <simicsl@verat.net>\n" "Language-Team: Serbian <kde-i18n-sr@kde.org>\n" @@ -69,7 +69,7 @@ msgid " short!" msgstr " nedostaje!" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 msgid "All Torrents" msgstr "Svi torenti" @@ -82,64 +82,64 @@ msgid "Case sensitive" msgstr "Razlikuj mala i velika slova" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 msgid "Active downloads" msgstr "Aktivna preuzimanja" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 msgid "Active torrents" msgstr "Aktivni torenti" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 msgid "Active uploads" msgstr "Aktivna slanja" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "Preuzimanja" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 msgid "Uploads" msgstr "Slanja" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 msgid "Queued downloads" msgstr "Naredna preuzimanja" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 msgid "Queued uploads" msgstr "Naredna slanja" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 msgid "User downloads" msgstr "Korisnička preuzimanja" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 msgid "User uploads" msgstr "Korisnička slanja" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 msgid "Inactive torrents" msgstr "Neaktivni torenti" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 msgid "Inactive downloads" msgstr "Neaktivna preuzimanja" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 msgid "Inactive uploads" msgstr "Neaktivna slanja" diff --git a/translations/sv/messages/ktorrent.po b/translations/messages/sv.po index 8ecb4d9..02d0ed1 100644 --- a/translations/sv/messages/ktorrent.po +++ b/translations/messages/sv.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: ktorrent\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" "PO-Revision-Date: 2008-02-25 22:20+0100\n" "Last-Translator: Stefan Asserhäll <stefan.asserhall@comhem.se>\n" "Language-Team: Swedish <sv@li.org>\n" @@ -66,7 +66,7 @@ msgid " short!" msgstr " för lite." #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 msgid "All Torrents" msgstr "Alla dataflöden" @@ -79,64 +79,64 @@ msgid "Case sensitive" msgstr "Skiftlägeskänslig" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 msgid "Active downloads" msgstr "Aktiva nerladdningar" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 msgid "Active torrents" msgstr "Aktiva dataflöden" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 msgid "Active uploads" msgstr "Aktiva uppladdningar" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "Nerladdningar" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 msgid "Uploads" msgstr "Uppladdningar" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 msgid "Queued downloads" msgstr "Köade nerladdningar" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 msgid "Queued uploads" msgstr "Köade uppladdningar" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 msgid "User downloads" msgstr "Användarens nerladdningar" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 msgid "User uploads" msgstr "Användarens uppladdningar" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 msgid "Inactive torrents" msgstr "Inaktiva dataflöden" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 msgid "Inactive downloads" msgstr "Inaktiva nerladdningar" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 msgid "Inactive uploads" msgstr "Inaktiva uppladdningar" diff --git a/translations/tr/messages/ktorrent.po b/translations/messages/tr.po index 660173b..8e90d35 100644 --- a/translations/tr/messages/ktorrent.po +++ b/translations/messages/tr.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: ktorrent\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" "PO-Revision-Date: 2007-09-09 14:47+0300\n" "Last-Translator: Serdar Soytetir <tulliana@gmail.com>\n" "Language-Team: Turkish <yerellestirme@kde.org.tr>\n" @@ -76,7 +76,7 @@ msgid " short!" msgstr " kısa!" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 msgid "All Torrents" msgstr "Tüm Torrentler" @@ -89,64 +89,64 @@ msgid "Case sensitive" msgstr "" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 msgid "Active downloads" msgstr "Aktif indirme işlemleri" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 msgid "Active torrents" msgstr "Aktif torrentler" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 msgid "Active uploads" msgstr "Aktif gönderme işlemleri" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "İndirilenler" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 msgid "Uploads" msgstr "Gönderilenler" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 msgid "Queued downloads" msgstr "Sıralanmış indirme işlemleri" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 msgid "Queued uploads" msgstr "Sıralanmış gönderme işlemleri" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 msgid "User downloads" msgstr "Kullanıcının indirme işlemleri" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 msgid "User uploads" msgstr "Kullanıcının gönderme işlemleri" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 msgid "Inactive torrents" msgstr "Pasif torrentler" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 msgid "Inactive downloads" msgstr "Pasif indirme işlemleri" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 msgid "Inactive uploads" msgstr "Pasif gönderme işlemleri" diff --git a/translations/uk/messages/ktorrent.po b/translations/messages/uk.po index a241a08..10db484 100644 --- a/translations/uk/messages/ktorrent.po +++ b/translations/messages/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ktorrent\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" "PO-Revision-Date: 2022-04-24 17:21+0000\n" "Last-Translator: Roman Savochenko <roman@oscada.org>\n" "Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/" @@ -70,7 +70,7 @@ msgid " short!" msgstr " коротко!" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 msgid "All Torrents" msgstr "Всі торенти" @@ -83,64 +83,64 @@ msgid "Case sensitive" msgstr "З урахуванням регістру" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 msgid "Active downloads" msgstr "Активні звантаження" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 msgid "Active torrents" msgstr "Активні торенти" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 msgid "Active uploads" msgstr "Активні вивантаження" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "Звантаження" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 msgid "Uploads" msgstr "Вивантаження" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 msgid "Queued downloads" msgstr "Звантаження в черзі" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 msgid "Queued uploads" msgstr "Вивантаження в черзі" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 msgid "User downloads" msgstr "Звантаження користувача" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 msgid "User uploads" msgstr "Вивантаження користувача" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 msgid "Inactive torrents" msgstr "Бездіяльні торенти" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 msgid "Inactive downloads" msgstr "Бездіяльні звантаження" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 msgid "Inactive uploads" msgstr "Бездіяльні вивантаження" diff --git a/translations/zh_CN/messages/ktorrent.po b/translations/messages/zh_CN.po index 01967ae..17191bd 100644 --- a/translations/zh_CN/messages/ktorrent.po +++ b/translations/messages/zh_CN.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ktorrent 1.1rc1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" "PO-Revision-Date: 2008-01-21 15:13+0800\n" "Last-Translator: Lie_Ex <lilith.ex@gmail.com>\n" "Language-Team: zh_CN <kde-china@kde.org>\n" @@ -67,7 +67,7 @@ msgid " short!" msgstr " 短!" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 msgid "All Torrents" msgstr "全部 Torrent" @@ -80,64 +80,64 @@ msgid "Case sensitive" msgstr "大小写敏感" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 msgid "Active downloads" msgstr "活动的下载" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 msgid "Active torrents" msgstr "活动的种子" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 msgid "Active uploads" msgstr "活动的上传" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "下载" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 msgid "Uploads" msgstr "上传" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 msgid "Queued downloads" msgstr "已排队的下载" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 msgid "Queued uploads" msgstr "已排队的上传" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 msgid "User downloads" msgstr "用户下载" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 msgid "User uploads" msgstr "用户上传" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 msgid "Inactive torrents" msgstr "非活动种子" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 msgid "Inactive downloads" msgstr "非活动下载" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 msgid "Inactive uploads" msgstr "非活动上传" diff --git a/translations/zh_TW/messages/ktorrent.po b/translations/messages/zh_TW.po index 5a020b6..6b7fd01 100644 --- a/translations/zh_TW/messages/ktorrent.po +++ b/translations/messages/zh_TW.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: ktorrent\n" -"POT-Creation-Date: 2022-09-08 18:28+0000\n" +"POT-Creation-Date: 2025-03-21 18:18+0000\n" "PO-Revision-Date: 2006-08-28 14:39+0800\n" "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv " "dot tw>\n" @@ -65,7 +65,7 @@ msgid " short!" msgstr "" #: apps/ktorrent/fileselectdlg.cpp:284 apps/ktorrent/groups/allgroup.cpp:26 -#: apps/ktorrent/groups/groupmanager.h:54 apps/ktorrent/ktorrent.cpp:962 +#: apps/ktorrent/groups/groupmanager.h:55 apps/ktorrent/ktorrent.cpp:962 #, fuzzy msgid "All Torrents" msgstr "Torrent" @@ -79,73 +79,73 @@ msgid "Case sensitive" msgstr "" #: apps/ktorrent/groups/activedownloadsgroup.cpp:28 -#: apps/ktorrent/groups/groupmanager.h:87 +#: apps/ktorrent/groups/groupmanager.h:88 #, fuzzy msgid "Active downloads" msgstr "下載:" #: apps/ktorrent/groups/activegroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:84 +#: apps/ktorrent/groups/groupmanager.h:85 #, fuzzy msgid "Active torrents" msgstr "Torrent" #: apps/ktorrent/groups/activeuploadsgroup.cpp:29 -#: apps/ktorrent/groups/groupmanager.h:90 +#: apps/ktorrent/groups/groupmanager.h:91 #, fuzzy msgid "Active uploads" msgstr "上傳" #: apps/ktorrent/groups/downloadgroup.cpp:27 -#: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/ktorrentui.rc:9 +#: apps/ktorrent/groups/groupmanager.h:58 apps/ktorrent/ktorrentui.rc:9 #: apps/ktorrent/pref.cpp:147 apps/ktorrent/queuedlg.ui:31 #: apps/ktorrent/viewmanager.cpp:62 #, no-c-format msgid "Downloads" msgstr "下載" -#: apps/ktorrent/groups/groupmanager.h:60 +#: apps/ktorrent/groups/groupmanager.h:61 #: apps/ktorrent/groups/uploadgroup.cpp:27 apps/ktorrent/viewmanager.cpp:63 msgid "Uploads" msgstr "上傳" -#: apps/ktorrent/groups/groupmanager.h:63 +#: apps/ktorrent/groups/groupmanager.h:64 #: apps/ktorrent/groups/queueddownloadsgroup.cpp:29 #, fuzzy msgid "Queued downloads" msgstr "下載圖示" -#: apps/ktorrent/groups/groupmanager.h:66 +#: apps/ktorrent/groups/groupmanager.h:67 #: apps/ktorrent/groups/queueduploadsgroup.cpp:29 #, fuzzy msgid "Queued uploads" msgstr "已送進佇列" -#: apps/ktorrent/groups/groupmanager.h:69 +#: apps/ktorrent/groups/groupmanager.h:70 #: apps/ktorrent/groups/userdownloadsgroup.cpp:29 #, fuzzy msgid "User downloads" msgstr "下載:" -#: apps/ktorrent/groups/groupmanager.h:72 +#: apps/ktorrent/groups/groupmanager.h:73 #: apps/ktorrent/groups/useruploadsgroup.cpp:29 #, fuzzy msgid "User uploads" msgstr "上傳" -#: apps/ktorrent/groups/groupmanager.h:75 +#: apps/ktorrent/groups/groupmanager.h:76 #: apps/ktorrent/groups/inactivegroup.cpp:29 #, fuzzy msgid "Inactive torrents" msgstr "建立 Torrent" -#: apps/ktorrent/groups/groupmanager.h:78 +#: apps/ktorrent/groups/groupmanager.h:79 #: apps/ktorrent/groups/inactivedownloadsgroup.cpp:29 #, fuzzy msgid "Inactive downloads" msgstr "下載:" -#: apps/ktorrent/groups/groupmanager.h:81 +#: apps/ktorrent/groups/groupmanager.h:82 #: apps/ktorrent/groups/inactiveuploadsgroup.cpp:29 #, fuzzy msgid "Inactive uploads" diff --git a/translations/ms/Makefile.am b/translations/ms/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/ms/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/ms/messages/Makefile.am b/translations/ms/messages/Makefile.am deleted file mode 100644 index fc19612..0000000 --- a/translations/ms/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = ms -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/nb/Makefile.am b/translations/nb/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/nb/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/nb/messages/Makefile.am b/translations/nb/messages/Makefile.am deleted file mode 100644 index 61136e8..0000000 --- a/translations/nb/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = nb -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/nds/Makefile.am b/translations/nds/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/nds/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/nds/messages/Makefile.am b/translations/nds/messages/Makefile.am deleted file mode 100644 index 45ab185..0000000 --- a/translations/nds/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = nds -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/nl/Makefile.am b/translations/nl/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/nl/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/nl/messages/Makefile.am b/translations/nl/messages/Makefile.am deleted file mode 100644 index 69faf0b..0000000 --- a/translations/nl/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = nl -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/pa/Makefile.am b/translations/pa/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/pa/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/pa/messages/Makefile.am b/translations/pa/messages/Makefile.am deleted file mode 100644 index 944337a..0000000 --- a/translations/pa/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = pa -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/pl/Makefile.am b/translations/pl/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/pl/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/pl/messages/Makefile.am b/translations/pl/messages/Makefile.am deleted file mode 100644 index 498aaef..0000000 --- a/translations/pl/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = pl -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/pt/Makefile.am b/translations/pt/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/pt/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/pt/messages/Makefile.am b/translations/pt/messages/Makefile.am deleted file mode 100644 index fd3494d..0000000 --- a/translations/pt/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = pt -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/pt_BR/Makefile.am b/translations/pt_BR/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/pt_BR/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/pt_BR/messages/Makefile.am b/translations/pt_BR/messages/Makefile.am deleted file mode 100644 index 2046214..0000000 --- a/translations/pt_BR/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = pt_BR -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/ru/Makefile.am b/translations/ru/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/ru/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/ru/messages/Makefile.am b/translations/ru/messages/Makefile.am deleted file mode 100644 index 1c418b6..0000000 --- a/translations/ru/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = ru -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/rw/Makefile.am b/translations/rw/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/rw/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/rw/messages/Makefile.am b/translations/rw/messages/Makefile.am deleted file mode 100644 index 8d437bc..0000000 --- a/translations/rw/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = rw -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/sk/Makefile.am b/translations/sk/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/sk/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/sk/messages/Makefile.am b/translations/sk/messages/Makefile.am deleted file mode 100644 index 1e1bb19..0000000 --- a/translations/sk/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = sk -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/sr/Makefile.am b/translations/sr/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/sr/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/sr/messages/Makefile.am b/translations/sr/messages/Makefile.am deleted file mode 100644 index 791c3c6..0000000 --- a/translations/sr/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = sr -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/sr@Latn/Makefile.am b/translations/sr@Latn/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/sr@Latn/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/sr@Latn/messages/Makefile.am b/translations/sr@Latn/messages/Makefile.am deleted file mode 100644 index 1347978..0000000 --- a/translations/sr@Latn/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = sr@Latn -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/sv/Makefile.am b/translations/sv/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/sv/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/sv/messages/Makefile.am b/translations/sv/messages/Makefile.am deleted file mode 100644 index 300ce12..0000000 --- a/translations/sv/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = sv -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/tr/Makefile.am b/translations/tr/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/tr/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/tr/messages/Makefile.am b/translations/tr/messages/Makefile.am deleted file mode 100644 index a9550cb..0000000 --- a/translations/tr/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = tr -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/uk/Makefile.am b/translations/uk/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/uk/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/uk/messages/Makefile.am b/translations/uk/messages/Makefile.am deleted file mode 100644 index 7ffee10..0000000 --- a/translations/uk/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = uk -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/zh_CN/Makefile.am b/translations/zh_CN/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/zh_CN/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/zh_CN/messages/Makefile.am b/translations/zh_CN/messages/Makefile.am deleted file mode 100644 index b5f72f3..0000000 --- a/translations/zh_CN/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = zh_CN -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/translations/zh_TW/Makefile.am b/translations/zh_TW/Makefile.am deleted file mode 100644 index b9efc84..0000000 --- a/translations/zh_TW/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= messages diff --git a/translations/zh_TW/messages/Makefile.am b/translations/zh_TW/messages/Makefile.am deleted file mode 100644 index c37fe4d..0000000 --- a/translations/zh_TW/messages/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = zh_TW -SUBDIRS = $(AUTODIRS) -POFILES = AUTO diff --git a/utests/Makefile.am b/utests/Makefile.am deleted file mode 100644 index 78de5ad..0000000 --- a/utests/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -INCLUDES = -I$(srcdir)/../libktorrent -I$(srcdir)/.. $(all_includes) -METASOURCES = AUTO -noinst_HEADERS = unittest.h testrunner.h upnpparsedescriptiontest.h \ - upnpparseresponsetest.h dhtmsgparsetest.h biginttest.h rc4test.h difflehellmantest.h -bin_PROGRAMS = ktutester -ktutester_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ktutester_SOURCES = unittest.cpp testrunner.cpp main.cpp \ - upnpparsedescriptiontest.cpp upnpparseresponsetest.cpp dhtmsgparsetest.cpp biginttest.cpp \ - rc4test.cpp difflehellmantest.cpp -ktutester_LDADD = ../plugins/upnp/libktupnp.la \ - ../libktorrent/libktorrent.la -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) |