Compare commits

...

108 Commits

Author SHA1 Message Date
Slávek Banko aa95942b72
Remove cmake submodule since it has now been replaced by cmake-trinity dependency. 6 months ago
TDE Gitea 88fd723582 Reset submodule main/applications/amarok/cmake to latest HEAD 7 months ago
TDE Gitea fc13a8fc5a Reset submodule main/applications/amarok/cmake to latest HEAD 9 months ago
TDE Gitea b49dc396a8 Reset submodule main/applications/amarok/cmake to latest HEAD 10 months ago
TDE Gitea 0129bc1a3a Reset submodule main/applications/amarok/cmake to latest HEAD 10 months ago
TDE Gitea 1f5fd3373e Reset submodule main/applications/amarok/admin to latest HEAD 10 months ago
TDE Gitea 177bc4ab1f Reset submodule main/applications/amarok/cmake to latest HEAD 11 months ago
TDE Gitea 0eb2e53192 Reset submodule main/applications/amarok/cmake to latest HEAD 12 months ago
TDE Gitea 61514f526c Reset submodule main/applications/amarok/admin to latest HEAD 12 months ago
TDE Gitea 38d47e45f2 Reset submodule main/applications/amarok/cmake to latest HEAD 1 year ago
TDE Gitea fb7ea534d9 Reset submodule main/applications/amarok/admin to latest HEAD 1 year ago
TDE Gitea 78c9bca5a5 Reset submodule main/applications/amarok/cmake to latest HEAD 1 year ago
TDE Gitea f96d35760c Reset submodule main/applications/amarok/admin to latest HEAD 1 year ago
TDE Gitea 431f96ab48 Reset submodule main/applications/amarok/cmake to latest HEAD 1 year ago
TDE Gitea bdb3dafafe Reset submodule main/applications/amarok/admin to latest HEAD 1 year ago
TDE Gitea 0e3023452e Reset submodule main/applications/amarok/cmake to latest HEAD 1 year ago
TDE Gitea fb69a14b7e Reset submodule main/applications/amarok/cmake to latest HEAD 1 year ago
TDE Gitea b191cf34ea Reset submodule main/applications/amarok/cmake to latest HEAD 1 year ago
TDE Gitea 35e48079ab Reset submodule main/applications/amarok/admin to latest HEAD 1 year ago
TDE Gitea f969039653 Reset submodule main/applications/amarok/cmake to latest HEAD 1 year ago
TDE Gitea f7d948029f Reset submodule main/applications/amarok/cmake to latest HEAD 1 year ago
TDE Gitea 9905211fa4 Reset submodule main/applications/amarok/cmake to latest HEAD 1 year ago
TDE Gitea 3b2e351c4f Reset submodule main/applications/amarok/cmake to latest HEAD 1 year ago
TDE Gitea 50586a16f7 Reset submodule main/applications/amarok/admin to latest HEAD 1 year ago
TDE Gitea 37a3a1abed Reset submodule main/applications/amarok/cmake to latest HEAD 2 years ago
TDE Gitea b03823efd2 Reset submodule main/applications/amarok/cmake to latest HEAD 2 years ago
TDE Gitea db4d2a5cc2 Reset submodule main/applications/amarok/cmake to latest HEAD 2 years ago
TDE Gitea e3935ee446 Reset submodule main/applications/amarok/cmake to latest HEAD 2 years ago
TDE Gitea 52cecc89b2 Reset submodule main/applications/amarok/cmake to latest HEAD 2 years ago
TDE Gitea e2e57504a5 Reset submodule main/applications/amarok/cmake to latest HEAD 2 years ago
TDE Gitea 2e30a663e3 Reset submodule main/applications/amarok/cmake to latest HEAD 2 years ago
TDE Gitea 797ddc9a27 Reset submodule main/applications/amarok/cmake to latest HEAD 2 years ago
TDE Gitea 7846aaa330 Reset submodule main/applications/amarok/cmake to latest HEAD 2 years ago
Slávek Banko 098a3178c7
Switch all submodules to https. 2 years ago
TDE Gitea 888fd30b16 Reset submodule main/applications/amarok/cmake to latest HEAD 3 years ago
TDE Gitea 3d68e97826 Reset submodule main/applications/amarok/cmake to latest HEAD 3 years ago
TDE Gitea ace484fb4b Reset submodule main/applications/amarok/cmake to latest HEAD 3 years ago
TDE Gitea 18957d9100 Reset submodule main/applications/amarok/cmake to latest HEAD 3 years ago
TDE Gitea 73ee82e258 Reset submodule main/applications/amarok/admin to latest HEAD 3 years ago
TDE Gitea c1e7c1aa22 Reset submodule main/applications/amarok/cmake to latest HEAD 3 years ago
TDE Gitea 51ded8e4f5 Reset submodule main/applications/amarok/cmake to latest HEAD 3 years ago
TDE Gitea 1e48cd6d99 Reset submodule main/applications/amarok/cmake to latest HEAD 3 years ago
TDE Gitea 7e784098f2 Reset submodule main/applications/amarok/cmake to latest HEAD 3 years ago
TDE Gitea ebd6960bb3 Reset submodule main/applications/amarok/cmake to latest HEAD 3 years ago
TDE Gitea fd1c7fff4c Reset submodule main/applications/amarok/cmake to latest HEAD 3 years ago
TDE Gitea 20ce1f9b7f Reset submodule main/applications/amarok/admin to latest HEAD 3 years ago
TDE Gitea e9a75e8a2e Reset submodule main/applications/amarok/cmake to latest HEAD 3 years ago
TDE Gitea ebe9cf8ef4 Reset submodule main/applications/amarok/cmake to latest HEAD 3 years ago
TDE Gitea 7cab6f8798 Reset submodule main/applications/amarok/admin to latest HEAD 3 years ago
Slávek Banko 8b45069b30 Reset submodule main/applications/amarok/admin to latest HEAD 4 years ago
Slávek Banko 7e147146e5 Reset submodule main/applications/amarok/admin to latest HEAD 4 years ago
Slávek Banko 26b4132c45 Reset submodule main/applications/amarok/admin to latest HEAD 4 years ago
Slávek Banko adde19a4aa Reset submodule main/applications/amarok/cmake to latest HEAD 5 years ago
Slávek Banko 32a1057031 Reset submodule main/applications/amarok/admin to latest HEAD 5 years ago
Slávek Banko 57588dbec6 Reset submodule main/applications/amarok/cmake to latest HEAD 6 years ago
Slávek Banko 7186a92865 Reset submodule main/applications/amarok/admin to latest HEAD 6 years ago
Slávek Banko 399727d9e8 Reset submodule main/applications/amarok/admin to latest HEAD 9 years ago
Timothy Pearson a1260b5f05 Use xine-ui relative seek method to work around long-standing libxine FLAC seek failure 9 years ago
Slávek Banko 6f1f8ad8c3 Add cmake support for mp4v2 9 years ago
Slávek Banko 22c1da75d2 Add mp4v2 MP4Tags* API support 9 years ago
Timothy Pearson 928ca6f861 Fix build of mp4 tag writing option 9 years ago
Timothy Pearson 8ae8d0c37d Use updated DrKonqi instead of internal crash handler 9 years ago
Timothy Pearson 543c6eef6d Fix ARGB mode playlist throbber 9 years ago
Timothy Pearson d2f156e185 Fix Amarok startup crashes 9 years ago
Timothy Pearson d806197381 Fix Amarok keyboard shortcuts 9 years ago
Slávek Banko 37ade66425 Reset submodule main/applications/amarok/admin to latest HEAD 9 years ago
Slávek Banko dd6f30d4a6 Reset submodule main/applications/amarok/cmake to latest HEAD 9 years ago
Slávek Banko 95a2136e45 Reset submodule main/applications/amarok/cmake to latest HEAD 9 years ago
Darrell Anderson 8070a7a349 Fix references to user profile directory. 9 years ago
Darrell Anderson 5f01214157 Fix deprecation build warnings. The "preferred" function has 9 years ago
Slávek Banko b86ba73163 Reset submodule main/applications/amarok/cmake to latest HEAD 9 years ago
Slávek Banko 38be547a0f Reset submodule main/applications/amarok/cmake to latest HEAD 9 years ago
Slávek Banko 53f3df77ce Reset submodule main/applications/amarok/admin to latest HEAD 9 years ago
Slávek Banko e1292570da Fix build on Ruby 1.9.x without pkgconfig file 9 years ago
Slávek Banko 15f9743a81 Fix FTBFS due to system scriptmanager.h 9 years ago
Slávek Banko 4ad314fae0 Add conditionnal inotify support 9 years ago
Darrell Anderson ecd24e4f3c Fix inadvertent tq changes. 9 years ago
Darrell Anderson b59d8a0d7e Fix inadvertent tq changes. 9 years ago
Darrell Anderson 9802427270 Remove unnecessary language. 9 years ago
Darrell Anderson 7d3e87f4d8 Fix inadvertent tqt changes. 9 years ago
Darrell Anderson cd9571507e Fix typo. 9 years ago
Darrell Anderson b3e11e7fe0 Add build support for xine 1.2. 9 years ago
Timothy Pearson 7b7aa437f8 Fix FTBFS on x86 systems 9 years ago
Timothy Pearson 4a132b511d Fix format not a string literal security error in rb_raise 9 years ago
Timothy Pearson 2762188456 Fix build system for ruby >= 1.9 9 years ago
Slávek Banko 8f7845b165 Reset submodule main/applications/amarok/cmake to latest HEAD 9 years ago
Slávek Banko 214af1a5f4 Reset submodule main/applications/amarok/cmake to latest HEAD 9 years ago
Slávek Banko 279ee5c243 Reset submodule main/applications/amarok/admin to latest HEAD 9 years ago
Slávek Banko 057c011e8c Update final HTML install path so all modules are consistent. 9 years ago
Darrell Anderson 7effe97052 Update HTML install path references. 10 years ago
Slávek Banko 6a07d4f7c8 Add akode support to CMake 10 years ago
Slávek Banko 6b522cd955 Enable riokarma support 10 years ago
Slávek Banko 9997261b7f Fix FTBFS due missing taglib includes 10 years ago
Slávek Banko 6ddaf115c5 Fix FTBFS - konqueror side bar build 10 years ago
Slávek Banko 32dd552dda Fix SDL detection on old distros (no pkgconfig file) 10 years ago
Slávek Banko 4fe698b281 Fix FTBFS due to missing includes 10 years ago
Darrell Anderson ecc45da354 Fix build support for both ruby 1.8.x and 1.9.x. 10 years ago
Darrell Anderson 5aedbb687a GCC 4.7 fixes. 10 years ago
Timothy Pearson 1e47e4a1a2 Fix missing argument warnings 10 years ago
Darrell Anderson 96defb9c82 Fix inadvertent "TQ" changes. 10 years ago
Timothy Pearson 815eda6b76 Fix linear alphabet string errors 10 years ago
Timothy Pearson f16993b2b4 Fix inotify detection 10 years ago
Timothy Pearson 925e5f7567 Rename a few stragglers 10 years ago
Timothy Pearson 3a4c7b39c5 Rename obsolete tq methods to standard names 10 years ago
Timothy Pearson 60136760bf Remove additional unneeded tq method conversions 10 years ago
Timothy Pearson ace5f8593c Rename old tq methods that no longer need a unique name 10 years ago
Timothy Pearson 75350e0e87 Fix FTBFS 10 years ago
Slávek Banko b5b1f654e8 Add common directories 10 years ago
  1. 3
      .gitmodules
  2. 3
      CMakeLists.txt
  3. 61
      ConfigureChecks.cmake
  4. 11945
      acinclude.m4
  5. 881
      aclocal.m4
  6. 1
      admin
  7. 71
      amarok/configure.in.in
  8. 36
      amarok/src/Options1.ui
  9. 20
      amarok/src/Options2.ui
  10. 4
      amarok/src/Options2.ui.h
  11. 40
      amarok/src/Options4.ui
  12. 10
      amarok/src/Options5.ui
  13. 4
      amarok/src/Options5.ui.h
  14. 16
      amarok/src/Options8.ui
  15. 14
      amarok/src/actionclasses.cpp
  16. 4
      amarok/src/actionclasses.h
  17. 4
      amarok/src/amarok.h
  18. 4
      amarok/src/amarok_play_audiocd.desktop
  19. 4
      amarok/src/amarokcore/amarok.kcfg
  20. 10
      amarok/src/amarokcore/amarokdcophandler.cpp
  21. 8
      amarok/src/amarokcore/amarokdcophandler.h
  22. 8
      amarok/src/amarokcore/amarokdcopiface.h
  23. 36
      amarok/src/amarokcore/crashhandler.cpp
  24. 6
      amarok/src/analyzers/analyzerbase.h
  25. 4
      amarok/src/analyzers/analyzerfactory.cpp
  26. 2
      amarok/src/analyzers/baranalyzer.h
  27. 43
      amarok/src/analyzers/blockanalyzer.cpp
  28. 13
      amarok/src/analyzers/boomanalyzer.cpp
  29. 2
      amarok/src/analyzers/glanalyzer2.cpp
  30. 6
      amarok/src/analyzers/glanalyzer3.cpp
  31. 18
      amarok/src/app.cpp
  32. 2
      amarok/src/atomicstring.cpp
  33. 24
      amarok/src/browserbar.cpp
  34. 8
      amarok/src/clicklineedit.cpp
  35. 78
      amarok/src/collectionbrowser.cpp
  36. 778
      amarok/src/collectiondb.cpp
  37. 4
      amarok/src/collectiondb.h
  38. 1
      amarok/src/collectionscanner/CMakeLists.txt
  39. 7
      amarok/src/collectionscanner/collectionscanner.cpp
  40. 20
      amarok/src/configdialog.cpp
  41. 141
      amarok/src/contextbrowser.cpp
  42. 10
      amarok/src/coverfetcher.cpp
  43. 46
      amarok/src/covermanager.cpp
  44. 4
      amarok/src/covermanager.h
  45. 8
      amarok/src/cuefile.cpp
  46. 240
      amarok/src/database_refactor/collectiondb.cpp
  47. 6
      amarok/src/database_refactor/dbenginebase.cpp
  48. 8
      amarok/src/dbsetup.ui
  49. 10
      amarok/src/deletedialogbase.ui
  50. 8
      amarok/src/device/massstorage/massstoragedevicehandler.cpp
  51. 12
      amarok/src/device/nfs/nfsdevicehandler.cpp
  52. 12
      amarok/src/device/smb/smbdevicehandler.cpp
  53. 16
      amarok/src/directorylist.cpp
  54. 6
      amarok/src/directorylist.h
  55. 12
      amarok/src/dynamicmode.cpp
  56. 6
      amarok/src/editfilterdialog.cpp
  57. 1
      amarok/src/engine/CMakeLists.txt
  58. 37
      amarok/src/engine/akode/CMakeLists.txt
  59. 2
      amarok/src/engine/akode/akode-engine.cpp
  60. 20
      amarok/src/engine/helix/Makefile.test
  61. 18
      amarok/src/engine/helix/helix-configdialog.cpp
  62. 11
      amarok/src/engine/helix/helix-engine.cpp
  63. 2
      amarok/src/engine/helix/helix-sp/gain.cpp
  64. 2
      amarok/src/engine/helix/helix-sp/gain.h
  65. 156
      amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h
  66. 16
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcore.h
  67. 4
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxengin.h
  68. 2
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxfiles.h
  69. 4
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxiids.h
  70. 16
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxmon.h
  71. 2
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxpiids.h
  72. 12
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxresult.h
  73. 2
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtypes.h
  74. 12
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwin.h
  75. 2
      amarok/src/engine/helix/helix-sp/helix-sp.cpp
  76. 1
      amarok/src/engine/helix/helix-sp/helix-sp.h
  77. 216
      amarok/src/engine/helix/hxplayercontrol.cpp
  78. 4
      amarok/src/engine/helix/hxplayercontrol.h
  79. 6
      amarok/src/engine/mas/masengine.cpp
  80. 10
      amarok/src/engine/nmm/HostList.cpp
  81. 22
      amarok/src/engine/nmm/HostListItem.cpp
  82. 6
      amarok/src/engine/nmm/HostListItem.h
  83. 2
      amarok/src/engine/nmm/NmmLocation.h
  84. 12
      amarok/src/engine/nmm/nmm_configdialogbase.ui
  85. 6
      amarok/src/engine/nmm/nmm_engine.cpp
  86. 2
      amarok/src/engine/nmm/nmm_engine.h
  87. 4
      amarok/src/engine/xine/xine-config.cpp
  88. 80
      amarok/src/engine/xine/xine-engine.cpp
  89. 26
      amarok/src/engine/xine/xineconfigbase.ui
  90. 2
      amarok/src/engine/yauap/yauap-engine.cpp
  91. 12
      amarok/src/enginecontroller.cpp
  92. 12
      amarok/src/equalizergraph.cpp
  93. 8
      amarok/src/equalizergraph.h
  94. 4
      amarok/src/equalizerpresetmanager.cpp
  95. 6
      amarok/src/equalizerpresetmanager.h
  96. 16
      amarok/src/equalizersetup.cpp
  97. 6
      amarok/src/equalizersetup.h
  98. 8
      amarok/src/filebrowser.cpp
  99. 10
      amarok/src/firstrunwizard.ui
  100. 138
      amarok/src/htmlview.cpp
  101. 6
      amarok/src/konquisidebar/universalamarok.cpp
  102. 6
      amarok/src/konquisidebar/universalamarok.h
  103. 16
      amarok/src/ktrm.cpp
  104. 92
      amarok/src/lastfm.cpp
  105. 4
      amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp
  106. 2
      amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui
  107. 14
      amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui
  108. 2
      amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui
  109. 6
      amarok/src/magnatunebrowser/magnatunexmlparser.cpp
  110. 4
      amarok/src/magnatunebrowser/magnatunexmlparser.h
  111. 2
      amarok/src/main.cpp
  112. 68
      amarok/src/mediabrowser.cpp
  113. 49
      amarok/src/mediadevice/daap/ConfigureChecks.cmake
  114. 10
      amarok/src/mediadevice/daap/addhostbase.ui
  115. 12
      amarok/src/mediadevice/daap/daapclient.cpp
  116. 2
      amarok/src/mediadevice/daap/daapclient.h
  117. 4
      amarok/src/mediadevice/daap/daapreader/reader.cpp
  118. 4
      amarok/src/mediadevice/daap/daapserver.cpp
  119. 2
      amarok/src/mediadevice/daap/mongrel/http11/CMakeLists.txt
  120. 7
      amarok/src/mediadevice/daap/mongrel/http11/Makefile.am
  121. 2
      amarok/src/mediadevice/daap/mongrel/http11/ext_help.h
  122. 53
      amarok/src/mediadevice/daap/mongrel/http11/http11.c
  123. 4
      amarok/src/mediadevice/daap/mongrel/lib/mongrel/cgi.rb
  124. 2
      amarok/src/mediadevice/daap/mongrel/lib/mongrel/handlers.rb
  125. 4
      amarok/src/mediadevice/daap/mongrel/lib/rubygems/package.rb
  126. 2
      amarok/src/mediadevice/daap/proxy.cpp
  127. 44
      amarok/src/mediadevice/generic/genericmediadevice.cpp
  128. 18
      amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui
  129. 6
      amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui.h
  130. 16
      amarok/src/mediadevice/ifp/ifpmediadevice.cpp
  131. 54
      amarok/src/mediadevice/ipod/ipodmediadevice.cpp
  132. 28
      amarok/src/mediadevice/mtp/mtpmediadevice.cpp
  133. 14
      amarok/src/mediadevice/njb/njbmediadevice.cpp
  134. 2
      amarok/src/mediadevice/njb/playlist.cpp
  135. 4
      amarok/src/mediadevice/riokarma/CMakeLists.txt
  136. 2
      amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp
  137. 34
      amarok/src/mediumpluginmanager.cpp
  138. 28
      amarok/src/metabundle.cpp
  139. 4
      amarok/src/metabundle.h
  140. 1
      amarok/src/metadata/aac/CMakeLists.txt
  141. 1
      amarok/src/metadata/audible/CMakeLists.txt
  142. 5
      amarok/src/metadata/m4a/CMakeLists.txt
  143. 2
      amarok/src/metadata/m4a/mp4file.h
  144. 2
      amarok/src/metadata/m4a/mp4mvhdbox.cpp
  145. 2
      amarok/src/metadata/m4a/mp4mvhdbox.h
  146. 33
      amarok/src/metadata/mp4/CMakeLists.txt
  147. 69
      amarok/src/metadata/mp4/mp4file.cpp
  148. 2
      amarok/src/metadata/mp4/mp4properties.cpp
  149. 7
      amarok/src/metadata/mp4/mp4properties.h
  150. 60
      amarok/src/metadata/mp4/mp4tag.cpp
  151. 7
      amarok/src/metadata/mp4/mp4tag.h
  152. 5
      amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp
  153. 2
      amarok/src/metadata/trueaudio/ttafile.h
  154. 1
      amarok/src/metadata/wav/CMakeLists.txt
  155. 2
      amarok/src/metadata/wavpack/wvfile.h
  156. 6
      amarok/src/moodbar.cpp
  157. 2
      amarok/src/moodbar.h
  158. 22
      amarok/src/mountpointmanager.cpp
  159. 4
      amarok/src/mountpointmanager.h
  160. 134
      amarok/src/multitabbar.cpp
  161. 2
      amarok/src/multitabbar.h
  162. 18
      amarok/src/mydirlister.h
  163. 2
      amarok/src/mydiroperator.cpp
  164. 14
      amarok/src/newdynamic.ui
  165. 16
      amarok/src/organizecollectiondialog.ui
  166. 6
      amarok/src/organizecollectiondialog.ui.h
  167. 30
      amarok/src/osd.cpp
  168. 6
      amarok/src/osd.h
  169. 22
      amarok/src/playerwindow.cpp
  170. 102
      amarok/src/playlist.cpp
  171. 4
      amarok/src/playlist.h
  172. 106
      amarok/src/playlistbrowser.cpp
  173. 127
      amarok/src/playlistbrowseritem.cpp
  174. 8
      amarok/src/playlistbrowseritem.h
  175. 26
      amarok/src/playlistitem.cpp
  176. 8
      amarok/src/playlistloader.cpp
  177. 4
      amarok/src/playlistloader.h
  178. 6
      amarok/src/playlistselection.cpp
  179. 4
      amarok/src/playlistselection.h
  180. 38
      amarok/src/playlistwindow.cpp
  181. 2
      amarok/src/playlistwindow.h
  182. 16
      amarok/src/pluginmanager.cpp
  183. 4
      amarok/src/podcastsettings.cpp
  184. 4
      amarok/src/podcastsettingsbase.ui
  185. 18
      amarok/src/prettypopupmenu.cpp
  186. 2
      amarok/src/qstringx.h
  187. 12
      amarok/src/queuemanager.cpp
  188. 6
      amarok/src/queuemanager.h
  189. 6
      amarok/src/refreshimages.cpp
  190. 2
      amarok/src/scancontroller.cpp
  191. 36
      amarok/src/scriptmanager.cpp
  192. 2
      amarok/src/scriptmanagerbase.ui
  193. 8
      amarok/src/scripts/amarok_live/amarok.live.remaster.part1.sh
  194. 4
      amarok/src/scripts/amarok_live/amarok_live.py
  195. 2
      amarok/src/scripts/databasescripts/backupDatabase.rb
  196. 28
      amarok/src/scripts/databasescripts/databaseScripts.rb
  197. 2
      amarok/src/scripts/embedcover/embedcover.rb
  198. 14
      amarok/src/scripts/graphequalizer/eqdialog.ui
  199. 6
      amarok/src/scripts/graphequalizer/equalizercanvasview.h
  200. 4
      amarok/src/scripts/graphequalizer/equalizerdialog.h
  201. 2
      amarok/src/scripts/lyrics_astraweb/lyrics_astraweb.rb
  202. 2
      amarok/src/scripts/playlist2html/Playlist.py
  203. 2
      amarok/src/scripts/webcontrol/Playlist.py
  204. 22
      amarok/src/scripts/webcontrol/RequestHandler.py
  205. 38
      amarok/src/scripts/webcontrol/WebControl.py
  206. 42
      amarok/src/scrobbler.cpp
  207. 16
      amarok/src/sliderwidget.cpp
  208. 24
      amarok/src/smartplaylisteditor.cpp
  209. 6
      amarok/src/socketserver.cpp
  210. 318
      amarok/src/sqlite/sqlite3.c
  211. 4
      amarok/src/sqlite/sqlite3.h
  212. 13
      amarok/src/starmanager.cpp
  213. 2
      amarok/src/starmanager.h
  214. 52
      amarok/src/statistics.cpp
  215. 2
      amarok/src/statistics.h
  216. 4
      amarok/src/statusbar/overlayWidget.cpp
  217. 14
      amarok/src/statusbar/popupMessage.cpp
  218. 2
      amarok/src/statusbar/popupMessage.h
  219. 10
      amarok/src/statusbar/progressBar.cpp
  220. 2
      amarok/src/statusbar/progressBar.h
  221. 32
      amarok/src/statusbar/queueLabel.cpp
  222. 4
      amarok/src/statusbar/queueLabel.h
  223. 6
      amarok/src/statusbar/selectLabel.h
  224. 16
      amarok/src/statusbar/squeezedtextlabel.cpp
  225. 10
      amarok/src/statusbar/squeezedtextlabel.h
  226. 32
      amarok/src/statusbar/statusBarBase.cpp
  227. 8
      amarok/src/statusbar/statusBarBase.h
  228. 34
      amarok/src/statusbar/statusbar.cpp
  229. 2
      amarok/src/statusbar/timeLabel.h
  230. 2
      amarok/src/statusbar/toggleLabel.h
  231. 36
      amarok/src/systray.cpp
  232. 2
      amarok/src/systray.h
  233. 54
      amarok/src/tagdialog.cpp
  234. 36
      amarok/src/tagdialogbase.ui
  235. 5
      amarok/src/tagguesserconfigdialog.ui
  236. 4
      amarok/src/threadmanager.cpp
  237. 6
      amarok/src/threadmanager.h
  238. 14
      amarok/src/tooltip.cpp
  239. 2
      amarok/src/tooltip.h
  240. 6
      amarok/src/trackpickerdialogbase.ui
  241. 26
      amarok/src/tracktooltip.cpp
  242. 14
      amarok/src/transferdialog.cpp
  243. 4
      amarok/src/xmlloader.cpp
  244. 4
      amarok/src/xmlloader.h
  245. 3
      config.h.cmake
  246. 28
      config.h.in
  247. 1761
      configure.in
  248. 2
      doc/amarok/config.docbook
  249. 8
      doc/amarok/faq.docbook
  250. 2
      doc/da/config.docbook
  251. 6
      doc/da/faq.docbook
  252. 2
      doc/de/config.docbook
  253. 6
      doc/de/faq.docbook
  254. 2
      doc/es/config.docbook
  255. 6
      doc/es/faq.docbook
  256. 2
      doc/et/config.docbook
  257. 6
      doc/et/faq.docbook
  258. 2
      doc/fr/advanced.docbook
  259. 2
      doc/fr/config.docbook
  260. 6
      doc/fr/faq.docbook
  261. 2
      doc/it/config.docbook
  262. 6
      doc/it/faq.docbook
  263. 2
      doc/nl/config.docbook
  264. 6
      doc/nl/faq.docbook
  265. 2
      doc/pl/config.docbook
  266. 6
      doc/pl/faq.docbook
  267. 2
      doc/pt/config.docbook
  268. 6
      doc/pt/faq.docbook
  269. 2
      doc/pt_BR/advanced.docbook
  270. 2
      doc/sv/config.docbook
  271. 6
      doc/sv/faq.docbook

3
.gitmodules

@ -0,0 +1,3 @@
[submodule "admin"]
path = admin
url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin

3
CMakeLists.txt

@ -47,12 +47,15 @@ option( WITH_LIBVISUAL "Enable libvisual support" OFF )
option( WITH_KONQSIDEBAR "Enable konqsidebar plugin" OFF )
option( WITH_XINE "Enable xine-engine support" OFF )
option( WITH_YAUAP "Enable yauap-engine support" OFF )
option( WITH_AKODE "Enable akode-engine support" OFF )
option( WITH_IPOD "Enable iPod support from libgpod" OFF )
option( WITH_IFP "Enable ifp support" OFF )
option( WITH_NJB "Enable njb support" OFF )
option( WITH_MTP "Enable mtp support" OFF )
option( WITH_RIOKARMA "Enable riokarma support" OFF )
option( WITH_DAAP "Enable daap support" OFF )
option( WITH_MP4V2 "Enable mp4v2 support" OFF )
option( WITH_INOTIFY "Enable inotify support" OFF )
##### user requested modules ####################

61
ConfigureChecks.cmake

@ -21,7 +21,25 @@ check_type_size( "long" SIZEOF_LONG BUILTIN_TYPES_ONLY )
check_include_file( stdint.h HAVE_STDINT_H )
check_include_file( systems.h HAVE_SYSTEMS_H )
check_include_file( linux/inotify.h HAVE_INOTIFY )
##### check for inotify ###########################
if( WITH_INOTIFY )
check_include_file( "inotify.h" INOTIFY_FOUND )
check_include_file( "sys/inotify.h" INOTIFY_SYS_FOUND )
if( NOT INOTIFY_FOUND )
if( NOT INOTIFY_SYS_FOUND )
message(FATAL_ERROR "\ninotify support was requested, but inotify was not found on your system" )
endif( NOT INOTIFY_SYS_FOUND )
endif( NOT INOTIFY_FOUND )
if( INOTIFY_FOUND )
set( HAVE_INOTIFY 1 )
endif( INOTIFY_FOUND )
if( INOTIFY_SYS_FOUND )
set( HAVE_INOTIFY 1 )
set( HAVE_SYS_INOTIFY 1 )
endif( INOTIFY_SYS_FOUND )
endif( )
check_function_exists( statvfs HAVE_STATVFS )
@ -88,7 +106,12 @@ if( WITH_LIBVISUAL )
pkg_search_module( SDL sdl )
if( NOT SDL_FOUND )
tde_message_fatal( "SDL are required, but not found on your system" )
check_include_file( SDL/SDL.h HAVE_SDL_H )
if( NOT HAVE_SDL_H )
tde_message_fatal( "SDL are required, but not found on your system" )
endif ( )
set ( SDL_INCLUDE_DIRS /usr/include/SDL )
set ( SDL_LIBRARIES SDL pthread )
endif( )
pkg_search_module( LIBVISUAL libvisual-0.4 )
@ -116,6 +139,18 @@ if( WITH_XINE )
endif( )
endif( )
# akode-engine
if( WITH_AKODE )
pkg_search_module( AKODE akode )
if( AKODE_FOUND )
if( ${AKODE_VERSION} VERSION_LESS "2.0.0" )
tde_message_fatal( "your akode version is too old; at least 2.0.0 is required" )
endif( )
else( )
tde_message_fatal( "akode is requested, but was not found on your system" )
endif( )
endif( )
# iPod
if( WITH_IPOD )
@ -163,7 +198,7 @@ if( WITH_KONQSIDEBAR )
set( CMAKE_REQUIRED_DEFINITIONS ${TQT_CFLAGS_OTHER} )
set( CMAKE_REQUIRED_INCLUDES ${TDE_INCLUDE_DIR};${TQT_INCLUDE_DIRS};${CMAKE_INCLUDE_PATH} )
set( CMAKE_REQUIRED_FLAGS "-include tqt.h" )
set( CMAKE_REQUIRED_LIBRARIES -L${TQT_LIBRARY_DIRS} ${TQT_LIBRARIES} )
set( CMAKE_REQUIRED_LIBRARIES -L${TQT_LIBRARY_DIRS} -L${QT_LIBRARY_DIRS} ${TQT_LIBRARIES} )
check_cxx_source_compiles("
#include <konqsidebarplugin.h>
int main(int, char**) { return 0; } "
@ -173,3 +208,23 @@ if( WITH_KONQSIDEBAR )
tde_message_fatal( "konqsidebarplugin.h are requested, but not found on your system" )
endif( )
endif( )
##### check for mp4v2 ###########################
if( WITH_MP4V2 )
check_include_file( "mp4v2/mp4v2.h" MP4V2_H_FOUND )
if( MP4V2_H_FOUND )
set( HAVE_MP4V2_H 1)
else( MP4V2_H_FOUND )
check_include_file( "mp4.h" MP4_H_FOUND )
if( MP4_H_FOUND )
set( HAVE_MP4_H 1)
endif( MP4_H_FOUND )
endif( MP4V2_H_FOUND )
if( HAVE_MP4V2_H OR HAVE_MP4_H )
set( HAVE_MP4V2 1 )
else( )
tde_message_fatal( "MP4V2 support was requested, but not found on your system" )
endif( )
endif( )

11945
acinclude.m4

File diff suppressed because it is too large

881
aclocal.m4

@ -1,881 +0,0 @@
# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008 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.
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(AC_AUTOCONF_VERSION, [2.61],,
[m4_warning([this file was generated for autoconf 2.61.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
# Copyright (C) 2002, 2003, 2005, 2006, 2007 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.
# 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.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.10.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
# _AM_AUTOCONF_VERSION(VERSION)
# -----------------------------
# aclocal traces this macro to find the Autoconf version.
# This is a private macro too. Using m4_define simplifies
# the logic in aclocal, which can simply ignore this definition.
m4_define([_AM_AUTOCONF_VERSION], [])
# AM_SET_CURRENT_AUTOMAKE_VERSION
# -------------------------------
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.10.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
# Copyright (C) 2001, 2003, 2005 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.
# 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.
AC_DEFUN([AM_AUX_DIR_EXPAND],
[dnl Rely on autoconf to set up CDPATH properly.
AC_PREREQ([2.50])dnl
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
])
# AM_CONDITIONAL -*- Autoconf -*-
# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
# 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.
# serial 8
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
# Define a conditional.
AC_DEFUN([AM_CONDITIONAL],
[AC_PREREQ(2.52)dnl
ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
AC_SUBST([$1_TRUE])dnl
AC_SUBST([$1_FALSE])dnl
_AM_SUBST_NOTMAKE([$1_TRUE])dnl
_AM_SUBST_NOTMAKE([$1_FALSE])dnl
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])])
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
# 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.
# serial 9
# 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], UPC, [depcc="$UPC" am_compiler_list=],
[$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
# Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
# Solaris 8's {/usr,}/bin/sh.
touch 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/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
# that says an option was ignored or not supported.
# When given -MP, icc 7.0 and 7.1 complain thusly:
# icc: Command line warning: ignoring option '-M'; no argument required
# The diagnosis changed in icc 8.0:
# icc: Command line remark: option '-MP' not supported
if (grep 'ignoring option' conftest.err ||
grep 'not supported' 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 build
--enable-dependency-tracking do not reject slow dependency extractors])
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
AC_SUBST([AMDEPBACKSLASH])dnl
_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
])
# Generate code to set up dependency tracking. -*- Autoconf -*-
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
# 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.
#serial 3
# _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.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
dirpart=`AS_DIRNAME("$mf")`
else
continue
fi
# Extract the definition of DEPDIR, am__include, and am__quote
# from the Makefile without running `make'.
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
am__include=`sed -n 's/^am__include = //p' < "$mf"`
test -z "am__include" && continue
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
# When using ansi2knr, U may be empty or an underscore; expand it
U=`sed -n 's/^U = //p' < "$mf"`
# Find all dependency output files, they are included files with
# $(DEPDIR) in their names. 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 "
s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/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"])
])
# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
# 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.
# serial 8
# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2008 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.
# serial 13
# 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.
# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
# AM_INIT_AUTOMAKE([OPTIONS])
# -----------------------------------------------
# The call with PACKAGE and VERSION arguments is the old style
# call (pre autoconf-2.50), which is being phased out. PACKAGE
# and VERSION should now be passed to AC_INIT and removed from
# the call to AM_INIT_AUTOMAKE.
# We support both call styles for the transition. After
# the next Automake release, Autoconf can make the AC_INIT
# arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
[AC_PREREQ([2.60])dnl
dnl Autoconf wants to disallow AM_ names. We explicitly allow
dnl the ones we care about.
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
AC_REQUIRE([AC_PROG_INSTALL])dnl
if test "`cd $srcdir && pwd`" != "`pwd`"; then
# Use -I$(srcdir) only when $(srcdir) != ., so that make's output
# is not polluted with repeated "-I."
AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
fi
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
dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
[m4_fatal([AC_INIT should be called with package and version arguments])])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_PROG_INSTALL_SH
AM_PROG_INSTALL_STRIP
AC_REQUIRE([AM_PROG_MKDIR_P])dnl
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
[_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
[_AM_PROG_TAR([v7])])])
_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
AC_PROVIDE_IFELSE([AC_PROG_OBJC],
[_AM_DEPENDENCIES(OBJC)],
[define([AC_PROG_OBJC],
defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])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_arg=$1
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
$_am_arg | $_am_arg:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001, 2003, 2005 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.
# AM_PROG_INSTALL_SH
# ------------------
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
AC_SUBST(install_sh)])
# Copyright (C) 2003, 2005 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.
# serial 2
# 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])])
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001, 2002, 2003, 2005 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.
# serial 3
# 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
])
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
# 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.
# serial 5
# 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
AC_REQUIRE_AUX_FILE([missing])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
])
# Copyright (C) 2003, 2004, 2005, 2006 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.
# AM_PROG_MKDIR_P
# ---------------
# Check for `mkdir -p'.
AC_DEFUN([AM_PROG_MKDIR_P],
[AC_PREREQ([2.60])dnl
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
dnl while keeping a definition of mkdir_p for backward compatibility.
dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
dnl Makefile.ins that do not define MKDIR_P, so we do our own
dnl adjustment using top_builddir (which is defined more often than
dnl MKDIR_P).
AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
case $mkdir_p in
[[\\/$]]* | ?:[[\\/]]*) ;;
*/*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
esac
])
# Helper functions for option handling. -*- Autoconf -*-
# Copyright (C) 2001, 2002, 2003, 2005 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.
# serial 3
# _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. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
# 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.
# serial 4
# 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)])
# Copyright (C) 2001, 2003, 2005 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.
# AM_PROG_INSTALL_STRIP
# ---------------------
# 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="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
# Copyright (C) 2006 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.
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
# Check how to create a tarball. -*- Autoconf -*-
# Copyright (C) 2004, 2005 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.
# serial 2
# _AM_PROG_TAR(FORMAT)
# --------------------
# Check how to create a tarball in format FORMAT.
# FORMAT should be one of `v7', `ustar', or `pax'.
#
# Substitute a variable $(am__tar) that is a command
# writing to stdout a FORMAT-tarball containing the directory
# $tardir.
# tardir=directory && $(am__tar) > result.tar
#
# Substitute a variable $(am__untar) that extract such
# a tarball read from stdin.
# $(am__untar) < result.tar
AC_DEFUN([_AM_PROG_TAR],
[# Always define AMTAR for backward compatibility.
AM_MISSING_PROG([AMTAR], [tar])
m4_if([$1], [v7],
[am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
[m4_case([$1], [ustar],, [pax],,
[m4_fatal([Unknown tar format])])
AC_MSG_CHECKING([how to create a $1 tar archive])
# Loop over all known methods to create a tar archive until one works.
_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
_am_tools=${am_cv_prog_tar_$1-$_am_tools}
# Do not fold the above two line into one, because Tru64 sh and
# Solaris sh will not grok spaces in the rhs of `-'.
for _am_tool in $_am_tools
do
case $_am_tool in
gnutar)
for _am_tar in tar gnutar gtar;
do
AM_RUN_LOG([$_am_tar --version]) && break
done
am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
am__untar="$_am_tar -xf -"
;;
plaintar)
# Must skip GNU tar: if it does not support --format= it doesn't create
# ustar tarball either.
(tar --version) >/dev/null 2>&1 && continue
am__tar='tar chf - "$$tardir"'
am__tar_='tar chf - "$tardir"'
am__untar='tar xf -'
;;
pax)
am__tar='pax -L -x $1 -w "$$tardir"'
am__tar_='pax -L -x $1 -w "$tardir"'
am__untar='pax -r'
;;
cpio)
am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
am__untar='cpio -i -H $1 -d'
;;
none)
am__tar=false
am__tar_=false
am__untar=false
;;
esac
# If the value was cached, stop now. We just wanted to have am__tar
# and am__untar set.
test -n "${am_cv_prog_tar_$1}" && break
# tar/untar a dummy directory, and stop if the command works
rm -rf conftest.dir
mkdir conftest.dir
echo GrepMe > conftest.dir/file
AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
rm -rf conftest.dir
if test -s conftest.tar; then
AM_RUN_LOG([$am__untar <conftest.tar])
grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
fi
done
rm -rf conftest.dir
AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
AC_MSG_RESULT([$am_cv_prog_tar_$1])])
AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
m4_include([acinclude.m4])

1
admin

@ -0,0 +1 @@
Subproject commit 5bf424d9d8a3a8c3a894d6540ae164a42d2c25a5

71
amarok/configure.in.in

@ -995,15 +995,29 @@ if test "$have_mp4v2" != "no"; then
ac_cppflags_save=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I."
AC_CHECK_HEADERS(systems.h)
AC_CHECK_HEADERS([mp4.h], [have_mp4_h=yes], [],
AC_CHECK_HEADERS([mp4v2/mp4v2.h], [have_mp4v2_h=yes], [],
[#ifdef HAVE_SYSTEMS_H
# include <systems.h>
#endif
])
if test "$have_mp4v2_h" = "yes"; then
AC_DEFINE(HAVE_MP4V2_H, 1, [have mp4v2 h])
else
AC_CHECK_HEADERS([mp4.h], [have_mp4_h=yes], [],
[#ifdef HAVE_SYSTEMS_H
# include <systems.h>
#endif
])
if test "$have_mp4_h" = "yes"; then
AC_DEFINE(HAVE_MP4_H, 1, [have mp4 h])
fi
fi
AC_CHECK_LIB( mp4v2, MP4Read, have_mp4v2=yes, have_mp4v2=no )
if test "$have_mp4v2_h" = "yes" -o "$have_mp4_h" = "yes"; then
AC_CHECK_LIB( mp4v2, MP4Read, have_mp4v2=yes, have_mp4v2=no )
fi
if test "$have_mp4v2" = "yes" -a "$have_mp4_h" = "yes"; then
if test "$have_mp4v2" = "yes"; then
AC_DEFINE(HAVE_MP4V2, 1, [have mp4v2])
MP4V2_INCLUDES="-I$mp4v2_dir/include"
MP4V2_LIBS="-L$mp4v2_dir/lib -lmp4v2"
@ -1100,15 +1114,54 @@ AC_CHECK_TYPES([uint8_t, u_int8_t, uint16_t, u_int16_t, uint32_t, u_int32_t, uin
AC_PATH_PROG(RUBY, ruby, no)
ruby_includes=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["archdir"] )'`]
ruby_ldflags=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["LIBRUBYARG_SHARED"] )'`]
if test -n "$PKG_CONFIG"; then
RUBY_VERSION=`$PKG_CONFIG ruby --modversion 2>/dev/null`
if test -n "$RUBY_VERSION"; then
RUBY_CFLAGS=`$PKG_CONFIG ruby --cflags`
fi
if test -z "$RUBY_VERSION"; then
RUBY_VERSION=`$PKG_CONFIG ruby-1.9 --modversion 2>/dev/null`
if test -n "$RUBY_VERSION"; then
RUBY_CFLAGS=`$PKG_CONFIG ruby-1.9 --cflags`
fi
fi
if test -z "$RUBY_VERSION"; then
# pkgconfig file does not exist but might be 1.9.1: RUBY_VERSION defined in ruby/version.h
if test -n "$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubyhdrdir"@:>@)'"; then
# rubyhdrdir parameter works only in >=1.9.1; this is 1.9.1
RUBY_MAJOR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"['MAJOR']"@:>@)'`
RUBY_MINOR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"['MINOR']"@:>@)'`
RUBY_TEENY=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"['TEENY']"@:>@)'`
if test "$RUBY_MAJOR" == "1" && test "$RUBY_MINOR" == "9"; then
RUBY_VERSION="$RUBY_MAJOR.$RUBY_MINOR.$RUBY_TEENY"
RUBY_CFLAGS="-I`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubyhdrdir"@:>@)'`"
RUBY_CFLAGS="$RUBY_CFLAGS/`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"arch"@:>@)'` $RUBY_CFLAGS"
fi
fi
fi
if test -n "$RUBY_VERSION"; then
RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"archdir"@:>@)'`
RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitearchdir"@:>@)'`
RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitelibdir"@:>@)'`
RUBY_RUBYLIBDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubylibdir"@:>@)'`
RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"libdir"@:>@)'`
RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x])
fi
fi
if test -z "$RUBY_VERSION"; then
ruby_includes=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["archdir"] )'`]
ruby_ldflags=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["LIBRUBYARG_SHARED"] )'`]
RUBY_CFLAGS="-I$ruby_includes"
RUBY_LIBRUBYARG="$ruby_ldflags"
fi
AC_SUBST(ruby_includes)
AC_SUBST(ruby_ldflags)
AC_SUBST(RUBY_CFLAGS)
AC_SUBST(RUBY_LIBRUBYARG)
OLDCFLAGS="$CFLAGS"
CFLAGS="-I$ruby_includes -Wall"
CFLAGS="$RUBY_CFLAGS -Wall"
OLDCPPFLAGS="$CPPFLAGS"
CPPFLAGS="-I$ruby_includes" #no I don't know why CPPFLAGS is used
CPPFLAGS="$RUBY_CFLAGS" #no I don't know why CPPFLAGS is used
AC_CHECK_HEADERS([ruby.h], [have_ruby_h=yes], [have_ruby_h=no]) #used in ruby check below
CFLAGS="$OLDCFLAGS"
CPPFLAGS="$OLDCPPFLAGS"

36
amarok/src/Options1.ui

@ -74,7 +74,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@ -90,7 +90,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>16</width>
<height>21</height>
@ -132,7 +132,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@ -188,7 +188,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
@ -199,7 +199,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@ -209,7 +209,7 @@
<property name="name">
<cstring>textLabel1_2</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
@ -234,7 +234,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
@ -254,7 +254,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>50</width>
<height>21</height>
@ -265,7 +265,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@ -278,7 +278,7 @@
<property name="enabled">
<bool>true</bool>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
@ -303,7 +303,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
@ -323,7 +323,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>50</width>
<height>21</height>
@ -443,7 +443,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8_2_2</cstring>
<cstring>layout8_2_2</cstring>
</property>
<hbox>
<property name="name">
@ -459,7 +459,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>16</width>
<height>21</height>
@ -516,7 +516,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>130</width>
<height>20</height>
@ -527,7 +527,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7_2_2</cstring>
<cstring>layout7_2_2</cstring>
</property>