Merge pull request #473 from Montellese/onplaybackspeedchanged
authorSascha Montellese <sascha.montellese@gmail.com>
Thu, 13 Oct 2011 10:47:54 +0000 (03:47 -0700)
committerSascha Montellese <sascha.montellese@gmail.com>
Thu, 13 Oct 2011 10:47:54 +0000 (03:47 -0700)
[dvdplayer] only call IPlayerCallback::OnPlayBackSpeedChanged if the speed has actually changed

262 files changed:
.gitignore
.gitmodules [new file with mode: 0644]
Makefile.in
README.ios
XBMC-ATV2.xcodeproj/project.pbxproj
XBMC-IOS.xcodeproj/project.pbxproj
XBMC.xcodeproj/project.pbxproj
addons/metadata.albums.allmusic.com/resources/language/Slovenian/strings.xml [new file with mode: 0644]
addons/metadata.artists.allmusic.com/resources/language/Slovenian/strings.xml [new file with mode: 0644]
addons/metadata.mtv.com/addon.xml [deleted file]
addons/metadata.mtv.com/icon.png [deleted file]
addons/metadata.mtv.com/mtv.xml [deleted file]
addons/metadata.themoviedb.org/resources/language/Slovenian/strings.xml [new file with mode: 0644]
addons/metadata.tvdb.com/resources/language/Slovenian/strings.xml [new file with mode: 0644]
addons/metadata.yahoomusic.com/addon.xml [new file with mode: 0644]
addons/metadata.yahoomusic.com/icon.png [new file with mode: 0644]
addons/metadata.yahoomusic.com/resources/language/Dutch/strings.xml [new file with mode: 0644]
addons/metadata.yahoomusic.com/resources/language/English/strings.xml [new file with mode: 0644]
addons/metadata.yahoomusic.com/resources/language/Hungarian/strings.xml [new file with mode: 0644]
addons/metadata.yahoomusic.com/resources/language/Korean/strings.xml [new file with mode: 0644]
addons/metadata.yahoomusic.com/resources/language/Polish/strings.xml [new file with mode: 0644]
addons/metadata.yahoomusic.com/resources/language/Portuguese/strings.xml [new file with mode: 0644]
addons/metadata.yahoomusic.com/resources/language/Slovenian/strings.xml [new file with mode: 0644]
addons/metadata.yahoomusic.com/resources/settings.xml [new file with mode: 0644]
addons/metadata.yahoomusic.com/yahoomusic.xml [new file with mode: 0644]
addons/screensaver.xbmc.builtin.dim/resources/language/Slovenian/strings.xml [new file with mode: 0644]
addons/screensaver.xbmc.builtin.dim/resources/settings.xml
addons/screensaver.xbmc.builtin.slideshow/resources/language/Slovenian/strings.xml [new file with mode: 0644]
addons/screensaver.xbmc.builtin.slideshow/resources/settings.xml
addons/skin.confluence/720p/DialogPeripheralManager.xml
addons/skin.confluence/720p/DialogPeripheralSettings.xml
addons/skin.confluence/720p/Home.xml
addons/skin.confluence/720p/includes.xml
addons/skin.confluence/language/Turkish/strings.xml
addons/skin.touched [new submodule]
addons/skin.touched/4x3Hirez/AddonBrowser.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogAddonInfo.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogAddonSettings.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogAlbumInfo.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogBusy.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogButtonMenu.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogContentSettings.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogContextMenu.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogFavourites.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogFileStacking.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogGamepad.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogKaiToast.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogKaraokeSongSelector.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogKaraokeSongSelectorLarge.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogKeyboard.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogMediaSource.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogMusicScan.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogMuteBug.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogNetworkSetup.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogNumeric.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogOK.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogPictureInfo.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogProgress.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogSeekBar.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogSelect.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogSongInfo.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogTextViewer.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogVideoInfo.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogVideoScan.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogVolumeBar.xml [deleted file]
addons/skin.touched/4x3Hirez/DialogYesNo.xml [deleted file]
addons/skin.touched/4x3Hirez/FileBrowser.xml [deleted file]
addons/skin.touched/4x3Hirez/FileManager.xml [deleted file]
addons/skin.touched/4x3Hirez/Font.xml [deleted file]
addons/skin.touched/4x3Hirez/Home.xml [deleted file]
addons/skin.touched/4x3Hirez/IncludesCodecFlagging.xml [deleted file]
addons/skin.touched/4x3Hirez/IncludesKeypad.xml [deleted file]
addons/skin.touched/4x3Hirez/IncludesPlayerControls.xml [deleted file]
addons/skin.touched/4x3Hirez/LockSettings.xml [deleted file]
addons/skin.touched/4x3Hirez/LoginScreen.xml [deleted file]
addons/skin.touched/4x3Hirez/MusicKaraokeLyrics.xml [deleted file]
addons/skin.touched/4x3Hirez/MusicOSD.xml [deleted file]
addons/skin.touched/4x3Hirez/MusicOverlay.xml [deleted file]
addons/skin.touched/4x3Hirez/MusicVisualisation.xml [deleted file]
addons/skin.touched/4x3Hirez/MyMusicNav.xml [deleted file]
addons/skin.touched/4x3Hirez/MyMusicPlaylist.xml [deleted file]
addons/skin.touched/4x3Hirez/MyMusicPlaylistEditor.xml [deleted file]
addons/skin.touched/4x3Hirez/MyMusicSongs.xml [deleted file]
addons/skin.touched/4x3Hirez/MyPics.xml [deleted file]
addons/skin.touched/4x3Hirez/MyPrograms.xml [deleted file]
addons/skin.touched/4x3Hirez/MyVideoNav.xml [deleted file]
addons/skin.touched/4x3Hirez/MyVideoPlaylist.xml [deleted file]
addons/skin.touched/4x3Hirez/MyWeather.xml [deleted file]
addons/skin.touched/4x3Hirez/PlayerControls.xml [deleted file]
addons/skin.touched/4x3Hirez/Pointer.xml [deleted file]
addons/skin.touched/4x3Hirez/ProfileSettings.xml [deleted file]
addons/skin.touched/4x3Hirez/Settings.xml [deleted file]
addons/skin.touched/4x3Hirez/SettingsCategory.xml [deleted file]
addons/skin.touched/4x3Hirez/SettingsProfile.xml [deleted file]
addons/skin.touched/4x3Hirez/SettingsScreenCalibration.xml [deleted file]
addons/skin.touched/4x3Hirez/SettingsSystemInfo.xml [deleted file]
addons/skin.touched/4x3Hirez/SlideShow.xml [deleted file]
addons/skin.touched/4x3Hirez/SmartPlaylistEditor.xml [deleted file]
addons/skin.touched/4x3Hirez/SmartPlaylistRule.xml [deleted file]
addons/skin.touched/4x3Hirez/Startup.xml [deleted file]
addons/skin.touched/4x3Hirez/VideoFullScreen.xml [deleted file]
addons/skin.touched/4x3Hirez/VideoOSD.xml [deleted file]
addons/skin.touched/4x3Hirez/VideoOSDBookmarks.xml [deleted file]
addons/skin.touched/4x3Hirez/VideoOSDSettings.xml [deleted file]
addons/skin.touched/4x3Hirez/VideoOverlay.xml [deleted file]
addons/skin.touched/4x3Hirez/ViewsAddonBrowser.xml [deleted file]
addons/skin.touched/4x3Hirez/ViewsCommon.xml [deleted file]
addons/skin.touched/4x3Hirez/ViewsMetaData.xml [deleted file]
addons/skin.touched/4x3Hirez/VisualisationPresetList.xml [deleted file]
addons/skin.touched/4x3Hirez/custom_skinsettings_1113.xml [deleted file]
addons/skin.touched/4x3Hirez/custom_volume_1112.xml [deleted file]
addons/skin.touched/4x3Hirez/defaults.xml [deleted file]
addons/skin.touched/4x3Hirez/includes.xml [deleted file]
addons/skin.touched/4x3Hirez/script-XBMC-Subtitles-main.xml [deleted file]
addons/skin.touched/addon.xml [deleted file]
addons/skin.touched/background/background.png [deleted file]
addons/skin.touched/background/movies.png [deleted file]
addons/skin.touched/background/music.png [deleted file]
addons/skin.touched/background/pictures.png [deleted file]
addons/skin.touched/background/programs.png [deleted file]
addons/skin.touched/background/tvshows.png [deleted file]
addons/skin.touched/background/videos.png [deleted file]
addons/skin.touched/colors/defaults.xml [deleted file]
addons/skin.touched/fonts/DejaVuSans-Bold-Caps.ttf [deleted file]
addons/skin.touched/fonts/DejaVuSans-Bold.ttf [deleted file]
addons/skin.touched/icon.png [deleted file]
addons/skin.touched/language/Chinese (Simple)/strings.xml [deleted file]
addons/skin.touched/language/Dutch/strings.xml [deleted file]
addons/skin.touched/language/English/strings.xml [deleted file]
addons/skin.touched/language/Finnish/strings.xml [deleted file]
addons/skin.touched/language/Korean/strings.xml [deleted file]
addons/skin.touched/media/Textures.xbt [deleted file]
addons/visualization.dxspectrum/resources/language/Slovenian/strings.xml [new file with mode: 0644]
addons/visualization.glspectrum/resources/language/Slovenian/strings.xml [new file with mode: 0644]
addons/visualization.milkdrop/resources/language/Slovenian/strings.xml [new file with mode: 0644]
addons/visualization.projectm/resources/language/Slovenian/strings.xml [new file with mode: 0644]
addons/webinterface.default/js/MediaLibrary.js
bootstrap
configure.in
language/Chinese (Simple)/strings.xml
language/English/strings.xml
language/Slovenian/strings.xml
language/Turkish/strings.xml
lib/DllLibbluray.h [new file with mode: 0644]
lib/UnrarXLib/extract.cpp
lib/addons/script.module.pil/Imaging-1.1.7-access.patch [new file with mode: 0644]
lib/addons/script.module.pil/Imaging-1.1.7-crosscompiling-0.1.patch [new file with mode: 0644]
lib/addons/script.module.pil/Imaging-1.1.7-setuptools-0.1.patch [new file with mode: 0644]
lib/addons/script.module.pil/Makefile.in
lib/ffmpeg/libavcodec/dvdsubdec.c
lib/ffmpeg/patches/0012-dvdsub-hacks.patch
lib/libcec/Makefile.in [new file with mode: 0644]
lib/libid3tag/libid3tag/Makefile.am
project/BuildDependencies/scripts/libbluray_d.bat
project/BuildDependencies/scripts/libbluray_d.txt
project/BuildDependencies/scripts/libcec_d.bat
project/BuildDependencies/scripts/libcec_d.txt
project/BuildDependencies/scripts/libplist_d.bat
project/BuildDependencies/scripts/libplist_d.txt
project/VS2010Express/XBMC.vcxproj
project/VS2010Express/XBMC.vcxproj.filters
system/keymaps/keyboard.xml
tools/darwin/depends/Makefile.in
tools/darwin/depends/distribute/Makefile [new file with mode: 0644]
tools/darwin/depends/distutilscross/Makefile [new file with mode: 0644]
tools/darwin/depends/libcec/Makefile [new file with mode: 0644]
tools/darwin/depends/libusb/Makefile [new file with mode: 0644]
tools/darwin/depends/openssl/Makefile
tools/darwin/depends/python26/Makefile.ios
tools/darwin/depends/python26/Makefile.osx
tools/darwin/depends/sed/Makefile [new file with mode: 0644]
xbmc/Application.cpp
xbmc/GUIInfoManager.cpp
xbmc/GUIInfoManager.h
xbmc/URL.cpp
xbmc/Util.cpp
xbmc/addons/GUIWindowAddonBrowser.cpp
xbmc/addons/Repository.cpp
xbmc/cores/AudioRenderers/IOSAudioRenderer.cpp
xbmc/cores/AudioRenderers/IOSAudioRenderer.h
xbmc/cores/VideoRenderers/OverlayRendererDX.cpp
xbmc/cores/VideoRenderers/OverlayRendererGL.cpp
xbmc/cores/VideoRenderers/OverlayRendererUtil.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamBluray.cpp
xbmc/cores/dvdplayer/DVDOverlayRenderer.cpp
xbmc/cores/dvdplayer/DVDPlayer.cpp
xbmc/cores/dvdplayer/DVDPlayer.h
xbmc/cores/paplayer/CodecFactory.cpp
xbmc/dialogs/GUIDialogMediaSource.cpp
xbmc/filesystem/AFPDirectory.cpp
xbmc/filesystem/File.cpp
xbmc/filesystem/FileAFP.cpp
xbmc/filesystem/FileFactory.cpp
xbmc/filesystem/FileUPnP.cpp [new file with mode: 0644]
xbmc/filesystem/FileUPnP.h [new file with mode: 0644]
xbmc/filesystem/HTTPDirectory.cpp
xbmc/filesystem/IFile.h
xbmc/filesystem/Makefile.in
xbmc/guilib/Texture.cpp
xbmc/guilib/TextureGL.cpp
xbmc/input/ButtonTranslator.cpp
xbmc/interfaces/json-rpc/ApplicationOperations.cpp
xbmc/interfaces/json-rpc/ApplicationOperations.h
xbmc/interfaces/json-rpc/AudioLibrary.cpp
xbmc/interfaces/json-rpc/FileItemHandler.cpp
xbmc/interfaces/json-rpc/FileOperations.cpp
xbmc/interfaces/json-rpc/JSONRPC.cpp
xbmc/interfaces/json-rpc/JSONServiceDescription.cpp
xbmc/interfaces/json-rpc/JSONServiceDescription.h
xbmc/interfaces/json-rpc/PlayerOperations.cpp
xbmc/interfaces/json-rpc/PlayerOperations.h
xbmc/interfaces/json-rpc/ServiceDescription.h
xbmc/interfaces/json-rpc/VideoLibrary.cpp
xbmc/interfaces/json-rpc/methods.json
xbmc/interfaces/json-rpc/types.json
xbmc/music/windows/GUIWindowVisualisation.cpp
xbmc/network/AirPlayServer.cpp
xbmc/network/AirTunesServer.cpp
xbmc/network/DllLibPlist.h
xbmc/network/TCPServer.cpp
xbmc/network/TCPServer.h
xbmc/osx/HotKeyController.m
xbmc/peripherals/Peripherals.cpp
xbmc/peripherals/bus/Makefile.in
xbmc/peripherals/bus/PeripheralBus.cpp
xbmc/peripherals/bus/linux/PeripheralBusUSBLibUdev.cpp
xbmc/peripherals/bus/osx/PeripheralBusUSB.cpp
xbmc/peripherals/bus/win32/PeripheralBusUSB.cpp
xbmc/peripherals/devices/Makefile.in
xbmc/peripherals/devices/Peripheral.h
xbmc/peripherals/devices/PeripheralCecAdapter.cpp
xbmc/peripherals/devices/PeripheralCecAdapter.h
xbmc/settings/AdvancedSettings.cpp
xbmc/settings/AdvancedSettings.h
xbmc/settings/GUISettings.cpp
xbmc/settings/GUIWindowSettingsCategory.cpp
xbmc/settings/Settings.cpp
xbmc/settings/Settings.h
xbmc/storage/linux/DeviceKitDisksProvider.cpp
xbmc/storage/linux/UDisksProvider.cpp
xbmc/system.h
xbmc/utils/URIUtils.cpp
xbmc/utils/URIUtils.h
xbmc/video/VideoInfoScanner.cpp
xbmc/video/windows/GUIWindowVideoNav.cpp
xbmc/visualizations/Goom/goom2k4-0/Makefile.in [deleted file]
xbmc/visualizations/Goom/goom2k4-0/aclocal.m4 [deleted file]
xbmc/visualizations/Goom/goom2k4-0/config.guess [deleted file]
xbmc/visualizations/Goom/goom2k4-0/config.sub [deleted file]
xbmc/visualizations/Goom/goom2k4-0/configure [deleted file]
xbmc/visualizations/Goom/goom2k4-0/sdl-goom/Makefile.in [deleted file]
xbmc/visualizations/Goom/goom2k4-0/src/Makefile.in [deleted file]
xbmc/visualizations/Goom/goom2k4-0/xmms-goom/Makefile.in [deleted file]
xbmc/visualizations/Goom/goom2k4-0/ylwrap [deleted file]
xbmc/visualizations/Goom/visualization.goom/addon.xml
xbmc/visualizations/Goom/visualization.goom/default.tbn [deleted file]
xbmc/visualizations/Goom/visualization.goom/description.xml [deleted file]
xbmc/visualizations/Goom/visualization.goom/icon.png [new file with mode: 0644]
xbmc/windows/GUIMediaWindow.cpp
xbmc/windows/GUIWindowSystemInfo.cpp

index a425033..d7c757e 100644 (file)
@@ -175,6 +175,11 @@ lib/cmyth/Makefile
 /lib/cpluff/libcpluff/win32/Debug
 /lib/cpluff/libcpluff/win32/Release
 
+# /lib/libcec
+/lib/libcec/Makefile
+/lib/libcec/include
+/lib/libcec/libcec
+
 # /lib/enca
 /lib/enca/libenca_win32/Debug
 /lib/enca/libenca_win32/Release
@@ -230,20 +235,6 @@ lib/cmyth/Makefile
 /lib/libass/m4/ltversion.m4
 /lib/libass/m4/lt~obsolete.m4
 
-# /lib/libcec
-/lib/libcec/Makefile
-/lib/libcec/Makefile.in
-/lib/libcec/aclocal.m4
-/lib/libcec/config.guess
-/lib/libcec/config.sub
-/lib/libcec/configure
-/lib/libcec/depcomp
-/lib/libcec/install-sh
-/lib/libcec/ltmain.sh
-/lib/libcec/missing
-/lib/libcec/src/lib/Makefile.in
-/lib/libcec/src/testclient/Makefile.in
-
 # /lib/libiconv
 /lib/libiconv/libiconv_win32/Debug
 /lib/libiconv/libiconv_win32/Release
@@ -372,6 +363,8 @@ lib/cmyth/Makefile
 /system/libsamplerate-0.dll
 /system/libnfs.dll
 /system/dnssd.dll
+/system/libcec.dll
+/system/pthreadVC2.dll
 
 # /system/cdrip
 /system/cdrip/lame_enc.dll
@@ -1193,6 +1186,19 @@ lib/cmyth/Makefile
 /xbmc/visualizations/DirectXSpectrum/Release (DirectX)
 
 /xbmc/visualizations/Goom/Makefile
+/xbmc/visualizations/Goom/goom2k4-0/aclocal.m4
+/xbmc/visualizations/Goom/goom2k4-0/configure
+/xbmc/visualizations/Goom/goom2k4-0/Makefile.in
+/xbmc/visualizations/Goom/goom2k4-0/config.guess
+/xbmc/visualizations/Goom/goom2k4-0/config.sub
+/xbmc/visualizations/Goom/goom2k4-0/depcomp
+/xbmc/visualizations/Goom/goom2k4-0/install-sh
+/xbmc/visualizations/Goom/goom2k4-0/ltmain.sh
+/xbmc/visualizations/Goom/goom2k4-0/missing
+/xbmc/visualizations/Goom/goom2k4-0/sdl-goom/Makefile.in
+/xbmc/visualizations/Goom/goom2k4-0/src/Makefile.in
+/xbmc/visualizations/Goom/goom2k4-0/xmms-goom/Makefile.in
+/xbmc/visualizations/Goom/goom2k4-0/ylwrap
 
 /xbmc/visualizations/Milkdrop/Debug
 /xbmc/visualizations/Milkdrop/Release
diff --git a/.gitmodules b/.gitmodules
new file mode 100644 (file)
index 0000000..a92044b
--- /dev/null
@@ -0,0 +1,4 @@
+[submodule "touched"]
+       path = addons/skin.touched
+       url = git://github.com/xbmc/skin.touched.git
+       ignore = all
index bff37e6..8ce6b37 100644 (file)
@@ -160,9 +160,12 @@ ifneq (@DISABLE_GOOM@,1)
 endif
 
 CONFLUENCE_MEDIA=addons/skin.confluence/media
+SKIN_DIRS=$(CONFLUENCE_MEDIA)
 
-SKIN_DIRS=\
-       $(CONFLUENCE_MEDIA)
+ifeq (@USE_SKIN_TOUCHED@,1)
+TOUCHED_MEDIA=addons/skin.touched/media
+SKIN_DIRS+=$(TOUCHED_MEDIA)
+endif
 
 DIRS= $(BIN_DIRS) $(EC_DIRS) $(XBMCTEX_DIRS) $(DVDPCODECS_DIRS) $(PAPCODECS_DIRS) \
        $(LIB_DIRS) $(SS_DIRS) $(VIS_DIRS) $(SKIN_DIRS)
@@ -205,6 +208,9 @@ configure: configure.in
 ifeq (@USE_TEXTUREPACKER@,1)
 skins: tools/TexturePacker/TexturePacker force
         $(MAKE) -C $(CONFLUENCE_MEDIA)
+ifeq (@USE_SKIN_TOUCHED@,1)
+        $(MAKE) -C $(TOUCHED_MEDIA)
+endif
 else
 skins:
 endif
@@ -364,6 +370,8 @@ lib/libapetag/.libs/libapetag.a: force
        $(MAKE) -C lib/libapetag
 lib/cpluff/libcpluff/.libs/libcpluff.a: force
        $(MAKE) -C lib/cpluff/libcpluff
+lib/libcec/libcec.a: force
+       $(MAKE) -C lib/libcec libcec.a
 system/libcpluff-@ARCH@.so: lib/cpluff/libcpluff/.libs/libcpluff.a
 ifeq ($(findstring osx,@ARCH@), osx)
   ifeq (@ARCH@, arm-osx)
@@ -541,6 +549,10 @@ DYNOBJSXBMC= \
 
 LIBS += @PYTHON_LDFLAGS@
 
+ifeq ((@USE_LIBCEC@,1),(@USE_EXTERNAL_LIBCEC@,0))
+  DYNOBJSXBMC += lib/libcec/libcec.a
+endif
+
 xbmc.bin: $(OBJSXBMC) $(DYNOBJSXBMC)
 ifeq ($(findstring osx,@ARCH@), osx)
        $(CXX) $(LDFLAGS) -o xbmc.bin -Wl,-all_load,-ObjC $(DYNOBJSXBMC) $(OBJSXBMC) $(LIBS) -rdynamic
index da92c5f..aac3a73 100644 (file)
@@ -37,6 +37,8 @@ character itself should NOT be typed as part of the command.
 
  $ cd $HOME
  $ git clone git://github.com/xbmc/xbmc.git xbmc
+ $ cd xbmc
+ $ git submodule update --init addons/skin.touched
 
 -----------------------------------------------------------------------------
 3.0 Install Xcode
index 5cd7559..1077410 100644 (file)
@@ -35,6 +35,7 @@
                DF4485341400651B0069344B /* FilePipe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF4485301400651B0069344B /* FilePipe.cpp */; };
                DF4485351400651B0069344B /* PipesManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF4485321400651B0069344B /* PipesManager.cpp */; };
                DF4485381400654A0069344B /* AirTunesServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF4485361400654A0069344B /* AirTunesServer.cpp */; };
+               DF673A251443769300A5A509 /* FileUPnP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF673A231443769300A5A509 /* FileUPnP.cpp */; };
                DF98D9A81434F4B400A6EBE1 /* SkinVariable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF98D9A61434F4B400A6EBE1 /* SkinVariable.cpp */; };
                DFA6BE8713FED2A10048CC11 /* AirPlayServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFA6BE8513FED2A10048CC11 /* AirPlayServer.cpp */; };
                DFA6BE8A13FED2B40048CC11 /* HttpParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFA6BE8813FED2B40048CC11 /* HttpParser.cpp */; };
                DF4485331400651B0069344B /* PipesManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PipesManager.h; sourceTree = "<group>"; };
                DF4485361400654A0069344B /* AirTunesServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AirTunesServer.cpp; sourceTree = "<group>"; };
                DF4485371400654A0069344B /* AirTunesServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AirTunesServer.h; sourceTree = "<group>"; };
+               DF673A231443769300A5A509 /* FileUPnP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileUPnP.cpp; sourceTree = "<group>"; };
+               DF673A241443769300A5A509 /* FileUPnP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileUPnP.h; sourceTree = "<group>"; };
                DF98D9A61434F4B400A6EBE1 /* SkinVariable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SkinVariable.cpp; sourceTree = "<group>"; };
                DF98D9A71434F4B400A6EBE1 /* SkinVariable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SkinVariable.h; sourceTree = "<group>"; };
                DFA6BE8513FED2A10048CC11 /* AirPlayServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AirPlayServer.cpp; sourceTree = "<group>"; };
                                F56C73E3131EC151000AD0F6 /* FileTuxBox.h */,
                                F56C73E4131EC151000AD0F6 /* FileUDF.cpp */,
                                F56C73E5131EC151000AD0F6 /* FileUDF.h */,
+                               DF673A231443769300A5A509 /* FileUPnP.cpp */,
+                               DF673A241443769300A5A509 /* FileUPnP.h */,
                                F56C73E8131EC151000AD0F6 /* FileZip.cpp */,
                                F56C73E9131EC151000AD0F6 /* FileZip.h */,
                                F56C73EA131EC151000AD0F6 /* FTPDirectory.cpp */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/bash;
-                       shellScript = "#!/bin/bash\n\necho \"copy root files\"\n\nif [ \"$ACTION\" = build ] ; then\n\n# for external testing\nTARGET_NAME=$PRODUCT_NAME.$WRAPPER_EXTENSION\n#SRCROOT=/Users/Shared/xbmc_svn/XBMC\n#TARGET_BUILD_DIR=/Users/Shared/xbmc_svn/XBMC/build/Debug\n\n# rsync command with exclusions for items we don't want in the app package\nSYNC=\"rsync -aq --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *x86-osx.* --exclude *.zlib --exclude *.a --exclude *.pyd --exclude *x86-osx.so --exclude *powerpc-osx.so\"\n\n# rsync command for excluding pngs and jpgs as well. Note that if the skin itself is not compiled\n# using XBMCTex then excluding the pngs and jpgs will most likely make the skin unusable \n#SYNCSKIN=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll  --exclude *.DLL --exclude *linux.* --exclude *.png --exclude *.jpg --exclude *.bat\"\nSYNCSKIN=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll  --exclude *.DLL --exclude *linux.*  --exclude *.bat\"\n\n# rsync command for including everything but the skins\nADDONSYNC=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude skin.confluence --exclude screensaver.rsxs* --exclude visualization.*\"\n\n# binary name is XBMC but we build XBMC.bin so to get a clean binary each time\nmv $TARGET_BUILD_DIR/$TARGET_NAME/XBMC.bin $TARGET_BUILD_DIR/$TARGET_NAME/XBMC\n\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/language\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/sounds\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/system\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/userdata\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/tools/osx\"\n\n${SYNC} \"$SRCROOT/LICENSE.GPL\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/\"\n${SYNC} \"$SRCROOT/xbmc/osx/Credits.html\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/\"\n#${SYNC} \"$SRCROOT/tools/osx\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/tools\"\n${ADDONSYNC} \"$SRCROOT/addons\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/addons/visualization.glspectrum\"   \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/addons/visualization.waveform\"    \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/language\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/media\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNCSKIN} \"$SRCROOT/addons/skin.confluence\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/backgrounds\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/icon.png\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/sounds\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/system\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/userdata\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n\n# copy extra packages if applicable\nif [ -d \"$SRCROOT/extras/system\" ]; then\n\t${SYNC} \"$SRCROOT/extras/system/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\nfi\n\n# copy extra user packages if applicable\nif [ -d \"$SRCROOT/extras/user\" ]; then\n\tmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Resources/XBMC/extras/user\"\n\t${SYNC} \"$SRCROOT/extras/user/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/extras/user\"\nfi\n\nfi";
+                       shellScript = "#!/bin/bash\n\necho \"copy root files\"\n\nif [ \"$ACTION\" = build ] ; then\n\n# for external testing\nTARGET_NAME=$PRODUCT_NAME.$WRAPPER_EXTENSION\n#SRCROOT=/Users/Shared/xbmc_svn/XBMC\n#TARGET_BUILD_DIR=/Users/Shared/xbmc_svn/XBMC/build/Debug\n\n# rsync command with exclusions for items we don't want in the app package\nSYNC=\"rsync -aq --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *x86-osx.* --exclude *.zlib --exclude *.a --exclude *.pyd --exclude *x86-osx.so --exclude *powerpc-osx.so\"\n\n# rsync command for excluding pngs and jpgs as well. Note that if the skin itself is not compiled\n# using XBMCTex then excluding the pngs and jpgs will most likely make the skin unusable \n#SYNCSKIN=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll  --exclude *.DLL --exclude *linux.* --exclude *.png --exclude *.jpg --exclude *.bat\"\nSYNCSKIN=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll  --exclude *.DLL --exclude *linux.*  --exclude *.bat\"\n\n# rsync command for including everything but the skins\nADDONSYNC=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude skin.confluence --exclude skin.touched --exclude screensaver.rsxs* --exclude visualization.*\"\n\n# binary name is XBMC but we build XBMC.bin so to get a clean binary each time\nmv $TARGET_BUILD_DIR/$TARGET_NAME/XBMC.bin $TARGET_BUILD_DIR/$TARGET_NAME/XBMC\n\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/language\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/sounds\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/system\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/userdata\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/tools/osx\"\n\n${SYNC} \"$SRCROOT/LICENSE.GPL\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/\"\n${SYNC} \"$SRCROOT/xbmc/osx/Credits.html\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/\"\n${ADDONSYNC} \"$SRCROOT/addons\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/addons/visualization.glspectrum\"   \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/addons/visualization.waveform\"    \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/language\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/media\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNCSKIN} \"$SRCROOT/addons/skin.confluence\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/backgrounds\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/icon.png\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/sounds\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/system\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/userdata\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n\nfi";
                        showEnvVarsInLog = 0;
                };
                F589B48D128A697C00D8079E /* copy frameworks */ = {
                                F5E1132814357B6500175026 /* GUIDialogPeripheralSettings.cpp in Sources */,
                                F5E1132914357B6500175026 /* Peripherals.cpp in Sources */,
                                F5E113AD1435882400175026 /* pyrendercapture.cpp in Sources */,
+                               DF673A251443769300A5A509 /* FileUPnP.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
index bb66183..07ffbc2 100644 (file)
@@ -36,6 +36,7 @@
                DF448571140065E10069344B /* FilePipe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF44856D140065E10069344B /* FilePipe.cpp */; };
                DF448572140065E10069344B /* PipesManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF44856F140065E10069344B /* PipesManager.cpp */; };
                DF4485751400662D0069344B /* AirTunesServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF4485731400662D0069344B /* AirTunesServer.cpp */; };
+               DF6739E21443765F00A5A509 /* FileUPnP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6739E01443765F00A5A509 /* FileUPnP.cpp */; };
                DF98D9991434F49500A6EBE1 /* SkinVariable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF98D9971434F49500A6EBE1 /* SkinVariable.cpp */; };
                DFA6BE4313FECA010048CC11 /* AirPlayServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFA6BE4113FECA010048CC11 /* AirPlayServer.cpp */; };
                DFA6BE7713FED09C0048CC11 /* HttpParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFA6BE7513FED09C0048CC11 /* HttpParser.cpp */; };
                DF448570140065E10069344B /* PipesManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PipesManager.h; sourceTree = "<group>"; };
                DF4485731400662D0069344B /* AirTunesServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AirTunesServer.cpp; sourceTree = "<group>"; };
                DF4485741400662D0069344B /* AirTunesServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AirTunesServer.h; sourceTree = "<group>"; };
+               DF6739E01443765F00A5A509 /* FileUPnP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileUPnP.cpp; sourceTree = "<group>"; };
+               DF6739E11443765F00A5A509 /* FileUPnP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileUPnP.h; sourceTree = "<group>"; };
                DF98D9971434F49500A6EBE1 /* SkinVariable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SkinVariable.cpp; sourceTree = "<group>"; };
                DF98D9981434F49500A6EBE1 /* SkinVariable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SkinVariable.h; sourceTree = "<group>"; };
                DFA6BE4113FECA010048CC11 /* AirPlayServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AirPlayServer.cpp; sourceTree = "<group>"; };
                                F56C83C6131F42E8000AD0F6 /* FileTuxBox.h */,
                                F56C83C7131F42E8000AD0F6 /* FileUDF.cpp */,
                                F56C83C8131F42E8000AD0F6 /* FileUDF.h */,
+                               DF6739E01443765F00A5A509 /* FileUPnP.cpp */,
+                               DF6739E11443765F00A5A509 /* FileUPnP.h */,
                                F56C83CB131F42E8000AD0F6 /* FileZip.cpp */,
                                F56C83CC131F42E8000AD0F6 /* FileZip.h */,
                                F56C83CD131F42E8000AD0F6 /* FTPDirectory.cpp */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/bash;
-                       shellScript = "#!/bin/bash\n\necho \"copy root files\"\n\nif [ \"$ACTION\" = build ] ; then\n\n# for external testing\nTARGET_NAME=$PRODUCT_NAME.$WRAPPER_EXTENSION\n#SRCROOT=/Users/Shared/xbmc_svn/XBMC\n#TARGET_BUILD_DIR=/Users/Shared/xbmc_svn/XBMC/build/Debug\n\n# rsync command with exclusions for items we don't want in the app package\nSYNC=\"rsync -aq --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *x86-osx.so --exclude *.zlib --exclude *.a\"\n\n# rsync command for excluding pngs and jpgs as well. Note that if the skin itself is not compiled\n# using XBMCTex then excluding the pngs and jpgs will most likely make the skin unusable \n#SYNCSKIN=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll  --exclude *.DLL --exclude *linux.* --exclude *.png --exclude *.jpg --exclude *.bat\"\nSYNCSKIN=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll  --exclude *.DLL --exclude *linux.*  --exclude *.bat\"\n\n# rsync command for including everything but the skins\nADDONSYNC=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude skin.confluence --exclude screensaver.rsxs* --exclude visualization.*\"\n\n# binary name is XBMC but we build XBMC.bin so to get a clean binary each time\nmv $TARGET_BUILD_DIR/$TARGET_NAME/XBMC.bin $TARGET_BUILD_DIR/$TARGET_NAME/XBMC\n\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/language\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/sounds\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/system\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/userdata\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/tools/osx\"\n\n${SYNC} \"$SRCROOT/LICENSE.GPL\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/\"\n${SYNC} \"$SRCROOT/xbmc/osx/Credits.html\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/\"\n${ADDONSYNC} \"$SRCROOT/addons\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/addons/visualization.glspectrum\"  \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/addons/visualization.waveform\"    \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/language\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/media\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNCSKIN} \"$SRCROOT/addons/skin.touched\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/addons/skin.touched/backgrounds\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.touched\"\n${SYNC} \"$SRCROOT/addons/skin.touched/icon.png\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.touched\"\n${SYNCSKIN} \"$SRCROOT/addons/skin.confluence\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/backgrounds\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/icon.png\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/sounds\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/system\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/userdata\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n\n# copy extra packages if applicable\nif [ -d \"$SRCROOT/extras/system\" ]; then\n\t${SYNC} \"$SRCROOT/extras/system/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\nfi\n\n# copy extra user packages if applicable\nif [ -d \"$SRCROOT/extras/user\" ]; then\n\tmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Resources/XBMC/extras/user\"\n\t${SYNC} \"$SRCROOT/extras/user/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/extras/user\"\nfi\n\nfi";
+                       shellScript = "#!/bin/bash\n\necho \"copy root files\"\n\nif [ \"$ACTION\" = build ] ; then\n\n# for external testing\nTARGET_NAME=$PRODUCT_NAME.$WRAPPER_EXTENSION\n#SRCROOT=/Users/Shared/xbmc_svn/XBMC\n#TARGET_BUILD_DIR=/Users/Shared/xbmc_svn/XBMC/build/Debug\n\n# rsync command with exclusions for items we don't want in the app package\nSYNC=\"rsync -aq --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *x86-osx.so --exclude *.zlib --exclude *.a\"\n\n# rsync command for excluding pngs and jpgs as well. Note that if the skin itself is not compiled\n# using XBMCTex then excluding the pngs and jpgs will most likely make the skin unusable \n#SYNCSKIN=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll  --exclude *.DLL --exclude *linux.* --exclude *.png --exclude *.jpg --exclude *.bat\"\nSYNCSKIN=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll  --exclude *.DLL --exclude *linux.*  --exclude *.bat\"\n\n# rsync command for including everything but the skins\nADDONSYNC=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude skin.confluence --exclude skin.touched --exclude screensaver.rsxs* --exclude visualization.*\"\n\n# binary name is XBMC but we build XBMC.bin so to get a clean binary each time\nmv $TARGET_BUILD_DIR/$TARGET_NAME/XBMC.bin $TARGET_BUILD_DIR/$TARGET_NAME/XBMC\n\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/language\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/sounds\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/system\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/userdata\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/tools/osx\"\n\n${SYNC} \"$SRCROOT/LICENSE.GPL\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/\"\n${SYNC} \"$SRCROOT/xbmc/osx/Credits.html\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/\"\n${ADDONSYNC} \"$SRCROOT/addons\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/addons/visualization.glspectrum\"  \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/addons/visualization.waveform\"    \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/language\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/media\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\nif [ -f \"$SRCROOT/addons/skin.touched/addon.xml\" ]; then\n${SYNCSKIN} \"$SRCROOT/addons/skin.touched\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/addons/skin.touched/background\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.touched\"\n${SYNC} \"$SRCROOT/addons/skin.touched/icon.png\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.touched\"\nfi\n${SYNCSKIN} \"$SRCROOT/addons/skin.confluence\" \t\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/backgrounds\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/icon.png\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/sounds\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/system\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/userdata\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n\nfi";
                        showEnvVarsInLog = 0;
                };
                F589B48D128A697C00D8079E /* copy frameworks */ = {
                                F5E112E8143577A000175026 /* GUIDialogPeripheralManager.cpp in Sources */,
                                F5E112E9143577A000175026 /* GUIDialogPeripheralSettings.cpp in Sources */,
                                F5E112EC143577A000175026 /* Peripherals.cpp in Sources */,
+                               DF6739E21443765F00A5A509 /* FileUPnP.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
index 9f36f8f..3ccf278 100644 (file)
@@ -57,7 +57,6 @@
                18968DC914155D7C005BA742 /* ApplicationOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18968DC614155D7C005BA742 /* ApplicationOperations.cpp */; };
                18ACF84313596C9B00B67371 /* RecentlyAddedJob.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18ACF84113596C9B00B67371 /* RecentlyAddedJob.cpp */; };
                18B4A0021152BFA5001AF8A6 /* Addon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B49FF11152BFA5001AF8A6 /* Addon.cpp */; };
-               18B4A0031152BFA5001AF8A6 /* AddonManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B49FF41152BFA5001AF8A6 /* AddonManager.cpp */; };
                18B4A0041152BFA5001AF8A6 /* fft.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B49FF91152BFA5001AF8A6 /* fft.cpp */; };
                18B4A0051152BFA5001AF8A6 /* Scraper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B49FFC1152BFA5001AF8A6 /* Scraper.cpp */; };
                18B4A0061152BFA5001AF8A6 /* ScreenSaver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B49FFE1152BFA5001AF8A6 /* ScreenSaver.cpp */; };
                DF448460140048C80069344B /* PipesManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF44845B140048C80069344B /* PipesManager.cpp */; };
                DF4484EE140054530069344B /* BXAcodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF4484EC140054530069344B /* BXAcodec.cpp */; };
                DF4484EF140054530069344B /* BXAcodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF4484EC140054530069344B /* BXAcodec.cpp */; };
+               DF673AA51443819600A5A509 /* AddonManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B49FF41152BFA5001AF8A6 /* AddonManager.cpp */; };
+               DF85BAB51443669A000686BE /* FileUPnP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF85BAB41443669A000686BE /* FileUPnP.cpp */; };
+               DF85BAB61443669A000686BE /* FileUPnP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF85BAB41443669A000686BE /* FileUPnP.cpp */; };
                DF98D98C1434F47D00A6EBE1 /* SkinVariable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF98D98A1434F47D00A6EBE1 /* SkinVariable.cpp */; };
                DF98D98D1434F47D00A6EBE1 /* SkinVariable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF98D98A1434F47D00A6EBE1 /* SkinVariable.cpp */; };
                DFAB049813F8376700B70BFB /* InertialScrollingHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAB049613F8376700B70BFB /* InertialScrollingHandler.cpp */; };
                DF44845C140048C80069344B /* PipesManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PipesManager.h; sourceTree = "<group>"; };
                DF4484EC140054530069344B /* BXAcodec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BXAcodec.cpp; sourceTree = "<group>"; };
                DF4484ED140054530069344B /* BXAcodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BXAcodec.h; sourceTree = "<group>"; };
+               DF85BAB31443669A000686BE /* FileUPnP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileUPnP.h; sourceTree = "<group>"; };
+               DF85BAB41443669A000686BE /* FileUPnP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileUPnP.cpp; sourceTree = "<group>"; };
                DF98D98A1434F47D00A6EBE1 /* SkinVariable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SkinVariable.cpp; sourceTree = "<group>"; };
                DF98D98B1434F47D00A6EBE1 /* SkinVariable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SkinVariable.h; sourceTree = "<group>"; };
                DFAB049613F8376700B70BFB /* InertialScrollingHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InertialScrollingHandler.cpp; sourceTree = "<group>"; };
                                E38E16DF0D25F9FA00618676 /* FileTuxBox.h */,
                                433219D112E4C6A500CD7486 /* FileUDF.cpp */,
                                433219D212E4C6A500CD7486 /* FileUDF.h */,
+                               DF85BAB41443669A000686BE /* FileUPnP.cpp */,
+                               DF85BAB31443669A000686BE /* FileUPnP.h */,
                                E38E16E20D25F9FA00618676 /* FileZip.cpp */,
                                E38E16E30D25F9FA00618676 /* FileZip.h */,
                                E38E16E40D25F9FA00618676 /* FTPDirectory.cpp */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/bash;
-                       shellScript = "#!/bin/bash\n\necho \"copy root files\"\n\nif [ \"$ACTION\" = build ] ; then\n\n# for external testing\n#TARGET_NAME=XBMC.app\n#SRCROOT=/Users/Shared/xbmc_svn/XBMC\n#TARGET_BUILD_DIR=/Users/Shared/xbmc_svn/XBMC/build/Debug\n# force TARGET_NAME on ppc\nTARGET_NAME=$PRODUCT_NAME\n\n# rsync command with exclusions for items we don't want in the app package\nSYNC=\"rsync -aq --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *arm-osx.* --exclude *.zlib --exclude *.a\"\n\n# rsync command for excluding pngs and jpgs as well. Note that if the skin itself is not compiled\n# using XBMCTex then excluding the pngs and jpgs will most likely make the skin unusable \nSYNCSKIN=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll  --exclude *.DLL --exclude *linux.* --exclude *.png --exclude *.jpg --exclude *.bat\"\n\n# rsync command for including everything but the skins\nADDONSYNC=\"rsync -aq --exclude .DS_Store* --exclude skin.confluence\"\n\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/language\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/sounds\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/system\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/userdata\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/darwin/runtime\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/extras/user\"\n\n${SYNC} \"$SRCROOT/LICENSE.GPL\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/\"\n${SYNC} \"$SRCROOT/xbmc/osx/Credits.html\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/\"\n${SYNC} \"$SRCROOT/tools/darwin/runtime\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/darwin\"\n${ADDONSYNC} \"$SRCROOT/addons\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/language\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/media\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNCSKIN} \"$SRCROOT/addons/skin.confluence\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/backgrounds\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/icon.png\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/sounds\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/system\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/userdata\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n\n# copy extra packages if applicable\nif [ -d \"$SRCROOT/extras/system\" ]; then\n\t${SYNC} \"$SRCROOT/extras/system/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\nfi\n\n# copy extra user packages if applicable\nif [ -d \"$SRCROOT/extras/user\" ]; then\n\t${SYNC} \"$SRCROOT/extras/user/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/extras/user\"\nfi\n\n\n\n# magic that gets the icon to update\ntouch \"$TARGET_BUILD_DIR/$TARGET_NAME\"\n\n# not sure we want to do this with out major testing, many scripts cannot handle the spaces in the app name\n#mv \"$TARGET_BUILD_DIR/$TARGET_NAME\" \"$TARGET_BUILD_DIR/XBMC Media Center.app\"\n\nfi";
+                       shellScript = "#!/bin/bash\n\necho \"copy root files\"\n\nif [ \"$ACTION\" = build ] ; then\n\n# for external testing\n#TARGET_NAME=XBMC.app\n#SRCROOT=/Users/Shared/xbmc_svn/XBMC\n#TARGET_BUILD_DIR=/Users/Shared/xbmc_svn/XBMC/build/Debug\n# force TARGET_NAME on ppc\nTARGET_NAME=$PRODUCT_NAME\n\n# rsync command with exclusions for items we don't want in the app package\nSYNC=\"rsync -aq --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *arm-osx.* --exclude *.zlib --exclude *.a\"\n\n# rsync command for excluding pngs and jpgs as well. Note that if the skin itself is not compiled\n# using XBMCTex then excluding the pngs and jpgs will most likely make the skin unusable \nSYNCSKIN=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll  --exclude *.DLL --exclude *linux.* --exclude *.png --exclude *.jpg --exclude *.bat\"\n\n# rsync command for including everything but the skins\nADDONSYNC=\"rsync -aq --exclude .DS_Store* --exclude skin.confluence --exclude skin.touched\"\n\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/language\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/sounds\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/system\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/userdata\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/darwin/runtime\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/extras/user\"\n\n${SYNC} \"$SRCROOT/LICENSE.GPL\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/\"\n${SYNC} \"$SRCROOT/xbmc/osx/Credits.html\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/\"\n${SYNC} \"$SRCROOT/tools/darwin/runtime\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/darwin\"\n${ADDONSYNC} \"$SRCROOT/addons\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/language\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/media\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNCSKIN} \"$SRCROOT/addons/skin.confluence\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/backgrounds\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/icon.png\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/sounds\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/system\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/userdata\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n\n# copy extra packages if applicable\nif [ -d \"$SRCROOT/extras/system\" ]; then\n\t${SYNC} \"$SRCROOT/extras/system/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\nfi\n\n# copy extra user packages if applicable\nif [ -d \"$SRCROOT/extras/user\" ]; then\n\t${SYNC} \"$SRCROOT/extras/user/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/extras/user\"\nfi\n\n\n\n# magic that gets the icon to update\ntouch \"$TARGET_BUILD_DIR/$TARGET_NAME\"\n\n# not sure we want to do this with out major testing, many scripts cannot handle the spaces in the app name\n#mv \"$TARGET_BUILD_DIR/$TARGET_NAME\" \"$TARGET_BUILD_DIR/XBMC Media Center.app\"\n\nfi";
                };
                F5A1CBDF0F6B0B4700A96ABD /* copy frameworks */ = {
                        isa = PBXShellScriptBuildPhase;
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/bash;
-                       shellScript = "#!/bin/bash\n\necho \"copy root files\"\n\nif [ \"$ACTION\" = build ] ; then\n\n# for external testing\n#TARGET_NAME=XBMC.app\n#SRCROOT=/Users/Shared/xbmc_svn/XBMC\n#TARGET_BUILD_DIR=/Users/Shared/xbmc_svn/XBMC/build/Debug\n\n# rsync command with exclusions for items we don't want in the app package\nSYNC=\"rsync -aq --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *arm-osx.* --exclude *.zlib --exclude *.a\"\n\n# rsync command for excluding pngs and jpgs as well. Note that if the skin itself is not compiled\n# using XBMCTex then excluding the pngs and jpgs will most likely make the skin unusable \nSYNCSKIN=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll  --exclude *.DLL --exclude *linux.* --exclude *.png --exclude *.jpg --exclude *.bat\"\n\n# rsync command for including everything but the skins\nADDONSYNC=\"rsync -aq --exclude .DS_Store* --exclude skin.confluence\"\n\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/language\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/sounds\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/system\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/userdata\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/darwin/runtime\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/extras/user\"\n\n${SYNC} \"$SRCROOT/LICENSE.GPL\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/\"\n${SYNC} \"$SRCROOT/xbmc/osx/Credits.html\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/\"\n${SYNC} \"$SRCROOT/tools/darwin/runtime\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/darwin\"\n${ADDONSYNC} \"$SRCROOT/addons\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/language\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/media\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNCSKIN} \"$SRCROOT/addons/skin.confluence\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/backgrounds\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/icon.png\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/sounds\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/system\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/userdata\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n\n# copy extra packages if applicable\nif [ -d \"$SRCROOT/extras/system\" ]; then\n\t${SYNC} \"$SRCROOT/extras/system/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\nfi\n\n# copy extra user packages if applicable\nif [ -d \"$SRCROOT/extras/user\" ]; then\n\t${SYNC} \"$SRCROOT/extras/user/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/extras/user\"\nfi\n\n\n\n# magic that gets the icon to update\ntouch \"$TARGET_BUILD_DIR/$TARGET_NAME\"\n\n# not sure we want to do this with out major testing, many scripts cannot handle the spaces in the app name\n#mv \"$TARGET_BUILD_DIR/$TARGET_NAME\" \"$TARGET_BUILD_DIR/XBMC Media Center.app\"\n\nfi";
+                       shellScript = "#!/bin/bash\n\necho \"copy root files\"\n\nif [ \"$ACTION\" = build ] ; then\n\n# for external testing\n#TARGET_NAME=XBMC.app\n#SRCROOT=/Users/Shared/xbmc_svn/XBMC\n#TARGET_BUILD_DIR=/Users/Shared/xbmc_svn/XBMC/build/Debug\n\n# rsync command with exclusions for items we don't want in the app package\nSYNC=\"rsync -aq --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *arm-osx.* --exclude *.zlib --exclude *.a\"\n\n# rsync command for excluding pngs and jpgs as well. Note that if the skin itself is not compiled\n# using XBMCTex then excluding the pngs and jpgs will most likely make the skin unusable \nSYNCSKIN=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll  --exclude *.DLL --exclude *linux.* --exclude *.png --exclude *.jpg --exclude *.bat\"\n\n# rsync command for including everything but the skins\nADDONSYNC=\"rsync -aq --exclude .DS_Store* --exclude skin.confluence --exclude skin.touched\"\n\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/language\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/sounds\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/system\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/userdata\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/darwin/runtime\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/extras/user\"\n\n${SYNC} \"$SRCROOT/LICENSE.GPL\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/\"\n${SYNC} \"$SRCROOT/xbmc/osx/Credits.html\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/\"\n${SYNC} \"$SRCROOT/tools/darwin/runtime\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/darwin\"\n${ADDONSYNC} \"$SRCROOT/addons\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/language\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/media\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNCSKIN} \"$SRCROOT/addons/skin.confluence\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/backgrounds\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/icon.png\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/sounds\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/system\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/userdata\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n\n# copy extra packages if applicable\nif [ -d \"$SRCROOT/extras/system\" ]; then\n\t${SYNC} \"$SRCROOT/extras/system/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\nfi\n\n# copy extra user packages if applicable\nif [ -d \"$SRCROOT/extras/user\" ]; then\n\t${SYNC} \"$SRCROOT/extras/user/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/extras/user\"\nfi\n\n\n\n# magic that gets the icon to update\ntouch \"$TARGET_BUILD_DIR/$TARGET_NAME\"\n\n# not sure we want to do this with out major testing, many scripts cannot handle the spaces in the app name\n#mv \"$TARGET_BUILD_DIR/$TARGET_NAME\" \"$TARGET_BUILD_DIR/XBMC Media Center.app\"\n\nfi";
                        showEnvVarsInLog = 0;
                };
 /* End PBXShellScriptBuildPhase section */
                                F5A7B37E113AFB900059D6AA /* SFTPDirectory.cpp in Sources */,
                                F5A7B42C113CBB950059D6AA /* AddonsDirectory.cpp in Sources */,
                                18B4A0021152BFA5001AF8A6 /* Addon.cpp in Sources */,
-                               18B4A0031152BFA5001AF8A6 /* AddonManager.cpp in Sources */,
                                18B4A0041152BFA5001AF8A6 /* fft.cpp in Sources */,
                                18B4A0051152BFA5001AF8A6 /* Scraper.cpp in Sources */,
                                18B4A0061152BFA5001AF8A6 /* ScreenSaver.cpp in Sources */,
                                F5E1125E14356B2400175026 /* pyrendercapture.cpp in Sources */,
                                F5E1138014357F3800175026 /* PeripheralCecAdapter.cpp in Sources */,
                                F54BCC5F1439345300F86B0F /* HotKeyController.m in Sources */,
+                               DF85BAB51443669A000686BE /* FileUPnP.cpp in Sources */,
+                               DF673AA51443819600A5A509 /* AddonManager.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                F5E1125F14356B2400175026 /* pyrendercapture.cpp in Sources */,
                                F5E1138114357F3900175026 /* PeripheralCecAdapter.cpp in Sources */,
                                F54BCC601439345300F86B0F /* HotKeyController.m in Sources */,
+                               DF85BAB61443669A000686BE /* FileUPnP.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ARCHS = i386;
+                               GCC_OPTIMIZATION_LEVEL = 0;
                                GCC_PREPROCESSOR_DEFINITIONS = "";
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_SIGN_COMPARE = YES;
                                        "-lsamplerate",
                                        "-lmicrohttpd",
                                        "-lyajl",
+                                       "-ljpeg",
                                        "-lGLEW",
                                        "-lSDL",
                                        "-lSDL_mixer",
                                        "-lboost_thread",
                                        "-L$XBMC_DEPENDS/lib/mysql",
                                        "-lmysqlclient",
-                                       "-ljpeg",
                                );
                                PRODUCT_NAME = XBMC;
                                USER_HEADER_SEARCH_PATHS = "$XBMC_DEPENDS/include $XBMC_DEPENDS/include/mysql $XBMC_DEPENDS/include/freetype2 $XBMC_DEPENDS/include/python2.6";
                                        "-lsamplerate",
                                        "-lmicrohttpd",
                                        "-lyajl",
+                                       "-ljpeg",
                                        "-lGLEW",
                                        "-lSDL",
                                        "-lSDL_mixer",
                                        "-lboost_thread",
                                        "-L$XBMC_DEPENDS/lib/mysql",
                                        "-lmysqlclient",
-                                       "-ljpeg",
                                );
                                PRODUCT_NAME = XBMC;
                                USER_HEADER_SEARCH_PATHS = "$XBMC_DEPENDS/include $XBMC_DEPENDS/include/mysql $XBMC_DEPENDS/include/freetype2 $XBMC_DEPENDS/include/python2.6";
diff --git a/addons/metadata.albums.allmusic.com/resources/language/Slovenian/strings.xml b/addons/metadata.albums.allmusic.com/resources/language/Slovenian/strings.xml
new file mode 100644 (file)
index 0000000..ac1e5d1
--- /dev/null
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<strings>
+    <string id="30000">Prenesi ovitke albumov z Allmusic.com</string>
+    <string id="30001">Prenesi ovitke albumov z Last.fm</string>
+</strings>
diff --git a/addons/metadata.artists.allmusic.com/resources/language/Slovenian/strings.xml b/addons/metadata.artists.allmusic.com/resources/language/Slovenian/strings.xml
new file mode 100644 (file)
index 0000000..71c6b36
--- /dev/null
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<strings>
+    <string id="30000">Prenesi ozadja s HTBackdrops.com</string>
+    <string id="30001">Prenesi sličica izvajalcev z Allmusic.com</string>
+    <string id="30002">Prenesi sličica izvajalcev z Last.fm</string>
+    <string id="30003">Prenesi sličica izvajalcev s HTBackdrops.com</string>
+</strings>
diff --git a/addons/metadata.mtv.com/addon.xml b/addons/metadata.mtv.com/addon.xml
deleted file mode 100644 (file)
index 3db0645..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="metadata.mtv.com"
-       name="MTV"
-       version="1.0.5"
-       provider-name="Team XBMC">
-  <requires>
-    <import addon="xbmc.metadata" version="1.0"/>
-  </requires>
-  <extension point="xbmc.metadata.scraper.musicvideos"
-             language="en"
-             library="mtv.xml"/>
-  <extension point="xbmc.addon.metadata">
-    <summary lang="en">MTV Music Video Scraper</summary>
-    <summary lang="de">MTV Scraper für Musikvideos</summary>
-    <summary lang="es">Scraper de videoclips de MTV</summary>
-    <summary lang="fr">Scraper MTV pour vidéo-clips</summary>
-    <summary lang="hu">MTV videóklip leolvasó</summary>
-    <summary lang="kr">MTV 뮤직 비디오 스크래퍼</summary>
-    <summary lang="nl">MTV-muziekvideoscraper</summary>
-    <summary lang="pl">Scraper teledysków MTV</summary>
-    <summary lang="pt">Scraper de videoclips MTV</summary>
-    <summary lang="ro">Catalog MTV pentru videoclipuri</summary>
-    <summary lang="ru">Обработчик музыкальных видео для MTV</summary>
-    <summary lang="se">MTV Musikvideoskrapa</summary>
-    <summary lang="zh">MTV音乐电视刮削器</summary>
-    <description lang="en">Download Music Video information</description>
-    <description lang="de">Downloade Informationen zu Musikvideos von www.mtv.com</description>
-    <description lang="es">Descarga información de videoclips de www.mtv.com</description>
-    <description lang="fr">Télécharge les infos des vidéo-clips</description>
-    <description lang="hu">Zenei videóklip információk letöltése</description>
-    <description lang="kr">MTV 에서 뮤직비디오 정보 다운로드</description>
-    <description lang="nl">Muziekvideo-info ophalen van MTV</description>
-    <description lang="pl">Pobieraj informacje o teledyskach</description>
-    <description lang="pt">Descarregar informação de videoclips de www.mtv.com</description>
-    <description lang="ro">Descărcați informații videoclipuri.</description>
-    <description lang="ru">Загружать информацию о музыкальных видео с www.mtv.com</description>
-    <description lang="se">Ladda ner musikvideoinformation från MTV.</description>
-    <description lang="zh">下载音乐电视资料。</description>
-    <platform>all</platform>
-  </extension>
-</addon>
diff --git a/addons/metadata.mtv.com/icon.png b/addons/metadata.mtv.com/icon.png
deleted file mode 100644 (file)
index c7d595a..0000000
Binary files a/addons/metadata.mtv.com/icon.png and /dev/null differ
diff --git a/addons/metadata.mtv.com/mtv.xml b/addons/metadata.mtv.com/mtv.xml
deleted file mode 100644 (file)
index 73c20d2..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scraper framework="1.0" date="2009-05-22">
-       <CreateSearchUrl dest="3">
-               <RegExp input="$$1" output="&lt;url&gt;http://api.mtvnservices.com/1/video/search/?term=\1&lt;/url&gt;" dest="3">
-                       <expression noclean="1"/>
-               </RegExp>
-       </CreateSearchUrl>
-       <GetSearchResults dest="8">
-               <RegExp input="$$5" output="&lt;?xml version=&quot;1.0&quot; encoding=&quot;iso-8859-1&quot; standalone=&quot;yes&quot;?&gt;&lt;results&gt;\1&lt;/results&gt;" dest="8">
-                       <RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\1 - \2&lt;/title&gt;&lt;url&gt;\4&lt;/url&gt;&lt;/entity&gt;" dest="5">
-                               <expression noclean="1" repeat="yes">&lt;entry&gt;.*?&lt;content&gt;(.*?) \| (.*?) \| (.*?)&lt;/content&gt;.*?media:player url=&quot;([^&quot;]*)&quot;/&gt;</expression>
-                       </RegExp>
-                       <expression noclean="1"/>
-               </RegExp>               
-       </GetSearchResults>
-       <GetDetails dest="3">
-               <RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="3">
-                       <RegExp input="$$1" output="&lt;title&gt;\1&lt;/title&gt;" dest="5">
-                               <expression trim="1" noclean="1">&lt;meta name=&quot;mtv_vt&quot; content=&quot;([^&quot;]*)&quot;</expression>
-                       </RegExp>
-                       <RegExp input="$$1" output="&lt;artist&gt;\1&lt;/artist&gt;" dest="5+">
-                               <expression trim="1" noclean="1">&lt;meta name=&quot;mtv_an&quot; content=&quot;([^&quot;]*)&quot;</expression>
-                       </RegExp>
-                       <RegExp input="$$1" output="&lt;album&gt;\1&lt;/album&gt;" dest="5+">
-                               <expression trim="1" noclean="1">&lt;meta name=&quot;mtv_at&quot; content=&quot;([^&quot;]*)&quot;</expression>
-                       </RegExp>
-                       <RegExp input="$$1" output="&lt;studio&gt;\1&lt;/studio&gt;" dest="5+">
-                               <expression trim="1" noclean="1">&lt;strong&gt;Label&lt;/strong&gt; ([^&lt;]*)&lt;/li&gt;</expression>
-                       </RegExp>
-                       <RegExp input="$$1" output="&lt;year&gt;\1&lt;/year&gt;" dest="5+">
-                               <expression>&lt;meta name=&quot;content_create_date&quot; content=&quot;([0-9]*)-[^&quot;]*&quot;</expression>
-                       </RegExp>
-                       <RegExp input="$$1" output="&lt;director&gt;\1&lt;/director&gt;" dest="5+">
-                               <expression trim="1" noclean="1">&lt;meta name=&quot;mtv_vd&quot; content=&quot;([^&quot;]*)&quot;</expression>
-                       </RegExp>
-                       <RegExp input="$$1" output="&lt;thumb&gt;http://www.mtv.com\2.jpg&lt;/thumb&gt;" dest="5+">
-                               <expression noclean="1">&quot;thumbnail&quot;([^&quot;]*)content=&quot;([^&quot;]*)\.jpg</expression>
-                       </RegExp>
-                       <expression noclean="1"/>
-               </RegExp>
-       </GetDetails>
-</scraper>
diff --git a/addons/metadata.themoviedb.org/resources/language/Slovenian/strings.xml b/addons/metadata.themoviedb.org/resources/language/Slovenian/strings.xml
new file mode 100644 (file)
index 0000000..60f311e
--- /dev/null
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<strings>
+    <string id="30000">Vključi ozadja</string>
+    <string id="30001">Vključi napovednike s HD-Trailers.net</string>
+    <string id="30002">Jezik</string>
+    <string id="30003">Prenesi oceno z IMDb</string>
+</strings>
diff --git a/addons/metadata.tvdb.com/resources/language/Slovenian/strings.xml b/addons/metadata.tvdb.com/resources/language/Slovenian/strings.xml
new file mode 100644 (file)
index 0000000..2011be8
--- /dev/null
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+    <string id="30000">Uporabi zaporedje DVDja</string>
+    <string id="30001">Uporabi absolutno zaporedje (ena sezona)</string>
+    <string id="30002">Vključi ozadja</string>
+    <string id="30003">Prenesi plakate</string>
+    <string id="30004">Jezik</string>
+</strings>
diff --git a/addons/metadata.yahoomusic.com/addon.xml b/addons/metadata.yahoomusic.com/addon.xml
new file mode 100644 (file)
index 0000000..bcea793
--- /dev/null
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<addon id="metadata.yahoomusic.com"
+       name="Yahoo Music Videos"
+       version="1.0.4"
+       provider-name="Team XBMC">
+  <requires>
+    <import addon="xbmc.metadata" version="1.0"/>
+  </requires>
+  <extension point="xbmc.metadata.scraper.musicvideos"
+             language="en"
+             library="yahoomusic.xml"/>
+  <extension point="xbmc.addon.metadata">
+    <summary lang="en">Yahoo! Music Video Scraper</summary>
+    <summary lang="hu">Yahoo! videóklip leolvasó</summary>
+    <summary lang="kr">야후! 뮤직 비디오 스크래퍼</summary>
+    <summary lang="pl">Scraper teledysków Yahoo!</summary>
+    <summary lang="pt">Scraper de música Yahoo!</summary>
+    <description lang="en">Download Music Video information</description>
+    <description lang="hu">Videóklip információk letöltése a Yahoo! webhelyről</description>
+    <description lang="kr">뮤직 비디오 정보 다운로드</description>
+    <description lang="pl">Pobieraj informacje o teledyskach z music.yahoo.com</description>
+    <description lang="pt">Descarregar informação de filmes de music.yahoo.com</description>
+  </extension>
+</addon>
diff --git a/addons/metadata.yahoomusic.com/icon.png b/addons/metadata.yahoomusic.com/icon.png
new file mode 100644 (file)
index 0000000..f04e6f4
Binary files /dev/null and b/addons/metadata.yahoomusic.com/icon.png differ
diff --git a/addons/metadata.yahoomusic.com/resources/language/Dutch/strings.xml b/addons/metadata.yahoomusic.com/resources/language/Dutch/strings.xml
new file mode 100644 (file)
index 0000000..93ec0c6
--- /dev/null
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+    <!-- settings labels -->
+    <string id="30000">Afmetingen van de voorbeeld afbeeldingen</string>
+</strings>
diff --git a/addons/metadata.yahoomusic.com/resources/language/English/strings.xml b/addons/metadata.yahoomusic.com/resources/language/English/strings.xml
new file mode 100644 (file)
index 0000000..b41bc3e
--- /dev/null
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+    <!-- settings labels -->
+    <string id="30000">Thumb(s) Size</string>
+</strings>
diff --git a/addons/metadata.yahoomusic.com/resources/language/Hungarian/strings.xml b/addons/metadata.yahoomusic.com/resources/language/Hungarian/strings.xml
new file mode 100644 (file)
index 0000000..8944ed5
--- /dev/null
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+    <!-- settings labels -->
+    <string id="30000">Bélyegképek mérete</string>
+</strings>
diff --git a/addons/metadata.yahoomusic.com/resources/language/Korean/strings.xml b/addons/metadata.yahoomusic.com/resources/language/Korean/strings.xml
new file mode 100644 (file)
index 0000000..4532347
--- /dev/null
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+    <!-- settings labels -->
+    <string id="30000">미리보기 크기</string>
+</strings>
diff --git a/addons/metadata.yahoomusic.com/resources/language/Polish/strings.xml b/addons/metadata.yahoomusic.com/resources/language/Polish/strings.xml
new file mode 100644 (file)
index 0000000..05b9a8d
--- /dev/null
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+    <!-- settings labels -->
+    <string id="30000">Rozmiar miniatur</string>
+</strings>
diff --git a/addons/metadata.yahoomusic.com/resources/language/Portuguese/strings.xml b/addons/metadata.yahoomusic.com/resources/language/Portuguese/strings.xml
new file mode 100644 (file)
index 0000000..72d365c
--- /dev/null
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+    <!-- settings labels -->
+    <string id="30000">Tamanho de miniaturas</string>
+</strings>
diff --git a/addons/metadata.yahoomusic.com/resources/language/Slovenian/strings.xml b/addons/metadata.yahoomusic.com/resources/language/Slovenian/strings.xml
new file mode 100644 (file)
index 0000000..2c30932
--- /dev/null
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+    <!-- settings labels -->
+    <string id="30000">Velikost sličic(e)</string>
+</strings>
diff --git a/addons/metadata.yahoomusic.com/resources/settings.xml b/addons/metadata.yahoomusic.com/resources/settings.xml
new file mode 100644 (file)
index 0000000..373a6de
--- /dev/null
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings>
+    <setting label="30000" type="labelenum" values="192|256|384|512|1024" id="yahooscale" default="384"/>
+</settings>
diff --git a/addons/metadata.yahoomusic.com/yahoomusic.xml b/addons/metadata.yahoomusic.com/yahoomusic.xml
new file mode 100644 (file)
index 0000000..9bd5a3f
--- /dev/null
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scraper framework="1.0" date="2009-05-22">
+       <CreateSearchUrl dest="3">
+               <RegExp input="$$1" output="&lt;url&gt;http://us.music.yahooapis.com/video/v1/list/search/all/\1?appid=r6QWQGXV34H0Sl3Wq4vWJI2v9IO1XnZw5JkeifPbTq2p0S9H9kg0JUc3SVN0Yw--&amp;amp;response=artists,images&lt;/url&gt;" dest="3">
+                       <expression noclean="1"/>
+               </RegExp>
+       </CreateSearchUrl>
+       <GetSearchResults dest="8">
+               <RegExp input="$$5" output="&lt;?xml version=&quot;1.0&quot; encoding=&quot;iso-8859-1&quot; standalone=&quot;yes&quot;?&gt;&lt;results&gt;\1&lt;/results&gt;" dest="8">
+                       <RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\4 - \1 (\2)&lt;/title&gt;&lt;url&gt;http://us.music.yahooapis.com/video/v1/item/\3?format=xml&amp;amp;appid=r6QWQGXV34H0Sl3Wq4vWJI2v9IO1XnZw5JkeifPbTq2p0S9H9kg0JUc3SVN0Yw--&lt;/url&gt;&lt;/entity&gt;" dest="5">
+                               <expression repeat="yes">&lt;Video.*?title=&quot;([^&quot;]*)&quot;.*?copyrightYear=&quot;([^&quot;]*)&quot;.*?\/([0-9]*)\?size.*?name=&quot;([^&quot;]*)&quot;.*?&lt;/Video&gt;</expression>
+                       </RegExp>
+                       <expression noclean="1"/>
+               </RegExp>               
+       </GetSearchResults>
+       <GetDetails dest="3">
+               <RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="3">
+                       <RegExp input="$$1" output="&lt;title&gt;\1&lt;/title&gt;" dest="5">
+                               <expression>&lt;Video.*?title=&quot;([^&quot;]*)&quot;</expression>
+                       </RegExp>
+                       <RegExp input="$$1" output="&lt;artist&gt;\1&lt;/artist&gt;" dest="5+">
+                               <expression repeat="yes">&lt;Artist.*?name=&quot;([^&quot;]*)&quot;</expression>
+                       </RegExp>
+                       <RegExp input="$$1" output="&lt;album&gt;\1&lt;/album&gt;" dest="5+">
+                               <expression>&lt;Release.*?title=&quot;([^&quot;]*)&quot;</expression>
+                       </RegExp>
+                       <RegExp input="$$1" output="&lt;studio&gt;\1&lt;/studio&gt;" dest="5+">
+                               <expression repeat="yes">label=&quot;([^&quot;]*)&quot;</expression>
+                       </RegExp>
+                       <RegExp input="$$1" output="&lt;year&gt;\1&lt;/year&gt;" dest="5+">
+                               <expression>copyrightYear=&quot;([0-9]*)&quot;</expression>
+                       </RegExp>
+                       <RegExp input="$$1" output="&lt;genre&gt;\1&lt;/genre&gt;" dest="5+">
+                               <expression repeat="yes">&lt;Category.*?name=&quot;([^&quot;]*)&quot; rating=&quot;([^&quot;]*)&quot; type=&quot;Genre&quot;&gt;</expression>
+                       </RegExp>
+                       <RegExp input="$$1" output="&lt;thumb&gt;http://d.yimg.com/img.music.yahoo.com/image/v1/video/\1?size=$INFO[yahooscale]&lt;/thumb&gt;" dest="5+">
+                               <expression>\/([0-9]*)\?size</expression>
+                       </RegExp>
+                       <expression noclean="1"/>
+               </RegExp>
+       </GetDetails>
+</scraper>
diff --git a/addons/screensaver.xbmc.builtin.dim/resources/language/Slovenian/strings.xml b/addons/screensaver.xbmc.builtin.dim/resources/language/Slovenian/strings.xml
new file mode 100644 (file)
index 0000000..c54d4bf
--- /dev/null
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<strings>
+    <string id="30000">Nivo zatemnitve</string>
+</strings>
index db4b867..b6a95cd 100644 (file)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <settings>
-  <setting label="30000" type="slider" id="level" range="20,1,100" default="20"/>
+  <setting label="30000" type="slider" id="level" range="20,1,100" option="percent" default="20"/>
 </settings>
diff --git a/addons/screensaver.xbmc.builtin.slideshow/resources/language/Slovenian/strings.xml b/addons/screensaver.xbmc.builtin.slideshow/resources/language/Slovenian/strings.xml
new file mode 100644 (file)
index 0000000..272a802
--- /dev/null
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<strings>
+    <string id="30000">Vir slik za projekcijo</string>
+    <string id="30001">Mapa</string>
+    <string id="30002">Ozadja videa</string>
+    <string id="30003">Ozadja glasbe</string>
+    <string id="30004">Mapa s slikami</string>
+    <string id="30005">Nivo zatemnitve</string>
+</strings>
index 2efad8b..c987f2f 100644 (file)
@@ -2,5 +2,5 @@
 <settings>
   <setting label="30000" type="enum" id="type" default="0" lvalues="30002|30003|30004"/>
   <setting label="30001" type="folder" source="pictures" id="path" default="" enable="eq(-1,2)"/>
-  <setting label="30005" type="slider" id="level" range="0,1,100" default="100"/>
+  <setting label="30005" type="slider" id="level" range="0,1,100" option="percent" default="100"/>
 </settings>
index 16195d9..26d2535 100644 (file)
 <window id="10140">
        <defaultcontrol always="true">20</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
        <coordinates>
                <system>1</system>
-               <posx>190</posx>
+               <posx>335</posx>
                <posy>30</posy>
        </coordinates>
        <include>dialogeffect</include>
-
        <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>900</width>
-                       <height>660</height>
-                       <texture border="40">DialogBack.png</texture>
-               </control>
-               <control type="image">
-                       <description>Dialog Header image</description>
-                       <posx>40</posx>
-                       <posy>16</posy>
-                       <width>820</width>
-                       <height>40</height>
-                       <texture>dialogheader.png</texture>
-               </control>
-               <control type="label">
-                       <description>header label</description>
-                       <posx>40</posx>
-                       <posy>20</posy>
-                       <width>820</width>
-                       <height>30</height>
-                       <font>font13_title</font>
-                       <label>$LOCALIZE[35000]</label>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <textcolor>selected</textcolor>
-                       <shadowcolor>black</shadowcolor>
-               </control>
-               <control type="label">
-                       <description>header label</description>
-                       <posx>40</posx>
-                       <posy>20</posy>
-                       <width>820</width>
-                       <height>30</height>
-                       <font>font13_title</font>
-                       <label>$LOCALIZE[35000]</label>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <textcolor>selected</textcolor>
-                       <shadowcolor>black</shadowcolor>
-               </control>
-               <control type="button">
-                       <description>Close Window button</description>
-                       <posx>810</posx>
-                       <posy>15</posy>
-                       <width>64</width>
-                       <height>32</height>
-                       <label>-</label>
-                       <font>-</font>
-                       <onclick>PreviousMenu</onclick>
-                       <texturefocus>DialogCloseButton-focus.png</texturefocus>
-                       <texturenofocus>DialogCloseButton.png</texturenofocus>
-                       <onleft>10</onleft>
-                       <onright>10</onright>
-                       <onup>10</onup>
-                       <ondown>10</ondown>
-                       <visible>system.getbool(input.enablemouse)</visible>
-               </control>
-
                <control type="group">
-                       <description>Peripheral list</description>
-                       <posx>20</posx>
-                       <posy>70</posy>
-                       <control type="label">
-                               <description>peripheral option header</description>
-                               <posx>130</posx>
+                       <visible>!Window.IsVisible(PeripheralSettings)</visible>
+                       <include>VisibleFadeEffect</include>
+                       <control type="image">
+                               <description>background image</description>
+                               <posx>0</posx>
                                <posy>0</posy>
-                               <width>380</width>
-                               <height>20</height>
-                               <font>font12_title</font>
-                               <label>$LOCALIZE[35000]</label>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <textcolor>blue</textcolor>
-                               <shadowcolor>black</shadowcolor>
+                               <width>610</width>
+                               <height>650</height>
+                               <texture border="40">DialogBack.png</texture>
+                               <visible>![Window.IsVisible(FullscreenVideo) | Window.IsVisible(Visualisation)]</visible>
                        </control>
-                       <control type="scrollbar" id="60">
+                       <control type="image">
+                               <description>background image</description>
                                <posx>0</posx>
-                               <posy>40</posy>
-                               <width>25</width>
-                               <height>445</height>
-                               <texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
-                               <texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
-                               <texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
-                               <textureslidernib>ScrollBarNib.png</textureslidernib>
-                               <textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
-                               <onleft>9000</onleft>
-                               <onright>20</onright>
-                               <showonepage>false</showonepage>
-                               <orientation>vertical</orientation>
+                               <posy>0</posy>
+                               <width>610</width>
+                               <height>650</height>
+                               <texture border="40">DialogBack2.png</texture>
+                               <visible>Window.IsVisible(FullscreenVideo) | Window.IsVisible(Visualisation)</visible>
                        </control>
                        <control type="image">
-                               <posx>25</posx>
-                               <posy>35</posy>
-                               <width>330</width>
-                               <height>440</height>
-                               <texture border="5">button-nofocus.png</texture>
+                               <description>Dialog Header image</description>
+                               <posx>40</posx>
+                               <posy>16</posy>
+                               <width>530</width>
+                               <height>40</height>
+                               <texture>dialogheader.png</texture>
                        </control>
-                       
+                       <control type="label" id="1">
+                               <description>header label</description>
+                               <posx>40</posx>
+                               <posy>20</posy>
+                               <width>530</width>
+                               <height>30</height>
+                               <font>font13_title</font>
+                               <label>$LOCALIZE[35000]</label>
+                               <align>center</align>
+                               <aligny>center</aligny>
+                               <textcolor>selected</textcolor>
+                               <shadowcolor>black</shadowcolor>
+                       </control>
+                       <control type="button">
+                               <description>Close Window button</description>
+                               <posx>520</posx>
+                               <posy>15</posy>
+                               <width>64</width>
+                               <height>32</height>
+                               <label>-</label>
+                               <font>-</font>
+                               <onclick>PreviousMenu</onclick>
+                               <texturefocus>DialogCloseButton-focus.png</texturefocus>
+                               <texturenofocus>DialogCloseButton.png</texturenofocus>
+                               <onleft>10</onleft>
+                               <onright>10</onright>
+                               <onup>10</onup>
+                               <ondown>10</ondown>
+                               <visible>system.getbool(input.enablemouse)</visible>
+                       </control>
+
                        <control type="list" id="20">
-                               <posx>30</posx>
-                               <posy>40</posy>
-                               <width>320</width>
-                               <height>445</height>
-                               <onup>20</onup>
-                               <ondown>20</ondown>
-                               <onleft>60</onleft>
-                               <onright>9000</onright>
-                               <pagecontrol>60</pagecontrol>
+                               <posx>20</posx>
+                               <posy>65</posy>
+                               <width>550</width>
+                               <height>510</height>
+                               <onup>6</onup>
+                               <ondown>6</ondown>
+                               <onleft>5</onleft>
+                               <onright>61</onright>
+                               <pagecontrol>61</pagecontrol>
                                <scrolltime>200</scrolltime>
-                               <itemlayout height="45" width="320">
+                               <animation effect="slide" start="0,0" end="10,0" time="0" condition="!Control.IsVisible(61)">Conditional</animation>
+                               <itemlayout height="85" width="550">
                                        <control type="image">
                                                <posx>0</posx>
                                                <posy>0</posy>
-                                               <width>320</width>
-                                               <height>40</height>
+                                               <width>550</width>
+                                               <height>80</height>
                                                <texture border="5">button-nofocus.png</texture>
                                        </control>
                                        <control type="label">
+                                               <description>Name</description>
                                                <posx>10</posx>
-                                               <posy>0</posy>
-                                               <width>320</width>
-                                               <height>40</height>
+                                               <posy>5</posy>
+                                               <width>520</width>
+                                               <height>20</height>
+                                               <label>$INFO[ListItem.Label]</label>
+                                               <align>left</align>
+                                               <aligny>center</aligny>
+                                               <font>font13</font>
+                                               <textcolor>white</textcolor>
+                                       </control>
+                                       <control type="label">
+                                               <description>Product ID Vendor ID</description>
+                                               <posx>10</posx>
+                                               <posy>30</posy>
+                                               <width>520</width>
+                                               <height>20</height>
+                                               <label>$LOCALIZE[35504]:  [COLOR=grey2]$INFO[ListItem.Property(Product)][/COLOR]    $LOCALIZE[35503]:  [COLOR=grey2]$INFO[ListItem.Property(Vendor)][/COLOR]</label>
+                                               <align>left</align>
+                                               <aligny>center</aligny>
                                                <font>font12</font>
+                                               <textcolor>blue</textcolor>
+                                       </control>
+                                       <control type="label">
+                                               <description>class</description>
+                                               <posx>10</posx>
+                                               <posy>50</posy>
+                                               <width>520</width>
+                                               <height>20</height>
+                                               <label>$LOCALIZE[35501]:  [COLOR=grey2]$INFO[ListItem.Property(Class)][/COLOR]</label>
                                                <align>left</align>
                                                <aligny>center</aligny>
-                                               <textcolor>grey2</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <info>ListItem.Label</info>
+                                               <font>font12</font>
+                                               <textcolor>blue</textcolor>
                                        </control>
                                </itemlayout>
-                               <focusedlayout height="45" width="320">
+                               <focusedlayout height="85" width="550">
                                        <control type="image">
                                                <posx>0</posx>
                                                <posy>0</posy>
-                                               <width>320</width>
-                                               <height>40</height>
+                                               <width>550</width>
+                                               <height>80</height>
                                                <texture border="5">button-nofocus.png</texture>
                                                <visible>!Control.HasFocus(20)</visible>
+                                               <include>VisibleFadeEffect</include>
                                        </control>
                                        <control type="image">
                                                <posx>0</posx>
                                                <posy>0</posy>
-                                               <width>320</width>
-                                               <height>40</height>
+                                               <width>550</width>
+                                               <height>80</height>
                                                <texture border="5">button-focus2.png</texture>
                                                <visible>Control.HasFocus(20)</visible>
+                                               <include>VisibleFadeEffect</include>
                                        </control>
                                        <control type="label">
+                                               <description>Name</description>
                                                <posx>10</posx>
-                                               <posy>0</posy>
-                                               <width>320</width>
-                                               <height>40</height>
-                                               <font>font12</font>
+                                               <posy>5</posy>
+                                               <width>520</width>
+                                               <height>20</height>
+                                               <label>$INFO[ListItem.Label]</label>
                                                <align>left</align>
                                                <aligny>center</aligny>
+                                               <font>font13</font>
                                                <textcolor>white</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <info>ListItem.Label</info>
+                                       </control>
+                                       <control type="label">
+                                               <description>Product ID Vendor ID</description>
+                                               <posx>10</posx>
+                                               <posy>30</posy>
+                                               <width>520</width>
+                                               <height>20</height>
+                                               <label>$LOCALIZE[35504]:  [COLOR=grey2]$INFO[ListItem.Property(Product)][/COLOR]    $LOCALIZE[35503]:  [COLOR=grey2]$INFO[ListItem.Property(Vendor)][/COLOR]</label>
+                                               <align>left</align>
+                                               <aligny>center</aligny>
+                                               <font>font12</font>
+                                               <textcolor>blue</textcolor>
+                                       </control>
+                                       <control type="label">
+                                               <description>class</description>
+                                               <posx>10</posx>
+                                               <posy>50</posy>
+                                               <width>520</width>
+                                               <height>20</height>
+                                               <label>$LOCALIZE[35501]:  [COLOR=grey2]$INFO[ListItem.Property(Class)][/COLOR]</label>
+                                               <align>left</align>
+                                               <aligny>center</aligny>
+                                               <font>font12</font>
+                                               <textcolor>blue</textcolor>
                                        </control>
                                </focusedlayout>
                        </control>
 
+                       <control type="scrollbar" id="61">
+                               <posx>570</posx>
+                               <posy>65</posy>
+                               <width>25</width>
+                               <height>510</height>
+                               <texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
+                               <texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
+                               <texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
+                               <textureslidernib>ScrollBarNib.png</textureslidernib>
+                               <textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
+                               <onleft>3</onleft>
+                               <onright>3</onright>
+                               <ondown>61</ondown>
+                               <onup>61</onup>
+                               <showonepage>false</showonepage>
+                               <orientation>vertical</orientation>
+                       </control>
                        <control type="label">
-                               <description>Page Count Label</description>
-                               <posx>80</posx>
-                               <posy>480</posy>
-                               <width>420</width>
-                               <height>20</height>
+                               <description>number of files/pages in list text label</description>
+                               <posx>580</posx>
+                               <posy>585</posy>
+                               <width>300</width>
+                               <height>35</height>
                                <font>font12</font>
-                               <textcolor>grey</textcolor>
-                               <scroll>false</scroll>
-                               <align>center</align>
+                               <align>right</align>
                                <aligny>center</aligny>
-                               <label>([COLOR=blue]$INFO[Container(20).NumItems][/COLOR]) $LOCALIZE[19019] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(20).CurrentPage]/$INFO[Container(20).NumPages][/COLOR])</label>
-                       </control>
-               </control>
-
-               <control type="group" id="9002">
-                       <control type="group">
-                               <posx>400</posx>
-                               <posy>70</posy>
-                               <control type="label">
-                                       <description>peripheral option header</description>
-                                       <posx>150</posx>
-                                       <posy>0</posy>
-                                       <width>380</width>
-                                       <height>20</height>
-                                       <font>font12_title</font>
-                                       <label>$LOCALIZE[33029]</label>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>blue</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-
-                               <control type="label">
-                                       <description>name</description>
-                                       <posx>0</posx>
-                                       <posy>35</posy>
-                                       <width>380</width>
-                                       <height>20</height>
-                                       <label>$LOCALIZE[35502]</label>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <font>font12</font>
-                                       <textcolor>blue</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="label">
-                                       <description>name value</description>
-                                       <posx>150</posx>
-                                       <posy>35</posy>
-                                       <width>330</width>
-                                       <height>20</height>
-                                       <label fallback="13205">$INFO[Container(20).ListItem.Label]</label>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <font>font12</font>
-                                       <scroll>true</scroll>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-
-                               <control type="label">
-                                       <description>location</description>
-                                       <posx>0</posx>
-                                       <posy>60</posy>
-                                       <width>380</width>
-                                       <height>20</height>
-                                       <label>$LOCALIZE[35500]</label>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <font>font12</font>
-                                       <textcolor>blue</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="label">
-                                       <description>location value</description>
-                                       <posx>150</posx>
-                                       <posy>60</posy>
-                                       <width>330</width>
-                                       <height>20</height>
-                                       <label fallback="13205">$INFO[Container(20).ListItem.Property(Bus)] - $INFO[Container(20).ListItem.Property(Location)]</label>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <font>font12</font>
-                                       <scroll>true</scroll>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-
-                               <control type="label">
-                                       <description>class</description>
-                                       <posx>0</posx>
-                                       <posy>85</posy>
-                                       <width>380</width>
-                                       <height>20</height>
-                                       <label>$LOCALIZE[35501]</label>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <font>font12</font>
-                                       <textcolor>blue</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="label">
-                                       <description>class value</description>
-                                       <posx>150</posx>
-                                       <posy>85</posy>
-                                       <width>330</width>
-                                       <height>20</height>
-                                       <label fallback="13205">$INFO[Container(20).ListItem.Property(Class)]</label>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <font>font12</font>
-                                       <scroll>true</scroll>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-
-                               <control type="label">
-                                       <description>vendor</description>
-                                       <posx>0</posx>
-                                       <posy>110</posy>
-                                       <width>380</width>
-                                       <height>20</height>
-                                       <label>$LOCALIZE[35503]</label>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <font>font12</font>
-                                       <textcolor>blue</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="label">
-                                       <description>vendor value</description>
-                                       <posx>150</posx>
-                                       <posy>110</posy>
-                                       <width>330</width>
-                                       <height>20</height>
-                                       <label fallback="13205">$INFO[Container(20).ListItem.Property(Vendor)]</label>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <font>font12</font>
-                                       <scroll>true</scroll>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-
-                               <control type="label">
-                                       <description>product</description>
-                                       <posx>0</posx>
-                                       <posy>135</posy>
-                                       <width>380</width>
-                                       <height>20</height>
-                                       <label>$LOCALIZE[35504]</label>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <font>font12</font>
-                                       <textcolor>blue</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="label">
-                                       <description>product value</description>
-                                       <posx>150</posx>
-                                       <posy>135</posy>
-                                       <width>330</width>
-                                       <height>20</height>
-                                       <label fallback="13205">$INFO[Container(20).ListItem.Property(Product)]</label>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <font>font12</font>
-                                       <scroll>true</scroll>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-
+                               <scroll>true</scroll>
+                               <textcolor>grey</textcolor>
+                               <label>([COLOR=blue]$INFO[Container(20).NumItems][/COLOR]) $LOCALIZE[31025] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(20).CurrentPage]/$INFO[Container(20).NumPages][/COLOR])</label>
                        </control>
-               </control>
-
-               <control type="group" id="9000">
-                       <posx>70</posx>
-                       <posy>590</posy>
                        <control type="button" id="10">
-                               <description>Close Button</description>
-                               <posy>0</posy>
-                               <posx>100</posx>
+                               <description>Close button</description>
+                               <posx>20</posx>
+                               <posy>585</posy>
                                <width>200</width>
                                <height>40</height>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font12_title</font>
                                <label>186</label>
-                               <onleft>11</onleft>
-                               <onright>11</onright>
-                               <onup>20</onup>
-                               <ondown>20</ondown>
-                       </control>
-                       <control type="button" id="11">
-                               <description>Settings Button</description>
-                               <posy>0</posy>
-                               <posx>400</posx>
-                               <width>200</width>
-                               <height>40</height>
-                               <align>center</align>
-                               <aligny>center</aligny>
                                <font>font12_title</font>
-                               <label>5</label>
-                               <onleft>10</onleft>
-                               <onright>10</onright>
+                               <textcolor>white</textcolor>
+                               <focusedcolor>white</focusedcolor>
+                               <align>center</align>
+                               <onleft>61</onleft>
+                               <onright>20</onright>
                                <onup>20</onup>
                                <ondown>20</ondown>
                        </control>
index df089c1..b5e025b 100644 (file)
@@ -2,94 +2,96 @@
        <defaultcontrol>5</defaultcontrol>
        <coordinates>
                <system>1</system>
-               <posx>240</posx>
-               <posy>60</posy>
+               <posx>290</posx>
+               <posy>75</posy>
        </coordinates>
        <include>dialogeffect</include>
        <controls>
-               <control type="group">
-                       <animation effect="fade" start="100" end="0" time="400" condition="Window.IsVisible(SliderDialog) | Window.IsVisible(FileBrowser)">Conditional</animation>
-                       <control type="image">
-                               <description>background image</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>800</width>
-                               <height>600</height>
-                               <texture border="40">DialogBack2.png</texture>
-                       </control>
-                       <control type="image">
-                               <description>Dialog Header image</description>
-                               <posx>40</posx>
-                               <posy>16</posy>
-                               <width>720</width>
-                               <height>40</height>
-                               <texture>dialogheader.png</texture>
-                       </control>
-                       <control type="button">
-                               <description>Close Window button</description>
-                               <posx>710</posx>
-                               <posy>15</posy>
-                               <width>64</width>
-                               <height>32</height>
-                               <label>-</label>
-                               <font>-</font>
-                               <onclick>PreviousMenu</onclick>
-                               <texturefocus>DialogCloseButton-focus.png</texturefocus>
-                               <texturenofocus>DialogCloseButton.png</texturenofocus>
-                               <onleft>2</onleft>
-                               <onright>2</onright>
-                               <onup>2</onup>
-                               <ondown>2</ondown>
-                               <visible>system.getbool(input.enablemouse)</visible>
-                       </control>
-                       <control type="label" id="3">
-                               <description>No Settings Label</description>
-                               <posx>20</posx>
-                               <posy>180</posy>
-                               <width>760</width>
-                               <align>center</align>
-                               <label>35004</label>
-                               <font>font13caps</font>
-                       </control>
-                       <control type="grouplist" id="5">
-                               <description>control area</description>
-                               <posx>40</posx>
-                               <posy>65</posy>
-                               <width>720</width>
-                               <height>490</height>
-                               <itemgap>5</itemgap>
-                               <pagecontrol>60</pagecontrol>
-                               <onleft>9000</onleft>
-                               <onright>60</onright>
-                               <onup>5</onup>
-                               <ondown>5</ondown>
-                       </control>
-                       <control type="scrollbar" id="60">
-                               <posx>760</posx>
-                               <posy>65</posy>
-                               <width>25</width>
-                               <height>450</height>
-                               <texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
-                               <texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
-                               <texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
-                               <textureslidernib>ScrollBarNib.png</textureslidernib>
-                               <textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
-                               <onleft>5</onleft>
-                               <onright>9000</onright>
-                               <ondown>61</ondown>
-                               <onup>61</onup>
-                               <showonepage>true</showonepage>
-                               <orientation>vertical</orientation>
-                       </control>
+               <control type="image">
+                       <description>background image</description>
+                       <posx>0</posx>
+                       <posy>0</posy>
+                       <width>700</width>
+                       <height>570</height>
+                       <texture border="40">DialogBack.png</texture>
                </control>
-               <control type="sliderex" id="10">
-                       <description>Default Slider</description>
+               <control type="image">
+                       <description>Dialog Header image</description>
+                       <posx>40</posx>
+                       <posy>16</posy>
+                       <width>620</width>
                        <height>40</height>
-                       <texturenofocus border="5">button-nofocus.png</texturenofocus>
-                       <texturefocus border="5">button-focus2.png</texturefocus>
-                       <font>font13</font>
-                       <textcolor>grey2</textcolor>
-                       <focusedcolor>white</focusedcolor>
+                       <texture>dialogheader.png</texture>
+               </control>
+               <control type="label">
+                       <description>header label</description>
+                       <posx>40</posx>
+                       <posy>20</posy>
+                       <width>620</width>
+                       <height>30</height>
+                       <font>font13_title</font>
+                       <label>$LOCALIZE[5]</label>
+                       <align>center</align>
+                       <aligny>center</aligny>
+                       <textcolor>selected</textcolor>
+                       <shadowcolor>black</shadowcolor>
+               </control>
+               <control type="button">
+                       <description>Close Window button</description>
+                       <posx>610</posx>
+                       <posy>15</posy>
+                       <width>64</width>
+                       <height>32</height>
+                       <label>-</label>
+                       <font>-</font>
+                       <onclick>PreviousMenu</onclick>
+                       <texturefocus>DialogCloseButton-focus.png</texturefocus>
+                       <texturenofocus>DialogCloseButton.png</texturenofocus>
+                       <onleft>5</onleft>
+                       <onright>5</onright>
+                       <onup>5</onup>
+                       <ondown>5</ondown>
+                       <visible>system.getbool(input.enablemouse)</visible>
+               </control>
+               <control type="label" id="3">
+                       <description>No Settings Label</description>
+                       <posx>20</posx>
+                       <posy>180</posy>
+                       <width>640</width>
+                       <align>center</align>
+                       <label>35004</label>
+                       <font>font13caps</font>
+               </control>
+               <control type="grouplist" id="5">
+                       <animation effect="slide" start="0,0" end="5,0" time="0" condition="!Control.IsVisible(60)">Conditional</animation>
+                       <description>control area</description>
+                       <posx>30</posx>
+                       <posy>70</posy>
+                       <width>630</width>
+                       <height>410</height>
+                       <itemgap>5</itemgap>
+                       <pagecontrol>60</pagecontrol>
+                       <onleft>28</onleft>
+                       <onright>60</onright>
+                       <onup>28</onup>
+                       <ondown>28</ondown>
+               </control>
+               <control type="scrollbar" id="60">
+                       <posx>658</posx>
+                       <posy>70</posy>
+                       <width>25</width>
+                       <height>410</height>
+                       <texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
+                       <texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
+                       <texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
+                       <textureslidernib>ScrollBarNib.png</textureslidernib>
+                       <textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
+                       <onleft>3</onleft>
+                       <onright>3</onright>
+                       <ondown>60</ondown>
+                       <onup>60</onup>
+                       <showonepage>false</showonepage>
+                       <orientation>vertical</orientation>
                </control>
                <control type="button" id="7">
                        <description>Default Button</description>
                        <font>font13</font>
                        <textcolor>grey2</textcolor>
                        <focusedcolor>white</focusedcolor>
-                       <texturenofocus border="5">button-nofocus.png</texturenofocus>
                        <texturefocus border="5">button-focus2.png</texturefocus>
+                       <texturenofocus border="5">button-nofocus.png</texturenofocus>
                        <aligny>center</aligny>
                        <reverse>yes</reverse>
                </control>
+               <control type="sliderex" id="10">
+                       <description>Default Slider</description>
+                       <height>40</height>
+                       <texturenofocus border="5">button-nofocus.png</texturenofocus>
+                       <texturefocus border="5">button-focus2.png</texturefocus>
+                       <font>font13</font>
+                       <textcolor>grey2</textcolor>
+                       <focusedcolor>white</focusedcolor>
+               </control>
                <control type="image" id="11">
                        <description>separator image</description>
                        <height>2</height>
                </control>
 
                <control type="group" id="9000">
-                       <posx>50</posx>
-                       <posy>530</posy>
+                       <posx>40</posx>
+                       <posy>505</posy>
                        <control type="button" id="29">
                                <description>Cancel Button</description>
                                <posy>0</posy>
                        <control type="button" id="28">
                                <description>OK Button</description>
                                <posy>0</posy>
-                               <posx>250</posx>
+                               <posx>210</posx>
                                <width>200</width>
                                <height>40</height>
                                <align>center</align>
                        <control type="button" id="50">
                                <description>Defaults Button</description>
                                <posy>0</posy>
-                               <posx>500</posx>
+                               <posx>420</posx>
                                <width>200</width>
                                <height>40</height>
                                <align>center</align>
index 8313540..8e8fec8 100644 (file)
                                        <onclick>RunAddon($INFO[Skin.String(HomeVideosButton1)])</onclick>
                                        <icon>$INFO[system.addonicon(Skin.String(HomeVideosButton1))]</icon>
                                        <thumb>-</thumb>
-                                       <visible>Container(9000).HasFocus(2) + !IsEmpty(Skin.String(HomeVideosButton1))</visible>
+                                       <visible>[Container(9000).HasFocus(2) | Container(9000).HasFocus(10) | Container(9000).HasFocus(11)] + !IsEmpty(Skin.String(HomeVideosButton1))</visible>
                                </item>
                                <item>
                                        <label>$INFO[system.addontitle(Skin.String(HomeVideosButton2))]</label>
                                        <onclick>RunAddon($INFO[Skin.String(HomeVideosButton2)])</onclick>
                                        <icon>$INFO[system.addonicon(Skin.String(HomeVideosButton2))]</icon>
                                        <thumb>-</thumb>
-                                       <visible>Container(9000).HasFocus(2) + !IsEmpty(Skin.String(HomeVideosButton2))</visible>
+                                       <visible>[Container(9000).HasFocus(2) | Container(9000).HasFocus(10) | Container(9000).HasFocus(11)] + !IsEmpty(Skin.String(HomeVideosButton2))</visible>
                                </item>
                                <item>
                                        <label>$INFO[system.addontitle(Skin.String(HomeVideosButton3))]</label>
                                        <onclick>RunAddon($INFO[Skin.String(HomeVideosButton3)])</onclick>
                                        <icon>$INFO[system.addonicon(Skin.String(HomeVideosButton3))]</icon>
                                        <thumb>-</thumb>
-                                       <visible>Container(9000).HasFocus(2) + !IsEmpty(Skin.String(HomeVideosButton3))</visible>
+                                       <visible>[Container(9000).HasFocus(2) | Container(9000).HasFocus(10) | Container(9000).HasFocus(11)] + !IsEmpty(Skin.String(HomeVideosButton3))</visible>
                                </item>
                                <item>
                                        <label>$INFO[system.addontitle(Skin.String(HomeVideosButton4))]</label>
                                        <onclick>RunAddon($INFO[Skin.String(HomeVideosButton4)])</onclick>
                                        <icon>$INFO[system.addonicon(Skin.String(HomeVideosButton4))]</icon>
                                        <thumb>-</thumb>
-                                       <visible>Container(9000).HasFocus(2) + !IsEmpty(Skin.String(HomeVideosButton4))</visible>
+                                       <visible>[Container(9000).HasFocus(2) | Container(9000).HasFocus(10) | Container(9000).HasFocus(11)] + !IsEmpty(Skin.String(HomeVideosButton4))</visible>
                                </item>
                                <item>
                                        <label>$INFO[system.addontitle(Skin.String(HomeVideosButton5))]</label>
                                        <onclick>RunAddon($INFO[Skin.String(HomeVideosButton5)])</onclick>
                                        <icon>$INFO[system.addonicon(Skin.String(HomeVideosButton5))]</icon>
                                        <thumb>-</thumb>
-                                       <visible>Container(9000).HasFocus(2) + !IsEmpty(Skin.String(HomeVideosButton5))</visible>
+                                       <visible>[Container(9000).HasFocus(2) | Container(9000).HasFocus(10) | Container(9000).HasFocus(11)] + !IsEmpty(Skin.String(HomeVideosButton5))</visible>
                                </item>
 
                                <item>
index c885b26..b563db5 100644 (file)
@@ -28,7 +28,7 @@
                        <texture>black-back.png</texture>
                        <animation effect="fade" time="400">Visible</animation>
                        <animation effect="fade" time="200">Hidden</animation>
-                       <visible>Window.IsActive(MovieInformation) | Window.IsActive(MusicInformation) | Window.IsActive(SongInformation) | Window.IsActive(FileBrowser) | Window.IsActive(TextViewer) | Window.IsActive(AddonSettings) | Window.IsActive(ContentSettings) | Window.IsActive(SelectDialog) | Window.IsActive(FileStackingDialog) | Window.IsActive(MediaSource) | Window.IsActive(PictureInfo) | Window.IsActive(PlayerControls) | Window.IsActive(VirtualKeyboard) | Window.IsActive(NumericInput) | Window.IsActive(ProfileSettings) | Window.IsActive(LockSettings) | Window.IsActive(SmartPlaylistEditor) | Window.IsActive(SmartPlaylistRule) | Window.IsActive(script-Apple_Movie_Trailers-settings.xml) | Window.IsActive(script-Apple_Movie_Trailers-chooser.xml) | Window.IsActive(script-Apple_Movie_Trailers-search.xml) | Window.IsActive(script-Apple_Movie_Trailers-showtimes.xml) | Window.IsActive(script-XBMC_Lyrics-settings.xml) | Window.IsActive(script-RSS_Editor-rssEditor.xml) | Window.IsActive(script-RSS_Editor-setEditor.xml) | Window.IsActive(AddonInformation)</visible>
+                       <visible>Window.IsActive(MovieInformation) | Window.IsActive(MusicInformation) | Window.IsActive(SongInformation) | Window.IsActive(FileBrowser) | Window.IsActive(TextViewer) | Window.IsActive(AddonSettings) | Window.IsActive(ContentSettings) | Window.IsActive(SelectDialog) | Window.IsActive(FileStackingDialog) | Window.IsActive(MediaSource) | Window.IsActive(PictureInfo) | Window.IsActive(PlayerControls) | Window.IsActive(VirtualKeyboard) | Window.IsActive(NumericInput) | Window.IsActive(ProfileSettings) | Window.IsActive(LockSettings) | Window.IsActive(SmartPlaylistEditor) | Window.IsActive(SmartPlaylistRule) | Window.IsActive(script-Apple_Movie_Trailers-settings.xml) | Window.IsActive(script-Apple_Movie_Trailers-chooser.xml) | Window.IsActive(script-Apple_Movie_Trailers-search.xml) | Window.IsActive(script-Apple_Movie_Trailers-showtimes.xml) | Window.IsActive(script-XBMC_Lyrics-settings.xml) | Window.IsActive(script-RSS_Editor-rssEditor.xml) | Window.IsActive(script-RSS_Editor-setEditor.xml) | Window.IsActive(AddonInformation) | Window.IsActive(Peripherals) | Window.IsActive(PeripheralSettings)</visible>
                </control>
        </include>
        <include name="WindowTitleCommons">
index e595c18..014e3a9 100644 (file)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--Translator: Özgür BASKIN (queeup)-->
 <!--Email: ozgur.baskin@gmail.com-->
-<!--Date of translation: 20/04/2011-->
-<!--Turkish strings based on English strings commit 51ed57d4fede2c21c1ca-->
+<!--Date of translation: 08/10/2011-->
+<!--Turkish strings based on English strings commit 52a14da027966458c44b1e7899f6c9f155ee1c44 -->
 <strings>
   <!-- Misc labels -->
   <string id="31000">Değiştir</string>
@@ -62,7 +62,7 @@
   <string id="31102">Arka Plan</string>
   <string id="31103">Resim slayt gösterisinde "DURAKLATILDI"yı göster</string>
   <string id="31104">Fragmanları pencere içinde oynat [COLOR=grey3](Sadece Video Bilgisi İletişim Kutusu İçin)[/COLOR]</string>
-  <string id="31105"></string>
+  <string id="31105">"Videolar" düğmesi herzaman video "Dosyalar"'a gider</string>
   <string id="31106">Çeşitli seçenekler</string>
   <string id="31107">Video dosya adlarında etiket okumayı gizle [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]</string>
   <string id="31108">Ana Menü Tuşlarını Gizle</string>
@@ -76,7 +76,7 @@
   <string id="31116"></string>
   <string id="31117">Son Eklenen Videoları Göster</string>
   <string id="31118">Ana Sayfa Programlar Alt Menüsü</string>
-  <string id="31119"></string>  <!-- blanked 2010-11-12 -->
+  <string id="31119">Arkaplan Fanartını Gizle</string>
   <string id="31120">TUŞ ETİKETİ</string>
   <string id="31121"></string>  <!-- blanked 2010-11-12 -->
   <string id="31122">Hava Durumu Sayfası</string>
   <string id="31124">Arkaplanda Oynatılan Videoyu göster</string>
   <string id="31125">Arkaplanda Görsel Ögeyi göster</string>
 
-  <string id="31126"></string>  <!-- blanked 2010-11-12 -->
-  <string id="31127"></string>  <!-- blanked 2010-11-12 -->
-  <string id="31128">Lyrics</string>
+  <string id="31126">Play TV theme songs in video library (TvTunes eklentisi)</string>
+  <string id="31127">TvTunes</string>
+  <string id="31128">Şarkı Sözleri</string>
   <string id="31129"></string>  <!-- blanked 2010-11-12 -->
   <string id="31130"></string>  <!-- blanked 2010-11-12 -->
   
   <string id="31131"></string>
-  <string id="31132">Lyrics Eklentisi</string>
+  <string id="31132">Şarkı Sözleri Eklentisi</string>
   <string id="31133">Altyazı Eklentisi</string>
   <string id="31134">Ana Sayfa Videolar Alt Menüsü</string>
   <string id="31135">Ana Sayfa Müzik Alt Menüsü</string>
   <string id="31202">Oyuncuları Göster</string>
   <string id="31203">Şarkını Seç</string>
   <string id="31204">Bölge Bağlantıları</string>
-  <string id="31205">Lyrics Kaynağı</string>
+  <string id="31205">Şarkı Sözleri Kaynağı</string>
 
   <!-- Extra labels -->
   <string id="31300">Mevcut Sıcaklık</string>
   <string id="31408">[B]EKLENTİLERİ YAPILANDIR[/B][CR][CR]Yüklenmiş eklentileri yönet · Eklentilere gözat ve yenilerini yükle[CR]Eklenti ayarlarını değiştir</string>
 
   <string id="31421">Oturum açıp devam etmek için[CR]XBMC kullanıcı profilinizi seçin</string>
+  
+  <!-- Weather plugin -->
+  <string id="31900">Hava Durumu Haritaları</string>
+  <string id="31901">36 Saatlik Hava Tahmini</string>
+  <string id="31902">Saatlik Hava Tahmini</string>
+  <string id="31903">Haftalık Hava Tahmini</string>
+  <string id="31904">10 Günlik Hava Tahmini</string>
+  <string id="31905">Hava Tahmini</string>
+  <string id="31906">Video ve Haritalar</string>
+  <string id="31907">Video Hava Tahmini [COLOR=grey2](Tam ekran oynatım)[/COLOR]</string>
+  <string id="31908">Chance of Precipitation</string>
+  <string id="31909">Hava tahmini bilgisi getiriliyor...</string>
+
 </strings>
diff --git a/addons/skin.touched b/addons/skin.touched
new file mode 160000 (submodule)
index 0000000..1d03746
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit 1d03746646111f97e28b807a290bd762c7db547c
diff --git a/addons/skin.touched/4x3Hirez/AddonBrowser.xml b/addons/skin.touched/4x3Hirez/AddonBrowser.xml
deleted file mode 100644 (file)
index 04d2db6..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-<window id="40">
-       <defaultcontrol always="true">50</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <views>50,500</views>
-       <onunload>Skin.Reset(MediaSubMenuVisible)</onunload>
-       <controls>
-               <include>CommonBackground</include>
-               <include>FileCountCommons</include>
-               <include>HomeButtonCommons</include>
-               <include>CommonNowPlaying</include>
-               <include>OptionsButtonCommons</include>
-               <control type="label">
-                       <description>Window label</description>
-                       <include>MediaWindowTitleCommons</include>
-                       <label>$LOCALIZE[24001]</label>
-               </control>
-               <control type="group">
-                       <include>Window_OpenClose_Animation_Zoom</include>
-                       <include>CommonRootViewAddons</include> <!-- view id = 50 -->
-                       <include>ThumbnailView</include> <!-- view id = 500 -->
-                       <include>ScrollArrowsCommons</include>
-               </control>
-               <include>MediaSubMenu</include>
-               <control type="group">
-                       <visible>Skin.HasSetting(MediaSubMenuVisible)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <control type="button">
-                               <description>Hidden button to close the sort when its focused</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>ScreenWidth</width>
-                               <height>ScreenHeight</height>
-                               <texturenofocus>-</texturenofocus>
-                               <texturefocus>-</texturefocus>
-                               <onclick>Skin.Reset(MediaSubMenuVisible)</onclick>
-                       </control>
-                       <control type="group">
-                               <posx>340r</posx>
-                               <posy>130</posy>
-                               <control type="image">
-                                       <description>Shadow Background</description>
-                                       <posx>-30</posx>
-                                       <posy>-30</posy>
-                                       <width>380</width>
-                                       <height>500</height>
-                                       <texture border="30">ShadowBorder.png</texture>
-                               </control>
-                               <control type="button">
-                                       <description>Panel Background image</description>
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>320</width>
-                                       <height>440</height>
-                                       <texturefocus border="5">SubBack.png</texturefocus>
-                                       <texturenofocus border="5">SubBack.png</texturenofocus>
-                                       <onclick>-</onclick>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Forground image</description>
-                                       <posx>10</posx>
-                                       <posy>10</posy>
-                                       <width>300</width>
-                                       <height>420</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Arrow image</description>
-                                       <posx>270</posx>
-                                       <posy>-34</posy>
-                                       <width>40</width>
-                                       <height>40</height>
-                                       <texture>arrow-big-up.png</texture>
-                               </control>
-                               <control type="grouplist">
-                                       <posx>11</posx>
-                                       <posy>10</posy>
-                                       <width>298</width>
-                                       <height>420</height>
-                                       <onleft>9000</onleft>
-                                       <onright>50</onright>
-                                       <onup>9000</onup>
-                                       <ondown>9000</ondown>
-                                       <itemgap>0</itemgap>
-                                       <control type="button" id="3">
-                                               <description>Sort by button</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>103</label>
-                                       </control>
-                                       <control type="togglebutton" id="4">
-                                               <description>Sort asc</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <alttexturefocus>button-focus2.png</alttexturefocus>
-                                               <alttexturenofocus>button-nofocus.png</alttexturenofocus>
-                                               <label>31051</label>
-                                               <altlabel>31050</altlabel>
-                                               <usealttexture>Container.SortDirection(Ascending)</usealttexture>
-                                       </control>
-                                       <control type="radiobutton" id ="5">
-                                               <description>Enable auto-updates</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>24063</label>
-                                       </control>
-                                       <control type="radiobutton" id ="6">
-                                               <description>No notifications</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>25000</label>
-                                       </control>
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>100</posy>
-                                               <width>298</width>
-                                               <height>10</height>
-                                               <texture>shelf_shadow.png</texture>
-                                       </control>
-                               </control>
-                       </control>
-               </control>
-               <include>ScrollOffsetLabel</include>
-               <include>BehindDialogFadeOut</include>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/DialogAddonInfo.xml b/addons/skin.touched/4x3Hirez/DialogAddonInfo.xml
deleted file mode 100644 (file)
index c8543e5..0000000
+++ /dev/null
@@ -1,338 +0,0 @@
-<window id="146">
-       <defaultcontrol always="true"></defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>140</posx>
-               <posy>30</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1000</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="label">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>910</width>
-                       <label>$LOCALIZE[24003]</label>
-               </control>
-               <control type="group">
-                       <posx>930</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>1000</width>
-                       <height>840</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-
-               <control type="group">
-                       <posy>70</posy>
-                       <posx>20</posx>
-                       <control type="label">
-                               <description>Addon Title value</description>
-                               <posx>20</posx>
-                               <posy>0</posy>
-                               <width>960</width>
-                               <height>30</height>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font28_title</font>
-                               <label>$INFO[ListItem.Property(Addon.Name)]</label>
-                               <textcolor>black</textcolor>
-                               <scroll>true</scroll>
-                       </control>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>40</posy>
-                               <width>260</width>
-                               <height>300</height>
-                               <aspectratio>keep</aspectratio>
-                               <bordertexture border="8">ThumbShadow.png</bordertexture>
-                               <bordersize>8</bordersize>
-                               <texture background="true">$INFO[ListItem.Icon]</texture>
-                       </control>
-                       <control type="label">
-                               <posx>280</posx>
-                               <posy>50</posy>
-                               <width>680</width>
-                               <height>30</height>
-                               <font>font13_title</font>
-                               <textcolor>black</textcolor>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <label>$LOCALIZE[21821]$INFO[Container(601).CurrentPage, ( $LOCALIZE[31024] ]$INFO[Container(601).NumPages,/, )]</label>
-                       </control>
-                       <control type="textbox" id="601">
-                               <description>Description Value for Albums</description>
-                               <posx>280</posx>
-                               <posy>80</posy>
-                               <width>680</width>
-                               <height>300</height>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <pagecontrol>-</pagecontrol>
-                               <label>$INFO[ListItem.Property(Addon.Description)]</label>
-                       </control>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>390</posy>
-                               <width>960</width>
-                               <height>5</height>
-                               <texture>separator.png</texture>
-                       </control>
-                       <control type="group">
-                               <posx>0</posx>
-                               <posy>420</posy>
-                               <control type="label">
-                                       <description>Type txt</description>
-                                       <posx>200</posx>
-                                       <posy>0</posy>
-                                       <width>200</width>
-                                       <height>25</height>
-                                       <label>$LOCALIZE[146]</label>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13_title</font>
-                                       <textcolor>black</textcolor>
-                               </control>
-                               <control type="label">
-                                       <description>Type Value</description>
-                                       <posx>210</posx>
-                                       <posy>0</posy>
-                                       <width>770</width>
-                                       <height>25</height>
-                                       <label fallback="416">$INFO[ListItem.Property(Addon.Type)]</label>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <scroll>true</scroll>
-                               </control>
-                               <control type="label">
-                                       <description>Author txt</description>
-                                       <posx>200</posx>
-                                       <posy>30</posy>
-                                       <width>200</width>
-                                       <height>25</height>
-                                       <label>$LOCALIZE[21863]:</label>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13_title</font>
-                                       <textcolor>black</textcolor>
-                               </control>
-                               <control type="label">
-                                       <description>Author Value</description>
-                                       <posx>210</posx>
-                                       <posy>30</posy>
-                                       <width>770</width>
-                                       <height>25</height>
-                                       <label fallback="416">$INFO[ListItem.Property(Addon.Creator)]</label>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <scroll>true</scroll>
-                               </control>
-                               <control type="label">
-                                       <description>Version txt</description>
-                                       <posx>200</posx>
-                                       <posy>60</posy>
-                                       <width>200</width>
-                                       <height>25</height>
-                                       <label>$LOCALIZE[24051]</label>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13_title</font>
-                                       <textcolor>black</textcolor>
-                               </control>
-                               <control type="label">
-                                       <description>Version Value</description>
-                                       <posx>210</posx>
-                                       <posy>60</posy>
-                                       <width>770</width>
-                                       <height>25</height>
-                                       <label fallback="416">$INFO[ListItem.Property(Addon.Version)]</label>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <scroll>true</scroll>
-                               </control>
-                               <control type="label">
-                                       <description>Rating txt</description>
-                                       <posx>200</posx>
-                                       <posy>90</posy>
-                                       <width>200</width>
-                                       <height>25</height>
-                                       <label>$LOCALIZE[563]:</label>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13_title</font>
-                                       <textcolor>black</textcolor>
-                               </control>
-                               <control type="image">
-                                       <description>Rating value</description>
-                                       <posx>208</posx>
-                                       <posy>88</posy>
-                                       <width>170</width>
-                                       <height>34</height>
-                                       <aspectratio align="left">keep</aspectratio>
-                                       <texture>$INFO[ListItem.Property(Addon.StarRating),dark/left_rating/]</texture>
-                               </control>
-                               <control type="label">
-                                       <description>Summary txt</description>
-                                       <posx>200</posx>
-                                       <posy>120</posy>
-                                       <width>200</width>
-                                       <height>25</height>
-                                       <label>$LOCALIZE[20037]:</label>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13_title</font>
-                                       <textcolor>black</textcolor>
-                               </control>
-                               <control type="fadelabel">
-                                       <description>Summary Value</description>
-                                       <posx>210</posx>
-                                       <posy>120</posy>
-                                       <width>770</width>
-                                       <height>25</height>
-                                       <label fallback="416">$INFO[ListItem.Property(Addon.Summary)]</label>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <scrollout>false</scrollout>
-                                       <pauseatend>2000</pauseatend>
-                               </control>
-                               <control type="label">
-                                       <description>Disclaimer txt</description>
-                                       <posx>200</posx>
-                                       <posy>150</posy>
-                                       <width>200</width>
-                                       <height>25</height>
-                                       <label>$LOCALIZE[24052]:</label>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13_title</font>
-                                       <textcolor>black</textcolor>
-                               </control>
-                               <control type="textbox">
-                                       <description>Disclaimer</description>
-                                       <posx>210</posx>
-                                       <posy>146</posy>
-                                       <width>770</width>
-                                       <height>60</height>
-                                       <font>font13</font>
-                                       <align>-</align>
-                                       <textcolor>black</textcolor>
-                                       <label fallback="231">$INFO[ListItem.Property(Addon.Disclaimer)]</label>
-                                       <autoscroll time="2000" delay="3000" repeat="5000">true</autoscroll>
-                               </control>
-                       </control>
-               </control>
-
-               <control type="grouplist" id="9000">
-                       <posx>20</posx>
-                       <posy>830</posy>
-                       <width>960</width>
-                       <height>50</height>
-                       <itemgap>5</itemgap>
-                       <align>center</align>
-                       <orientation>horizontal</orientation>
-                       <onleft>9000</onleft>
-                       <onright>9000</onright>
-                       <onup>50</onup>
-                       <ondown>49</ondown>
-                       <control type="button" id ="6">
-                               <description>Enable Addon button</description>
-                               <width>185</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>24022</label>
-                       </control>
-                       <control type="button" id="7">
-                               <description>Disable Addon button</description>
-                               <width>185</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>24021</label>
-                       </control>
-                       <control type="button" id="9">
-                               <description>Addon Settings</description>
-                               <width>185</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>24020</label>
-                       </control>
-                       <control type="button" id="8">
-                               <description>Update Addon button</description>
-                               <width>185</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>24069</label>
-                       </control>
-                       <control type="button" id="10">
-                               <description>Changelog button</description>
-                               <width>185</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>24036</label>
-                       </control>
-               </control>
-
-               <control type="group">
-                       <include>VisibleFadeEffect</include>
-                       <control type="group">
-                               <visible>!IsEmpty(ListItem.Property(Addon.broken))</visible>
-                               <posx>40</posx>
-                               <posy>720</posy>
-                               <control type="image">
-                                       <description>background image</description>
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>920</width>
-                                       <height>100</height>
-                                       <texture border="20">OverlayDialogBackground.png</texture>
-                               </control>
-                               <control type="image">
-                                       <description>Icon image</description>
-                                       <posx>18</posx>
-                                       <posy>18</posy>
-                                       <width>64</width>
-                                       <height>64</height>
-                                       <texture>DefaultIconError.png</texture>
-                               </control>
-                               <control type="label">
-                                       <description>header label</description>
-                                       <posx>100</posx>
-                                       <posy>15</posy>
-                                       <width>800</width>
-                                       <height>25</height>
-                                       <font>font13_title</font>
-                                       <label>24096</label>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>selected</textcolor>
-                               </control>
-                               <control type="textbox">
-                                       <description>Reason label</description>
-                                       <posx>100</posx>
-                                       <posy>35</posy>
-                                       <width>800</width>
-                                       <height>50</height>
-                                       <font>font13</font>
-                                       <label>$INFO[ListItem.Property(Addon.broken)]</label>
-                                       <align>left</align>
-                                       <textcolor>white</textcolor>
-                               </control>
-                       </control>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/DialogAddonSettings.xml b/addons/skin.touched/4x3Hirez/DialogAddonSettings.xml
deleted file mode 100644 (file)
index cdd5657..0000000
+++ /dev/null
@@ -1,200 +0,0 @@
-<window id="10140">
-       <defaultcontrol></defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>140</posx>
-               <posy>30</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1000</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="label" id="20">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>910</width>
-                       <label>-</label>
-               </control>
-               <control type="group">
-                       <posx>930</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>1000</width>
-                       <height>840</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-
-               <control type="group">
-                       <posx>20</posx>
-                       <posy>75</posy>
-                       <control type="button">
-                               <description>left Arrow</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>40</width>
-                               <height>40</height>
-                               <texturefocus>arrow-big-left.png</texturefocus>
-                               <texturenofocus>arrow-big-left.png</texturenofocus>
-                               <onclick>Control.Move(9,-1)</onclick>
-                               <include>VisibleFadeEffect</include>
-                               <visible>Container(9).HasPrevious</visible>
-                       </control>
-                       <control type="button" id="11001">
-                               <description>right Arrow</description>
-                               <posx>920</posx>
-                               <posy>0</posy>
-                               <width>40</width>
-                               <height>40</height>
-                               <texturefocus>arrow-big-right.png</texturefocus>
-                               <texturenofocus>arrow-big-right.png</texturenofocus>
-                               <onclick>Control.Move(9,1)</onclick>
-                               <include>VisibleFadeEffect</include>
-                               <visible>Container(9).HasNext</visible>
-                       </control>
-               </control>
-               <control type="grouplist" id="9">
-                       <description>button area</description>
-                       <posx>60</posx>
-                       <posy>70</posy>
-                       <width>880</width>
-                       <height>50</height>
-                       <itemgap>5</itemgap>
-                       <align>center</align>
-                       <orientation>horizontal</orientation>
-                       <onleft>9</onleft>
-                       <onright>9</onright>
-                       <onup>2</onup>
-                       <ondown>2</ondown>
-               </control>
-               <control type="grouplist" id="2">
-                       <description>control area</description>
-                       <posx>40</posx>
-                       <posy>140</posy>
-                       <width>920</width>
-                       <height>670</height>
-                       <itemgap>-1</itemgap>
-                       <pagecontrol>30</pagecontrol>
-                       <onup>9</onup>
-                       <ondown>9001</ondown>
-                       <onleft>2</onleft>
-                       <onright>30</onright>
-               </control>
-               <control type="scrollbar" id="30">
-                       <posx>975</posx>
-                       <posy>120</posy>
-                       <width>20</width>
-                       <height>670</height>
-                       <texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
-                       <texturesliderbar border="2,16,2,16">ScrollBarV_bar.png</texturesliderbar>
-                       <texturesliderbarfocus border="2,16,2,16">ScrollBarV_bar_focus.png</texturesliderbarfocus>
-                       <textureslidernib>ScrollBarNib.png</textureslidernib>
-                       <textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
-                       <onleft>2</onleft>
-                       <onright>9</onright>
-                       <showonepage>false</showonepage>
-                       <orientation>vertical</orientation>
-               </control>
-               <control type="grouplist" id="9001">
-                       <posx>20</posx>
-                       <posy>830</posy>
-                       <width>960</width>
-                       <height>50</height>
-                       <itemgap>5</itemgap>
-                       <align>center</align>
-                       <orientation>horizontal</orientation>
-                       <onleft>9001</onleft>
-                       <onright>9001</onright>
-                       <onup>2</onup>
-                       <ondown>9</ondown>
-                       <control type="button" id="10">
-                               <description>OK Button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>186</label>
-                       </control>
-                       <control type="button" id="11">
-                               <description>Cancel Button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>222</label>
-                       </control>
-                       <control type="button" id="12">
-                               <description>Defaults Button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>409</label>
-                       </control>
-               </control>
-
-               <control type="button" id="13">
-                       <description>Default Category Button</description>
-                       <width>200</width>
-                       <include>ButtonInfoDialogsCommonValues</include>
-               </control>
-               <control type="button" id="3">
-                       <description>Default Button</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <height>55</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-               </control>
-               <control type="radiobutton" id="4">
-                       <description>Default RadioButton</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <height>55</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-               </control>
-               <control type="spincontrolex" id="5">
-                       <description>Default SpinControlex</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <height>55</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                       <aligny>center</aligny>
-                       <reverse>yes</reverse>
-               </control>
-               <control type="image" id="6">
-                       <description>separator image</description>
-                       <height>5</height>
-                       <texture>separator.png</texture>
-               </control>
-               <control type="label" id="7">
-                       <height>50</height>
-                       <font>font13_title</font>
-                       <label>-</label>
-                       <textcolor>black</textcolor>
-                       <align>center</align>
-                       <aligny>center</aligny>
-               </control>
-               <control type="sliderex" id="8">
-                       <description>Default Slider</description>
-                       <height>55</height>
-                       <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/DialogAlbumInfo.xml b/addons/skin.touched/4x3Hirez/DialogAlbumInfo.xml
deleted file mode 100644 (file)
index e3086cc..0000000
+++ /dev/null
@@ -1,550 +0,0 @@
-<window id="2001">
-       <defaultcontrol always="true">5</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>140</posx>
-               <posy>30</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1000</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="label">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>910</width>
-                       <label>$INFO[Listitem.Album]</label>
-                       <visible>container.content(Albums)</visible>
-               </control>
-               <control type="label">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>910</width>
-                       <label>$INFO[Listitem.Artist]</label>
-                       <visible>container.content(Artists)</visible>
-               </control>
-               <control type="group">
-                       <posx>930</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>1000</width>
-                       <height>840</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-
-               <control type="group">
-                       <visible>Container.Content(Albums) + !Control.IsVisible(50)</visible>
-                       <posy>70</posy>
-                       <posx>20</posx>
-                       <include>VisibleFadeEffect</include>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>260</width>
-                               <height>360</height>
-                               <aspectratio>keep</aspectratio>
-                               <bordertexture border="8">ThumbShadow.png</bordertexture>
-                               <bordersize>8</bordersize>
-                               <texture background="true">$INFO[ListItem.Icon]</texture>
-                       </control>
-                       <control type="label">
-                               <posx>280</posx>
-                               <posy>0</posy>
-                               <width>680</width>
-                               <height>30</height>
-                               <font>font13_title</font>
-                               <textcolor>black</textcolor>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <label>$LOCALIZE[21821]$INFO[Container(601).CurrentPage, ( $LOCALIZE[31024] ]$INFO[Container(601).NumPages,/, )]</label>
-                       </control>
-                       <control type="textbox" id="601">
-                               <description>Description Value for Albums</description>
-                               <posx>280</posx>
-                               <posy>30</posy>
-                               <width>680</width>
-                               <height>330</height>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <pagecontrol>-</pagecontrol>
-                               <label>$INFO[ListItem.Property(Album_Description)]</label>
-                       </control>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>390</posy>
-                               <width>960</width>
-                               <height>5</height>
-                               <texture>separator.png</texture>
-                       </control>
-                       <control type="list" id="49">
-                               <posx>0</posx>
-                               <posy>400</posy>
-                               <width>960</width>
-                               <height>330</height>
-                               <onleft>49</onleft>
-                               <onright>49</onright>
-                               <onup>9000</onup>
-                               <ondown>61</ondown>
-                               <pagecontrol>-</pagecontrol>
-                               <scrolltime>200</scrolltime>
-                               <itemlayout height="30">
-                                       <control type="label">
-                                               <posx>200</posx>
-                                               <posy>0</posy>
-                                               <width>160</width>
-                                               <height>30</height>
-                                               <font>font13_title</font>
-                                               <align>right</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                                       <control type="label">
-                                               <posx>210</posx>
-                                               <posy>0</posy>
-                                               <width>750</width>
-                                               <height>30</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>white</selectedcolor>
-                                               <info>ListItem.Label2</info>
-                                       </control>
-                               </itemlayout>
-                               <focusedlayout height="30">
-                                       <control type="label">
-                                               <posx>200</posx>
-                                               <posy>0</posy>
-                                               <width>160</width>
-                                               <height>30</height>
-                                               <font>font13_title</font>
-                                               <align>right</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                                       <control type="label">
-                                               <posx>210</posx>
-                                               <posy>0</posy>
-                                               <width>750</width>
-                                               <height>30</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>white</selectedcolor>
-                                               <info>ListItem.Label2</info>
-                                       </control>
-                               </focusedlayout>
-                               <content>
-                                       <item>
-                                               <label>$LOCALIZE[557]:</label>
-                                               <label2>$INFO[ListItem.Artist]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Artist)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[515]:</label>
-                                               <label2>$INFO[ListItem.Genre]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Genre)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[563]:</label>
-                                               <label2>$INFO[ListItem.Rating]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Rating)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[175]:</label>
-                                               <label2>$INFO[ListItem.Property(Album_Mood)]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Property(Album_Mood))</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[176]:</label>
-                                               <label2>$INFO[ListItem.Property(Album_Style)]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Property(Album_Style))</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[21895]:</label>
-                                               <label2>$INFO[ListItem.Property(Album_Theme)]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Property(Album_Theme))</visible>
-                                       </item>
-                                       <item>
-                                               <label>146</label>
-                                               <label2>$INFO[ListItem.Property(Album_Type)]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Property(Album_Type))</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[21899]:</label>
-                                               <label2>$INFO[ListItem.Property(Album_Label)]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Property(Album_Label))</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[562]:</label>
-                                               <label2>$INFO[ListItem.Year]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Year)</visible>
-                                       </item>
-                               </content>
-                       </control>
-               </control>
-
-               <control type="group">
-                       <visible>Container.Content(Artists) + !Control.IsVisible(50)</visible>
-                       <posy>70</posy>
-                       <posx>20</posx>
-                       <include>VisibleFadeEffect</include>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>260</width>
-                               <height>360</height>
-                               <aspectratio>keep</aspectratio>
-                               <bordertexture border="8">ThumbShadow.png</bordertexture>
-                               <bordersize>8</bordersize>
-                               <texture background="true">$INFO[ListItem.Icon]</texture>
-                       </control>
-                       <control type="label">
-                               <posx>280</posx>
-                               <posy>0</posy>
-                               <width>680</width>
-                               <height>30</height>
-                               <font>font13_title</font>
-                               <textcolor>black</textcolor>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <label>$LOCALIZE[21821]$INFO[Container(600).CurrentPage, ( $LOCALIZE[31024] ]$INFO[Container(600).NumPages,/, )]</label>
-                       </control>
-                       <control type="textbox" id="600">
-                               <description>Description Value for Albums</description>
-                               <posx>280</posx>
-                               <posy>30</posy>
-                               <width>680</width>
-                               <height>330</height>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <pagecontrol>-</pagecontrol>
-                               <label>$INFO[ListItem.Property(Artist_Description)]</label>
-                       </control>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>390</posy>
-                               <width>960</width>
-                               <height>5</height>
-                               <texture>separator.png</texture>
-                       </control>
-                       <control type="list" id="49">
-                               <posx>0</posx>
-                               <posy>400</posy>
-                               <width>960</width>
-                               <height>330</height>
-                               <onleft>49</onleft>
-                               <onright>49</onright>
-                               <onup>9000</onup>
-                               <ondown>61</ondown>
-                               <pagecontrol>-</pagecontrol>
-                               <scrolltime>200</scrolltime>
-                               <itemlayout height="30">
-                                       <control type="label">
-                                               <posx>200</posx>
-                                               <posy>0</posy>
-                                               <width>160</width>
-                                               <height>30</height>
-                                               <font>font13_title</font>
-                                               <align>right</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                                       <control type="label">
-                                               <posx>210</posx>
-                                               <posy>0</posy>
-                                               <width>750</width>
-                                               <height>30</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>white</selectedcolor>
-                                               <info>ListItem.Label2</info>
-                                       </control>
-                               </itemlayout>
-                               <focusedlayout height="30">
-                                       <control type="label">
-                                               <posx>200</posx>
-                                               <posy>0</posy>
-                                               <width>160</width>
-                                               <height>30</height>
-                                               <font>font13_title</font>
-                                               <align>right</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                                       <control type="label">
-                                               <posx>210</posx>
-                                               <posy>0</posy>
-                                               <width>750</width>
-                                               <height>30</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>white</selectedcolor>
-                                               <info>ListItem.Label2</info>
-                                       </control>
-                               </focusedlayout>
-                               <content>
-                                       <item>
-                                               <label>$LOCALIZE[21893]:</label>
-                                               <label2>$INFO[ListItem.Property(Artist_Born)]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Property(Artist_Born))</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[21894]:</label>
-                                               <label2>$INFO[ListItem.Property(Artist_Formed)]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Property(Artist_Formed))</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[515]:</label>
-                                               <label2>$INFO[ListItem.Genre]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Genre)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[175]:</label>
-                                               <label2>$INFO[ListItem.Property(Artist_Mood)]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Property(Artist_Mood))</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[176]:</label>
-                                               <label2>$INFO[ListItem.Property(Artist_Style)]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Property(Artist_Style))</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[21892]:</label>
-                                               <label2>$INFO[ListItem.Property(Artist_Instrument)]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Property(Artist_Instrument))</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[21897]:</label>
-                                               <label2>$INFO[ListItem.Property(Artist_Died)]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Property(Artist_Died))</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[21896]:</label>
-                                               <label2>$INFO[ListItem.Property(Artist_Disbanded)]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Property(Artist_Disbanded))</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[21898]:</label>
-                                               <label2>$INFO[ListItem.Property(Artist_YearsActive)]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Property(Artist_YearsActive))</visible>
-                                       </item>
-                               </content>
-                       </control>
-               </control>
-
-               <control type="panel" id="50">
-                       <posx>0</posx>
-                       <posy>85</posy>
-                       <width>1000</width>
-                       <height>680</height>
-                       <onup>50</onup>
-                       <onleft>50</onleft>
-                       <onright>50</onright>
-                       <ondown>50</ondown>
-                       <pagecontrol>-</pagecontrol>
-                       <scrolltime>200</scrolltime>
-                       <include>VisibleFadeEffect</include>
-                       <itemlayout condition="Container.Content(Albums)" height="60" width="1000">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>-2</posy>
-                                       <width>1000</width>
-                                       <height>5</height>
-                                       <texture>separator.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>30</posx>
-                                       <posy>0</posy>
-                                       <width>940</width>
-                                       <height>60</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <label>([B]$INFO[ListItem.TrackNumber][/B]) - $INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>970</posx>
-                                       <posy>0</posy>
-                                       <width>500</width>
-                                       <height>60</height>
-                                       <font>font13</font>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <label>$INFO[ListItem.Duration]</label>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout condition="Container.Content(Albums)" height="60" width="700">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>-2</posy>
-                                       <width>1000</width>
-                                       <height>5</height>
-                                       <texture>separator.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>30</posx>
-                                       <posy>0</posy>
-                                       <width>940</width>
-                                       <height>60</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <label>([B]$INFO[ListItem.TrackNumber][/B]) - $INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>970</posx>
-                                       <posy>0</posy>
-                                       <width>500</width>
-                                       <height>60</height>
-                                       <font>font13</font>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <label>$INFO[ListItem.Duration]</label>
-                               </control>
-                       </focusedlayout>
-                       <itemlayout condition="Container.Content(Artists)" height="260" width="250">
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>0</posy>
-                                       <width>230</width>
-                                       <height>230</height>
-                                       <texture>$INFO[ListItem.Icon]</texture>
-                                       <bordertexture border="8">ThumbShadow.png</bordertexture>
-                                       <bordersize>8</bordersize>
-                               </control>
-                               <control type="label">
-                                       <posx>125</posx>
-                                       <posy>230</posy>
-                                       <width>230</width>
-                                       <height>30</height>
-                                       <font>font12</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout condition="Container.Content(Artists)" height="260" width="250">
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>0</posy>
-                                       <width>230</width>
-                                       <height>230</height>
-                                       <texture>$INFO[ListItem.Icon]</texture>
-                                       <bordertexture border="8">ThumbShadow.png</bordertexture>
-                                       <bordersize>8</bordersize>
-                               </control>
-                               <control type="label">
-                                       <posx>125</posx>
-                                       <posy>230</posy>
-                                       <width>230</width>
-                                       <height>30</height>
-                                       <font>font12</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                       </focusedlayout>
-               </control>
-               <control type="label">
-                       <posx>980</posx>
-                       <posy>790</posy>
-                       <width>800</width>
-                       <height>30</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <scroll>true</scroll>
-                       <align>right</align>
-                       <aligny>center</aligny>
-                       <label>$INFO[Container(50).CurrentPage, ( $LOCALIZE[31024] ]$INFO[Container(50).NumPages,/, )]</label>
-                       <visible>Control.IsVisible(50)</visible>
-               </control>
-
-               <control type="grouplist" id="9000">
-                       <posx>20</posx>
-                       <posy>830</posy>
-                       <width>960</width>
-                       <height>50</height>
-                       <itemgap>10</itemgap>
-                       <align>center</align>
-                       <orientation>horizontal</orientation>
-                       <onleft>9000</onleft>
-                       <onright>9000</onright>
-                       <onup>50</onup>
-                       <ondown>49</ondown>
-                       <control type="button" id="5">
-                               <description>Cast/Review</description>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>206</label>
-                       </control>
-                       <control type="button" id="6">
-                               <description>Refresh</description>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>184</label>
-                       </control>
-                       <control type="button" id="10">
-                               <description>Get Thumb</description>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>13405</label>
-                       </control>
-                       <control type="button" id="12">
-                               <description>Get Fanart</description>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>20413</label>
-                       </control>
-               </control>
-
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/DialogBusy.xml b/addons/skin.touched/4x3Hirez/DialogBusy.xml
deleted file mode 100644 (file)
index 5543873..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-<window id="136">
-       <animation effect="fade" time="100">WindowOpen</animation>
-       <animation effect="fade" time="200">WindowClose</animation>
-       <coordinates>
-               <system>1</system>
-               <posx>0</posx>
-               <posy>0</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>ScreenWidth</width>
-                       <height>ScreenHeight</height>
-                       <colordiffuse>BBFFFFFF</colordiffuse>
-                       <texture>black-back.png</texture>
-               </control>
-               <control type="group">
-                       <posx>490</posx>
-                       <posy>420</posy>
-                       <control type="image">
-                               <description>background image</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>300</width>
-                               <height>100</height>
-                               <texture border="20">OverlayDialogBackground.png</texture>
-                       </control>
-                       <control type="image">
-                               <description>Busy animation</description>
-                               <posx>20</posx>
-                               <posy>25</posy>
-                               <width>50</width>
-                               <height>50</height>
-                               <texture>busy.png</texture>
-                               <aspectratio>keep</aspectratio>
-                               <animation effect="rotate" start="0" end="360" center="auto" time="1200" loop="true" condition="true">conditional</animation>
-                       </control>
-                       <control type="label">
-                               <description>Busy label</description>
-                               <posx>90</posx>
-                               <posy>34</posy>
-                               <width>180</width>
-                               <height>32</height>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <label>$LOCALIZE[31009]</label>
-                               <font>font16</font>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/DialogButtonMenu.xml b/addons/skin.touched/4x3Hirez/DialogButtonMenu.xml
deleted file mode 100644 (file)
index 939f55e..0000000
+++ /dev/null
@@ -1,266 +0,0 @@
-<window type="buttonMenu" id="111">
-       <defaultcontrol always="true">13</defaultcontrol>
-       <include>dialogeffect</include>
-       <coordinates>
-               <system>1</system>
-               <posx>0</posx>
-               <posy>0</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1280</width>
-                       <height>720</height>
-                       <texture>black-back.png</texture>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1280</width>
-                       <height>720</height>
-                       <texture>black-back.png</texture>
-                       <colordiffuse>99FFFFFF</colordiffuse>
-               </control>
-               <control type="group">
-                       <posx>305</posx>
-                       <posy>245</posy>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>670</width>
-                               <height>210</height>
-                               <texture border="20">OverlayDialogBackground.png</texture>
-                               <visible>!System.HasAlarm(shutdowntimer)</visible>
-                       </control>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>670</width>
-                               <height>235</height>
-                               <texture border="20">OverlayDialogBackground.png</texture>
-                               <visible>System.HasAlarm(shutdowntimer)</visible>
-                       </control>
-                       <control type="image">
-                               <posx>10</posx>
-                               <posy>5</posy>
-                               <width>650</width>
-                               <height>60</height>
-                               <aspectratio>stretch</aspectratio>
-                               <texture>GlassTitleBar.png</texture>
-                       </control>
-                       <control type="button">
-                               <description>Close Window button</description>
-                               <posx>570</posx>
-                               <posy>5</posy>
-                               <width>64</width>
-                               <height>32</height>
-                               <label>-</label>
-                               <font>-</font>
-                               <onclick>PreviousMenu</onclick>
-                               <texturefocus>DialogCloseButton-focus.png</texturefocus>
-                               <texturenofocus>DialogCloseButton.png</texturenofocus>
-                               <onleft>13</onleft>
-                               <onright>13</onright>
-                               <onup>13</onup>
-                               <ondown>13</ondown>
-                               <visible>system.getbool(input.enablemouse)</visible>
-                       </control>
-                       <control type="label" id="3100">
-                               <description>Label control</description>
-                               <posx>10</posx>
-                               <posy>15</posy>
-                               <width>650</width>
-                               <height>35</height>
-                               <label>-</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font24_title</font>
-                               <textcolor>white</textcolor>
-                               <shadowcolor>black</shadowcolor>
-                       </control>
-                       <control type="image">
-                               <posx>10</posx>
-                               <posy>60</posy>
-                               <width>650</width>
-                               <height>100</height>
-                               <aspectratio>stretch</aspectratio>
-                               <texture>GlassTitleBar.png</texture>
-                               <colordiffuse>99FFFFFF</colordiffuse>
-                       </control>
-                       <control type="grouplist">
-                               <posx>15</posx>
-                               <posy>85</posy>
-                               <width>640</width>
-                               <itemgap>20</itemgap>
-                               <align>center</align>
-                               <orientation>Horizontal</orientation>
-                               <control type="togglebutton" id="9">
-                                       <description>Master mode button</description>
-                                       <width>90</width>
-                                       <height>90</height>
-                                       <label>20046</label>
-                                       <altlabel>20045</altlabel>
-                                       <texturefocus>ButtonMenuMasterFO.png</texturefocus>
-                                       <texturenofocus>ButtonMenuMasterNF.png</texturenofocus>
-                                       <usealttexture>!System.IsMaster</usealttexture>
-                                       <alttexturefocus>ButtonMenuNoMasterFO.png</alttexturefocus>
-                                       <alttexturenofocus>ButtonMenuNoMasterNF.png</alttexturenofocus>
-                                       <onclick>xbmc.mastermode</onclick>
-                                       <pulseonselect>no</pulseonselect>
-                                       <font>-</font>
-                                       <visible>System.HasLocks</visible>
-                               </control>
-                               <control type="button" id="10">
-                                       <description>LogOff Profile</description>
-                                       <width>90</width>
-                                       <height>90</height>
-                                       <texturefocus>ButtonMenuLogOffFO.png</texturefocus>
-                                       <texturenofocus>ButtonMenuLogOffNF.png</texturenofocus>
-                                       <onclick>dialog.close(all,true)</onclick>
-                                       <onclick>System.LogOff</onclick>
-                                       <pulseonselect>no</pulseonselect>
-                                       <font>-</font>
-                                       <label>$LOCALIZE[20126] $INFO[system.profilename]</label>
-                                       <visible>System.HasLoginScreen | IntegerGreaterThan(System.ProfileCount,1)</visible>
-                                       <visible>System.Loggedon</visible>
-                               </control>
-                               <control type="button" id="11">
-                                       <description>Exit xbmc</description>
-                                       <width>90</width>
-                                       <height>90</height>
-                                       <texturefocus>ButtonMenuExitFO.png</texturefocus>
-                                       <texturenofocus>ButtonMenuExitNF.png</texturenofocus>
-                                       <onclick>XBMC.Quit()</onclick>
-                                       <pulseonselect>no</pulseonselect>
-                                       <font>-</font>
-                                       <label>$LOCALIZE[13012]</label>
-                               </control>
-                               <control type="group" id="13">
-                                       <width>90</width>
-                                       <defaultcontrol always="true">15</defaultcontrol>
-                                       <control type="button" id="17">
-                                               <description>Cancel Shutdown Timer button</description>
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>90</width>
-                                               <height>90</height>
-                                               <texturefocus>-</texturefocus>
-                                               <texturenofocus>-</texturenofocus>
-                                               <onclick>XBMC.CancelAlarm(shutdowntimer)</onclick>
-                                               <pulseonselect>no</pulseonselect>
-                                               <font>-</font>
-                                               <label>20151</label>
-                                               <onleft>11</onleft>
-                                               <onright>12</onright>
-                                               <onup>15</onup>
-                                               <ondown>16</ondown>
-                                               <visible>System.HasAlarm(shutdowntimer)</visible>
-                                       </control>
-                                       <control type="button" id="16">
-                                               <description>Custom Shutdown Timer button</description>
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>90</width>
-                                               <height>90</height>
-                                               <texturefocus>-</texturefocus>
-                                               <texturenofocus>-</texturenofocus>
-                                               <onclick>XBMC.AlarmClock(shutdowntimer,XBMC.Powerdown())</onclick>
-                                               <pulseonselect>no</pulseonselect>
-                                               <font>-</font>
-                                               <label>20150</label>
-                                               <onleft>11</onleft>
-                                               <onright>12</onright>
-                                               <onup>17</onup>
-                                               <ondown>15</ondown>
-                                       </control>
-                                       <control type="button" id="15">
-                                               <description>Shutdown button</description>
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>90</width>
-                                               <height>90</height>
-                                               <texturefocus>-</texturefocus>
-                                               <texturenofocus>ButtonMenuShutdownNF.png</texturenofocus>
-                                               <onclick>XBMC.Powerdown()</onclick>
-                                               <pulseonselect>no</pulseonselect>
-                                               <font>-</font>
-                                               <label>13016</label>
-                                               <onleft>11</onleft>
-                                               <onright>12</onright>
-                                               <onup>16</onup>
-                                               <ondown>17</ondown>
-                                       </control>
-                                       <control type="image">
-                                               <description>Shutdown focus image</description>
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>90</width>
-                                               <height>90</height>
-                                               <texture>ButtonMenuShutdownFO.png</texture>
-                                               <visible>Control.HasFocus(15) | Control.HasFocus(16) | Control.HasFocus(17)</visible>
-                                       </control>
-                               </control>
-                               <control type="button" id="12">
-                                       <description>Suspend xbmc</description>
-                                       <width>90</width>
-                                       <height>90</height>
-                                       <texturefocus>ButtonMenuSleepFO.png</texturefocus>
-                                       <texturenofocus>ButtonMenuSleepNF.png</texturenofocus>
-                                       <onclick>XBMC.Suspend()</onclick>
-                                       <pulseonselect>no</pulseonselect>
-                                       <font>-</font>
-                                       <label>$LOCALIZE[13011]</label>
-                               </control>
-                               <control type="button" id="14">
-                                       <description>Reboot button</description>
-                                       <width>90</width>
-                                       <height>90</height>
-                                       <texturefocus>ButtonMenuRestartFO.png</texturefocus>
-                                       <texturenofocus>ButtonMenuRestartNF.png</texturenofocus>
-                                       <onclick>XBMC.Reset()</onclick>
-                                       <pulseonselect>no</pulseonselect>
-                                       <font>-</font>
-                                       <label>13013</label>
-                               </control>
-                       </control>
-                       <control type="group">
-                               <posx>270</posx>
-                               <posy>70</posy>
-                               <visible>ControlGroup(13).HasFocus</visible>
-                               <include>VisibleFadeEffect</include>
-                               <animation effect="slide" start="0,0" end="55,0" time="0" condition="System.HasLocks">Conditional</animation>
-                               <animation effect="slide" start="0,0" end="55,0" time="0" condition="[System.HasLoginScreen | IntegerGreaterThan(System.ProfileCount,1)] + System.LoggedOn">Conditional</animation>
-                               <control type="image">
-                                       <description>Shutdown Arrow Up image</description>
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>20</width>
-                                       <height>15</height>
-                                       <texture>ArrowUp.png</texture>
-                               </control>
-                               <control type="image">
-                                       <description>Shutdown Arrow Down image</description>
-                                       <posx>0</posx>
-                                       <posy>107</posy>
-                                       <width>20</width>
-                                       <height>15</height>
-                                       <texture>ArrowDown.png</texture>
-                               </control>
-                       </control>
-                       <control type="label">
-                               <posx>10</posx>
-                               <posy>190</posy>
-                               <width>650</width>
-                               <height>35</height>
-                               <font>font12</font>
-                               <textcolor>white</textcolor>
-                               <shadowcolor>black</shadowcolor>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <label>$LOCALIZE[31329] [B]$INFO[System.Alarmpos][/B]</label>
-                               <visible>System.HasAlarm(shutdowntimer)</visible>
-                       </control>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/DialogContentSettings.xml b/addons/skin.touched/4x3Hirez/DialogContentSettings.xml
deleted file mode 100644 (file)
index 6c2806e..0000000
+++ /dev/null
@@ -1,311 +0,0 @@
-<window id="132">
-       <defaultcontrol always="true">3</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>140</posx>
-               <posy>30</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1000</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="label" id="1">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>910</width>
-                       <label>$LOCALIZE[20333]</label>
-               </control>
-               <control type="group">
-                       <posx>930</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>1000</width>
-                       <height>840</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-
-               <control type="group">
-                       <posx>20</posx>
-                       <control type="label">
-                               <description>Content Picker Header</description>
-                               <posx>0</posx>
-                               <posy>70</posy>
-                               <width>460</width>
-                               <height>40</height>
-                               <font>font13_title</font>
-                               <label>$LOCALIZE[20344]</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <textcolor>black</textcolor>
-                       </control>
-                       <control type="spincontrolex" id="3">
-                               <description>Content Picker</description>
-                               <posx>0</posx>
-                               <posy>120</posy>
-                               <width>460</width>
-                               <height>50</height>
-                               <texturefocus border="5">ListNF.png</texturefocus>
-                               <texturenofocus border="5">ListNF.png</texturenofocus>
-                               <font>-</font>
-                               <label>-</label>
-                               <reverse>yes</reverse>
-                               <onup>28</onup>
-                               <ondown>5</ondown>
-                               <onleft>60</onleft>
-                               <onright>4</onright>
-                       </control>
-                       <control type="label">
-                               <description>Content Picker label</description>
-                               <posx>10</posx>
-                               <posy>120</posy>
-                               <width>280</width>
-                               <height>50</height>
-                               <font>font13</font>
-                               <label>$INFO[Control.GetLabel(3)]</label>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <textcolor>white</textcolor>
-                       </control>
-                       <control type="label">
-                               <description>Used Scraper Header</description>
-                               <posx>0</posx>
-                               <posy>180</posy>
-                               <width>460</width>
-                               <height>20</height>
-                               <font>font13</font>
-                               <label>$LOCALIZE[31312]</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <textcolor>black</textcolor>
-                               <shadowcolor>black</shadowcolor>
-                       </control>
-                       <control type="image">
-                               <description>Used Scraper Image</description>
-                               <posx>0</posx>
-                               <posy>210</posy>
-                               <width>460</width>
-                               <height>190</height>
-                               <aspectratio>keep</aspectratio>
-                               <texture>$INFO[ListItem.Icon]</texture>
-                               <bordertexture border="8">ThumbShadow.png</bordertexture>
-                               <bordersize>8</bordersize>
-                       </control>
-                       <control type="label">
-                               <description>Used Scaper Label</description>
-                               <posx>0</posx>
-                               <posy>400</posy>
-                               <width>460</width>
-                               <height>30</height>
-                               <font>font13</font>
-                               <label>[B]$INFO[ListItem.Label][/B]</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <textcolor>black</textcolor>
-                       </control>
-               </control>
-               <control type="group">
-                       <posx>520</posx>
-                       <control type="label">
-                               <description>Scraper List Header</description>
-                               <posx>0</posx>
-                               <posy>70</posy>
-                               <width>460</width>
-                               <height>40</height>
-                               <font>font13_title</font>
-                               <label>$LOCALIZE[31313]</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <textcolor>black</textcolor>
-                       </control>
-                       <control type="list" id="4">
-                               <posx>0</posx>
-                               <posy>120</posy>
-                               <width>460</width>
-                               <height>310</height>
-                               <onup>4</onup>
-                               <onleft>3</onleft>
-                               <onright>60</onright>
-                               <ondown>4</ondown>
-                               <pagecontrol>60</pagecontrol>
-                               <scrolltime>200</scrolltime>
-                               <itemlayout height="50" width="460">
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>460</width>
-                                               <height>51</height>
-                                               <texture>MenuItemNF.png</texture>
-                                       </control>
-                                       <control type="image">
-                                               <posx>5</posx>
-                                               <posy>5</posy>
-                                               <width>40</width>
-                                               <height>40</height>
-                                               <texture>$INFO[Listitem.Icon]</texture>
-                                       </control>
-                                       <control type="label" width="460">
-                                               <posx>60</posx>
-                                               <posy>0</posy>
-                                               <width>410</width>
-                                               <height>50</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                               </itemlayout>
-                               <focusedlayout height="50">
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>460</width>
-                                               <height>51</height>
-                                               <texture>MenuItemNF.png</texture>
-                                       </control>
-                                       <control type="image">
-                                               <posx>5</posx>
-                                               <posy>5</posy>
-                                               <width>40</width>
-                                               <height>40</height>
-                                               <texture>$INFO[Listitem.Icon]</texture>
-                                       </control>
-                                       <control type="label" width="460">
-                                               <posx>60</posx>
-                                               <posy>0</posy>
-                                               <width>410</width>
-                                               <height>50</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                               </focusedlayout>
-                       </control>
-               </control>
-               <control type="image">
-                       <posx>20</posx>
-                       <posy>460</posy>
-                       <width>960</width>
-                       <height>5</height>
-                       <texture>separator.png</texture>
-               </control>
-               <control type="label">
-                       <description>Scanning Options Header</description>
-                       <posx>20</posx>
-                       <posy>490</posy>
-                       <width>960</width>
-                       <height>30</height>
-                       <font>font13_title</font>
-                       <label>$LOCALIZE[31314]</label>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="grouplist" id="5">
-                       <description>control area</description>
-                       <posx>20</posx>
-                       <posy>540</posy>
-                       <width>960</width>
-                       <height>250</height>
-                       <itemgap>-1</itemgap>
-                       <onup>3</onup>
-                       <ondown>28</ondown>
-                       <onleft>5</onleft>
-                       <onright>5</onright>
-               </control>
-               <control type="grouplist" id="9000">
-                       <posx>20</posx>
-                       <posy>830</posy>
-                       <width>960</width>
-                       <height>50</height>
-                       <itemgap>5</itemgap>
-                       <align>center</align>
-                       <orientation>horizontal</orientation>
-                       <onleft>9000</onleft>
-                       <onright>9000</onright>
-                       <onup>50</onup>
-                       <ondown>49</ondown>
-                       <control type="button" id="28">
-                               <description>OK Button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>186</label>
-                       </control>
-                       <control type="button" id="29">
-                               <description>Cancel Button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>222</label>
-                       </control>
-                       <control type="button" id="6">
-                               <description>Settings Button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>5</label>
-                       </control>
-               </control>
-
-               <control type="button" id="7">
-                       <description>Default Button</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <height>50</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <texturefocus border="5">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="5">MenuItemNF.png</texturenofocus>
-               </control>
-               <control type="radiobutton" id="8">
-                       <description>Default RadioButton</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <height>50</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <texturefocus border="5">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="5">MenuItemNF.png</texturenofocus>
-               </control>
-
-               <control type="group">
-                       <control type="image">
-                               <posx>370</posx>
-                               <posy>60</posy>
-                               <width>5</width>
-                               <height>280</height>
-                               <aspectratio>stretch</aspectratio>
-                               <texture>separator_vertical.png</texture>
-                       </control>
-                       <control type="scrollbar" id="60">
-                               <posx>745</posx>
-                               <posy>100</posy>
-                               <width>25</width>
-                               <height>240</height>
-                               <texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
-                               <texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
-                               <texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
-                               <textureslidernib>ScrollBarNib.png</textureslidernib>
-                               <textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
-                               <onleft>4</onleft>
-                               <onright>3</onright>
-                               <showonepage>false</showonepage>
-                               <orientation>vertical</orientation>
-                       </control>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/DialogContextMenu.xml b/addons/skin.touched/4x3Hirez/DialogContextMenu.xml
deleted file mode 100644 (file)
index 4e21f02..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-<window id="106">
-       <defaultcontrol>1000</defaultcontrol>
-       <include>dialogeffect</include>
-       <coordinates>
-               <system>1</system>
-               <posx>0</posx>
-               <posy>0</posy>
-       </coordinates>
-       <controls>
-               <control type="image" id="999">
-                       <description>background image</description>
-                       <posx>0</posx>
-                       <posy>-20</posy>
-                       <width>400</width>
-                       <height>760</height>
-                       <texture border="5">SubBack.png</texture>
-               </control>
-               <control type="label">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>-20</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>300</width>
-                       <label>$LOCALIZE[31007]</label>
-               </control>
-               <control type="group">
-                       <posx>330</posx>
-                       <posy>-20</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="grouplist" id="996">
-                       <description>grouplist for context buttons</description>
-                       <posx>10</posx>
-                       <posy>40</posy>
-                       <width>400</width>
-                       <height max="690">auto</height>
-                       <itemgap>0</itemgap>
-               </control>
-               <control type="button" id="1000">
-                       <description>button template</description>
-                       <posx>0</posx>
-                       <posy>-</posy>
-                       <width>380</width>
-                       <height>60</height>
-                       <font>font13</font>
-                       <align>center</align>
-                       <textcolor>black</textcolor>
-                       <texturefocus>button-focus2.png</texturefocus>
-                       <texturenofocus>button-nofocus.png</texturenofocus>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/DialogFavourites.xml b/addons/skin.touched/4x3Hirez/DialogFavourites.xml
deleted file mode 100644 (file)
index 7fac8a2..0000000
+++ /dev/null
@@ -1,126 +0,0 @@
-<window type="dialog" id="134">
-       <defaultcontrol always="true">450</defaultcontrol>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>290</posx>
-               <posy>80</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>700</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>700</width>
-                       <height>740</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-               <control type="label">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>600</width>
-                       <label>$LOCALIZE[1036]</label>
-               </control>
-               <control type="group">
-                       <posx>630</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="list" id="450">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>700</width>
-                       <height>680</height>
-                       <onup>450</onup>
-                       <onleft>450</onleft>
-                       <onright>450</onright>
-                       <ondown>450</ondown>
-                       <pagecontrol>-</pagecontrol>
-                       <scrolltime>200</scrolltime>
-                       <itemlayout height="80">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>-2</posy>
-                                       <width>700</width>
-                                       <height>5</height>
-                                       <texture>separator.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>20</posx>
-                                       <posy>0</posy>
-                                       <width>530</width>
-                                       <height>80</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="image">
-                                       <posx>560</posx>
-                                       <posy>4</posy>
-                                       <width>120</width>
-                                       <height>72</height>
-                                       <aspectratio align="right">keep</aspectratio>
-                                       <fadetime>IconCrossfadeTime</fadetime>
-                                       <texture>$INFO[ListItem.Icon]</texture>
-                                       <bordertexture border="5">ThumbBorderGrey.png</bordertexture>
-                                       <bordersize>2</bordersize>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="80">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>-2</posy>
-                                       <width>700</width>
-                                       <height>5</height>
-                                       <texture>separator.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>20</posx>
-                                       <posy>0</posy>
-                                       <width>530</width>
-                                       <height>80</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="image">
-                                       <posx>560</posx>
-                                       <posy>4</posy>
-                                       <width>120</width>
-                                       <height>72</height>
-                                       <aspectratio align="right">keep</aspectratio>
-                                       <fadetime>IconCrossfadeTime</fadetime>
-                                       <texture>$INFO[ListItem.Icon]</texture>
-                                       <bordertexture border="5">ThumbBorderGrey.png</bordertexture>
-                                       <bordersize>2</bordersize>
-                               </control>
-                       </focusedlayout>
-               </control>
-               <control type="label">
-                       <description>Page label</description>
-                       <posx>680</posx>
-                       <posy>760</posy>
-                       <width>660</width>
-                       <height>30</height>
-                       <align>right</align>
-                       <aligny>center</aligny>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <label>($INFO[Container(450).NumItems]) $LOCALIZE[31025] - $LOCALIZE[31024] ($INFO[Container(450).CurrentPage]/$INFO[Container(450).NumPages])</label>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/DialogFileStacking.xml b/addons/skin.touched/4x3Hirez/DialogFileStacking.xml
deleted file mode 100644 (file)
index bfb1ca7..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-<window id="2008">
-       <defaultcontrol>450</defaultcontrol>
-       <include>dialogeffect</include>
-       <coordinates>
-               <system>1</system>
-               <posx>315</posx>
-               <posy>260</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>650</width>
-                       <height>200</height>
-                       <texture border="20">OverlayDialogBackground.png</texture>
-               </control>
-               <control type="button">
-                       <description>Close Window button</description>
-                       <posx>560</posx>
-                       <posy>5</posy>
-                       <width>64</width>
-                       <height>32</height>
-                       <label>-</label>
-                       <font>-</font>
-                       <onclick>PreviousMenu</onclick>
-                       <texturefocus>DialogCloseButton-focus.png</texturefocus>
-                       <texturenofocus>DialogCloseButton.png</texturenofocus>
-                       <onleft>13</onleft>
-                       <onright>13</onright>
-                       <onup>13</onup>
-                       <ondown>13</ondown>
-                       <visible>system.getbool(input.enablemouse)</visible>
-               </control>
-               <control type="label">
-                       <description>heading label</description>
-                       <posx>40</posx>
-                       <posy>18</posy>
-                       <width>570</width>
-                       <height>30</height>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <font>font13</font>
-                       <label>$INFO[ListItem.Label]</label>
-                       <textcolor>white</textcolor>
-               </control>
-               <control type="label">
-                       <posx>40</posx>
-                       <posy>60</posy>
-                       <width>570</width>
-                       <height>30</height>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <font>font12</font>
-                       <label>31060</label>
-                       <textcolor>grey2</textcolor>
-               </control>
-               <control type="image">
-                       <posx>50</posx>
-                       <posy>110</posy>
-                       <width>20</width>
-                       <height>25</height>
-                       <texture>scroll-left-focus.png</texture>
-                       <visible>Container(450).HasPrevious</visible>
-               </control>
-               <control type="image">
-                       <posx>575</posx>
-                       <posy>110</posy>
-                       <width>20</width>
-                       <height>25</height>
-                       <texture>scroll-right-focus.png</texture>
-                       <visible>Container(450).HasNext</visible>
-               </control>
-               <control type="list" id="450">
-                       <posx>85</posx>
-                       <posy>105</posy>
-                       <width>480</width>
-                       <height>100</height>
-                       <onleft>450</onleft>
-                       <onright>450</onright>
-                       <onup>450</onup>
-                       <ondown>450</ondown>
-                       <orientation>horizontal</orientation>
-                       <focusposition>2</focusposition>
-                       <viewtype label="535">list</viewtype>
-                       <scrolltime>200</scrolltime>
-                       <itemlayout width="40">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>38</width>
-                                       <height>32</height>
-                                       <aspectratio>stretch</aspectratio>
-                                       <texture>StackNF.png</texture>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout width="40">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>38</width>
-                                       <height>32</height>
-                                       <aspectratio>stretch</aspectratio>
-                                       <texture>StackFO.png</texture>
-                               </control>
-                       </focusedlayout>
-               </control>
-               <control type="label">
-                       <posx>40</posx>
-                       <posy>155</posy>
-                       <width>570</width>
-                       <height>22</height>
-                       <font>font13_title</font>
-                       <align>center</align>
-                       <info>Container(450).ListItem.Label</info>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/DialogGamepad.xml b/addons/skin.touched/4x3Hirez/DialogGamepad.xml
deleted file mode 100644 (file)
index 5a24bfe..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<window id="110">
-       <defaultcontrol>-</defaultcontrol>
-       <coordinates>
-               <system>1</system>
-               <posx>290</posx>
-               <posy>300</posy>
-       </coordinates>
-       <include>dialogeffect</include>
-       <controls>
-               <control type="image">
-                       <description>Shadow Background for dialogs without BehindDialogFadeOut include</description>
-                       <posx>-30</posx>
-                       <posy>-30</posy>
-                       <width>760</width>
-                       <height>370</height>
-                       <texture border="30">DialogShadow.png</texture>
-               </control>
-               <control type="image">
-                       <description>Header Background</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>700</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="group">
-                       <posx>630</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="label" id="1">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>600</width>
-                       <label>$LOCALIZE[13406]</label>
-               </control>
-               <control type="image">
-                       <description>Background</description>
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>700</width>
-                       <height>250</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-               <control type="label" id="2">
-                       <description>dialog line 1</description>
-                       <posx>20</posx>
-                       <posy>80</posy>
-                       <width>660</width>
-                       <height>30</height>
-                       <align>left</align>
-                       <aligny>center</aligny>
-                       <label>-</label>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="label" id="3">
-                       <description>dialog line 2</description>
-                       <posx>20</posx>
-                       <posy>110</posy>
-                       <width>660</width>
-                       <height>30</height>
-                       <align>left</align>
-                       <aligny>center</aligny>
-                       <label>-</label>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="label" id="4">
-                       <description>dialog line 3</description>
-                       <posx>20</posx>
-                       <posy>200</posy>
-                       <width>660</width>
-                       <height>30</height>
-                       <align>left</align>
-                       <aligny>center</aligny>
-                       <label>-</label>
-                       <font>font30_title</font>
-                       <textcolor>black</textcolor>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/DialogKaiToast.xml b/addons/skin.touched/4x3Hirez/DialogKaiToast.xml
deleted file mode 100644 (file)
index 27c8f66..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-<window id="107">
-       <include>Window_OpenClose_Animation</include>
-       <controls>
-               <control type="group">
-                       <posx>526r</posx>
-                       <posy>110r</posy>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>490</width>
-                               <height>80</height>
-                               <texture border="8">IconBack.png</texture>
-                       </control>
-                       <control type="image" id="400">
-                               <description>Icon</description>
-                               <posx>10</posx>
-                               <posy>10</posy>
-                               <width>70</width>
-                               <height>60</height>
-                               <aspectratio>keep</aspectratio>
-                               <texture>DefaultFile.png</texture>
-                       </control>
-                       <control type="fadelabel" id="401">
-                               <description>Line 1 Label</description>
-                               <posx>100</posx>
-                               <posy>10</posy>
-                               <width>370</width>
-                               <height>20</height>
-                               <font>font12_title</font>
-                               <textcolor>black</textcolor>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <scrollout>false</scrollout>
-                               <pauseatend>2000</pauseatend>
-                       </control>
-                       <control type="textbox" id="402">
-                               <description>Line 2 Label</description>
-                               <posx>100</posx>
-                               <posy>25</posy>
-                               <width>370</width>
-                               <height>40</height>
-                               <font>font12</font>
-                               <textcolor>black</textcolor>
-                               <align>left</align>
-                       </control>
-                       <control type="image" id="403">
-                               <description>avatar</description>
-                               <posx>10</posx>
-                               <posy>10</posy>
-                               <width>70</width>
-                               <height>60</height>
-                               <aspectratio>keep</aspectratio>
-                               <visible>false</visible>
-                               <texture>DefaultIconInfo.png</texture>
-                       </control>
-                       <control type="image" id="404">
-                               <description>avatar</description>
-                               <posx>10</posx>
-                               <posy>10</posy>
-                               <width>70</width>
-                               <height>60</height>
-                               <aspectratio>keep</aspectratio>
-                               <visible>false</visible>
-                               <texture>DefaultIconWarning.png</texture>
-                       </control>
-                       <control type="image" id="405">
-                               <description>avatar</description>
-                               <posx>10</posx>
-                               <posy>10</posy>
-                               <width>70</width>
-                               <height>60</height>
-                               <aspectratio>keep</aspectratio>
-                               <visible>false</visible>
-                               <texture>DefaultIconError.png</texture>
-                       </control>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/DialogKaraokeSongSelector.xml b/addons/skin.touched/4x3Hirez/DialogKaraokeSongSelector.xml
deleted file mode 100644 (file)
index 0523d9d..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-<window type="dialog" id="143">
-       <include>dialogeffect</include>
-       <coordinates>
-               <system>1</system>
-               <posx>442</posx>
-               <posy>220</posy>
-       </coordinates>
-       <include>dialogeffect</include>
-       <controls>
-               <control type="image">
-                       <description>Header Background</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>395</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="group">
-                       <posx>325</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="label" id="1">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>290</width>
-                       <label>$LOCALIZE[31321]</label>
-               </control>
-               <control type="image">
-                       <description>Background</description>
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>395</width>
-                       <height>140</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-               <control type="label" id="401">
-                       <description>Song Number Label</description>
-                       <posx>20</posx>
-                       <posy>80</posy>
-                       <width>355</width>
-                       <height>30</height>
-                       <font>font28_title</font>
-                       <textcolor>black</textcolor>
-                       <align>center</align>
-                       <aligny>center</aligny>
-               </control>
-               <control type="label" id="402">
-                       <description>Song Name Label</description>
-                       <posx>20</posx>
-                       <posy>150</posy>
-                       <width>355</width>
-                       <height>20</height>
-                       <font>font24</font>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <textcolor>black</textcolor>
-                       <scroll>true</scroll>
-               </control>
-               <control type="group">
-                       <posx>0</posx>
-                       <posy>205</posy>
-                       <include>KeypadButtons</include>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/DialogKaraokeSongSelectorLarge.xml b/addons/skin.touched/4x3Hirez/DialogKaraokeSongSelectorLarge.xml
deleted file mode 100644 (file)
index 4159f50..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-<window type="dialog" id="144">
-       <include>dialogeffect</include>
-       <coordinates>
-               <system>1</system>
-               <posx>442</posx>
-               <posy>220</posy>
-       </coordinates>
-       <include>dialogeffect</include>
-       <controls>
-               <control type="image">
-                       <description>Header Background</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>395</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="group">
-                       <posx>325</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="label" id="1">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>290</width>
-                       <label>$LOCALIZE[31321]</label>
-               </control>
-               <control type="image">
-                       <description>Background</description>
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>395</width>
-                       <height>140</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-               <control type="label" id="401">
-                       <description>Song Number Label</description>
-                       <posx>20</posx>
-                       <posy>80</posy>
-                       <width>355</width>
-                       <height>30</height>
-                       <font>font28_title</font>
-                       <textcolor>black</textcolor>
-                       <align>center</align>
-                       <aligny>center</aligny>
-               </control>
-               <control type="label" id="402">
-                       <description>Song Name Label</description>
-                       <posx>20</posx>
-                       <posy>150</posy>
-                       <width>355</width>
-                       <height>20</height>
-                       <font>font24</font>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <textcolor>black</textcolor>
-                       <scroll>true</scroll>
-               </control>
-               <control type="group">
-                       <posx>0</posx>
-                       <posy>205</posy>
-                       <include>KeypadButtons</include>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/DialogKeyboard.xml b/addons/skin.touched/4x3Hirez/DialogKeyboard.xml
deleted file mode 100644 (file)
index 20ff506..0000000
+++ /dev/null
@@ -1,752 +0,0 @@
-<window id="103">
-       <defaultcontrol always="true">65</defaultcontrol>
-       <coordinates>
-               <system>1</system>
-               <posx>0</posx>
-               <posy>0</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>ScreenWidth</width>
-                       <height>ScreenHeight</height>
-                       <texture>black-back.png</texture>
-                       <animation effect="fade" time="400">WindowOpen</animation>
-                       <animation effect="fade" time="200">WindowClose</animation>
-               </control>
-               <control type="button">
-                       <description>Hidden button to close the keyboard when its focused</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>ScreenWidth</width>
-                       <height>ScreenHeight</height>
-                       <texturenofocus>-</texturenofocus>
-                       <texturefocus>-</texturefocus>
-                       <onclick>PreviousMenu</onclick>
-               </control>
-               <control type="group">
-                       <animation effect="slide" start="0,500" end="0,0" time="400" easing="out" tween="quadratic" >WindowOpen</animation>
-                       <animation effect="slide" start="0,0" end="0,500" time="400" easing="in" tween="quadratic" >WindowClose</animation>
-                       <animation effect="slide" start="0,0" end="0,500" time="400" easing="in" tween="quadratic" condition="Window.IsVisible(numericinput)">Conditional</animation>
-                       <posx>15</posx>
-                       <posy>500r</posy>
-                       <control type="button">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>ScreenWidth</width>
-                               <height>500</height>
-                               <texturenofocus>-</texturenofocus>
-                               <texturefocus>-</texturefocus>
-                               <onclick>-</onclick>
-                       </control>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>1250</width>
-                               <height>60</height>
-                               <aspectratio>stretch</aspectratio>
-                               <texture border="20">KeyboardEditArea.png</texture>
-                       </control>      
-                       <control type="label" id="310">
-                               <description>Edit Text</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>1250</width>
-                               <height>60</height>
-                               <font>font16</font>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                       </control>
-                       <control type="label" id="311">
-                               <description>dialog Heading</description>
-                               <posx>0</posx>
-                               <posy>-30</posy>
-                               <width>1250</width>
-                               <height>20</height>
-                               <font>font13_title</font>
-                               <textcolor>white</textcolor>
-                               <shadowcolor>black</shadowcolor>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                       </control>
-                       <control type="group">
-                               <posx>0</posx>
-                               <posy>70</posy>
-<!-- First Row -->
-                               <control type="image">
-                                       <description>Blank image</description>
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>65</width>
-                                       <height>80</height>
-                                       <texture border="5">KeyboardKeyDark.png</texture>
-                               </control>
-                               <control type="button" id="49">
-                                       <description>'1' button</description>
-                                       <posx>70</posx>
-                                       <posy>0</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="50">
-                                       <description>'2' button</description>
-                                       <posx>170</posx>
-                                       <posy>0</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="51">
-                                       <description>'3' button</description>
-                                       <posx>270</posx>
-                                       <posy>0</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="52">
-                                       <description>'4' button</description>
-                                       <posx>370</posx>
-                                       <posy>0</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="53">
-                                       <description>'5' button</description>
-                                       <posx>470</posx>
-                                       <posy>0</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="54">
-                                       <description>'6' button</description>
-                                       <posx>570</posx>
-                                       <posy>0</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="55">
-                                       <description>'7' button</description>
-                                       <posx>670</posx>
-                                       <posy>0</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="56">
-                                       <description>'8' button</description>
-                                       <posx>770</posx>
-                                       <posy>0</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="57">
-                                       <description>'9' button</description>
-                                       <posx>870</posx>
-                                       <posy>0</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="48">
-                                       <description>'0' button</description>
-                                       <posx>970</posx>
-                                       <posy>0</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="togglebutton" id="304">
-                                       <description>Symbols button</description>
-                                       <posx>1070</posx>
-                                       <posy>0</posy>
-                                       <width>180</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKeyDark.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <alttexturenofocus border="5">KeyboardKeyDark.png</alttexturenofocus>
-                                       <alttexturefocus border="5">KeyboardKeyFocus.png</alttexturefocus>
-                                       <textcolor>white</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <label>@#$%</label>
-                                       <altlabel>[COLOR=blue]@#$%[/COLOR]</altlabel>
-                               </control>
-<!-- Second Row -->
-                               <control type="button" id="307">
-                                       <description>IP Input button</description>
-                                       <posx>0</posx>
-                                       <posy>85</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKeyDark.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>white</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <label>31003</label>
-                               </control>
-                               <control type="button" id="81">
-                                       <description>'Q' button</description>
-                                       <posx>100</posx>
-                                       <posy>85</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="87">
-                                       <description>'W' button</description>
-                                       <posx>200</posx>
-                                       <posy>85</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="69">
-                                       <description>'E' button</description>
-                                       <posx>300</posx>
-                                       <posy>85</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="82">
-                                       <description>'R' button</description>
-                                       <posx>400</posx>
-                                       <posy>85</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="84">
-                                       <description>'T' button</description>
-                                       <posx>500</posx>
-                                       <posy>85</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="89">
-                                       <description>'Y' button</description>
-                                       <posx>600</posx>
-                                       <posy>85</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="85">
-                                       <description>'U' button</description>
-                                       <posx>700</posx>
-                                       <posy>85</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="73">
-                                       <description>'I' button</description>
-                                       <posx>800</posx>
-                                       <posy>85</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="79">
-                                       <description>'O' button</description>
-                                       <posx>900</posx>
-                                       <posy>85</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="80">
-                                       <description>'P' button</description>
-                                       <posx>1000</posx>
-                                       <posy>85</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="8">
-                                       <description>'BACKSPACE' button</description>
-                                       <posx>1100</posx>
-                                       <posy>85</posy>
-                                       <width>150</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKeyDark.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>white</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <label>-</label>
-                               </control>
-                               <control type="image">
-                                       <description>BackSpace Icon image</description>
-                                       <posx>1150</posx>
-                                       <posy>100</posy>
-                                       <width>50</width>
-                                       <height>50</height>
-                                       <texture>icon_backspace.png</texture>
-                               </control>
-<!-- Third Row -->
-                               <control type="togglebutton" id="303">
-                                       <description>CAPS LOCK button</description>
-                                       <posx>0</posx>
-                                       <posy>170</posy>
-                                       <width>125</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKeyDark.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <alttexturenofocus border="5">KeyboardKeyDark.png</alttexturenofocus>
-                                       <alttexturefocus border="5">KeyboardKeyFocus.png</alttexturefocus>
-                                       <textcolor>white</textcolor>
-                                       <font>font13</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <label>31004</label>
-                                       <altlabel>[COLOR=blue]$LOCALIZE[31004][/COLOR]</altlabel>
-                               </control>
-                               <control type="button" id="65">
-                                       <description>'A' button</description>
-                                       <posx>130</posx>
-                                       <posy>170</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="83">
-                                       <description>'S' button</description>
-                                       <posx>230</posx>
-                                       <posy>170</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="68">
-                                       <description>'D' button</description>
-                                       <posx>330</posx>
-                                       <posy>170</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="70">
-                                       <description>'F' button</description>
-                                       <posx>430</posx>
-                                       <posy>170</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="71">
-                                       <description>'G' button</description>
-                                       <posx>530</posx>
-                                       <posy>170</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="72">
-                                       <description>'H' button</description>
-                                       <posx>630</posx>
-                                       <posy>170</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="74">
-                                       <description>'J' button</description>
-                                       <posx>730</posx>
-                                       <posy>170</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="75">
-                                       <description>'K' button</description>
-                                       <posx>830</posx>
-                                       <posy>170</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="76">
-                                       <description>'L' button</description>
-                                       <posx>930</posx>
-                                       <posy>170</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="300">
-                                       <description>DONE button</description>
-                                       <posx>1030</posx>
-                                       <posy>170</posy>
-                                       <width>220</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKeyDark.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>white</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <label>-</label>
-                               </control>
-                               <control type="image">
-                                       <description>Enter\done Icon image</description>
-                                       <posx>1110</posx>
-                                       <posy>185</posy>
-                                       <width>50</width>
-                                       <height>50</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>icon_enter.png</texture>
-                               </control>
-<!-- Forth Row -->
-                               <control type="button" id="302">
-                                       <description>SHIFT button</description>
-                                       <posx>0</posx>
-                                       <posy>255</posy>
-                                       <width>150</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKeyDark.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>white</textcolor>
-                                       <font>font16</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>-</label>
-                               </control>
-                               <control type="image">
-                                       <description>Enter\done Icon image</description>
-                                       <posx>50</posx>
-                                       <posy>270</posy>
-                                       <width>50</width>
-                                       <height>50</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>icon_shift.png</texture>
-                               </control>
-                               <control type="button" id="90">
-                                       <description>'Z' button</description>
-                                       <posx>160</posx>
-                                       <posy>255</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="88">
-                                       <description>'X' button</description>
-                                       <posx>260</posx>
-                                       <posy>255</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="67">
-                                       <description>'C' button</description>
-                                       <posx>360</posx>
-                                       <posy>255</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="86">
-                                       <description>'V' button</description>
-                                       <posx>460</posx>
-                                       <posy>255</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="66">
-                                       <description>'B' button</description>
-                                       <posx>560</posx>
-                                       <posy>255</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="78">
-                                       <description>'N' button</description>
-                                       <posx>660</posx>
-                                       <posy>255</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="77">
-                                       <description>'M' button</description>
-                                       <posx>760</posx>
-                                       <posy>255</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                               </control>
-                               <control type="button" id="305">
-                                       <description>previous button</description>
-                                       <posx>860</posx>
-                                       <posy>255</posy>
-                                       <width>193</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKeyDark.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>white</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <label>-</label>
-                               </control>
-                               <control type="image">
-                                       <description>Previous Icon image</description>
-                                       <posx>930</posx>
-                                       <posy>275</posy>
-                                       <width>50</width>
-                                       <height>40</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture flipx="true">icon_arrowkey.png</texture>
-                               </control>
-                               <control type="button" id="306">
-                                       <description>next button</description>
-                                       <posx>1058</posx>
-                                       <posy>255</posy>
-                                       <width>191</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKeyDark.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>white</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <label></label>
-                               </control>
-                               <control type="image">
-                                       <description>Next Icon image</description>
-                                       <posx>1135</posx>
-                                       <posy>275</posy>
-                                       <width>50</width>
-                                       <height>40</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>icon_arrowkey.png</texture>
-                               </control>
-<!-- Fifth Row -->
-                               <control type="image">
-                                       <description>Blank image</description>
-                                       <posx>0</posx>
-                                       <posy>340</posy>
-                                       <width>185</width>
-                                       <height>80</height>
-                                       <texture border="5">KeyboardKeyDark.png</texture>
-                               </control>
-                               <control type="button" id="32">
-                                       <description>SPACE button</description>
-                                       <posx>190</posx>
-                                       <posy>340</posy>
-                                       <width>695</width>
-                                       <height>80</height>
-                                       <texturenofocus border="5">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="5">KeyboardKeyFocus.png</texturefocus>
-                                       <textcolor>black</textcolor>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <label>20182</label>
-                               </control>
-                               <control type="image">
-                                       <description>Blank image</description>
-                                       <posx>890</posx>
-                                       <posy>340</posy>
-                                       <width>360</width>
-                                       <height>80</height>
-                                       <texture border="5">KeyboardKeyDark.png</texture>
-                               </control>
-                       </control>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/DialogMediaSource.xml b/addons/skin.touched/4x3Hirez/DialogMediaSource.xml
deleted file mode 100644 (file)
index 29df945..0000000
+++ /dev/null
@@ -1,223 +0,0 @@
-<window id="129">
-       <defaultcontrol>10</defaultcontrol>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>140</posx>
-               <posy>130</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1000</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="label" id="2">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>910</width>
-                       <label>$LOCALIZE[13406]</label>
-               </control>
-               <control type="group">
-                       <posx>930</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>1000</width>
-                       <height>600</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-               <control type="label">
-                       <description>path label</description>
-                       <posx>20</posx>
-                       <posy>80</posy>
-                       <width>960</width>
-                       <height>30</height>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <font>font13_title</font>
-                       <label>1021</label>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="list" id="10">
-                       <posx>20</posx>
-                       <posy>140</posy>
-                       <width>740</width>
-                       <height>650</height>
-                       <onup>9001</onup>
-                       <onleft>9000</onleft>
-                       <onright>60</onright>
-                       <ondown>12</ondown>
-                       <pagecontrol>60</pagecontrol>
-                       <scrolltime>200</scrolltime>
-                       <itemlayout height="50">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>740</width>
-                                       <height>51</height>
-                                       <texture border="5">MenuItemNF.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>10</posx>
-                                       <posy>0</posy>
-                                       <width>720</width>
-                                       <height>50</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="50">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>740</width>
-                                       <height>51</height>
-                                       <texture border="5">MenuItemNF.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>10</posx>
-                                       <posy>0</posy>
-                                       <width>720</width>
-                                       <height>50</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <label>[COLOR=blue] > [/COLOR] $INFO[ListItem.Label]</label>
-                               </control>
-                       </focusedlayout>
-               </control>
-               <control type="group" id="9000">
-                       <posx>780</posx>
-                       <posy>140</posy>
-                       <control type="button" id="11">
-                               <description>Browse Button</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>200</width>
-                               <height>50</height>
-                               <label>1024</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font12_title</font>
-                               <texturefocus border="5">IconBack-focus.png</texturefocus>
-                               <texturenofocus border="5">ListNF.png</texturenofocus>
-                               <pulseonselect>false</pulseonselect>
-                               <onup>18</onup>
-                               <onleft>60</onleft>
-                               <onright>10</onright>
-                               <ondown>13</ondown>
-                       </control>
-                       <control type="button" id="13">
-                               <description>Add Path Button</description>
-                               <posx>0</posx>
-                               <posy>55</posy>
-                               <width>200</width>
-                               <height>50</height>
-                               <label>15019</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font12_title</font>
-                               <texturefocus border="5">IconBack-focus.png</texturefocus>
-                               <texturenofocus border="5">ListNF.png</texturenofocus>
-                               <pulseonselect>false</pulseonselect>
-                               <onup>11</onup>
-                               <onleft>60</onleft>
-                               <onright>10</onright>
-                               <ondown>14</ondown>
-                       </control>
-                       <control type="button" id="14">
-                               <description>Remove Path Button</description>
-                               <posx>0</posx>
-                               <posy>110</posy>
-                               <width>200</width>
-                               <height>50</height>
-                               <label>1210</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font12_title</font>
-                               <texturefocus border="5">IconBack-focus.png</texturefocus>
-                               <texturenofocus border="5">ListNF.png</texturenofocus>
-                               <pulseonselect>false</pulseonselect>
-                               <onup>13</onup>
-                               <onleft>60</onleft>
-                               <onright>10</onright>
-                               <ondown>12</ondown>
-                       </control>
-               </control>
-               <control type="label">
-                       <description>Name label</description>
-                       <posx>20</posx>
-                       <posy>450</posy>
-                       <width>960</width>
-                       <height>30</height>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <font>font13_title</font>
-                       <label>1022</label>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="button" id="12">
-                       <description>Name Button</description>
-                       <posx>20</posx>
-                       <posy>490</posy>
-                       <width>960</width>
-                       <height>50</height>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <label>-</label>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <texturefocus border="5">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="5">MenuItemNF.png</texturenofocus>
-                       <onup>10</onup>
-                       <onleft>12</onleft>
-                       <onright>19</onright>
-                       <ondown>9001</ondown>
-               </control>
-               <control type="grouplist" id="9001">
-                       <posx>20</posx>
-                       <posy>590</posy>
-                       <width>960</width>
-                       <height>50</height>
-                       <itemgap>5</itemgap>
-                       <align>center</align>
-                       <orientation>horizontal</orientation>
-                       <onleft>9001</onleft>
-                       <onright>9001</onright>
-                       <onup>50</onup>
-                       <ondown>49</ondown>
-                       <control type="button" id="18">
-                               <description>Ok Button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>186</label>
-                       </control>
-                       <control type="button" id="19">
-                               <description>Cancel Button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>222</label>
-                       </control>
-                       <control type="button" id="20">
-                               <description>Set Content Button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>20333</label>
-                       </control>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/DialogMusicScan.xml b/addons/skin.touched/4x3Hirez/DialogMusicScan.xml
deleted file mode 100644 (file)
index 04ad9dd..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-<window id="112">
-       <defaultcontrol></defaultcontrol>
-       <include>dialogeffect</include>
-       <controls>
-               <control type="group">
-                       <posx>420r</posx>
-                       <posy>25</posy>
-                       <visible>!Window.IsVisible(FullscreenVideo) + !Window.IsVisible(Visualisation)</visible>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>350</width>
-                               <height>67</height>
-                               <texture border="8">IconBack.png</texture>
-                       </control>
-                       <control type="fadelabel" id="401">
-                               <posx>10</posx>
-                               <posy>5</posy>
-                               <width>330</width>
-                               <height>15</height>
-                               <scrollout>false</scrollout>
-                               <pauseatend>3000</pauseatend>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font10_title</font>
-                               <textcolor>black</textcolor>
-                       </control>
-                       <control type="fadelabel" id="402">
-                               <posx>10</posx>
-                               <posy>24</posy>
-                               <width>330</width>
-                               <height>20</height>
-                               <scrollout>false</scrollout>
-                               <pauseatend>3000</pauseatend>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font12</font>
-                               <textcolor>black</textcolor>
-                               <haspath>true</haspath>
-                       </control>
-                       <control type="progress" id="403">
-                               <description>progress control</description>
-                               <posx>5</posx>
-                               <posy>47</posy>
-                               <width>340</width>
-                               <height>15</height>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/DialogMuteBug.xml b/addons/skin.touched/4x3Hirez/DialogMuteBug.xml
deleted file mode 100644 (file)
index 0325d88..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-<window id="113">
-       <defaultcontrol>-</defaultcontrol>
-       <include>dialogeffect</include>
-       <coordinates>
-               <system>0</system>
-               <posx>0</posx>
-               <posy>0</posy>
-       </coordinates>
-       <controls>
-               <control type="group">
-                       <posx>80r</posx>
-                       <posy>0</posy>
-                       <animation effect="slide" end="100,0" time="200" tween="quadratic" easing="out">WindowClose</animation>
-                       <animation effect="slide" start="100,0" time="200" tween="quadratic" easing="out">WindowOpen</animation>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>80</width>
-                               <height>35</height>
-                               <texture flipx="true" border="32,0,0,0">header.png</texture>
-                       </control>
-                       <control type="image">
-                               <posx>35</posx>
-                               <posy>0</posy>
-                               <width>30</width>
-                               <height>30</height>
-                               <aspectratio>keep</aspectratio>
-                               <texture>icon-mute.png</texture>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/DialogNetworkSetup.xml b/addons/skin.touched/4x3Hirez/DialogNetworkSetup.xml
deleted file mode 100644 (file)
index 59dc469..0000000
+++ /dev/null
@@ -1,194 +0,0 @@
-<window id="128">
-       <defaultcontrol>10</defaultcontrol>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>240</posx>
-               <posy>220</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <description>Shadow Background for dialogs without BehindDialogFadeOut include</description>
-                       <posx>-30</posx>
-                       <posy>-30</posy>
-                       <width>860</width>
-                       <height>580</height>
-                       <texture border="30">DialogShadow.png</texture>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>800</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="label" id="2">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>710</width>
-                       <label>$LOCALIZE[1007]</label>
-               </control>
-               <control type="group">
-                       <posx>730</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>800</width>
-                       <height>460</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-
-               <control type="spincontrolex" id="10">
-                       <description>Protocol SpinControl</description>
-                       <posx>20</posx>
-                       <posy>80</posy>
-                       <height>51</height>
-                       <width>760</width>
-                       <texturefocus border="5">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="5">MenuItemNF.png</texturenofocus>
-                       <textcolor>black</textcolor>
-                       <disabledcolor>grey3</disabledcolor>
-                       <textoffsetx>12</textoffsetx>
-                       <aligny>center</aligny>
-                       <reverse>yes</reverse>
-                       <font>font132</font>
-                       <label>1008</label>
-                       <onup>18</onup>
-                       <ondown>11</ondown>
-                       <onleft>10</onleft>
-                       <onright>10</onright>
-               </control>
-               <control type="button" id="11">
-                       <description>Server Address Button</description>
-                       <posx>20</posx>
-                       <posy>140</posy>
-                       <width>570</width>
-                       <height>51</height>
-                       <textoffsetx>12</textoffsetx>
-                       <textcolor>black</textcolor>
-                       <aligny>center</aligny>
-                       <texturefocus border="5">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="5">MenuItemNF.png</texturenofocus>
-                       <font>font13</font>
-                       <label>-</label>
-                       <onup>10</onup>
-                       <onleft>12</onleft>
-                       <onright>12</onright>
-                       <ondown>16</ondown>
-               </control>
-               <control type="button" id="12">
-                       <description>Server Browse Button</description>
-                       <posx>610</posx>
-                       <posy>140</posy>
-                       <width>170</width>
-                       <include>ButtonInfoDialogsCommonValues</include>
-                       <label>1024</label>
-                       <onup>10</onup>
-                       <onleft>11</onleft>
-                       <onright>11</onright>
-                       <ondown>16</ondown>
-               </control>
-               <control type="button" id="16">
-                       <description>Remote path Button</description>
-                       <posx>20</posx>
-                       <posy>200</posy>
-                       <width>760</width>
-                       <height>51</height>
-                       <textoffsetx>12</textoffsetx>
-                       <textcolor>black</textcolor>
-                       <aligny>center</aligny>
-                       <texturefocus border="5">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="5">MenuItemNF.png</texturenofocus>
-                       <font>font13</font>
-                       <label>-</label>
-                       <onup>11</onup>
-                       <onleft>16</onleft>
-                       <onright>16</onright>
-                       <ondown>13</ondown>
-               </control>
-               <control type="button" id="13">
-                       <description>Port Button</description>
-                       <posx>20</posx>
-                       <posy>250</posy>
-                       <width>760</width>
-                       <height>51</height>
-                       <textoffsetx>12</textoffsetx>
-                       <textcolor>black</textcolor>
-                       <aligny>center</aligny>
-                       <texturefocus border="5">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="5">MenuItemNF.png</texturenofocus>
-                       <font>font13</font>
-                       <label>1013</label>
-                       <onup>16</onup>
-                       <onleft>13</onleft>
-                       <onright>13</onright>
-                       <ondown>14</ondown>
-               </control>
-               <control type="button" id="14">
-                       <description>Username Button</description>
-                       <posx>20</posx>
-                       <posy>300</posy>
-                       <width>760</width>
-                       <height>51</height>
-                       <textcolor>black</textcolor>
-                       <textoffsetx>12</textoffsetx>
-                       <aligny>center</aligny>
-                       <texturefocus border="5">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="5">MenuItemNF.png</texturenofocus>
-                       <font>font13</font>
-                       <label>1014</label>
-                       <onup>13</onup>
-                       <onleft>14</onleft>
-                       <onright>14</onright>
-                       <ondown>15</ondown>
-               </control>
-               <control type="button" id="15">
-                       <description>Password Button</description>
-                       <posx>20</posx>
-                       <posy>350</posy>
-                       <width>760</width>
-                       <height>51</height>
-                       <textoffsetx>12</textoffsetx>
-                       <textcolor>black</textcolor>
-                       <aligny>center</aligny>
-                       <texturefocus border="5">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="5">MenuItemNF.png</texturenofocus>
-                       <font>font13</font>
-                       <label>15052</label>
-                       <onup>14</onup>
-                       <onleft>15</onleft>
-                       <onright>15</onright>
-                       <ondown>18</ondown>
-               </control>
-               <control type="grouplist" id="9001">
-                       <posx>20</posx>
-                       <posy>450</posy>
-                       <width>760</width>
-                       <height>50</height>
-                       <itemgap>5</itemgap>
-                       <align>center</align>
-                       <orientation>horizontal</orientation>
-                       <onleft>9001</onleft>
-                       <onright>9001</onright>
-                       <onup>50</onup>
-                       <ondown>49</ondown>
-                       <control type="button" id="18">
-                               <description>Ok Button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>186</label>
-                       </control>
-                       <control type="button" id="19">
-                               <description>Cancel Button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>222</label>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/DialogNumeric.xml b/addons/skin.touched/4x3Hirez/DialogNumeric.xml
deleted file mode 100644 (file)
index 2035a0c..0000000
+++ /dev/null
@@ -1,354 +0,0 @@
-<window id="109">
-       <defaultcontrol always="true">21</defaultcontrol>
-       <coordinates>
-               <system>2</system>
-               <posx>0</posx>
-               <posy>0</posy>
-       </coordinates>
-       <controls>
-               <control type="button">
-                       <description>Hidden button to close the keyboard when its focused</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>ScreenWidth</width>
-                       <height>ScreenHeight</height>
-                       <texturenofocus>-</texturenofocus>
-                       <texturefocus>-</texturefocus>
-                       <onclick>PreviousMenu</onclick>
-               </control>
-               <control type="group">
-                       <posx>480</posx>
-                       <posy>170</posy>
-                       <animation effect="slide" start="0,-820" end="0,0" time="500" easing="out" tween="quadratic" >WindowOpen</animation>
-                       <animation effect="slide" start="0,0" end="0,-820" time="500" easing="in" tween="quadratic" >WindowClose</animation>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>70</posy>
-                               <width>395</width>
-                               <height>50</height>
-                               <aspectratio>stretch</aspectratio>
-                               <texture border="20">KeyboardEditArea.png</texture>
-                       </control>
-                       <control type="label" id="4">
-                               <description>Edit Text</description>
-                               <posx>20</posx>
-                               <posy>70</posy>
-                               <width>355</width>
-                               <height>50</height>
-                               <font>font16</font>
-                               <textcolor>selected</textcolor>
-                               <disabledcolor>grey2</disabledcolor>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                       </control>
-                       <control type="label" id="1">
-                               <description>dialog Heading</description>
-                               <posx>0</posx>
-                               <posy>20</posy>
-                               <width>395</width>
-                               <height>40</height>
-                               <font>font13_title</font>
-                               <textcolor>white</textcolor>
-                               <shadowcolor>black</shadowcolor>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <wrapmultiline>true</wrapmultiline>
-                       </control>
-                       <control type="group">
-                               <posx>0</posx>
-                               <posy>130</posy>
-                               <control type="button" id="11">
-                                       <description>1 button</description>
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                                       <label>12311</label>
-                                       <textcolor>black</textcolor>
-                                       <onleft>23</onleft>
-                                       <onright>12</onright>
-                                       <onup>20</onup>
-                                       <ondown>14</ondown>
-                               </control>
-                               <control type="button" id="12">
-                                       <description>2 button</description>
-                                       <posx>100</posx>
-                                       <posy>0</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                                       <label>12312</label>
-                                       <textcolor>black</textcolor>
-                                       <onleft>11</onleft>
-                                       <onright>13</onright>
-                                       <onup>10</onup>
-                                       <ondown>15</ondown>
-                               </control>
-                               <control type="button" id="13">
-                                       <description>3 button</description>
-                                       <posx>200</posx>
-                                       <posy>0</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                                       <label>12313</label>
-                                       <textcolor>black</textcolor>
-                                       <onleft>12</onleft>
-                                       <onright>23</onright>
-                                       <onup>22</onup>
-                                       <ondown>16</ondown>
-                               </control>
-                               <control type="button" id="23">
-                                       <description>Backspace button</description>
-                                       <posx>300</posx>
-                                       <posy>0</posy>
-                                       <width>95</width>
-                                       <height>165</height>
-                                       <font>font12</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <texturenofocus border="8">KeyboardKeyDark.png</texturenofocus>
-                                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                                       <textwidth>120</textwidth>
-                                       <label>-</label>
-                                       <textcolor>white</textcolor>
-                                       <angle>270</angle>
-                                       <onleft>13</onleft>
-                                       <onright>11</onright>
-                                       <onup>21</onup>
-                                       <ondown>21</ondown>
-                               </control>
-                               <control type="image">
-                                       <description>BackSpace Icon image</description>
-                                       <posx>320</posx>
-                                       <posy>60</posy>
-                                       <width>50</width>
-                                       <height>50</height>
-                                       <texture>icon_backspace.png</texture>
-                               </control>
-                               <control type="button" id="14">
-                                       <description>4 button</description>
-                                       <posx>0</posx>
-                                       <posy>85</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                                       <label>12314</label>
-                                       <textcolor>black</textcolor>
-                                       <onleft>23</onleft>
-                                       <onright>15</onright>
-                                       <onup>11</onup>
-                                       <ondown>17</ondown>
-                               </control>
-                               <control type="button" id="15">
-                                       <description>5 button</description>
-                                       <posx>100</posx>
-                                       <posy>85</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                                       <label>12315</label>
-                                       <textcolor>black</textcolor>
-                                       <onleft>14</onleft>
-                                       <onright>16</onright>
-                                       <onup>12</onup>
-                                       <ondown>18</ondown>
-                               </control>
-                               <control type="button" id="16">
-                                       <description>6 button</description>
-                                       <posx>200</posx>
-                                       <posy>85</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                                       <label>12316</label>
-                                       <textcolor>black</textcolor>
-                                       <onleft>15</onleft>
-                                       <onright>23</onright>
-                                       <onup>13</onup>
-                                       <ondown>19</ondown>
-                               </control>
-                               <control type="button" id="17">
-                                       <description>7 button</description>
-                                       <posx>0</posx>
-                                       <posy>170</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                                       <label>12317</label>
-                                       <textcolor>black</textcolor>
-                                       <onleft>21</onleft>
-                                       <onright>18</onright>
-                                       <onup>14</onup>
-                                       <ondown>20</ondown>
-                               </control>
-                               <control type="button" id="18">
-                                       <description>8 button</description>
-                                       <posx>100</posx>
-                                       <posy>170</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                                       <label>12318</label>
-                                       <textcolor>black</textcolor>
-                                       <onleft>17</onleft>
-                                       <onright>19</onright>
-                                       <onup>15</onup>
-                                       <ondown>10</ondown>
-                               </control>
-                               <control type="button" id="19">
-                                       <description>9 button</description>
-                                       <posx>200</posx>
-                                       <posy>170</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                                       <label>12319</label>
-                                       <textcolor>black</textcolor>
-                                       <onleft>18</onleft>
-                                       <onright>21</onright>
-                                       <onup>16</onup>
-                                       <ondown>22</ondown>
-                               </control>
-                               <control type="button" id="21">
-                                       <description>Done button</description>
-                                       <posx>300</posx>
-                                       <posy>170</posy>
-                                       <width>95</width>
-                                       <height>165</height>
-                                       <font>font12</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <texturenofocus border="8">KeyboardKeyDark.png</texturenofocus>
-                                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                                       <textwidth>120</textwidth>
-                                       <label>-</label>
-                                       <textcolor>white</textcolor>
-                                       <angle>270</angle>
-                                       <onleft>19</onleft>
-                                       <onright>17</onright>
-                                       <onup>23</onup>
-                                       <ondown>23</ondown>
-                               </control>
-                               <control type="image">
-                                       <description>Enter\done Icon image</description>
-                                       <posx>320</posx>
-                                       <posy>230</posy>
-                                       <width>50</width>
-                                       <height>50</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>icon_enter.png</texture>
-                               </control>
-                               <control type="button" id="20">
-                                       <description>prev button</description>
-                                       <posx>0</posx>
-                                       <posy>255</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <font>font30</font>
-                                       <label>-</label>
-                                       <textcolor>white</textcolor>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <texturenofocus border="8">KeyboardKeyDark.png</texturenofocus>
-                                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                                       <onleft>21</onleft>
-                                       <onright>10</onright>
-                                       <onup>17</onup>
-                                       <ondown>11</ondown>
-                               </control>
-                               <control type="image">
-                                       <description>Previous Icon image</description>
-                                       <posx>22</posx>
-                                       <posy>275</posy>
-                                       <width>50</width>
-                                       <height>40</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture flipx="true">icon_arrowkey.png</texture>
-                               </control>
-                               <control type="button" id="10">
-                                       <description>0 button</description>
-                                       <posx>100</posx>
-                                       <posy>255</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <font>font16</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                                       <label>12310</label>
-                                       <textcolor>black</textcolor>
-                                       <onleft>20</onleft>
-                                       <onright>22</onright>
-                                       <onup>18</onup>
-                                       <ondown>12</ondown>
-                               </control>
-                               <control type="button" id="22">
-                                       <description>next button</description>
-                                       <posx>200</posx>
-                                       <posy>255</posy>
-                                       <width>95</width>
-                                       <height>80</height>
-                                       <font>font30</font>
-                                       <label>-</label>
-                                       <textcolor>white</textcolor>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <texturenofocus border="8">KeyboardKeyDark.png</texturenofocus>
-                                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                                       <onleft>10</onleft>
-                                       <onright>21</onright>
-                                       <onup>19</onup>
-                                       <ondown>13</ondown>
-                               </control>
-                               <control type="image">
-                                       <description>Next Icon image</description>
-                                       <posx>222</posx>
-                                       <posy>275</posy>
-                                       <width>50</width>
-                                       <height>40</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>icon_arrowkey.png</texture>
-                               </control>
-                       </control>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/DialogOK.xml b/addons/skin.touched/4x3Hirez/DialogOK.xml
deleted file mode 100644 (file)
index 133d69a..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-<window id="2002">
-       <defaultcontrol always="true">10</defaultcontrol>
-       <coordinates>
-               <system>1</system>
-               <posx>290</posx>
-               <posy>300</posy>
-       </coordinates>
-       <include>dialogeffect</include>
-       <controls>
-               <control type="image">
-                       <description>Shadow Background for dialogs without BehindDialogFadeOut include</description>
-                       <posx>-30</posx>
-                       <posy>-30</posy>
-                       <width>760</width>
-                       <height>370</height>
-                       <texture border="30">DialogShadow.png</texture>
-               </control>
-               <control type="image">
-                       <description>Header Background</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>700</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="group">
-                       <posx>630</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="label" id="1">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>600</width>
-                       <label>$LOCALIZE[13406]</label>
-               </control>
-               <control type="image">
-                       <description>Background</description>
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>700</width>
-                       <height>250</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-               <control type="label" id="2">
-                       <description>dialog line 1</description>
-                       <posx>20</posx>
-                       <posy>80</posy>
-                       <width>660</width>
-                       <height>30</height>
-                       <align>left</align>
-                       <aligny>center</aligny>
-                       <label>-</label>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="label" id="3">
-                       <description>dialog line 2</description>
-                       <posx>20</posx>
-                       <posy>110</posy>
-                       <width>660</width>
-                       <height>30</height>
-                       <align>left</align>
-                       <aligny>center</aligny>
-                       <label>-</label>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="label" id="4">
-                       <description>dialog line 3</description>
-                       <posx>20</posx>
-                       <posy>140</posy>
-                       <width>660</width>
-                       <height>30</height>
-                       <align>left</align>
-                       <aligny>center</aligny>
-                       <label>-</label>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="grouplist" id="9000">
-                       <posx>20</posx>
-                       <posy>250</posy>
-                       <width>660</width>
-                       <height>50</height>
-                       <itemgap>10</itemgap>
-                       <align>center</align>
-                       <orientation>horizontal</orientation>
-                       <onleft>9000</onleft>
-                       <onright>9000</onright>
-                       <onup>9000</onup>
-                       <ondown>9000</ondown>
-                       <control type="button" id="10">
-                               <description>OK button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>186</label>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/DialogPictureInfo.xml b/addons/skin.touched/4x3Hirez/DialogPictureInfo.xml
deleted file mode 100644 (file)
index 0362bd0..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-<window id="139">
-       <defaultcontrol always="true">5</defaultcontrol>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>140</posx>
-               <posy>30</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1000</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="label">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>910</width>
-                       <label>$LOCALIZE[13406]</label>
-               </control>
-               <control type="group">
-                       <posx>930</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>1000</width>
-                       <height>840</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-               <control type="list" id="5">
-                       <posx>20</posx>
-                       <posy>80</posy>
-                       <width>960</width>
-                       <height>800</height>
-                       <onleft>5</onleft>
-                       <onright>5</onright>
-                       <onup>5</onup>
-                       <ondown>5</ondown>
-                       <pagecontrol>60</pagecontrol>
-                       <scrolltime>200</scrolltime>
-                       <itemlayout height="40">
-                               <control type="label">
-                                       <posx>250</posx>
-                                       <posy>0</posy>
-                                       <width>250</width>
-                                       <height>40</height>
-                                       <font>font13_title</font>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <info>ListItem.Label</info>
-                               </control>
-                               <control type="label">
-                                       <posx>260</posx>
-                                       <posy>0</posy>
-                                       <width>670</width>
-                                       <height>40</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>white</selectedcolor>
-                                       <info>ListItem.Label2</info>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="40">
-                               <control type="label">
-                                       <posx>250</posx>
-                                       <posy>0</posy>
-                                       <width>250</width>
-                                       <height>40</height>
-                                       <font>font13_title</font>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <info>ListItem.Label</info>
-                               </control>
-                               <control type="label">
-                                       <posx>260</posx>
-                                       <posy>0</posy>
-                                       <width>670</width>
-                                       <height>40</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>white</selectedcolor>
-                                       <info>ListItem.Label2</info>
-                               </control>
-                       </focusedlayout>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/DialogProgress.xml b/addons/skin.touched/4x3Hirez/DialogProgress.xml
deleted file mode 100644 (file)
index ea3372e..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-<window id="101">
-       <defaultcontrol always="true">10</defaultcontrol>
-       <coordinates>
-               <system>1</system>
-               <posx>290</posx>
-               <posy>300</posy>
-       </coordinates>
-       <include>dialogeffect</include>
-       <controls>
-               <control type="image">
-                       <description>Shadow Background for dialogs without BehindDialogFadeOut include</description>
-                       <posx>-30</posx>
-                       <posy>-30</posy>
-                       <width>760</width>
-                       <height>370</height>
-                       <texture border="30">DialogShadow.png</texture>
-               </control>
-               <control type="image">
-                       <description>Header Background</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>700</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="group">
-                       <posx>630</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="label" id="1">
-                       <description>heading label</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>0</width>
-                       <height>0</height>
-                       <font>-</font>
-                       <visible>false</visible>
-               </control>
-               <control type="label">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>600</width>
-                       <label>$INFO[Control.GetLabel(1)] $INFO[System.Progressbar,- ,%]</label>
-               </control>
-               <control type="image">
-                       <description>Background</description>
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>700</width>
-                       <height>250</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-               <control type="label" id="2">
-                       <description>dialog line 1</description>
-                       <posx>20</posx>
-                       <posy>80</posy>
-                       <width>660</width>
-                       <height>30</height>
-                       <align>left</align>
-                       <aligny>center</aligny>
-                       <label>-</label>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="label" id="3">
-                       <description>dialog line 2</description>
-                       <posx>20</posx>
-                       <posy>110</posy>
-                       <width>660</width>
-                       <height>30</height>
-                       <align>left</align>
-                       <aligny>center</aligny>
-                       <label>-</label>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="label" id="4">
-                       <description>dialog line 3</description>
-                       <posx>20</posx>
-                       <posy>140</posy>
-                       <width>660</width>
-                       <height>30</height>
-                       <align>left</align>
-                       <aligny>center</aligny>
-                       <label>-</label>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="progress">
-                       <description>Progressbar</description>
-                       <posx>20</posx>
-                       <posy>190</posy>
-                       <width>660</width>
-                       <height>32</height>
-                       <info>System.Progressbar</info>
-               </control>
-               <control type="grouplist" id="9000">
-                       <posx>20</posx>
-                       <posy>250</posy>
-                       <width>660</width>
-                       <height>50</height>
-                       <itemgap>10</itemgap>
-                       <align>center</align>
-                       <orientation>horizontal</orientation>
-                       <onleft>9000</onleft>
-                       <onright>9000</onright>
-                       <onup>9000</onup>
-                       <ondown>9000</ondown>
-                       <control type="button" id="10">
-                               <description>OK button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>222</label>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/DialogSeekBar.xml b/addons/skin.touched/4x3Hirez/DialogSeekBar.xml
deleted file mode 100644 (file)
index 4ec2dd7..0000000
+++ /dev/null
@@ -1,179 +0,0 @@
-<window id="115">
-       <defaultcontrol>1</defaultcontrol>
-       <visible>[Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding] + [Window.IsVisible(FullscreenVideo) | Window.IsVisible(Visualisation)] + ![Window.IsVisible(VideoOSD) | Window.IsVisible(MusicOSD) | Window.IsVisible(PlayerControls)]</visible>
-       <animation effect="fade" start="0" end="100" time="200">WindowOpen</animation>
-       <animation effect="fade" start="100" end="0" time="200">WindowClose</animation>
-       <controls>
-               <control type="group">
-                       <posx>580r</posx>
-                       <posy>0</posy>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>-5</posy>
-                               <width>315</width>
-                               <height>69</height>
-                               <texture border="8">DialogHeader.png</texture>
-                       </control>
-                       <control type="label">
-                               <description>Playing Label</description>
-                               <posx>15</posx>
-                               <posy>2</posy>
-                               <width>370</width>
-                               <height>18</height>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <font>font10_title</font>
-                               <textcolor>blue</textcolor>
-                               <label>$LOCALIZE[31042]</label>
-                               <visible>Player.Playing + !Player.Seeking + !Player.DisplayAfterSeek</visible>
-                       </control>
-                       <control type="label">
-                               <description>Paused Label</description>
-                               <posx>15</posx>
-                               <posy>2</posy>
-                               <width>370</width>
-                               <height>18</height>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <font>font10_title</font>
-                               <textcolor>blue</textcolor>
-                               <label>31043</label>
-                               <visible>[Player.Paused + !Player.Caching] + !Player.Seeking + !Player.DisplayAfterSeek</visible>
-                       </control>
-                       <control type="label">
-                               <description>Cache Label</description>
-                               <posx>15</posx>
-                               <posy>2</posy>
-                               <width>370</width>
-                               <height>18</height>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <font>font10_title</font>
-                               <textcolor>blue</textcolor>
-                               <label>$LOCALIZE[15107] $INFO[Player.CacheLevel]%</label>
-                               <visible>[Player.Paused + Player.Caching] + !Player.Seeking</visible>
-                       </control>
-                       <control type="label">
-                               <description>Seeking Label</description>
-                               <posx>15</posx>
-                               <posy>2</posy>
-                               <width>370</width>
-                               <height>18</height>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <font>font10_title</font>
-                               <textcolor>blue</textcolor>
-                               <label>[UPPERCASE]$LOCALIZE[773][/UPPERCASE]</label>
-                               <visible>Player.Seeking</visible>
-                       </control>
-                       <control type="label">
-                               <description>Final Seek amount Label</description>
-                               <posx>15</posx>
-                               <posy>2</posy>
-                               <width>370</width>
-                               <height>18</height>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <font>font10_title</font>
-                               <textcolor>blue</textcolor>
-                               <label>[UPPERCASE]$LOCALIZE[773][/UPPERCASE][COLOR=grey] $INFO[Player.SeekOffset][/COLOR]</label>
-                               <visible>Player.DisplayAfterSeek + ![player.forwarding | player.rewinding]</visible>
-                       </control>
-                       <control type="label">
-                               <description>FF Label</description>
-                               <posx>15</posx>
-                               <posy>2</posy>
-                               <width>370</width>
-                               <height>18</height>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <font>font10_title</font>
-                               <textcolor>blue</textcolor>
-                               <label>31044</label>
-                               <visible>Player.Forwarding</visible>
-                       </control>
-                       <control type="label">
-                               <description>RW Label</description>
-                               <posx>15</posx>
-                               <posy>2</posy>
-                               <width>370</width>
-                               <height>18</height>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <font>font10_title</font>
-                               <textcolor>blue</textcolor>
-                               <label>31045</label>
-                               <visible>Player.Rewinding</visible>
-                       </control>
-                       <control type="label">
-                               <description>Elapsed Time Label</description>
-                               <posx>15</posx>
-                               <posy>20</posy>
-                               <width>150</width>
-                               <height>15</height>
-                               <font>font12</font>
-                               <textcolor>white</textcolor>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <label>$INFO[Player.Time]</label>
-                               <visible>!Player.Seeking</visible>
-                       </control>
-                       <control type="label">
-                               <description>Seek Time Label</description>
-                               <posx>15</posx>
-                               <posy>20</posy>
-                               <width>150</width>
-                               <height>15</height>
-                               <font>font13_title</font>
-                               <textcolor>white</textcolor>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <label>$INFO[Player.SeekTime]</label>
-                               <visible>Player.Seeking</visible>
-                       </control>
-                       <control type="label">
-                               <description>Total Time Label</description>
-                               <posx>300</posx>
-                               <posy>20</posy>
-                               <width>150</width>
-                               <height>15</height>
-                               <font>font12</font>
-                               <textcolor>white</textcolor>
-                               <align>right</align>
-                               <aligny>center</aligny>
-                               <label>$INFO[Player.Duration]</label>
-                       </control>
-                       <control type="progress">
-                               <description>ProgressbarCache</description>
-                               <posx>7</posx>
-                               <posy>40</posy>
-                               <width>300</width>
-                               <height>15</height>
-                               <info>Player.ProgressCache</info>
-                               <midtexture border="16,0,16,0">OSDProgressMidLight.png</midtexture>
-                               <visible>true</visible>
-                       </control>
-                       <control type="progress" id="23">
-                               <description>Progressbar</description>
-                               <posx>7</posx>
-                               <posy>40</posy>
-                               <width>300</width>
-                               <height>15</height>
-                               <info>Player.Progress</info>
-                               <texturebg border="16,0,16,0">OSDProgressBack2.png</texturebg>
-                               <visible>true</visible>
-                       </control>
-                       <control type="slider" id="401">
-                               <description>Seek Slider</description>
-                               <posx>7</posx>
-                               <posy>40</posy>
-                               <width>300</width>
-                               <height>15</height>
-                               <texturesliderbar>seekslider.png</texturesliderbar>
-                               <textureslidernib>osd_slider_nib.png</textureslidernib>
-                               <textureslidernibfocus>osd_slider_nib.png</textureslidernibfocus>
-                               <visible>Player.Seeking</visible>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/DialogSelect.xml b/addons/skin.touched/4x3Hirez/DialogSelect.xml
deleted file mode 100644 (file)
index ee5f25f..0000000
+++ /dev/null
@@ -1,237 +0,0 @@
-<window type="dialog" id="2000">
-       <defaultcontrol always="true">3</defaultcontrol>
-       <coordinates>
-               <system>1</system>
-               <posx>335</posx>
-               <posy>35</posy>
-       </coordinates>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>290</posx>
-               <posy>80</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <description>Shadow Background for dialogs without BehindDialogFadeOut include</description>
-                       <posx>-30</posx>
-                       <posy>-30</posy>
-                       <width>760</width>
-                       <height>860</height>
-                       <texture border="30">DialogShadow.png</texture>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>700</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>700</width>
-                       <height>740</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-               <control type="label" id="1">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>600</width>
-                       <label>$LOCALIZE[13406]</label>
-               </control>
-               <control type="group">
-                       <posx>630</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="list" id="3">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>700</width>
-                       <height>650</height>
-                       <onup>3</onup>
-                       <ondown>3</ondown>
-                       <onleft>5</onleft>
-                       <onright>61</onright>
-                       <pagecontrol>-</pagecontrol>
-                       <scrolltime>200</scrolltime>
-                       <itemlayout height="60" width="700">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>-2</posy>
-                                       <width>700</width>
-                                       <height>5</height>
-                                       <texture>separator.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>20</posx>
-                                       <posy>0</posy>
-                                       <width>660</width>
-                                       <height>60</height>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="60" width="550">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>-2</posy>
-                                       <width>700</width>
-                                       <height>5</height>
-                                       <texture>separator.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>20</posx>
-                                       <posy>0</posy>
-                                       <width>660</width>
-                                       <height>60</height>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                       </focusedlayout>
-               </control>
-               <control type="list" id="6">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>700</width>
-                       <height>650</height>
-                       <onup>6</onup>
-                       <ondown>6</ondown>
-                       <onleft>5</onleft>
-                       <onright>61</onright>
-                       <pagecontrol>-</pagecontrol>
-                       <scrolltime>200</scrolltime>
-                       <itemlayout height="100" width="700">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>-2</posy>
-                                       <width>700</width>
-                                       <height>5</height>
-                                       <texture>separator.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>20</posx>
-                                       <posy>5</posy>
-                                       <width>550</width>
-                                       <height>30</height>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>[B]$INFO[ListItem.Label][/B]</label>
-                               </control>
-                               <control type="textbox">
-                                       <posx>30</posx>
-                                       <posy>35</posy>
-                                       <width>540</width>
-                                       <height>60</height>
-                                       <font>font12</font>
-                                       <textcolor>black</textcolor>
-                                       <align>left</align>
-                                       <label>$INFO[ListItem.Property(Addon.Summary)]</label>
-                               </control>
-                               <control type="image">
-                                       <posx>580</posx>
-                                       <posy>5</posy>
-                                       <width>100</width>
-                                       <height>90</height>
-                                       <texture>$INFO[Listitem.Icon]</texture>
-                                       <bordertexture>ThumbBorderGrey.png</bordertexture>
-                                       <bordersize>2</bordersize>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="100" width="700">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>-2</posy>
-                                       <width>700</width>
-                                       <height>5</height>
-                                       <texture>separator.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>20</posx>
-                                       <posy>5</posy>
-                                       <width>550</width>
-                                       <height>30</height>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>[B]$INFO[ListItem.Label][/B]</label>
-                               </control>
-                               <control type="textbox">
-                                       <posx>30</posx>
-                                       <posy>35</posy>
-                                       <width>540</width>
-                                       <height>60</height>
-                                       <font>font12</font>
-                                       <textcolor>black</textcolor>
-                                       <align>left</align>
-                                       <label>$INFO[ListItem.Property(Addon.Summary)]</label>
-                               </control>
-                               <control type="image">
-                                       <posx>580</posx>
-                                       <posy>5</posy>
-                                       <width>100</width>
-                                       <height>90</height>
-                                       <texture>$INFO[Listitem.Icon]</texture>
-                                       <bordertexture>ThumbBorderGrey.png</bordertexture>
-                                       <bordersize>2</bordersize>
-                               </control>
-                       </focusedlayout>
-               </control>
-               <control type="label">
-                       <description>number of files/pages in list text label</description>
-                       <posx>680</posx>
-                       <posy>750</posy>
-                       <width>300</width>
-                       <height>30</height>
-                       <font>font13</font>
-                       <align>right</align>
-                       <aligny>center</aligny>
-                       <scroll>true</scroll>
-                       <textcolor>black</textcolor>
-                       <label>($INFO[Container(3).NumItems]) $LOCALIZE[31025] - $LOCALIZE[31024] ($INFO[Container(3).CurrentPage]/$INFO[Container(3).NumPages])</label>
-                       <visible>Control.IsVisible(3)</visible>
-               </control>
-               <control type="label">
-                       <description>number of files/pages in list text label</description>
-                       <posx>680</posx>
-                       <posy>750</posy>
-                       <width>300</width>
-                       <height>30</height>
-                       <font>font13</font>
-                       <align>right</align>
-                       <aligny>center</aligny>
-                       <scroll>true</scroll>
-                       <textcolor>black</textcolor>
-                       <label>($INFO[Container(6).NumItems]) $LOCALIZE[31025] - $LOCALIZE[31024] ($INFO[Container(6).CurrentPage]/$INFO[Container(6).NumPages])</label>
-                       <visible>Control.IsVisible(6)</visible>
-               </control>
-               <control type="button" id="5">
-                       <description>Manual button</description>
-                       <posx>20</posx>
-                       <posy>740</posy>
-                       <width>200</width>
-                       <include>ButtonInfoDialogsCommonValues</include>
-                       <label>186</label>
-                       <onleft>61</onleft>
-                       <onright>3</onright>
-                       <onup>3</onup>
-                       <ondown>3</ondown>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/DialogSongInfo.xml b/addons/skin.touched/4x3Hirez/DialogSongInfo.xml
deleted file mode 100644 (file)
index ec9a515..0000000
+++ /dev/null
@@ -1,303 +0,0 @@
-<window id="135">
-       <defaultcontrol always="true">10</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>140</posx>
-               <posy>190</posy>
-       </coordinates>
-       <controls>
-               <control type="group">
-                       <include>VisibleFadeEffect</include>
-                       <visible>!Window.IsVisible(MusicInformation)</visible>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>1000</width>
-                               <height>60</height>
-                               <texture border="5">DialogHeader.png</texture>
-                       </control>
-                       <control type="label">
-                               <description>header label</description>
-                               <posx>20</posx>
-                               <posy>0</posy>
-                               <include>WindowTitleCommons</include>
-                               <width>910</width>
-                               <label>658</label>
-                       </control>
-                       <control type="group">
-                               <posx>930</posx>
-                               <posy>0</posy>
-                               <include>DialogCloseButtonCommons</include>
-                       </control>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>60</posy>
-                               <width>1000</width>
-                               <height>460</height>
-                               <texture border="5">DialogBack.png</texture>
-                       </control>
-                       <control type="label">
-                               <description>Song Title value</description>
-                               <posx>40</posx>
-                               <posy>80</posy>
-                               <width>960</width>
-                               <height>30</height>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font13_title</font>
-                               <label>[B]$INFO[ListItem.Title][/B]</label>
-                               <textcolor>black</textcolor>
-                               <scroll>true</scroll>
-                       </control>
-                       <control type="image">
-                               <posx>20</posx>
-                               <posy>140</posy>
-                               <width>250</width>
-                               <height>250</height>
-                               <aspectratio aligny="bottom">keep</aspectratio>
-                               <texture>$INFO[ListItem.Icon]</texture>
-                               <bordertexture border="8">ThumbShadow.png</bordertexture>
-                               <bordersize>8</bordersize>
-                       </control>
-                       <control type="group">
-                               <posx>280</posx>
-                               <posy>140</posy>
-                               <control type="label">
-                                       <description>Artist Title</description>
-                                       <posx>150</posx>
-                                       <posy>0</posy>
-                                       <width>150</width>
-                                       <height>25</height>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13_title</font>
-                                       <textcolor>black</textcolor>
-                                       <label>$LOCALIZE[557]:</label>
-                               </control>
-                               <control type="fadelabel">
-                                       <description>Artist Value</description>
-                                       <posx>160</posx>
-                                       <posy>0</posy>
-                                       <width>520</width>
-                                       <height>25</height>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <label fallback="161">$INFO[ListItem.Artist]</label>
-                               </control>
-                               <control type="label">
-                                       <description>Album Title</description>
-                                       <posx>150</posx>
-                                       <posy>30</posy>
-                                       <width>130</width>
-                                       <height>25</height>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13_title</font>
-                                       <textcolor>black</textcolor>
-                                       <label>$LOCALIZE[558]:</label>
-                               </control>
-                               <control type="fadelabel">
-                                       <description>Album Value</description>
-                                       <posx>160</posx>
-                                       <posy>30</posy>
-                                       <width>520</width>
-                                       <height>25</height>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <label fallback="161">$INFO[ListItem.Album]$INFO[listitem.discnumber, - $LOCALIZE[427] ]</label>
-                               </control>
-                               <control type="label">
-                                       <description>Genre Title</description>
-                                       <posx>150</posx>
-                                       <posy>60</posy>
-                                       <width>130</width>
-                                       <height>25</height>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13_title</font>
-                                       <textcolor>black</textcolor>
-                                       <label>$LOCALIZE[515]:</label>
-                               </control>
-                               <control type="fadelabel">
-                                       <description>Genre Value</description>
-                                       <posx>160</posx>
-                                       <posy>60</posy>
-                                       <width>520</width>
-                                       <height>25</height>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <label fallback="161">$INFO[ListItem.Genre]</label>
-                               </control>
-                               <control type="label">
-                                       <description>Year Title</description>
-                                       <posx>150</posx>
-                                       <posy>90</posy>
-                                       <width>130</width>
-                                       <height>25</height>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13_title</font>
-                                       <textcolor>black</textcolor>
-                                       <label>$LOCALIZE[562]:</label>
-                               </control>
-                               <control type="fadelabel">
-                                       <description>Year Value</description>
-                                       <posx>160</posx>
-                                       <posy>90</posy>
-                                       <width>520</width>
-                                       <height>25</height>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <label fallback="161">$INFO[ListItem.Year]</label>
-                               </control>
-                               <control type="label">
-                                       <description>Track Number Title</description>
-                                       <posx>150</posx>
-                                       <posy>120</posy>
-                                       <width>130</width>
-                                       <height>25</height>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13_title</font>
-                                       <textcolor>black</textcolor>
-                                       <label>$LOCALIZE[554]:</label>
-                               </control>
-                               <control type="fadelabel">
-                                       <description>Track Number Value</description>
-                                       <posx>160</posx>
-                                       <posy>120</posy>
-                                       <width>520</width>
-                                       <height>25</height>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <label fallback="161">$INFO[ListItem.TrackNumber]</label>
-                               </control>
-                               <control type="label">
-                                       <description>Rating Title</description>
-                                       <posx>150</posx>
-                                       <posy>150</posy>
-                                       <width>130</width>
-                                       <height>25</height>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13_title</font>
-                                       <textcolor>black</textcolor>
-                                       <label>$LOCALIZE[563]:</label>
-                               </control>
-                               <control type="group">
-                                       <posx>160</posx>
-                                       <posy>140</posy>
-                                       <control type="image">
-                                               <description>Rating value</description>
-                                               <posx>0</posx>
-                                               <posy>2</posy>
-                                               <width>200</width>
-                                               <height>40</height>
-                                               <aspectratio align="left">keep</aspectratio>
-                                               <texture fallback="dark/left_rating/rating0.png">$INFO[ListItem.StarRating,dark/left_rating/]</texture>
-                                       </control>
-                                       <control type="button" id="14">
-                                               <description>Decrease Rating</description>
-                                               <posx>170</posx>
-                                               <posy>0</posy>
-                                               <width>45</width>
-                                               <height>45</height>
-                                               <onclick>DecreaseRating</onclick>
-                                               <texturenofocus>Select_Down.png</texturenofocus>
-                                               <texturefocus>Select_Down.png</texturefocus>
-                                               <onleft>9000</onleft>
-                                               <onright>15</onright>
-                                               <ondown>14</ondown>
-                                               <onup>14</onup>
-                                       </control>
-                                       <control type="button" id="15">
-                                               <description>Increase Rating</description>
-                                               <posx>215</posx>
-                                               <posy>0</posy>
-                                               <width>45</width>
-                                               <height>45</height>
-                                               <onclick>IncreaseRating</onclick>
-                                               <texturenofocus>Select_Up.png</texturenofocus>
-                                               <texturefocus>Select_Up.png</texturefocus>
-                                               <onleft>14</onleft>
-                                               <onright>15</onright>
-                                               <ondown>15</ondown>
-                                               <onup>15</onup>
-                                       </control>
-                               </control>
-                               <control type="label">
-                                       <description>Comment Title</description>
-                                       <posx>150</posx>
-                                       <posy>200</posy>
-                                       <width>130</width>
-                                       <height>25</height>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13_title</font>
-                                       <textcolor>black</textcolor>
-                                       <label>$LOCALIZE[569]:</label>
-                               </control>
-                               <control type="textbox">
-                                       <description>Comment value</description>
-                                       <posx>165</posx>
-                                       <posy>195</posy>
-                                       <width>520</width>
-                                       <height>100</height>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <pagecontrol>-</pagecontrol>
-                                       <label fallback="161">$INFO[ListItem.Comment]</label>
-                               </control>
-                       </control>
-                       <control type="grouplist" id="9000">
-                               <posx>20</posx>
-                               <posy>450</posy>
-                               <width>960</width>
-                               <height>50</height>
-                               <itemgap>10</itemgap>
-                               <align>center</align>
-                               <orientation>horizontal</orientation>
-                               <onleft>9000</onleft>
-                               <onright>9000</onright>
-                               <onup>50</onup>
-                               <ondown>49</ondown>
-                               <control type="button" id ="10">
-                                       <description>Ok button</description>
-                                       <width>200</width>
-                                       <label>186</label>
-                                       <include>ButtonInfoDialogsCommonValues</include>
-                               </control>
-                               <control type="button" id="11">
-                                       <description>Cancel button</description>
-                                       <width>200</width>
-                                       <label>222</label>
-                                       <include>ButtonInfoDialogsCommonValues</include>
-                               </control>
-                               <control type="button" id="12">
-                                       <description>Album Info button</description>
-                                       <width>200</width>
-                                       <label>10523</label>
-                                       <include>ButtonInfoDialogsCommonValues</include>
-                               </control>
-                               <control type="button" id ="13">
-                                       <description>Get Thumb button</description>
-                                       <width>200</width>
-                                       <label>13405</label>
-                                       <include>ButtonInfoDialogsCommonValues</include>
-                               </control>
-                       </control>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/DialogTextViewer.xml b/addons/skin.touched/4x3Hirez/DialogTextViewer.xml
deleted file mode 100644 (file)
index 9eb7fb3..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-<window id="147">
-       <defaultcontrol>61</defaultcontrol>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>140</posx>
-               <posy>30</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1000</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="label" id="1">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>910</width>
-                       <label></label>
-               </control>
-               <control type="group">
-                       <posx>930</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>1000</width>
-                       <height>840</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-               <control type="textbox" id="5">
-                       <description>textarea</description>
-                       <posx>20</posx>
-                       <posy>70</posy>
-                       <width>940</width>
-                       <height>820</height>
-                       <label>-</label>
-                       <font>font13</font>
-                       <align>justify</align>
-                       <textcolor>black</textcolor>
-                       <pagecontrol>61</pagecontrol>
-               </control>
-               <control type="scrollbar" id="61">
-                       <posx>970</posx>
-                       <posy>70</posy>
-                       <width>20</width>
-                       <height>820</height>
-                       <texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
-                       <texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
-                       <texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
-                       <textureslidernib>ScrollBarNib.png</textureslidernib>
-                       <textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
-                       <onleft>61</onleft>
-                       <onright>61</onright>
-                       <ondown>61</ondown>
-                       <onup>61</onup>
-                       <showonepage>true</showonepage>
-                       <orientation>vertical</orientation>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/DialogVideoInfo.xml b/addons/skin.touched/4x3Hirez/DialogVideoInfo.xml
deleted file mode 100644 (file)
index 85b0795..0000000
+++ /dev/null
@@ -1,910 +0,0 @@
-<window id="2003">
-       <defaultcontrol always="true">49</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>140</posx>
-               <posy>30</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1000</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="label">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>910</width>
-                       <label>$INFO[Listitem.Title]</label>
-               </control>
-               <control type="group">
-                       <posx>930</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>1000</width>
-                       <height>840</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-
-               <control type="group">
-                       <visible>[!container.content(tvshows) + !container.content(episodes) + !container.content(musicvideos)] + !Control.IsVisible(50)</visible>
-                       <posy>70</posy>
-                       <posx>20</posx>
-                       <include>VisibleFadeEffect</include>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>240</width>
-                               <height>330</height>
-                               <aspectratio>keep</aspectratio>
-                               <bordertexture border="8">ThumbShadow.png</bordertexture>
-                               <bordersize>8</bordersize>
-                               <texture background="true">$INFO[ListItem.Icon]</texture>
-                       </control>
-                       <control type="label">
-                               <posx>260</posx>
-                               <posy>0</posy>
-                               <width>700</width>
-                               <height>30</height>
-                               <font>font13_title</font>
-                               <textcolor>black</textcolor>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <label>$LOCALIZE[207]$INFO[Container(600).CurrentPage, ( $LOCALIZE[31024] ]$INFO[Container(600).NumPages,/, )]</label>
-                       </control>
-                       <control type="textbox" id="600">
-                               <description>Description Value for Movies</description>
-                               <posx>260</posx>
-                               <posy>30</posy>
-                               <width>700</width>
-                               <height>290</height>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <pagecontrol>-</pagecontrol>
-                               <label>$INFO[ListItem.Plot]</label>
-                       </control>
-                       <control type="grouplist">
-                               <description>Media Codec Flagging Images</description>
-                               <posx>0</posx>
-                               <posy>340</posy>
-                               <width>960</width>
-                               <height>45</height>
-                               <align>center</align>
-                               <itemgap>5</itemgap>
-                               <orientation>horizontal</orientation>
-                               <include>VisibleFadeEffect</include>
-                               <visible>Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)</visible>
-                               <include>VideoCodecFlaggingConditions</include>
-                               <include>AudioCodecFlaggingConditions</include>
-                               <include>AudioChannelsFlaggingConditions</include>
-                               <include>AspectCodecFlaggingConditions</include>
-                               <include>VideoTypeHackFlaggingConditions</include>
-                       </control>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>390</posy>
-                               <width>960</width>
-                               <height>5</height>
-                               <texture>separator.png</texture>
-                       </control>
-                       <control type="list" id="49">
-                               <posx>0</posx>
-                               <posy>400</posy>
-                               <width>960</width>
-                               <height>330</height>
-                               <onleft>49</onleft>
-                               <onright>49</onright>
-                               <onup>9000</onup>
-                               <ondown>61</ondown>
-                               <pagecontrol>-</pagecontrol>
-                               <scrolltime>200</scrolltime>
-                               <itemlayout height="30">
-                                       <control type="label">
-                                               <posx>200</posx>
-                                               <posy>0</posy>
-                                               <width>160</width>
-                                               <height>30</height>
-                                               <font>font13_title</font>
-                                               <align>right</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                                       <control type="label">
-                                               <posx>210</posx>
-                                               <posy>0</posy>
-                                               <width>750</width>
-                                               <height>30</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>white</selectedcolor>
-                                               <info>ListItem.Label2</info>
-                                       </control>
-                               </itemlayout>
-                               <focusedlayout height="30">
-                                       <control type="label">
-                                               <posx>200</posx>
-                                               <posy>0</posy>
-                                               <width>160</width>
-                                               <height>30</height>
-                                               <font>font13_title</font>
-                                               <align>right</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                                       <control type="label">
-                                               <posx>210</posx>
-                                               <posy>0</posy>
-                                               <width>750</width>
-                                               <height>30</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>white</selectedcolor>
-                                               <info>ListItem.Label2</info>
-                                       </control>
-                               </focusedlayout>
-                               <content>
-                                       <item>
-                                               <label>$LOCALIZE[20376]:</label>
-                                               <label2>$INFO[ListItem.OriginalTitle]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.OriginalTitle) + !stringcompare(ListItem.OriginalTitle,Listitem.Title)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[20339]:</label>
-                                               <label2>$INFO[ListItem.Director]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Director)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[20417]:</label>
-                                               <label2>$INFO[ListItem.Writer]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Writer)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[572]:</label>
-                                               <label2>$INFO[ListItem.Studio]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Studio)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[515]:</label>
-                                               <label2>$INFO[ListItem.Genre]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Genre)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[562]:</label>
-                                               <label2>$INFO[ListItem.Year]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Year)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[2050]:</label>
-                                               <label2>$INFO[ListItem.Duration] $LOCALIZE[12391]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Duration)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[563]:</label>
-                                               <label2>$INFO[ListItem.RatingAndVotes]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.RatingAndVotes)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[202]:</label>
-                                               <label2>$INFO[ListItem.TagLine]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.TagLine)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[203]:</label>
-                                               <label2>$INFO[ListItem.PlotOutline]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.PlotOutline)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[20074]:</label>
-                                               <label2>$INFO[ListItem.mpaa]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.mpaa)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[15311]</label>
-                                               <label2>$INFO[ListItem.FilenameAndPath]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.FilenameAndPath)</visible>
-                                       </item>
-                               </content>
-                       </control>
-               </control>
-
-               <control type="group">
-                       <visible>Container.Content(TVShows) + !Control.IsVisible(50)</visible>
-                       <posy>70</posy>
-                       <posx>20</posx>
-                       <include>VisibleFadeEffect</include>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>960</width>
-                               <height>140</height>
-                               <aspectratio>keep</aspectratio>
-                               <bordertexture border="8">ThumbShadow.png</bordertexture>
-                               <bordersize>8</bordersize>
-                               <texture background="true">$INFO[ListItem.Icon]</texture>
-                       </control>
-                       <control type="label">
-                               <posx>10</posx>
-                               <posy>150</posy>
-                               <width>940</width>
-                               <height>30</height>
-                               <font>font13_title</font>
-                               <textcolor>black</textcolor>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <label>$LOCALIZE[207]$INFO[Container(601).CurrentPage, ( $LOCALIZE[31024] ]$INFO[Container(601).NumPages,/, )]</label>
-                       </control>
-                       <control type="textbox" id="601">
-                               <description>Description Value for TV SHows</description>
-                               <posx>10</posx>
-                               <posy>180</posy>
-                               <width>940</width>
-                               <height>240</height>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <pagecontrol>-</pagecontrol>
-                               <label>$INFO[ListItem.Plot]</label>
-                       </control>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>450</posy>
-                               <width>960</width>
-                               <height>5</height>
-                               <texture>separator.png</texture>
-                       </control>
-                       <control type="list" id="49">
-                               <posx>0</posx>
-                               <posy>460</posy>
-                               <width>960</width>
-                               <height>270</height>
-                               <onleft>49</onleft>
-                               <onright>49</onright>
-                               <onup>9000</onup>
-                               <ondown>61</ondown>
-                               <pagecontrol>-</pagecontrol>
-                               <scrolltime>200</scrolltime>
-                               <itemlayout height="30">
-                                       <control type="label">
-                                               <posx>200</posx>
-                                               <posy>0</posy>
-                                               <width>160</width>
-                                               <height>30</height>
-                                               <font>font13_title</font>
-                                               <align>right</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                                       <control type="label">
-                                               <posx>210</posx>
-                                               <posy>0</posy>
-                                               <width>750</width>
-                                               <height>30</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>white</selectedcolor>
-                                               <info>ListItem.Label2</info>
-                                       </control>
-                               </itemlayout>
-                               <focusedlayout height="30">
-                                       <control type="label">
-                                               <posx>200</posx>
-                                               <posy>0</posy>
-                                               <width>160</width>
-                                               <height>30</height>
-                                               <font>font13_title</font>
-                                               <align>right</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                                       <control type="label">
-                                               <posx>210</posx>
-                                               <posy>0</posy>
-                                               <width>750</width>
-                                               <height>30</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>white</selectedcolor>
-                                               <info>ListItem.Label2</info>
-                                       </control>
-                               </focusedlayout>
-                               <content>
-                                       <item>
-                                               <label>$LOCALIZE[20360]:</label>
-                                               <label2>$INFO[listitem.episode] ($INFO[ListItem.Property(WatchedEpisodes),, $LOCALIZE[16102]] - $INFO[ListItem.Property(UnWatchedEpisodes), , $LOCALIZE[16101]])</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Episode)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[31322]:</label>
-                                               <label2>$INFO[ListItem.Premiered]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Premiered)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[515]:</label>
-                                               <label2>$INFO[ListItem.Genre]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Genre)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[562]:</label>
-                                               <label2>$INFO[ListItem.Year]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Year)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[563]:</label>
-                                               <label2>$INFO[ListItem.Rating]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Rating)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[15311]</label>
-                                               <label2>$INFO[ListItem.FilenameAndPath]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.FilenameAndPath)</visible>
-                                       </item>
-                               </content>
-                       </control>
-               </control>
-
-               <control type="group">
-                       <visible>Container.Content(Episodes) + !Control.IsVisible(50)</visible>
-                       <posy>70</posy>
-                       <posx>20</posx>
-                       <include>VisibleFadeEffect</include>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>450</width>
-                               <height>330</height>
-                               <aspectratio>scale</aspectratio>
-                               <bordertexture border="8">ThumbShadow.png</bordertexture>
-                               <bordersize>8</bordersize>
-                               <texture background="true">$INFO[ListItem.Icon]</texture>
-                       </control>
-                       <control type="label">
-                               <posx>460</posx>
-                               <posy>0</posy>
-                               <width>500</width>
-                               <height>30</height>
-                               <font>font13_title</font>
-                               <textcolor>black</textcolor>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <label>$LOCALIZE[207]$INFO[Container(602).CurrentPage, ( $LOCALIZE[31024] ]$INFO[Container(602).NumPages,/, )]</label>
-                       </control>
-                       <control type="textbox" id="602">
-                               <description>Description Value for Episode</description>
-                               <posx>460</posx>
-                               <posy>30</posy>
-                               <width>500</width>
-                               <height>290</height>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <pagecontrol>-</pagecontrol>
-                               <label>$INFO[ListItem.Plot]</label>
-                       </control>
-                       <control type="grouplist">
-                               <description>Media Codec Flagging Images</description>
-                               <posx>0</posx>
-                               <posy>340</posy>
-                               <width>960</width>
-                               <height>45</height>
-                               <align>center</align>
-                               <itemgap>5</itemgap>
-                               <orientation>horizontal</orientation>
-                               <include>VisibleFadeEffect</include>
-                               <visible>Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)</visible>
-                               <include>VideoCodecFlaggingConditions</include>
-                               <include>AudioCodecFlaggingConditions</include>
-                               <include>AudioChannelsFlaggingConditions</include>
-                               <include>AspectCodecFlaggingConditions</include>
-                               <include>VideoTypeHackFlaggingConditions</include>
-                       </control>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>390</posy>
-                               <width>960</width>
-                               <height>5</height>
-                               <texture>separator.png</texture>
-                       </control>
-                       <control type="list" id="49">
-                               <posx>0</posx>
-                               <posy>400</posy>
-                               <width>960</width>
-                               <height>330</height>
-                               <onleft>49</onleft>
-                               <onright>49</onright>
-                               <onup>9000</onup>
-                               <ondown>61</ondown>
-                               <pagecontrol>-</pagecontrol>
-                               <scrolltime>200</scrolltime>
-                               <itemlayout height="30">
-                                       <control type="label">
-                                               <posx>200</posx>
-                                               <posy>0</posy>
-                                               <width>160</width>
-                                               <height>30</height>
-                                               <font>font13_title</font>
-                                               <align>right</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                                       <control type="label">
-                                               <posx>210</posx>
-                                               <posy>0</posy>
-                                               <width>750</width>
-                                               <height>30</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>white</selectedcolor>
-                                               <info>ListItem.Label2</info>
-                                       </control>
-                               </itemlayout>
-                               <focusedlayout height="30">
-                                       <control type="label">
-                                               <posx>200</posx>
-                                               <posy>0</posy>
-                                               <width>160</width>
-                                               <height>30</height>
-                                               <font>font13_title</font>
-                                               <align>right</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                                       <control type="label">
-                                               <posx>210</posx>
-                                               <posy>0</posy>
-                                               <width>750</width>
-                                               <height>30</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>white</selectedcolor>
-                                               <info>ListItem.Label2</info>
-                                       </control>
-                               </focusedlayout>
-                               <content>
-                                       <item>
-                                               <label>$LOCALIZE[20364]:</label>
-                                               <label2>$INFO[ListItem.TVShowTitle]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.TVShowTitle)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[20373]:</label>
-                                               <label2>$INFO[ListItem.Season]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Season)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[20359]:</label>
-                                               <label2>$INFO[ListItem.Episode]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Episode)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[31322]:</label>
-                                               <label2>$INFO[ListItem.Premiered]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Premiered)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[515]:</label>
-                                               <label2>$INFO[ListItem.Genre]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Genre)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[20339]:</label>
-                                               <label2>$INFO[ListItem.Director]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Director)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[20417]:</label>
-                                               <label2>$INFO[ListItem.Writer]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Writer)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[562]:</label>
-                                               <label2>$INFO[ListItem.Year]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Year)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[2050]:</label>
-                                               <label2>$INFO[ListItem.Duration] $LOCALIZE[12391]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Duration)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[563]:</label>
-                                               <label2>$INFO[ListItem.Rating]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Rating)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[15311]</label>
-                                               <label2>$INFO[ListItem.FilenameAndPath]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.FilenameAndPath)</visible>
-                                       </item>
-                               </content>
-                       </control>
-               </control>
-
-               <control type="group">
-                       <visible>Container.Content(MusicVideos) + !Control.IsVisible(50)</visible>
-                       <posy>70</posy>
-                       <posx>20</posx>
-                       <include>VisibleFadeEffect</include>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>450</width>
-                               <height>330</height>
-                               <aspectratio>scale</aspectratio>
-                               <bordertexture border="8">ThumbShadow.png</bordertexture>
-                               <bordersize>8</bordersize>
-                               <texture background="true">$INFO[ListItem.Icon]</texture>
-                       </control>
-                       <control type="label">
-                               <posx>460</posx>
-                               <posy>0</posy>
-                               <width>500</width>
-                               <height>30</height>
-                               <font>font13_title</font>
-                               <textcolor>black</textcolor>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <label>$LOCALIZE[207]$INFO[Container(603).CurrentPage, ( $LOCALIZE[31024] ]$INFO[Container(603).NumPages,/, )]</label>
-                       </control>
-                       <control type="textbox" id="603">
-                               <description>Description Value for Episode</description>
-                               <posx>460</posx>
-                               <posy>30</posy>
-                               <width>500</width>
-                               <height>290</height>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <pagecontrol>-</pagecontrol>
-                               <label>$INFO[ListItem.Plot]</label>
-                       </control>
-                       <control type="grouplist">
-                               <description>Media Codec Flagging Images</description>
-                               <posx>0</posx>
-                               <posy>340</posy>
-                               <width>960</width>
-                               <height>45</height>
-                               <align>center</align>
-                               <itemgap>5</itemgap>
-                               <orientation>horizontal</orientation>
-                               <include>VisibleFadeEffect</include>
-                               <visible>Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)</visible>
-                               <include>VideoCodecFlaggingConditions</include>
-                               <include>AudioCodecFlaggingConditions</include>
-                               <include>AudioChannelsFlaggingConditions</include>
-                               <include>AspectCodecFlaggingConditions</include>
-                               <include>VideoTypeHackFlaggingConditions</include>
-                       </control>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>390</posy>
-                               <width>960</width>
-                               <height>5</height>
-                               <texture>separator.png</texture>
-                       </control>
-                       <control type="list" id="49">
-                               <posx>0</posx>
-                               <posy>400</posy>
-                               <width>960</width>
-                               <height>330</height>
-                               <onleft>49</onleft>
-                               <onright>49</onright>
-                               <onup>9000</onup>
-                               <ondown>61</ondown>
-                               <pagecontrol>-</pagecontrol>
-                               <scrolltime>200</scrolltime>
-                               <itemlayout height="30">
-                                       <control type="label">
-                                               <posx>200</posx>
-                                               <posy>0</posy>
-                                               <width>160</width>
-                                               <height>30</height>
-                                               <font>font13_title</font>
-                                               <align>right</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                                       <control type="label">
-                                               <posx>210</posx>
-                                               <posy>0</posy>
-                                               <width>750</width>
-                                               <height>30</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>white</selectedcolor>
-                                               <info>ListItem.Label2</info>
-                                       </control>
-                               </itemlayout>
-                               <focusedlayout height="30">
-                                       <control type="label">
-                                               <posx>200</posx>
-                                               <posy>0</posy>
-                                               <width>160</width>
-                                               <height>30</height>
-                                               <font>font13_title</font>
-                                               <align>right</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                                       <control type="label">
-                                               <posx>210</posx>
-                                               <posy>0</posy>
-                                               <width>750</width>
-                                               <height>30</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>white</selectedcolor>
-                                               <info>ListItem.Label2</info>
-                                       </control>
-                               </focusedlayout>
-                               <content>
-                                       <item>
-                                               <label>$LOCALIZE[557]:</label>
-                                               <label2>$INFO[ListItem.Artist]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Artist)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[558]:</label>
-                                               <label2>$INFO[ListItem.Album]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Album)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[515]:</label>
-                                               <label2>$INFO[ListItem.Genre]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Genre)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[572]:</label>
-                                               <label2>$INFO[ListItem.Studio]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Studio)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[20417]:</label>
-                                               <label2>$INFO[ListItem.Writer]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Writer)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[20339]:</label>
-                                               <label2>$INFO[ListItem.Director]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Director)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[562]:</label>
-                                               <label2>$INFO[ListItem.Year]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Year)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[2050]:</label>
-                                               <label2>$INFO[ListItem.Duration] $LOCALIZE[12391]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.Duration)</visible>
-                                       </item>
-                                       <item>
-                                               <label>$LOCALIZE[15311]</label>
-                                               <label2>$INFO[ListItem.FilenameAndPath]</label2>
-                                               <onclick>-</onclick>
-                                               <visible>!IsEmpty(ListItem.FilenameAndPath)</visible>
-                                       </item>
-                               </content>
-                       </control>
-               </control>
-
-               <control type="panel" id="50">
-                       <posx>0</posx>
-                       <posy>65</posy>
-                       <width>1000</width>
-                       <height>702</height>
-                       <onup>50</onup>
-                       <onleft>50</onleft>
-                       <onright>50</onright>
-                       <ondown>50</ondown>
-                       <pagecontrol>-</pagecontrol>
-                       <scrolltime>200</scrolltime>
-                       <include>VisibleFadeEffect</include>
-                       <itemlayout height="100" width="500">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>-2</posy>
-                                       <width>500</width>
-                                       <height>5</height>
-                                       <texture>separator.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>4</posy>
-                                       <width>100</width>
-                                       <height>92</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <fadetime>IconCrossfadeTime</fadetime>
-                                       <texture>$INFO[ListItem.Icon]</texture>
-                                       <bordertexture border="5">ThumbBorderGrey.png</bordertexture>
-                                       <bordersize>2</bordersize>
-                               </control>
-                               <control type="textbox">
-                                       <posx>120</posx>
-                                       <posy>10</posy>
-                                       <width>360</width>
-                                       <height>80</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <textcolor>black</textcolor>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="100" width="500">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>-2</posy>
-                                       <width>700</width>
-                                       <height>5</height>
-                                       <texture>separator.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>4</posy>
-                                       <width>100</width>
-                                       <height>92</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <fadetime>IconCrossfadeTime</fadetime>
-                                       <texture>$INFO[ListItem.Icon]</texture>
-                                       <bordertexture border="5">ThumbBorderGrey.png</bordertexture>
-                                       <bordersize>2</bordersize>
-                               </control>
-                               <control type="textbox">
-                                       <posx>120</posx>
-                                       <posy>10</posy>
-                                       <width>360</width>
-                                       <height>80</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <textcolor>black</textcolor>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                       </focusedlayout>
-               </control>
-               <control type="label">
-                       <posx>980</posx>
-                       <posy>790</posy>
-                       <width>800</width>
-                       <height>30</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <scroll>true</scroll>
-                       <align>right</align>
-                       <aligny>center</aligny>
-                       <label>$INFO[Container(50).CurrentPage, ( $LOCALIZE[31024] ]$INFO[Container(50).NumPages,/, )]</label>
-                       <visible>Control.IsVisible(50)</visible>
-               </control>
-
-               <control type="grouplist" id="9000">
-                       <posx>20</posx>
-                       <posy>830</posy>
-                       <width>960</width>
-                       <height>50</height>
-                       <itemgap>2</itemgap>
-                       <align>center</align>
-                       <orientation>horizontal</orientation>
-                       <onleft>9000</onleft>
-                       <onright>9000</onright>
-                       <onup>50</onup>
-                       <ondown>49</ondown>
-                       <control type="togglebutton" id="8">
-                               <description>Play/browse to Show</description>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>208</label>
-                               <alttexturefocus border="5">IconBack-focus.png</alttexturefocus>
-                               <alttexturenofocus border="5">ListNF.png</alttexturenofocus>
-                               <altlabel>1024</altlabel>
-                               <usealttexture>Container.Content(TVShows)</usealttexture>
-                       </control>
-                       <control type="button" id="5">
-                               <description>Cast/Review</description>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>206</label>
-                       </control>
-                       <control type="button" id="6">
-                               <description>Refresh</description>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>184</label>
-                       </control>
-                       <control type="button" id="10">
-                               <description>Get Thumb</description>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>13405</label>
-                       </control>
-                       <control type="button" id="12">
-                               <description>Get Fanart</description>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>20413</label>
-                       </control>
-                       <control type="button" id="11">
-                               <description>Play Trailer</description>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>20410</label>
-                               <visible>!IsEmpty(ListItem.Trailer) + !Skin.HasSetting(WindowedTrailer)</visible>
-                       </control>
-                       <control type="button" id="15">
-                               <description>Play Trailer Windowed</description>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>20410</label>
-                               <onclick>PlayMedia($INFO[ListItem.Trailer],1)</onclick>
-                               <visible>!IsEmpty(ListItem.Trailer) + Skin.HasSetting(WindowedTrailer)</visible>
-                       </control>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/DialogVideoScan.xml b/addons/skin.touched/4x3Hirez/DialogVideoScan.xml
deleted file mode 100644 (file)
index d5e2e3e..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-<window id="133">
-       <defaultcontrol></defaultcontrol>
-       <include>dialogeffect</include>
-       <controls>
-               <control type="group">
-                       <posx>420r</posx>
-                       <posy>25</posy>
-                       <visible>!Window.IsVisible(FullscreenVideo) + !Window.IsVisible(Visualisation)</visible>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>350</width>
-                               <height>67</height>
-                               <texture border="8">IconBack.png</texture>
-                       </control>
-                       <control type="fadelabel" id="401">
-                               <posx>10</posx>
-                               <posy>5</posy>
-                               <width>330</width>
-                               <height>15</height>
-                               <scrollout>false</scrollout>
-                               <pauseatend>3000</pauseatend>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font10_title</font>
-                               <textcolor>black</textcolor>
-                       </control>
-                       <control type="fadelabel" id="405">
-                               <posx>10</posx>
-                               <posy>24</posy>
-                               <width>330</width>
-                               <height>20</height>
-                               <scrollout>false</scrollout>
-                               <pauseatend>3000</pauseatend>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font12</font>
-                               <textcolor>black</textcolor>
-                               <haspath>true</haspath>
-                       </control>
-                       <control type="progress" id="404">
-                               <description>progress control</description>
-                               <posx>5</posx>
-                               <posy>47</posy>
-                               <width>340</width>
-                               <height>15</height>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/DialogVolumeBar.xml b/addons/skin.touched/4x3Hirez/DialogVolumeBar.xml
deleted file mode 100644 (file)
index 266eb87..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<window id="104">
-       <defaultcontrol>1</defaultcontrol>
-               <animation effect="slide" start="0,-40" end="0,0" time="100">WindowOpen</animation>
-               <animation effect="slide" start="0,0" end="0,-40" delay="400" time="100">WindowClose</animation>
-       <controls>
-               <control type="group">
-                       <posx>820</posx>
-                       <posy>0</posy>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>-10</posy>
-                               <width>300</width>
-                               <height>50</height>
-                               <texture flipy="true" border="2">SubBack.png</texture>
-                       </control>
-                       <control type="group">
-                               <visible>!player.passthrough</visible>
-                               <control type="progress" id="1">
-                                       <description>progress control</description>
-                                       <posx>50</posx>
-                                       <posy>8</posy>
-                                       <width>230</width>
-                                       <height>18</height>
-                                       <info>Player.Volume</info>
-                               </control>
-                       </control>
-                       <control type="group">
-                               <visible>player.passthrough</visible>
-                               <control type="label">
-                                       <description>Passthrough Label</description>
-                                       <posx>50</posx>
-                                       <posy>6</posy>
-                                       <width>230</width>
-                                       <height>20</height>
-                                       <label>$LOCALIZE[29802]</label>
-                                       <font>font10_title</font>
-                                       <textcolor>white</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                               </control>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/DialogYesNo.xml b/addons/skin.touched/4x3Hirez/DialogYesNo.xml
deleted file mode 100644 (file)
index ebf9036..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-<window id="100">
-       <defaultcontrol always="true">10</defaultcontrol>
-       <coordinates>
-               <system>1</system>
-               <posx>290</posx>
-               <posy>300</posy>
-       </coordinates>
-       <include>dialogeffect</include>
-       <controls>
-               <control type="image">
-                       <description>Shadow Background for dialogs without BehindDialogFadeOut include</description>
-                       <posx>-30</posx>
-                       <posy>-30</posy>
-                       <width>760</width>
-                       <height>370</height>
-                       <texture border="30">DialogShadow.png</texture>
-               </control>
-               <control type="image">
-                       <description>Header Background</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>700</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="group">
-                       <posx>630</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="label" id="1">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>600</width>
-                       <label>$LOCALIZE[13406]</label>
-               </control>
-               <control type="image">
-                       <description>Background</description>
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>700</width>
-                       <height>250</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-               <control type="label" id="2">
-                       <description>dialog line 1</description>
-                       <posx>20</posx>
-                       <posy>80</posy>
-                       <width>660</width>
-                       <height>30</height>
-                       <align>left</align>
-                       <aligny>center</aligny>
-                       <label>-</label>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="label" id="3">
-                       <description>dialog line 2</description>
-                       <posx>20</posx>
-                       <posy>110</posy>
-                       <width>660</width>
-                       <height>30</height>
-                       <align>left</align>
-                       <aligny>center</aligny>
-                       <label>-</label>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="label" id="4">
-                       <description>dialog line 3</description>
-                       <posx>20</posx>
-                       <posy>140</posy>
-                       <width>660</width>
-                       <height>30</height>
-                       <align>left</align>
-                       <aligny>center</aligny>
-                       <label>-</label>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="grouplist" id="9000">
-                       <posx>20</posx>
-                       <posy>250</posy>
-                       <width>660</width>
-                       <height>50</height>
-                       <itemgap>10</itemgap>
-                       <align>center</align>
-                       <orientation>horizontal</orientation>
-                       <onleft>9000</onleft>
-                       <onright>9000</onright>
-                       <onup>9000</onup>
-                       <ondown>9000</ondown>
-                       <control type="button" id="11">
-                               <description>Yes button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>107</label>
-                       </control>
-                       <control type="button" id="10">
-                               <description>No button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>106</label>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/FileBrowser.xml b/addons/skin.touched/4x3Hirez/FileBrowser.xml
deleted file mode 100644 (file)
index b05a4a5..0000000
+++ /dev/null
@@ -1,242 +0,0 @@
-<window id="126">
-       <defaultcontrol always="true">450</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>140</posx>
-               <posy>30</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1000</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="label" id="411">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>910</width>
-                       <label>$LOCALIZE[1023]</label>
-               </control>
-               <control type="group">
-                       <posx>930</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>1000</width>
-                       <height>840</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-
-               <control type="label" id="412">
-                       <description>path label</description>
-                       <posx>20</posx>
-                       <posy>80</posy>
-                       <width>960</width>
-                       <height>30</height>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <font>font13_title</font>
-                       <haspath>true</haspath>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="list" id="450">
-                       <posx>20</posx>
-                       <posy>120</posy>
-                       <width>960</width>
-                       <height>650</height>
-                       <onleft>9000</onleft>
-                       <onright>60</onright>
-                       <onup>450</onup>
-                       <ondown>450</ondown>
-                       <pagecontrol>60</pagecontrol>
-                       <scrolltime>200</scrolltime>
-                       <itemlayout height="50" width="960">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>960</width>
-                                       <height>51</height>
-                                       <texture border="5">MenuItemNF.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>2</posy>
-                                       <width>47</width>
-                                       <height>47</height>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>70</posx>
-                                       <posy>0</posy>
-                                       <width>780</width>
-                                       <height>50</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="50" width="960">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>960</width>
-                                       <height>51</height>
-                                       <texture border="5">MenuItemNF.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>2</posy>
-                                       <width>47</width>
-                                       <height>47</height>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>70</posx>
-                                       <posy>0</posy>
-                                       <width>780</width>
-                                       <height>50</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                       </focusedlayout>
-               </control>
-               <control type="label">
-                       <description>Page label</description>
-                       <posx>980</posx>
-                       <posy>780</posy>
-                       <width>660</width>
-                       <height>30</height>
-                       <align>right</align>
-                       <aligny>center</aligny>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <label>($INFO[Container(450).NumItems]) $LOCALIZE[31025] - $LOCALIZE[31024] ($INFO[Container(450).CurrentPage]/$INFO[Container(450).NumPages])</label>
-                       <visible>!Control.IsVisible(451)</visible>
-               </control>
-               <control type="panel" id="451">
-                       <posx>20</posx>
-                       <posy>120</posy>
-                       <width>960</width>
-                       <height>650</height>
-                       <onleft>9000</onleft>
-                       <onright>60</onright>
-                       <onup>451</onup>
-                       <ondown>451</ondown>
-                       <pagecontrol>60</pagecontrol>
-                       <scrolltime>200</scrolltime>
-                       <itemlayout height="250" width="320">
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>0</posy>
-                                       <width>300</width>
-                                       <height>220</height>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                                       <bordertexture border="8">ThumbShadow.png</bordertexture>
-                                       <bordersize>8</bordersize>
-                               </control>
-                               <control type="label">
-                                       <posx>160</posx>
-                                       <posy>220</posy>
-                                       <width>300</width>
-                                       <height>20</height>
-                                       <font>font12</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <info>ListItem.Label</info>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="250" width="320">
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>0</posy>
-                                       <width>300</width>
-                                       <height>220</height>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                                       <bordertexture border="8">ThumbShadow.png</bordertexture>
-                                       <bordersize>8</bordersize>
-                               </control>
-                               <control type="label">
-                                       <posx>160</posx>
-                                       <posy>220</posy>
-                                       <width>300</width>
-                                       <height>20</height>
-                                       <font>font12</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <info>ListItem.Label</info>
-                               </control>
-                       </focusedlayout>
-               </control>
-               <control type="label">
-                       <description>Page label</description>
-                       <posx>980</posx>
-                       <posy>780</posy>
-                       <width>660</width>
-                       <height>30</height>
-                       <align>right</align>
-                       <aligny>center</aligny>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <label>($INFO[Container(451).NumItems]) $LOCALIZE[31025] - $LOCALIZE[31024] ($INFO[Container(451).CurrentPage]/$INFO[Container(451).NumPages])</label>
-                       <visible>Control.IsVisible(451)</visible>
-               </control>
-               <control type="grouplist" id="9000">
-                       <posx>20</posx>
-                       <posy>830</posy>
-                       <width>960</width>
-                       <height>50</height>
-                       <itemgap>5</itemgap>
-                       <align>center</align>
-                       <orientation>horizontal</orientation>
-                       <onleft>9000</onleft>
-                       <onright>9000</onright>
-                       <onup>50</onup>
-                       <ondown>49</ondown>
-                       <control type="button" id="413">
-                               <description>OK button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>186</label>
-                       </control>
-                       <control type="button" id="414">
-                               <description>Cancel button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>222</label>
-                       </control>
-                       <control type="button" id="415">
-                               <description>Create folder button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>119</label>
-                       </control>
-                       <control type="radiobutton" id="416">
-                               <description>Flip Image button</description>
-                               <width>270</width>
-                               <align>left</align>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>749</label>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/FileManager.xml b/addons/skin.touched/4x3Hirez/FileManager.xml
deleted file mode 100644 (file)
index 13f8618..0000000
+++ /dev/null
@@ -1,348 +0,0 @@
-<window id="3">
-       <defaultcontrol>20</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <controls>
-               <include>CommonSettingsBackground</include>
-               <control type="group">
-                       <animation effect="slide" start="-620,0" end="0,0" time="400" tween="quadratic" easing="out">WindowOpen</animation>
-                       <animation effect="slide" start="0,0" end="-620,0" time="400" tween="quadratic" easing="out">WindowClose</animation>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>620</width>
-                               <height>720</height>
-                               <texture border="0,0,15,0">MediaBladeSub.png</texture>
-                       </control>
-                       <control type="image">
-                               <posx>480</posx>
-                               <posy>10</posy>
-                               <width>90</width>
-                               <height>90</height>
-                               <aspectratio>keep</aspectratio>
-                               <info>Container(20).ListItem.Icon</info>
-                       </control>
-                       <control type="label">
-                               <description>header label</description>
-                               <posx>35</posx>
-                               <posy>50</posy>
-                               <width>570</width>
-                               <height>30</height>
-                               <font>font30_title</font>
-                               <label>A</label>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <textcolor>blue</textcolor>
-                               <shadowcolor>black</shadowcolor>
-                       </control>
-                       <control type="label" id="101">
-                               <description>current directory text label</description>
-                               <posx>35</posx>
-                               <posy>100</posy>
-                               <width>570</width>
-                               <height>30</height>
-                               <font>font13_title</font>
-                               <textcolor>white</textcolor>
-                               <shadowcolor>black</shadowcolor>
-                               <scroll>true</scroll>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                       </control>
-                       <control type="label">
-                               <description>number of files/pages in left list text label</description>
-                               <posx>35</posx>
-                               <posy>670</posy>
-                               <width>570</width>
-                               <font>font12</font>
-                               <align>left</align>
-                               <scroll>true</scroll>
-                               <textcolor>grey</textcolor>
-                               <shadowcolor>black</shadowcolor>
-                               <label>([COLOR=blue]$INFO[Container(20).NumItems][/COLOR]) $LOCALIZE[31025] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(20).CurrentPage]/$INFO[Container(20).NumPages][/COLOR])</label>
-                       </control>
-                       <control type="scrollbar" id="30">
-                               <posx>25</posx>
-                               <posy>140</posy>
-                               <width>25</width>
-                               <height>490</height>
-                               <texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
-                               <texturesliderbar border="2,16,2,16">ScrollBarV_bar.png</texturesliderbar>
-                               <texturesliderbarfocus border="2,16,2,16">ScrollBarV_bar_focus.png</texturesliderbarfocus>
-                               <textureslidernib>-</textureslidernib>
-                               <textureslidernibfocus>-</textureslidernibfocus>
-                               <onleft>31</onleft>
-                               <onright>20</onright>
-                               <ondown>20</ondown>
-                               <onup>20</onup>
-                               <showonepage>false</showonepage>
-                               <orientation>vertical</orientation>
-                       </control>
-                       <control type="list" id="20">
-                               <posx>60</posx>
-                               <posy>140</posy>
-                               <width>540</width>
-                               <height>491</height>
-                               <onleft>30</onleft>
-                               <onright>21</onright>
-                               <onup>20</onup>
-                               <ondown>20</ondown>
-                               <pagecontrol>30</pagecontrol>
-                               <scrolltime>200</scrolltime>
-                               <itemlayout height="35">
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>540</width>
-                                               <height>36</height>
-                                               <texture border="0,2,0,2">MenuItemNF.png</texture>
-                                       </control>
-                                       <control type="label">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>500</width>
-                                               <height>36</height>
-                                               <font>font13</font>
-                                               <aligny>center</aligny>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <textcolor>grey2</textcolor>
-                                               <align>left</align>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                                       <control type="label">
-                                               <posx>530</posx>
-                                               <posy>5</posy>
-                                               <width>200</width>
-                                               <height>24</height>
-                                               <font>font12</font>
-                                               <aligny>center</aligny>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <textcolor>grey</textcolor>
-                                               <align>right</align>
-                                               <info>ListItem.Label2</info>
-                                       </control>
-                               </itemlayout>
-                               <focusedlayout height="35">
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>540</width>
-                                               <height>36</height>
-                                               <visible>!Control.HasFocus(20)</visible>
-                                               <texture border="0,2,0,2">MenuItemNF.png</texture>
-                                       </control>
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>540</width>
-                                               <height>36</height>
-                                               <visible>Control.HasFocus(20)</visible>
-                                               <texture border="0,2,0,2">MenuItemFO.png</texture>
-                                       </control>
-                                       <control type="label">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>500</width>
-                                               <height>36</height>
-                                               <font>font13</font>
-                                               <aligny>center</aligny>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <textcolor>white</textcolor>
-                                               <align>left</align>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                                       <control type="label">
-                                               <posx>530</posx>
-                                               <posy>5</posy>
-                                               <width>200</width>
-                                               <height>24</height>
-                                               <font>font12</font>
-                                               <aligny>center</aligny>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <textcolor>grey</textcolor>
-                                               <align>right</align>
-                                               <info>ListItem.Label2</info>
-                                       </control>
-                               </focusedlayout>
-                       </control>
-               </control>
-               <control type="group">
-                       <animation effect="slide" start="620,0" end="0,0" time="400" tween="quadratic" easing="out">WindowOpen</animation>
-                       <animation effect="slide" start="0,0" end="620,0" time="400" tween="quadratic" easing="out">WindowClose</animation>
-                       <control type="image">
-                               <posx>620r</posx>
-                               <posy>0</posy>
-                               <width>620</width>
-                               <height>720</height>
-                               <texture border="15,0,0,0" flipx="true">MediaBladeSub.png</texture>
-                       </control>
-                       <control type="image">
-                               <posx>570r</posx>
-                               <posy>10</posy>
-                               <width>90</width>
-                               <height>90</height>
-                               <aspectratio>keep</aspectratio>
-                               <info>Container(21).ListItem.Icon</info>
-                       </control>
-                       <control type="label">
-                               <description>header label</description>
-                               <posx>35r</posx>
-                               <posy>50</posy>
-                               <width>570</width>
-                               <height>30</height>
-                               <font>font30_title</font>
-                               <label>B</label>
-                               <align>right</align>
-                               <aligny>center</aligny>
-                               <textcolor>blue</textcolor>
-                               <shadowcolor>black</shadowcolor>
-                       </control>
-                       <control type="label" id="102">
-                               <description>current directory text label right</description>
-                               <posx>35r</posx>
-                               <posy>100</posy>
-                               <width>570</width>
-                               <height>30</height>
-                               <font>font13_title</font>
-                               <textcolor>white</textcolor>
-                               <scroll>true</scroll>
-                               <align>right</align>
-                               <aligny>center</aligny>
-                       </control>
-                       <control type="label">
-                               <description>number of files/pages in left list text label</description>
-                               <posx>35r</posx>
-                               <posy>670</posy>
-                               <width>570</width>
-                               <font>font12</font>
-                               <align>right</align>
-                               <scroll>true</scroll>
-                               <textcolor>grey</textcolor>
-                               <shadowcolor>black</shadowcolor>
-                               <label>([COLOR=blue]$INFO[Container(21).NumItems][/COLOR]) $LOCALIZE[31025] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(21).CurrentPage]/$INFO[Container(21).NumPages][/COLOR])</label>
-                       </control>
-                       <control type="scrollbar" id="31">
-                               <posx>50r</posx>
-                               <posy>140</posy>
-                               <width>25</width>
-                               <height>490</height>
-                               <texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
-                               <texturesliderbar border="2,16,2,16">ScrollBarV_bar.png</texturesliderbar>
-                               <texturesliderbarfocus border="2,16,2,16">ScrollBarV_bar_focus.png</texturesliderbarfocus>
-                               <textureslidernib>-</textureslidernib>
-                               <textureslidernibfocus>-</textureslidernibfocus>
-                               <onleft>21</onleft>
-                               <onright>30</onright>
-                               <ondown>21</ondown>
-                               <onup>21</onup>
-                               <showonepage>false</showonepage>
-                               <orientation>vertical</orientation>
-                       </control>
-                       <control type="list" id="21">
-                               <posx>590r</posx>
-                               <posy>140</posy>
-                               <width>540</width>
-                               <height>491</height>
-                               <onleft>20</onleft>
-                               <onright>31</onright>
-                               <onup>21</onup>
-                               <ondown>21</ondown>
-                               <pagecontrol>31</pagecontrol>
-                               <scrolltime>200</scrolltime>
-                               <itemlayout height="35">
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>540</width>
-                                               <height>36</height>
-                                               <texture border="0,2,0,2">MenuItemNF.png</texture>
-                                       </control>
-                                       <control type="label">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>500</width>
-                                               <height>36</height>
-                                               <font>font13</font>
-                                               <aligny>center</aligny>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <textcolor>grey2</textcolor>
-                                               <align>left</align>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                                       <control type="label">
-                                               <posx>530</posx>
-                                               <posy>5</posy>
-                                               <width>200</width>
-                                               <height>24</height>
-                                               <font>font12</font>
-                                               <aligny>center</aligny>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <textcolor>grey</textcolor>
-                                               <align>right</align>
-                                               <info>ListItem.Label2</info>
-                                       </control>
-                               </itemlayout>
-                               <focusedlayout height="35">
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>540</width>
-                                               <height>36</height>
-                                               <visible>!Control.HasFocus(21)</visible>
-                                               <texture border="0,2,0,2">MenuItemNF.png</texture>
-                                       </control>
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>540</width>
-                                               <height>36</height>
-                                               <visible>Control.HasFocus(21)</visible>
-                                               <texture border="0,2,0,2">MenuItemFO.png</texture>
-                                       </control>
-                                       <control type="label">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>500</width>
-                                               <height>36</height>
-                                               <font>font13</font>
-                                               <aligny>center</aligny>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <textcolor>white</textcolor>
-                                               <align>left</align>
-                                               <info>ListItem.Label</info>
-                                       </control>
-                                       <control type="label">
-                                               <posx>530</posx>
-                                               <posy>5</posy>
-                                               <width>200</width>
-                                               <height>24</height>
-                                               <font>font12</font>
-                                               <aligny>center</aligny>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <textcolor>grey</textcolor>
-                                               <align>right</align>
-                                               <info>ListItem.Label2</info>
-                                       </control>
-                               </focusedlayout>
-                       </control>
-               </control>
-               <control type="group">
-                       <posx>60</posx>
-                       <posy>0</posy>
-                       <animation effect="slide" end="-310,0" time="400" tween="quadratic" easing="out">WindowClose</animation>
-                       <animation effect="slide" start="-310,0" time="400" tween="quadratic" easing="out">WindowOpen</animation>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>250</width>
-                               <height>35</height>
-                               <texture border="0,0,32,0">header.png</texture>
-                       </control>
-                       <control type="label">
-                               <include>WindowTitleCommons</include>
-                               <posx>220</posx>
-                               <label>$LOCALIZE[7]</label>
-                       </control>
-               </control>
-               <include>WindowTitleHomeButton</include>
-               <include>Clock</include>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/Font.xml b/addons/skin.touched/4x3Hirez/Font.xml
deleted file mode 100644 (file)
index 9c477b0..0000000
+++ /dev/null
@@ -1,182 +0,0 @@
-<fonts>
-       <fontset id="Default" idloc="31390" unicode="true"> 
-       <!-- Normal Fonts -->
-               <font>
-                       <name>font10</name>
-                       <filename>Arial.ttf</filename>
-                       <size>12</size>
-               </font>
-               <font>
-                       <name>font11</name>
-                       <filename>Arial.ttf</filename>
-                       <size>14</size>
-               </font>
-               <font>
-                       <name>font12</name>
-                       <filename>Arial.ttf</filename>
-                       <size>16</size>
-               </font>
-               <font>
-                       <name>font13</name>
-                       <filename>Arial.ttf</filename>
-                       <size>20</size>
-               </font>
-               <font>
-                       <name>font16</name>
-                       <filename>Arial.ttf</filename>
-                       <size>25</size>
-               </font>
-               <font>
-                       <name>font30</name>
-                       <filename>Arial.ttf</filename>
-                       <size>30</size>
-               </font>
-               <font>
-                       <name>font55</name>
-                       <filename>Arial.ttf</filename>
-                       <size>55</size>
-               </font>
-       <!-- Title Fonts -->
-               <font>
-                       <name>font8_title</name>
-                       <filename>DejaVuSans-Bold.ttf</filename>
-                       <size>11</size>
-               </font>
-               <font>
-                       <name>font10_title</name>
-                       <filename>DejaVuSans-Bold.ttf</filename>
-                       <size>14</size>
-               </font>
-               <font>
-                       <name>font12_title</name>
-                       <filename>DejaVuSans-Bold.ttf</filename>
-                       <size>18</size>
-               </font>
-               <font>
-                       <name>font13_title</name>
-                       <filename>DejaVuSans-Bold.ttf</filename>
-                       <size>20</size>
-               </font>
-               <font>
-                       <name>font13caps_title</name>
-                       <filename>DejaVuSans-Bold-Caps.ttf</filename>
-                       <size>20</size>
-               </font>
-               <font>
-                       <name>font24_title</name>
-                       <filename>DejaVuSans-Bold.ttf</filename>
-                       <size>24</size>
-               </font>
-               <font>
-                       <name>font28_title</name>
-                       <filename>DejaVuSans-Bold.ttf</filename>
-                       <size>28</size>
-               </font>
-               <font>
-                       <name>font30_title</name>
-                       <filename>DejaVuSans-Bold.ttf</filename>
-                       <size>30</size>
-               </font>
-
-               <font>
-                       <name>WeatherTemp</name>
-                       <filename>DejaVuSans-Bold.ttf</filename>
-                       <size>80</size>
-               </font>
-       </fontset>
-
-       <fontset id="Arial" idloc="31391" unicode="true"> 
-       <!-- Normal Fonts -->
-               <font>
-                       <name>font10</name>
-                       <filename>Arial.ttf</filename>
-                       <size>12</size>
-               </font>
-               <font>
-                       <name>font11</name>
-                       <filename>Arial.ttf</filename>
-                       <size>14</size>
-               </font>
-               <font>
-                       <name>font12</name>
-                       <filename>Arial.ttf</filename>
-                       <size>16</size>
-               </font>
-               <font>
-                       <name>font13</name>
-                       <filename>Arial.ttf</filename>
-                       <size>20</size>
-               </font>
-               <font>
-                       <name>font16</name>
-                       <filename>Arial.ttf</filename>
-                       <size>25</size>
-               </font>
-               <font>
-                       <name>font30</name>
-                       <filename>Arial.ttf</filename>
-                       <size>30</size>
-               </font>
-               <font>
-                       <name>font55</name>
-                       <filename>Arial.ttf</filename>
-                       <size>55</size>
-               </font>
-       <!-- Title Fonts -->
-               <font>
-                       <name>font8_title</name>
-                       <filename>Arial.ttf</filename>
-                       <size>11</size>
-                       <style>bold</style>
-               </font>
-               <font>
-                       <name>font10_title</name>
-                       <filename>Arial.ttf</filename>
-                       <size>14</size>
-                       <style>bold</style>
-               </font>
-               <font>
-                       <name>font12_title</name>
-                       <filename>Arial.ttf</filename>
-                       <size>18</size>
-                       <style>bold</style>
-               </font>
-               <font>
-                       <name>font13_title</name>
-                       <filename>Arial.ttf</filename>
-                       <size>20</size>
-                       <style>bold</style>
-               </font>
-               <font>
-                       <name>font13caps_title</name>
-                       <filename>Arial.ttf</filename>
-                       <size>20</size>
-                       <style>bold</style>
-               </font>
-               <font>
-                       <name>font24_title</name>
-                       <filename>Arial.ttf</filename>
-                       <size>24</size>
-                       <style>bold</style>
-               </font>
-               <font>
-                       <name>font28_title</name>
-                       <filename>Arial.ttf</filename>
-                       <size>28</size>
-                       <style>bold</style>
-               </font>
-               <font>
-                       <name>font30_title</name>
-                       <filename>Arial.ttf</filename>
-                       <size>30</size>
-                       <style>bold</style>
-               </font>
-
-               <font>
-                       <name>WeatherTemp</name>
-                       <filename>Arial.ttf</filename>
-                       <size>80</size>
-                       <style>bold</style>
-               </font>
-       </fontset>
-</fonts>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/Home.xml b/addons/skin.touched/4x3Hirez/Home.xml
deleted file mode 100644 (file)
index e8ef634..0000000
+++ /dev/null
@@ -1,406 +0,0 @@
-<window id="0">
-       <defaultcontrol always="true">9000</defaultcontrol>
-       <allowoverlay>no</allowoverlay> 
-       <controls>
-               <include>CommonBackground</include>
-               <control type="image">
-                       <description>XBMC Logo</description>
-                       <posx>20</posx>
-                       <posy>36</posy>
-                       <width>360</width>
-                       <height>48</height>
-                       <aspectratio align="left">keep</aspectratio>
-                       <texture>xbmc-logo.png</texture>
-                       <visible>!Player.HasMedia</visible>
-                       <include>VisibleFadeEffect</include>
-                       <include>Window_OpenClose_Animation</include>
-               </control>
-               <include>CommonNowPlaying</include>
-               <control type="group">
-                       <!-- weather Info -->
-                       <include>Window_OpenClose_Animation</include>
-                       <visible>Weather.IsFetched + ![Window.IsVisible(VideoScan) | Window.IsVisible(MusicScan)] + !Skin.HasSetting(HideHomeButtonWeather)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <posx>720r</posx>
-                       <posy>23</posy>
-                       <control type="button">
-                               <description>Goto Weather button</description>
-                               <posx>610</posx>
-                               <posy>0</posy>
-                               <width>160</width>
-                               <height>80</height>
-                               <texturenofocus>-</texturenofocus>
-                               <texturefocus>-</texturefocus>
-                               <onclick>ActivateWindow(Weather)</onclick>
-                       </control>
-                       <control type="image">
-                               <description>Weather image</description>
-                               <posx>632</posx>
-                               <posy>0</posy>
-                               <width>74</width>
-                               <height>74</height>
-                               <aspectratio>keep</aspectratio>
-                               <texture>$INFO[Weather.Conditions]</texture>
-                       </control>
-                       <control type="label">
-                               <description>location label</description>
-                               <posx>620</posx>
-                               <posy>12</posy>
-                               <height>25</height>
-                               <width>410</width>
-                               <label>[B]$INFO[Weather.Location][/B]</label>
-                               <align>right</align>
-                               <aligny>center</aligny>
-                               <font>font13</font>
-                               <shadowcolor>black</shadowcolor>
-                       </control>
-                       <control type="grouplist">
-                               <posx>0</posx>
-                               <posy>35</posy>
-                               <width>620</width>
-                               <height>35</height>
-                               <orientation>horizontal</orientation>
-                               <align>right</align>
-                               <itemgap>0</itemgap>
-                               <control type="label">
-                                       <description>Weather label</description>
-                                       <height>30</height>
-                                       <width max="400">auto</width>
-                                       <label>$INFO[Window(Weather).Property(Current.Condition)]  </label>
-                                       <font>font12</font>
-                                       <aligny>center</aligny>
-                                       <textcolor>grey</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="label">
-                                       <description>Temp Label</description>
-                                       <height>30</height>
-                                       <width max="400">auto</width>
-                                       <label>[B]$INFO[Window(Weather).Property(Current.Temperature)][/B]</label>
-                                       <aligny>center</aligny>
-                                       <font>font24_title</font>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="label">
-                                       <description>Temp Units Label</description>
-                                       <posy>2</posy>
-                                       <height>20</height>
-                                       <width max="200">auto</width>
-                                       <label>$INFO[System.TemperatureUnits]</label>
-                                       <font>font12</font>
-                                       <aligny>center</aligny>
-                                       <shadowcolor>black</shadowcolor>
-                                       <visible>!IsEmpty(Window(Weather).Property(Current.Temperature))</visible>
-                               </control>
-                       </control>
-               </control>
-               <control type="group">
-                       <include>Window_OpenClose_Animation_Zoom</include>
-                       <control type="group">
-                               <posx>0</posx>
-                               <posy>130</posy>
-                               <control type="button">
-                                       <description>left Arrow</description>
-                                       <posx>30</posx>
-                                       <posy>320</posy>
-                                       <width>40</width>
-                                       <height>60</height>
-                                       <texturefocus>arrow-big-left.png</texturefocus>
-                                       <texturenofocus>arrow-big-left.png</texturenofocus>
-                                       <onclick>Control.Move(9000,-1)</onclick>
-                                       <visible>Container(9000).HasPrevious</visible>
-                                       <include>VisibleFadeEffect</include>
-                               </control>
-                               <control type="button">
-                                       <description>right Arrow</description>
-                                       <posx>70r</posx>
-                                       <posy>320</posy>
-                                       <width>40</width>
-                                       <height>60</height>
-                                       <texturefocus>arrow-big-right.png</texturefocus>
-                                       <texturenofocus>arrow-big-right.png</texturenofocus>
-                                       <onclick>Control.Move(9000,1)</onclick>
-                                       <visible>Container(9000).HasNext</visible>
-                                       <include>VisibleFadeEffect</include>
-                               </control>
-                               <control type="panel" id="9000">
-                                       <posx>80</posx>
-                                       <posy>0</posy>
-                                       <width>1120</width>
-                                       <height>720</height>
-                                       <onleft>20</onleft>
-                                       <onright>22</onright>
-                                       <onup>9000</onup>
-                                       <ondown>9000</ondown>
-                                       <pagecontrol>-</pagecontrol>
-                                       <scrolltime>200</scrolltime>
-                                       <orientation>horizontal</orientation>
-                                       <preloaditems>2</preloaditems>
-                                       <itemlayout height="340" width="560">
-                                               <control type="image">
-                                                       <posx>0</posx>
-                                                       <posy>0</posy>
-                                                       <width>560</width>
-                                                       <height>360</height>
-                                                       <texture border="5">SubBack.png</texture>
-                                                       <bordertexture border="30">ShadowBorder.png</bordertexture>
-                                                       <bordersize>25</bordersize>
-                                               </control>
-                                               <control type="image">
-                                                       <posx>30</posx>
-                                                       <posy>30</posy>
-                                                       <width>500</width>
-                                                       <height>250</height>
-                                                       <aspectratio>scale</aspectratio>
-                                                       <texture>$INFO[ListItem.Icon,special://skin/background/]</texture>
-                                               </control>
-                                               <control type="image">
-                                                       <posx>30</posx>
-                                                       <posy>30</posy>
-                                                       <width>300</width>
-                                                       <height>300</height>
-                                                       <texture>GlassOverlay.png</texture>
-                                               </control>
-                                               <control type="label">
-                                                       <posx>40</posx>
-                                                       <posy>290</posy>
-                                                       <width>480</width>
-                                                       <height>30</height>
-                                                       <font>font13caps_title</font>
-                                                       <textcolor>white</textcolor>
-                                                       <shadowcolor>black</shadowcolor>
-                                                       <align>left</align>
-                                                       <aligny>center</aligny>
-                                                       <label>[B]$INFO[ListItem.Label][/B]</label>
-                                               </control>
-                                       </itemlayout>
-                                       <focusedlayout height="340" width="560">
-                                               <control type="image">
-                                                       <posx>0</posx>
-                                                       <posy>0</posy>
-                                                       <width>560</width>
-                                                       <height>360</height>
-                                                       <texture border="5">SubBack.png</texture>
-                                                       <bordertexture border="30">ShadowBorder.png</bordertexture>
-                                                       <bordersize>25</bordersize>
-                                               </control>
-                                               <control type="image">
-                                                       <posx>30</posx>
-                                                       <posy>30</posy>
-                                                       <width>500</width>
-                                                       <height>250</height>
-                                                       <aspectratio>scale</aspectratio>
-                                                       <texture>$INFO[ListItem.Icon,special://skin/background/]</texture>
-                                               </control>
-                                               <control type="image">
-                                                       <posx>30</posx>
-                                                       <posy>30</posy>
-                                                       <width>300</width>
-                                                       <height>300</height>
-                                                       <texture>GlassOverlay.png</texture>
-                                               </control>
-                                               <control type="label">
-                                                       <posx>40</posx>
-                                                       <posy>290</posy>
-                                                       <width>480</width>
-                                                       <height>30</height>
-                                                       <font>font13caps_title</font>
-                                                       <textcolor>white</textcolor>
-                                                       <shadowcolor>black</shadowcolor>
-                                                       <align>left</align>
-                                                       <aligny>center</aligny>
-                                                       <label>[B]$INFO[ListItem.Label][/B]</label>
-                                               </control>
-                                       </focusedlayout>
-                                       <content>
-                                               <item>
-                                                       <label>3</label>
-                                                       <onclick condition="!Skin.HasSetting(HomeVideosGoesToRoot)">ActivateWindow(Videos)</onclick>
-                                                       <onclick condition="Skin.HasSetting(HomeVideosGoesToRoot)">ActivateWindow(Videos,root)</onclick>
-                                                       <icon>videos.png</icon>
-                                                       <thumb>-</thumb>
-                                                       <visible>!Skin.HasSetting(HideHomeButtonVideo)</visible>
-                                               </item>
-                                               <item>
-                                                       <label>20342</label>
-                                                       <onclick>ActivateWindow(Videos,MovieTitles,Return)</onclick>
-                                                       <icon>movies.png</icon>
-                                                       <thumb>-</thumb>
-                                                       <visible>Library.HasContent(Movies)</visible>
-                                                       <visible>!Skin.HasSetting(HideHomeButtonMovies)</visible>
-                                               </item>
-                                               <item>
-                                                       <label>20343</label>
-                                                       <onclick>ActivateWindow(Videos,TVShowTitles,Return)</onclick>
-                                                       <icon>tvshows.png</icon>
-                                                       <thumb>-</thumb>
-                                                       <visible>Library.HasContent(TVShows)</visible>
-                                                       <visible>!Skin.HasSetting(HideHomeButtonTVShows)</visible>
-                                               </item>
-                                               <item>
-                                                       <label>2</label>
-                                                       <onclick>ActivateWindow(Music)</onclick>
-                                                       <icon>music.png</icon>
-                                                       <thumb>-</thumb>
-                                                       <visible>!Skin.HasSetting(HideHomeButtonMusic)</visible>
-                                               </item>
-                                               <item>
-                                                       <label>1</label>
-                                                       <onclick>ActivateWindow(Pictures)</onclick>
-                                                       <icon>pictures.png</icon>
-                                                       <thumb>-</thumb>
-                                                       <visible>!Skin.HasSetting(HideHomeButtonPictures)</visible>
-                                               </item>
-                                               <item>
-                                                       <label>0</label>
-                                                       <onclick>ActivateWindow(Programs,Addons,return)</onclick>
-                                                       <icon>programs.png</icon>
-                                                       <thumb>-</thumb>
-                                                       <visible>!Skin.HasSetting(HideHomeButtonPrograms)</visible>
-                                               </item>
-                                       </content>
-                               </control>
-                       </control>
-               </control>
-               <control type="panel" id="9002">
-                       <visible>!Window.IsActive(PlayerControls)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <include>SubMenuCommonLayout</include>
-                       <content>
-                               <item>
-                                       <label>13012</label>
-                                       <onclick>XBMC.Quit</onclick>
-                                       <icon>icon_shutdown.png</icon>
-                               </item>
-                               <item>
-                                       <label>20126</label>
-                                       <onclick>System.LogOff</onclick>
-                                       <icon>icon_logoff.png</icon>
-                                       <visible>System.HasLoginScreen | IntegerGreaterThan(System.ProfileCount,1)</visible>
-                               </item>
-                               <item>
-                                       <label>5</label>
-                                       <onclick>ActivateWindow(Settings)</onclick>
-                                       <icon>icon_settings.png</icon>
-                               </item>
-                               <item>
-                                       <label>13376</label>
-                                       <onclick>ActivateWindow(1112)</onclick>
-                                       <icon>icon_volume.png</icon>
-                                       <visible>false</visible>
-                               </item>
-                               <item>
-                                       <label>Reload Skin</label>
-                                       <onclick>ReloadSkin</onclick>
-                                       <icon>icon_refresh.png</icon>
-                                       <visible>false</visible>
-                               </item>
-                       </content>
-               </control>
-               <control type="panel" id="9003">
-                       <visible>!Window.IsActive(PlayerControls)</visible>
-                       <include>Window_OpenClose_Animation</include>
-                       <animation effect="slide" start="0,0" end="112,0" time="0" condition="StringCompare(Container(9003).NumItems,3)">conditional</animation>
-                       <animation effect="slide" start="0,0" end="224,0" time="0" condition="StringCompare(Container(9003).NumItems,2)">conditional</animation>
-                       <animation effect="slide" start="0,0" end="336,0" time="0" condition="StringCompare(Container(9003).NumItems,1)">conditional</animation>
-                       <posx>570r</posx>
-                       <posy>105r</posy>
-                       <width>448</width>
-                       <height>120</height>
-                       <onleft>9002</onleft>
-                       <onright>9002</onright>
-                       <onup>9001</onup>
-                       <ondown>20</ondown>
-                       <pagecontrol>-</pagecontrol>
-                       <scrolltime>300</scrolltime>
-                       <orientation>Horizontal</orientation>
-                       <itemlayout height="200" width="112">
-                               <control type="image">
-                                       <posx>16</posx>
-                                       <posy>0</posy>
-                                       <width>80</width>
-                                       <height>80</height>
-                                       <texture diffuse="shortcut_diffuse.png">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>16</posx>
-                                       <posy>0</posy>
-                                       <width>80</width>
-                                       <height>80</height>
-                                       <texture>shortcut_border.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>56</posx>
-                                       <posy>82</posy>
-                                       <width>100</width>
-                                       <height>20</height>
-                                       <font>font11</font>
-                                       <textcolor>white</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="200" width="112">
-                               <control type="image">
-                                       <posx>16</posx>
-                                       <posy>0</posy>
-                                       <width>80</width>
-                                       <height>80</height>
-                                       <texture diffuse="shortcut_diffuse.png">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>16</posx>
-                                       <posy>0</posy>
-                                       <width>80</width>
-                                       <height>80</height>
-                                       <texture>shortcut_border.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>56</posx>
-                                       <posy>82</posy>
-                                       <width>100</width>
-                                       <height>20</height>
-                                       <font>font11</font>
-                                       <textcolor>white</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                       </focusedlayout>
-                       <content>
-                               <item>
-                                       <label>$INFO[system.addontitle(Skin.String(HomeAddonButton1))]</label>
-                                       <onclick>RunAddon($INFO[Skin.String(HomeAddonButton1)])</onclick>
-                                       <icon>$INFO[system.addonicon(Skin.String(HomeAddonButton1))]</icon>
-                                       <thumb>-</thumb>
-                                       <visible>!IsEmpty(Skin.String(HomeAddonButton1))</visible>
-                               </item>
-                               <item>
-                                       <label>$INFO[system.addontitle(Skin.String(HomeAddonButton2))]</label>
-                                       <onclick>RunAddon($INFO[Skin.String(HomeAddonButton2)])</onclick>
-                                       <icon>$INFO[system.addonicon(Skin.String(HomeAddonButton2))]</icon>
-                                       <thumb>-</thumb>
-                                       <visible>!IsEmpty(Skin.String(HomeAddonButton2))</visible>
-                               </item>
-                               <item>
-                                       <label>$INFO[system.addontitle(Skin.String(HomeAddonButton3))]</label>
-                                       <onclick>RunAddon($INFO[Skin.String(HomeAddonButton3)])</onclick>
-                                       <icon>$INFO[system.addonicon(Skin.String(HomeAddonButton3))]</icon>
-                                       <thumb>-</thumb>
-                                       <visible>!IsEmpty(Skin.String(HomeAddonButton3))</visible>
-                               </item>
-                               <item>
-                                       <label>$INFO[system.addontitle(Skin.String(HomeAddonButton4))]</label>
-                                       <onclick>RunAddon($INFO[Skin.String(HomeAddonButton4)])</onclick>
-                                       <icon>$INFO[system.addonicon(Skin.String(HomeAddonButton4))]</icon>
-                                       <thumb>-</thumb>
-                                       <visible>!IsEmpty(Skin.String(HomeAddonButton4))</visible>
-                               </item>
-                       </content>
-               </control>
-               <include>BehindDialogFadeOut</include>
-       </controls>     
-</window>
diff --git a/addons/skin.touched/4x3Hirez/IncludesCodecFlagging.xml b/addons/skin.touched/4x3Hirez/IncludesCodecFlagging.xml
deleted file mode 100644 (file)
index 49b3cdc..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-<includes>
-       <include name="VideoCodecFlaggingConditions">
-               <control type="image">
-                       <description>Video rez Image</description>
-                       <width>70</width>
-                       <height>45</height>
-                       <aspectratio align="right">keep</aspectratio>
-                       <texture>$INFO[ListItem.VideoResolution,flagging/video/,.png]</texture>
-               </control>
-               <control type="image">
-                       <description>Common Codec Image</description>
-                       <width>100</width>
-                       <height>45</height>
-                       <aspectratio align="left">keep</aspectratio>
-                       <texture>$INFO[ListItem.VideoCodec,flagging/video/,.png]</texture>
-                       <!-- Don't show if its one of the 500 divx codecs -->
-                       <visible>![substring(ListItem.VideoCodec,div,left) | stringcompare(ListItem.VideoCodec,dx50)]</visible>
-               </control>
-               <control type="image">
-                       <description>Divx Codec Image</description>
-                       <width>100</width>
-                       <height>45</height>
-                       <aspectratio align="left">keep</aspectratio>
-                       <texture>flagging/video/divx.png</texture>
-                       <visible>[substring(ListItem.VideoCodec,div,left) | stringcompare(ListItem.VideoCodec,dx50)]</visible>
-               </control>
-       </include>
-       <include name="VideoTypeHackFlaggingConditions">
-               <control type="image">
-                       <description>Bluray Image</description>
-                       <width>100</width>
-                       <height>45</height>
-                       <aspectratio align="left">keep</aspectratio>
-                       <texture>flagging/video/bluray.png</texture>
-                       <visible>[substring(ListItem.FilenameAndPath,bluray) | substring(ListItem.FilenameAndPath,bdrip)] + !Skin.HasSetting(HideFilenameFlagging)</visible>
-               </control>
-               <control type="image">
-                       <description>HDDVD Image</description>
-                       <width>100</width>
-                       <height>45</height>
-                       <aspectratio align="left">keep</aspectratio>
-                       <texture>flagging/video/hddvd.png</texture>
-                       <visible>substring(ListItem.FilenameAndPath,hddvd) + !Skin.HasSetting(HideFilenameFlagging)</visible>
-               </control>
-               <control type="image">
-                       <description>DVD Image</description>
-                       <width>100</width>
-                       <height>45</height>
-                       <aspectratio align="left">keep</aspectratio>
-                       <texture>flagging/video/dvd.png</texture>
-                       <visible>[substring(ListItem.FilenameAndPath,dvd) + ![substring(ListItem.FilenameAndPath,hddvd) | substring(ListItem.FilenameAndPath,bluray) | substring(ListItem.FilenameAndPath,bdrip)]] + !Skin.HasSetting(HideFilenameFlagging)</visible>
-               </control>
-               <control type="image">
-                       <description>TV Types Image</description>
-                       <width>100</width>
-                       <height>45</height>
-                       <aspectratio align="left">keep</aspectratio>
-                       <texture>flagging/video/TV.png</texture>
-                       <visible>[substring(ListItem.FilenameAndPath,pdtv) | substring(ListItem.FilenameAndPath,hdtv) | substring(ListItem.FilenameAndPath,dsr)] + !Skin.HasSetting(HideFilenameFlagging)</visible>
-               </control>
-               <control type="image">
-                       <description>VHS Image</description>
-                       <width>100</width>
-                       <height>45</height>
-                       <aspectratio align="left">keep</aspectratio>
-                       <texture>flagging/video/vhs.png</texture>
-                       <visible>substring(ListItem.FilenameAndPath,vhs) + !Skin.HasSetting(HideFilenameFlagging)</visible>
-               </control>
-       </include>
-       <include name="AudioCodecFlaggingConditions">
-               <control type="image">
-                       <description>Audio Codec Image</description>
-                       <width>100</width>
-                       <height>45</height>
-                       <aspectratio align="right">keep</aspectratio>
-                       <texture>$INFO[ListItem.AudioCodec,flagging/audio/,.png]</texture>
-               </control>
-       </include>
-       <include name="AudioChannelsFlaggingConditions">
-               <control type="image">
-                       <description>Audio Codec Image</description>
-                       <width>70</width>
-                       <height>45</height>
-                       <aspectratio align="left">keep</aspectratio>
-                       <texture>$INFO[ListItem.AudioChannels,flagging/audio/,.png]</texture>
-               </control>
-       </include>
-       <include name="AspectCodecFlaggingConditions">
-               <control type="image">
-                       <description>Aspectratio Image</description>
-                       <width>70</width>
-                       <height>45</height>
-                       <aspectratio align="right">keep</aspectratio>
-                       <texture>$INFO[ListItem.VideoAspect,flagging/aspectratio/,.png]</texture>
-               </control>
-       </include>
-</includes>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/IncludesKeypad.xml b/addons/skin.touched/4x3Hirez/IncludesKeypad.xml
deleted file mode 100644 (file)
index 3160317..0000000
+++ /dev/null
@@ -1,224 +0,0 @@
-<includes>
-       <include name="KeypadButtons">
-               <control type="button">
-                       <description>1 button</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>95</width>
-                       <height>80</height>
-                       <font>font16</font>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                       <label>12311</label>
-                       <textcolor>black</textcolor>
-                       <onleft>23</onleft>
-                       <onright>12</onright>
-                       <onup>20</onup>
-                       <ondown>14</ondown>
-                       <onclick>Number1</onclick>
-               </control>
-               <control type="button">
-                       <description>2 button</description>
-                       <posx>100</posx>
-                       <posy>0</posy>
-                       <width>95</width>
-                       <height>80</height>
-                       <font>font16</font>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                       <label>12312</label>
-                       <textcolor>black</textcolor>
-                       <onleft>11</onleft>
-                       <onright>13</onright>
-                       <onup>10</onup>
-                       <ondown>15</ondown>
-                       <onclick>Number2</onclick>
-               </control>
-               <control type="button">
-                       <description>3 button</description>
-                       <posx>200</posx>
-                       <posy>0</posy>
-                       <width>95</width>
-                       <height>80</height>
-                       <font>font16</font>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                       <label>12313</label>
-                       <textcolor>black</textcolor>
-                       <onleft>12</onleft>
-                       <onright>23</onright>
-                       <onup>22</onup>
-                       <ondown>16</ondown>
-                       <onclick>Number3</onclick>
-               </control>
-               <control type="button">
-                       <description>0 button</description>
-                       <posx>300</posx>
-                       <posy>0</posy>
-                       <width>95</width>
-                       <height>80</height>
-                       <font>font16</font>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                       <label>12310</label>
-                       <textcolor>black</textcolor>
-                       <onleft>20</onleft>
-                       <onright>22</onright>
-                       <onup>18</onup>
-                       <ondown>12</ondown>
-                       <onclick>Number0</onclick>
-               </control>
-               <control type="button">
-                       <description>4 button</description>
-                       <posx>0</posx>
-                       <posy>85</posy>
-                       <width>95</width>
-                       <height>80</height>
-                       <font>font16</font>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                       <label>12314</label>
-                       <textcolor>black</textcolor>
-                       <onleft>23</onleft>
-                       <onright>15</onright>
-                       <onup>11</onup>
-                       <ondown>17</ondown>
-                       <onclick>Number4</onclick>
-               </control>
-               <control type="button">
-                       <description>5 button</description>
-                       <posx>100</posx>
-                       <posy>85</posy>
-                       <width>95</width>
-                       <height>80</height>
-                       <font>font16</font>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                       <label>12315</label>
-                       <textcolor>black</textcolor>
-                       <onleft>14</onleft>
-                       <onright>16</onright>
-                       <onup>12</onup>
-                       <ondown>18</ondown>
-                       <onclick>Number5</onclick>
-               </control>
-               <control type="button">
-                       <description>6 button</description>
-                       <posx>200</posx>
-                       <posy>85</posy>
-                       <width>95</width>
-                       <height>80</height>
-                       <font>font16</font>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                       <label>12316</label>
-                       <textcolor>black</textcolor>
-                       <onleft>15</onleft>
-                       <onright>23</onright>
-                       <onup>13</onup>
-                       <ondown>19</ondown>
-                       <onclick>Number6</onclick>
-               </control>
-               <control type="button">
-                       <description>7 button</description>
-                       <posx>0</posx>
-                       <posy>170</posy>
-                       <width>95</width>
-                       <height>80</height>
-                       <font>font16</font>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                       <label>12317</label>
-                       <textcolor>black</textcolor>
-                       <onleft>21</onleft>
-                       <onright>18</onright>
-                       <onup>14</onup>
-                       <ondown>20</ondown>
-                       <onclick>Number7</onclick>
-               </control>
-               <control type="button">
-                       <description>8 button</description>
-                       <posx>100</posx>
-                       <posy>170</posy>
-                       <width>95</width>
-                       <height>80</height>
-                       <font>font16</font>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                       <label>12318</label>
-                       <textcolor>black</textcolor>
-                       <onleft>17</onleft>
-                       <onright>19</onright>
-                       <onup>15</onup>
-                       <ondown>10</ondown>
-                       <onclick>Number8</onclick>
-               </control>
-               <control type="button">
-                       <description>9 button</description>
-                       <posx>200</posx>
-                       <posy>170</posy>
-                       <width>95</width>
-                       <height>80</height>
-                       <font>font16</font>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <texturenofocus border="8">KeyboardKey.png</texturenofocus>
-                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                       <label>12319</label>
-                       <textcolor>black</textcolor>
-                       <onleft>18</onleft>
-                       <onright>21</onright>
-                       <onup>16</onup>
-                       <ondown>22</ondown>
-                       <onclick>Number9</onclick>
-               </control>
-               <control type="button">
-                       <description>Done button</description>
-                       <posx>300</posx>
-                       <posy>85</posy>
-                       <width>95</width>
-                       <height>165</height>
-                       <font>font12</font>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <texturenofocus border="8">KeyboardKeyDark.png</texturenofocus>
-                       <texturefocus border="8">KeyboardKeyFocus.png</texturefocus>
-                       <textwidth>120</textwidth>
-                       <label>-</label>
-                       <textcolor>white</textcolor>
-                       <angle>270</angle>
-                       <onleft>19</onleft>
-                       <onright>17</onright>
-                       <onup>23</onup>
-                       <ondown>23</ondown>
-                       <onclick>Select</onclick>
-               </control>
-               <control type="image">
-                       <description>Enter\done Icon image</description>
-                       <posx>320</posx>
-                       <posy>135</posy>
-                       <width>50</width>
-                       <height>50</height>
-                       <aspectratio>keep</aspectratio>
-                       <texture>icon_enter.png</texture>
-               </control>
-       </include>
-</includes>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/IncludesPlayerControls.xml b/addons/skin.touched/4x3Hirez/IncludesPlayerControls.xml
deleted file mode 100644 (file)
index 8647569..0000000
+++ /dev/null
@@ -1,1027 +0,0 @@
-<includes>
-       <include name="PlayerControlCommons">
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>ScreenWidth</width>
-                       <height>ScreenHeight</height>
-                       <colordiffuse>BBFFFFFF</colordiffuse>
-                       <texture>black-back.png</texture>
-                       <visible>!Window.IsVisible(Visualisation) + !Window.IsVisible(FullScreenVideo)</visible>
-               </control>
-               <include>CommonHeader</include>
-               <control type="group">
-                       <posx>0</posx>
-                       <posy>84</posy>
-                       <visible>Skin.HasSetting(PlayerControlsShowAudioInfo) + Player.HasAudio</visible>
-                       <animation effect="slide" start="0,-200" end="0,0" time="300" easing="out" tween="quadratic" >Visible</animation>
-                       <animation effect="slide" start="0,0" end="0,-200" time="300" easing="in" tween="quadratic" >Hidden</animation>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>ScreenWidth</width>
-                               <height>200</height>
-                               <texture border="5">dialogback.png</texture>
-                       </control>
-                       <control type="group">
-                               <control type="image">
-                                       <description>cover image</description>
-                                       <posx>20</posx>
-                                       <posy>10</posy>
-                                       <width>180</width>
-                                       <height>180</height>
-                                       <info>MusicPlayer.Cover</info>
-                                       <aspectratio>keep</aspectratio>
-                                       <bordertexture>ThumbBorderGrey.png</bordertexture>
-                                       <bordersize>2</bordersize>
-                               </control>
-                               <control type="label">
-                                       <description>Artist label</description>
-                                       <posx>220</posx>
-                                       <posy>25</posy>
-                                       <width>1020</width>
-                                       <height>25</height>
-                                       <align>left</align>
-                                       <font>font13</font>
-                                       <label>$INFO[MusicPlayer.Artist]</label>
-                                       <textcolor>black</textcolor>
-                               </control>
-                               <control type="label">
-                                       <posx>230</posx>
-                                       <posy>60</posy>
-                                       <width>1030</width>
-                                       <height>30</height>
-                                       <font>font30_title</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[MusicPlayer.Title]</label>
-                                       <textcolor>black</textcolor>
-                                       <scroll>true</scroll>
-                               </control>
-                               <control type="label">
-                                       <description>Album label</description>
-                                       <posx>220</posx>
-                                       <posy>95</posy>
-                                       <width>1020</width>
-                                       <height>25</height>
-                                       <align>left</align>
-                                       <font>font13</font>
-                                       <label>$INFO[MusicPlayer.Album]</label>
-                                       <textcolor>black</textcolor>
-                               </control>
-                               <control type="group">
-                                       <posx>220</posx>
-                                       <posy>140</posy>
-                                       <width>600</width>
-                                       <height>45</height>
-                                       <control type="image">
-                                               <description>Audio Codec Image</description>
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>100</width>
-                                               <height>45</height>
-                                               <aspectratio align="left">keep</aspectratio>
-                                               <texture>$INFO[MusicPlayer.Codec,flagging/audio/,.png]</texture>
-                                       </control>
-                                       <control type="group">
-                                               <description>Rating</description>
-                                               <posx>105</posx>
-                                               <posy>0</posy>
-                                               <width>160</width>
-                                               <height>45</height>
-                                               <control type="image">
-                                                       <description>rating back</description>
-                                                       <posx>0</posx>
-                                                       <posy>0</posy>
-                                                       <width>160</width>
-                                                       <height>45</height>
-                                                       <aspectratio align="left">stretch</aspectratio>
-                                                       <texture border="5">flagging/blank.png</texture>
-                                               </control>
-                                               <control type="image">
-                                                       <description>Rating</description>
-                                                       <posx>10</posx>
-                                                       <posy>0</posy>
-                                                       <width>140</width>
-                                                       <height>45</height>
-                                                       <aspectratio align="center">keep</aspectratio>
-                                                       <texture fallback="LeftRating/rating0.png">$INFO[Player.StarRating,light/left_rating/]</texture>
-                                               </control>
-                                       </control>
-                               </control>
-                               <control type="label">
-                                       <description>Normal Header label</description>
-                                       <posx>1260</posx>
-                                       <posy>5</posy>
-                                       <width>300</width>
-                                       <height>25</height>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <label>$LOCALIZE[589]</label>
-                                       <visible>MusicPartyMode.Enabled</visible>
-                               </control>
-                               <control type="label">
-                                       <description>Partymode Header label</description>
-                                       <posx>1260</posx>
-                                       <posy>5</posy>
-                                       <width>300</width>
-                                       <height>25</height>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <label>$INFO[musicplayer.Playlistposition,$LOCALIZE[554]: ]$INFO[musicplayer.Playlistlength, / ]</label>
-                                       <visible>!MusicPartyMode.Enabled</visible>
-                               </control>
-                               <control type="label">
-                                       <posx>1260</posx>
-                                       <posy>160</posy>
-                                       <width>800</width>
-                                       <height>25</height>
-                                       <label>$LOCALIZE[209]: $INFO[MusicPlayer.offset(1).Artist,, - ]$INFO[MusicPlayer.offset(1).Title]</label>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <scroll>true</scroll>
-                                       <visible>MusicPlayer.HasNext</visible>
-                               </control>
-                       </control>
-               </control>
-               <control type="group">
-                       <posx>0</posx>
-                       <posy>84</posy>
-                       <visible>Skin.HasSetting(PlayerControlsShowVideoInfo) + Player.HasVideo</visible>
-                       <animation effect="slide" start="0,-200" end="0,0" time="300" easing="out" tween="quadratic" >Visible</animation>
-                       <animation effect="slide" start="0,0" end="0,-200" time="300" easing="in" tween="quadratic" >Hidden</animation>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>ScreenWidth</width>
-                               <height>200</height>
-                               <texture border="5">dialogback.png</texture>
-                       </control>
-                       <control type="group">
-                               <control type="group">
-                                       <visible>!VideoPlayer.Content(Movies) + !VideoPlayer.Content(Episodes)</visible>
-                                       <control type="image">
-                                               <description>cover image</description>
-                                               <posx>20</posx>
-                                               <posy>10</posy>
-                                               <width>250</width>
-                                               <height>180</height>
-                                               <info>VideoPlayer.Cover</info>
-                                               <aspectratio align="right">keep</aspectratio>
-                                               <bordertexture>ThumbBorderGrey.png</bordertexture>
-                                               <bordersize>2</bordersize>
-                                       </control>
-                                       <control type="label">
-                                               <description>studio label</description>
-                                               <posx>290</posx>
-                                               <posy>25</posy>
-                                               <width>950</width>
-                                               <height>25</height>
-                                               <align>left</align>
-                                               <font>font13</font>
-                                               <label>$INFO[VideoPlayer.Studio]</label>
-                                               <textcolor>black</textcolor>
-                                       </control>
-                                       <control type="label">
-                                               <posx>300</posx>
-                                               <posy>60</posy>
-                                               <width>940</width>
-                                               <height>30</height>
-                                               <font>font30_title</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[VideoPlayer.Title]</label>
-                                               <textcolor>black</textcolor>
-                                               <scroll>true</scroll>
-                                       </control>
-                                       <control type="label">
-                                               <description>Genre label</description>
-                                               <posx>290</posx>
-                                               <posy>95</posy>
-                                               <width>950</width>
-                                               <height>25</height>
-                                               <align>left</align>
-                                               <font>font13</font>
-                                               <label>$INFO[VideoPlayer.Genre]</label>
-                                               <textcolor>black</textcolor>
-                                       </control>
-                                       <control type="group">
-                                               <posx>290</posx>
-                                               <posy>140</posy>
-                                               <width>600</width>
-                                               <height>45</height>
-                                               <control type="image">
-                                                       <description>Video Codec Image</description>
-                                                       <posx>0</posx>
-                                                       <posy>0</posy>
-                                                       <width>100</width>
-                                                       <height>45</height>
-                                                       <aspectratio align="left">keep</aspectratio>
-                                                       <texture>$INFO[VideoPlayer.VideoCodec,flagging/video/,.png]</texture>
-                                               </control>
-                                               <control type="image">
-                                                       <description>Resolution Image</description>
-                                                       <posx>100</posx>
-                                                       <posy>0</posy>
-                                                       <width>75</width>
-                                                       <height>45</height>
-                                                       <aspectratio align="left">keep</aspectratio>
-                                                       <texture>$INFO[VideoPlayer.VideoResolution,flagging/video/,.png]</texture>
-                                               </control>
-                                               <control type="image">
-                                                       <description>Audio Codec Image</description>
-                                                       <posx>175</posx>
-                                                       <posy>0</posy>
-                                                       <width>100</width>
-                                                       <height>45</height>
-                                                       <aspectratio align="left">keep</aspectratio>
-                                                       <texture>$INFO[VideoPlayer.AudioCodec,flagging/audio/,.png]</texture>
-                                               </control>
-                                               <control type="image">
-                                                       <description>Audio Codec Image</description>
-                                                       <posx>275</posx>
-                                                       <posy>0</posy>
-                                                       <width>75</width>
-                                                       <height>45</height>
-                                                       <aspectratio align="left">keep</aspectratio>
-                                                       <texture>$INFO[VideoPlayer.AudioChannels,flagging/audio/,.png]</texture>
-                                               </control>
-                                       </control>
-                               </control>
-                               <control type="group">
-                                       <visible>VideoPlayer.Content(Movies)</visible>
-                                       <control type="image">
-                                               <description>cover image</description>
-                                               <posx>20</posx>
-                                               <posy>10</posy>
-                                               <width>150</width>
-                                               <height>180</height>
-                                               <info>VideoPlayer.Cover</info>
-                                               <aspectratio>keep</aspectratio>
-                                               <bordertexture>ThumbBorderGrey.png</bordertexture>
-                                               <bordersize>2</bordersize>
-                                       </control>
-                                       <control type="label">
-                                               <description>Studio label</description>
-                                               <posx>190</posx>
-                                               <posy>25</posy>
-                                               <width>1050</width>
-                                               <height>25</height>
-                                               <align>left</align>
-                                               <font>font13</font>
-                                               <label>$INFO[VideoPlayer.Studio]</label>
-                                               <textcolor>black</textcolor>
-                                       </control>
-                                       <control type="label">
-                                               <posx>200</posx>
-                                               <posy>60</posy>
-                                               <width>1040</width>
-                                               <height>30</height>
-                                               <font>font30_title</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[VideoPlayer.Title]</label>
-                                               <textcolor>black</textcolor>
-                                               <scroll>true</scroll>
-                                       </control>
-                                       <control type="label">
-                                               <description>Genre label</description>
-                                               <posx>190</posx>
-                                               <posy>95</posy>
-                                               <width>1050</width>
-                                               <height>25</height>
-                                               <align>left</align>
-                                               <font>font13</font>
-                                               <label>$INFO[VideoPlayer.Genre]</label>
-                                               <textcolor>black</textcolor>
-                                       </control>
-                                       <control type="group">
-                                               <posx>190</posx>
-                                               <posy>140</posy>
-                                               <width>600</width>
-                                               <height>45</height>
-                                               <control type="image">
-                                                       <description>Video Codec Image</description>
-                                                       <posx>0</posx>
-                                                       <posy>0</posy>
-                                                       <width>100</width>
-                                                       <height>45</height>
-                                                       <aspectratio align="left">keep</aspectratio>
-                                                       <texture>$INFO[VideoPlayer.VideoCodec,flagging/video/,.png]</texture>
-                                               </control>
-                                               <control type="image">
-                                                       <description>Resolution Image</description>
-                                                       <posx>100</posx>
-                                                       <posy>0</posy>
-                                                       <width>75</width>
-                                                       <height>45</height>
-                                                       <aspectratio align="left">keep</aspectratio>
-                                                       <texture>$INFO[VideoPlayer.VideoResolution,flagging/video/,.png]</texture>
-                                               </control>
-                                               <control type="image">
-                                                       <description>Audio Codec Image</description>
-                                                       <posx>175</posx>
-                                                       <posy>0</posy>
-                                                       <width>100</width>
-                                                       <height>45</height>
-                                                       <aspectratio align="left">keep</aspectratio>
-                                                       <texture>$INFO[VideoPlayer.AudioCodec,flagging/audio/,.png]</texture>
-                                               </control>
-                                               <control type="image">
-                                                       <description>Audio Codec Image</description>
-                                                       <posx>275</posx>
-                                                       <posy>0</posy>
-                                                       <width>75</width>
-                                                       <height>45</height>
-                                                       <aspectratio align="left">keep</aspectratio>
-                                                       <texture>$INFO[VideoPlayer.AudioChannels,flagging/audio/,.png]</texture>
-                                               </control>
-                                       </control>
-                               </control>
-                               <control type="group">
-                                       <visible>VideoPlayer.Content(Episodes)</visible>
-                                       <control type="image">
-                                               <description>cover image</description>
-                                               <posx>20</posx>
-                                               <posy>10</posy>
-                                               <width>250</width>
-                                               <height>180</height>
-                                               <info>VideoPlayer.Cover</info>
-                                               <aspectratio>scale</aspectratio>
-                                               <bordertexture>ThumbBorderGrey.png</bordertexture>
-                                               <bordersize>2</bordersize>
-                                       </control>
-                                       <control type="label">
-                                               <description>Show label</description>
-                                               <posx>290</posx>
-                                               <posy>25</posy>
-                                               <width>950</width>
-                                               <height>25</height>
-                                               <align>left</align>
-                                               <font>font13</font>
-                                               <label>$INFO[VideoPlayer.TVShowTitle]</label>
-                                               <textcolor>black</textcolor>
-                                       </control>
-                                       <control type="label">
-                                               <posx>300</posx>
-                                               <posy>60</posy>
-                                               <width>940</width>
-                                               <height>30</height>
-                                               <font>font30_title</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[VideoPlayer.Title]</label>
-                                               <textcolor>black</textcolor>
-                                               <scroll>true</scroll>
-                                       </control>
-                                       <control type="label">
-                                               <description>Episode label</description>
-                                               <posx>290</posx>
-                                               <posy>95</posy>
-                                               <width>950</width>
-                                               <height>25</height>
-                                               <align>left</align>
-                                               <font>font13</font>
-                                               <label>$INFO[VideoPlayer.Season,$LOCALIZE[20373]: ] &#32;&#32;&#32; $INFO[VideoPlayer.Episode,$LOCALIZE[20359]: ]</label>
-                                               <textcolor>black</textcolor>
-                                       </control>
-                                       <control type="group">
-                                               <posx>290</posx>
-                                               <posy>140</posy>
-                                               <width>600</width>
-                                               <height>45</height>
-                                               <control type="image">
-                                                       <description>Video Codec Image</description>
-                                                       <posx>0</posx>
-                                                       <posy>0</posy>
-                                                       <width>100</width>
-                                                       <height>45</height>
-                                                       <aspectratio align="left">keep</aspectratio>
-                                                       <texture>$INFO[VideoPlayer.VideoCodec,flagging/video/,.png]</texture>
-                                               </control>
-                                               <control type="image">
-                                                       <description>Resolution Image</description>
-                                                       <posx>100</posx>
-                                                       <posy>0</posy>
-                                                       <width>75</width>
-                                                       <height>45</height>
-                                                       <aspectratio align="left">keep</aspectratio>
-                                                       <texture>$INFO[VideoPlayer.VideoResolution,flagging/video/,.png]</texture>
-                                               </control>
-                                               <control type="image">
-                                                       <description>Audio Codec Image</description>
-                                                       <posx>175</posx>
-                                                       <posy>0</posy>
-                                                       <width>100</width>
-                                                       <height>45</height>
-                                                       <aspectratio align="left">keep</aspectratio>
-                                                       <texture>$INFO[VideoPlayer.AudioCodec,flagging/audio/,.png]</texture>
-                                               </control>
-                                               <control type="image">
-                                                       <description>Audio Codec Image</description>
-                                                       <posx>275</posx>
-                                                       <posy>0</posy>
-                                                       <width>75</width>
-                                                       <height>45</height>
-                                                       <aspectratio align="left">keep</aspectratio>
-                                                       <texture>$INFO[VideoPlayer.AudioChannels,flagging/audio/,.png]</texture>
-                                               </control>
-                                       </control>
-                               </control>
-                               <control type="label">
-                                       <description>Chapter label</description>
-                                       <posx>1260</posx>
-                                       <posy>5</posy>
-                                       <width>1200</width>
-                                       <height>25</height>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <label>$INFO[Player.Chapter,$LOCALIZE[21396]: ]$INFO[Player.ChapterCount, / ]$INFO[Player.ChapterName,[COLOR=grey3] (,)[/COLOR]]</label>
-                                       <visible>Player.ChapterCount</visible>
-                               </control>
-                               <control type="label">
-                                       <posx>1260</posx>
-                                       <posy>160</posy>
-                                       <width>800</width>
-                                       <height>25</height>
-                                       <label>$LOCALIZE[31049] $INFO[Player.FinishTime]</label>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <scroll>true</scroll>
-                               </control>
-                       </control>
-               </control>
-               <include>CommonHeader</include>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>20</posy>
-                       <width>1280</width>
-                       <height>64</height>
-                       <texture>header.png</texture>
-               </control>
-               <control type="grouplist">
-                       <description>Top Left bar</description>
-                       <posx>0</posx>
-                       <posy>20</posy>
-                       <width>200</width>
-                       <height>64</height>
-                       <align>left</align>
-                       <itemgap>5</itemgap>
-                       <orientation>horizontal</orientation>
-                       <control type="button">
-                               <description>Playlist Button</description>
-                               <width>64</width>
-                               <height>64</height>
-                               <texturenofocus>icon_playlistmusic.png</texturenofocus>
-                               <texturefocus>icon_playlistmusic.png</texturefocus>
-                               <onclick>PreviousMenu</onclick>
-                               <onclick>ActivateWindow(MusicPlaylist)</onclick>
-                               <visible>Player.HasAudio</visible>
-                       </control>
-                       <control type="button">
-                               <description>Playlist Button</description>
-                               <width>64</width>
-                               <height>64</height>
-                               <texturenofocus>icon_playlistvideo.png</texturenofocus>
-                               <texturefocus>icon_playlistvideo.png</texturefocus>
-                               <onclick>PreviousMenu</onclick>
-                               <onclick>ActivateWindow(VideoPlaylist)</onclick>
-                               <visible>Player.HasVideo</visible>
-                       </control>
-                       <control type="image">
-                               <width>2</width>
-                               <height>62</height>
-                               <texture>header-divide.png</texture>
-                       </control>
-               </control>
-               <control type="grouplist">
-                       <description>Top Right bar</description>
-                       <posx>1080r</posx>
-                       <posy>25</posy>
-                       <width>1000</width>
-                       <height>64</height>
-                       <align>right</align>
-                       <itemgap>5</itemgap>
-                       <orientation>horizontal</orientation>
-                       <control type="radiobutton">
-                               <description>Show Info Button</description>
-                               <width>270</width>
-                               <height>50</height>
-                               <label>$LOCALIZE[544]</label>
-                               <font>font13</font>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <selected>Skin.HasSetting(PlayerControlsShowAudioInfo)</selected>
-                               <texturenofocus border="5">floor_button.png</texturenofocus>
-                               <texturefocus border="5">floor_buttonFO.png</texturefocus>
-                               <onclick>Skin.ToggleSetting(PlayerControlsShowAudioInfo)</onclick>
-                               <visible>Player.HasAudio</visible>
-                       </control>
-                       <control type="radiobutton">
-                               <description>Show Info Button</description>
-                               <width>270</width>
-                               <height>50</height>
-                               <label>$LOCALIZE[544]</label>
-                               <font>font13</font>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <selected>Skin.HasSetting(PlayerControlsShowVideoInfo)</selected>
-                               <texturenofocus border="5">floor_button.png</texturenofocus>
-                               <texturefocus border="5">floor_buttonFO.png</texturefocus>
-                               <onclick>Skin.ToggleSetting(PlayerControlsShowVideoInfo)</onclick>
-                               <visible>Player.HasVideo</visible>
-                       </control>
-                       <control type="button">
-                               <description>Submenu Button</description>
-                               <width>200</width>
-                               <height>50</height>
-                               <label>$LOCALIZE[33063]</label>
-                               <font>font13</font>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <texturenofocus border="5">floor_button.png</texturenofocus>
-                               <texturefocus border="5">floor_buttonFO.png</texturefocus>
-                               <onclick>Skin.ToggleSetting(PlayerControlsSubMenuVisible)</onclick>
-                               <visible>!Window.IsVisible(Karaoke)</visible>
-                       </control>
-                       <control type="radiobutton">
-                               <description>Fullscreen Button</description>
-                               <posy>5</posy>
-                               <width>230</width>
-                               <height>50</height>
-                               <radiowidth>36</radiowidth>
-                               <radioheight>36</radioheight>
-                               <font>font13</font>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <texturenofocus border="5">floor_button.png</texturenofocus>
-                               <texturefocus border="5">floor_buttonFO.png</texturefocus>
-                               <label>31008</label>
-                               <onclick>fullscreen</onclick>
-                               <textureradiofocus>GoFullscreen2.png</textureradiofocus>
-                               <textureradionofocus>GoFullscreen2.png</textureradionofocus>
-                               <visible>!Window.IsVisible(Visualisation) + !Window.IsVisible(FullScreenVideo) + !Window.IsVisible(Karaoke)</visible>
-                       </control>
-                       <control type="radiobutton">
-                               <description>Fullscreen Button</description>
-                               <posy>5</posy>
-                               <width>230</width>
-                               <height>50</height>
-                               <radiowidth>36</radiowidth>
-                               <radioheight>36</radioheight>
-                               <font>font13</font>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <texturenofocus border="5">floor_button.png</texturenofocus>
-                               <texturefocus border="5">floor_buttonFO.png</texturefocus>
-                               <label>31008</label>
-                               <onclick>Dialog.Close(VideoOSD,true)</onclick>
-                               <onclick>Dialog.Close(MusicOSD,true)</onclick>
-                               <onclick>fullscreen</onclick>
-                               <textureradiofocus flipx="true" flipy="true">GoFullscreen2.png</textureradiofocus>
-                               <textureradionofocus flipx="true" flipy="true">GoFullscreen2.png</textureradionofocus>
-                               <visible>Window.IsVisible(Visualisation) | Window.IsVisible(FullScreenVideo) + !Window.IsVisible(Karaoke)</visible>
-                       </control>
-               </control>
-               <control type="group">
-                       <posx>65r</posx>
-                       <posy>20</posy>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>2</width>
-                               <height>62</height>
-                               <texture>header-divide.png</texture>
-                       </control>
-                       <control type="button">
-                               <description>Close Button</description>
-                               <posx>5</posx>
-                               <posy>0</posy>
-                               <width>60</width>
-                               <height>60</height>
-                               <font>-</font>
-                               <onclick>previousmenu</onclick>
-                               <texturefocus>icon_close.png</texturefocus>
-                               <texturenofocus>icon_close.png</texturenofocus>
-                       </control>
-               </control>
-
-               <control type="group">
-                       <posx>0</posx>
-                       <posy>70r</posy>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>1280</width>
-                               <height>71</height>
-                               <texture>floor.png</texture>
-                       </control>
-                       <control type="label">
-                               <posx>180</posx>
-                               <posy>16</posy>
-                               <width>180</width>
-                               <height>32</height>
-                               <font>font13</font>
-                               <align>right</align>
-                               <aligny>center</aligny>
-                               <label>$INFO[Player.Time(hh:mm:ss)]</label>
-                       </control>
-                       <control type="label">
-                               <posx>1100</posx>
-                               <posy>16</posy>
-                               <width>180</width>
-                               <height>32</height>
-                               <font>font13</font>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <label>$INFO[Player.Duration(hh:mm:ss)]</label>
-                       </control>
-                       <control type="progress">
-                               <description>ProgressbarCache</description>
-                               <posx>200</posx>
-                               <posy>16</posy>
-                               <width>880</width>
-                               <height>32</height>
-                               <info>Player.ProgressCache</info>
-                               <midtexture border="16,0,16,0">OSDProgressMidLight.png</midtexture>
-                       </control>
-                       <control type="progress">
-                               <description>Progressbar</description>
-                               <posx>200</posx>
-                               <posy>16</posy>
-                               <width>880</width>
-                               <height>32</height>
-                               <info>Player.Progress</info>
-                               <texturebg border="16,0,16,0">OSDProgressBack2.png</texturebg>
-                       </control>
-                       <control type="slider" id="87">
-                               <description>Seek Slider</description>
-                               <posx>200</posx>
-                               <posy>16</posy>
-                               <width>880</width>
-                               <height>32</height>
-                               <action>seek</action>
-                               <texturesliderbar border="16,0,16,0">OSDProgressBack2.png</texturesliderbar>
-                               <textureslidernib>-</textureslidernib>
-                               <textureslidernibfocus>-</textureslidernibfocus>
-                       </control>
-
-               </control>
-               <control type="group">
-                       <posx>370</posx>
-                       <posy>200r</posy>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>560</width>
-                               <height>80</height>
-                               <texture border="3">PlayerControls-Background.png</texture>
-                       </control>
-                       <control type="button" id="400">
-                               <posx>15</posx>
-                               <posy>0</posy>
-                               <width>85</width>
-                               <height>80</height>
-                               <label>-</label>
-                               <texturefocus>PlayerControls-PrevFO.png</texturefocus>
-                               <texturenofocus>PlayerControls-PrevNF.png</texturenofocus>
-                               <onleft>407</onleft>
-                               <onright>401</onright>
-                               <onup>400</onup>
-                               <ondown>400</ondown>
-                               <onclick>XBMC.PlayerControl(Previous)</onclick>
-                       </control>
-                       <control type="button" id="401">
-                               <posx>100</posx>
-                               <posy>0</posy>
-                               <width>85</width>
-                               <height>80</height>
-                               <label>-</label>
-                               <texturefocus>PlayerControls-RewindFO.png</texturefocus>
-                               <texturenofocus>PlayerControls-RewindNF.png</texturenofocus>
-                               <onleft>400</onleft>
-                               <onright>402</onright>
-                               <onup>401</onup>
-                               <ondown>401</ondown>
-                               <onclick>XBMC.PlayerControl(Rewind)</onclick>
-                       </control>
-                       <control type="button" id="402">
-                               <posx>190</posx>
-                               <posy>0</posy>
-                               <width>85</width>
-                               <height>80</height>
-                               <label>-</label>
-                               <texturefocus>PlayerControls-StopFO.png</texturefocus>
-                               <texturenofocus>PlayerControls-StopNF.png</texturenofocus>
-                               <onleft>401</onleft>
-                               <onright>403</onright>
-                               <onup>402</onup>
-                               <ondown>402</ondown>
-                               <onclick>XBMC.PlayerControl(Stop)</onclick>
-                       </control>
-                       <control type="togglebutton" id="403">
-                               <posx>280</posx>
-                               <posy>0</posy>
-                               <width>85</width>
-                               <height>80</height>
-                               <label>-</label>
-                               <texturefocus>PlayerControls-PauseFO.png</texturefocus>
-                               <texturenofocus>PlayerControls-PauseNF.png</texturenofocus>
-                               <usealttexture>Player.Paused | Player.Forwarding | Player.Rewinding</usealttexture>
-                               <alttexturefocus>PlayerControls-PlayFO.png</alttexturefocus>
-                               <alttexturenofocus>PlayerControls-PlayNF.png</alttexturenofocus>
-                               <onleft>402</onleft>
-                               <onright>404</onright>
-                               <onup>403</onup>
-                               <ondown>403</ondown>
-                               <onclick>XBMC.PlayerControl(Play)</onclick>
-                       </control>
-                       <control type="button" id="404">
-                               <posx>370</posx>
-                               <posy>0</posy>
-                               <width>85</width>
-                               <height>80</height>
-                               <label>-</label>
-                               <texturefocus>PlayerControls-ForwardFO.png</texturefocus>
-                               <texturenofocus>PlayerControls-ForwardNF.png</texturenofocus>
-                               <onleft>403</onleft>
-                               <onright>405</onright>
-                               <onup>404</onup>
-                               <ondown>404</ondown>
-                               <onclick>XBMC.PlayerControl(Forward)</onclick>
-                       </control>
-                       <control type="button" id="405">
-                               <posx>460</posx>
-                               <posy>0</posy>
-                               <width>85</width>
-                               <height>80</height>
-                               <label>-</label>
-                               <texturefocus>PlayerControls-NextFO.png</texturefocus>
-                               <texturenofocus>PlayerControls-NextNF.png</texturenofocus>
-                               <onleft>404</onleft>
-                               <onright>406</onright>
-                               <onup>405</onup>
-                               <ondown>405</ondown>
-                               <onclick>XBMC.PlayerControl(Next)</onclick>
-                       </control>
-               </control>
-               <control type="group">
-                       <visible>Window.IsVisible(FullscreenVideo)</visible>
-                       <posx>80r</posx>
-                       <posy>385</posy>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>90</width>
-                               <height>170</height>
-                               <colordiffuse>EEFFFFFF</colordiffuse>
-                               <texture border="3">PlayerControls-Background.png</texture>
-                       </control>
-                       <control type="label">
-                               <description>header label</description>
-                               <posx>0</posx>
-                               <posy>10</posy>
-                               <height>20</height>
-                               <width>80</width>
-                               <label>287</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font8_title</font>
-                               <shadowcolor>black</shadowcolor>
-                       </control>
-                       <control type="label">
-                               <description>Video Has no Subtitles label</description>
-                               <posx>0</posx>
-                               <posy>40</posy>
-                               <height>20</height>
-                               <width>80</width>
-                               <label>31011</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font10_title</font>
-                               <textcolor>grey2</textcolor>
-                               <shadowcolor>black</shadowcolor>
-                               <visible>!VideoPlayer.HasSubtitles</visible>
-                       </control>
-                       <control type="togglebutton">
-                               <description>Download with Subtitles script</description>
-                               <posx>10</posx>
-                               <posy>38</posy>
-                               <width>60</width>
-                               <height>35</height>
-                               <hitrect x="5" y="5" w="75" h="80" />
-                               <label>31356</label>
-                               <font>-</font>
-                               <texturefocus>radiobutton-nofocus.png</texturefocus>
-                               <texturenofocus>radiobutton-nofocus.png</texturenofocus>
-                               <alttexturefocus>radiobutton-focus.png</alttexturefocus>
-                               <alttexturenofocus>radiobutton-focus.png</alttexturenofocus>
-                               <onleft>605</onleft>
-                               <onright>702</onright>
-                               <onup>1000</onup>
-                               <ondown>1000</ondown>
-                               <onclick>Dialog.Close(VideoOSD,true)</onclick>
-                               <onclick>ShowSubtitles</onclick>
-                               <usealttexture>VideoPlayer.SubtitlesEnabled</usealttexture>
-                               <visible>VideoPlayer.HasSubtitles</visible>
-                       </control>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>88</posy>
-                               <width>80</width>
-                               <height>2</height>
-                               <texture>header-divide.png</texture>
-                       </control>
-                       <control type="togglebutton">
-                               <posx>10</posx>
-                               <posy>100</posy>
-                               <width>65</width>
-                               <height>60</height>
-                               <label>31356</label>
-                               <hitrect x="5" y="100" w="75" h="70" />
-                               <font>-</font>
-                               <texturefocus flipy="true">icon_shift.png</texturefocus>
-                               <texturenofocus flipy="true">icon_shift.png</texturenofocus>
-                               <alttexturefocus flipy="true">icon_shift.png</alttexturefocus>
-                               <alttexturenofocus flipy="true">icon_shift.png</alttexturenofocus>
-                               <onleft>605</onleft>
-                               <onright>702</onright>
-                               <onup>1000</onup>
-                               <ondown>1000</ondown>
-                               <onclick>Close</onclick>
-                               <onclick>XBMC.RunScript($INFO[Skin.String(SubtitleScript_Path)])</onclick>
-                               <altclick>Skin.SetAddon(SubtitleScript_Path,xbmc.python.subtitles)</altclick>
-                               <altclick>Close</altclick>
-                               <altclick>XBMC.RunScript($INFO[Skin.String(SubtitleScript_Path)])</altclick>
-                               <usealttexture>IsEmpty(Skin.String(SubtitleScript_Path))</usealttexture>
-                       </control>
-               </control>
-
-               <control type="group">
-                       <visible>Skin.HasSetting(PlayerControlsSubMenuVisible)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <control type="button">
-                               <description>Hidden button to close the sort when its focused</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>ScreenWidth</width>
-                               <height>ScreenHeight</height>
-                               <texturenofocus>-</texturenofocus>
-                               <texturefocus>-</texturefocus>
-                               <onclick>Skin.Reset(PlayerControlsSubMenuVisible)</onclick>
-                       </control>
-                       <control type="group">
-                               <posx>570r</posx>
-                               <posy>113</posy>
-                               <control type="image">
-                                       <description>Shadow Background</description>
-                                       <posx>-30</posx>
-                                       <posy>-30</posy>
-                                       <width>380</width>
-                                       <height>440</height>
-                                       <texture border="30">ShadowBorder.png</texture>
-                               </control>
-                               <control type="button">
-                                       <description>Panel Background image</description>
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>320</width>
-                                       <height>380</height>
-                                       <texturefocus border="5">SubBack.png</texturefocus>
-                                       <texturenofocus border="5">SubBack.png</texturenofocus>
-                                       <onclick>-</onclick>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Forground image</description>
-                                       <posx>10</posx>
-                                       <posy>10</posy>
-                                       <width>300</width>
-                                       <height>354</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Arrow image</description>
-                                       <posx>140</posx>
-                                       <posy>-34</posy>
-                                       <width>40</width>
-                                       <height>40</height>
-                                       <texture>arrow-big-up.png</texture>
-                               </control>
-                               <control type="grouplist">
-                                       <posx>11</posx>
-                                       <posy>10</posy>
-                                       <width>300</width>
-                                       <height>354</height>
-                                       <onleft>9000</onleft>
-                                       <onright>50</onright>
-                                       <onup>9000</onup>
-                                       <ondown>9000</ondown>
-                                       <itemgap>-1</itemgap>
-                                       <control type="radiobutton">
-                                               <description>Random Toggle</description>
-                                               <textwidth>170</textwidth>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>$LOCALIZE[191]</label>
-                                               <onclick>XBMC.PlayerControl(Random)</onclick>
-                                               <selected>Playlist.IsRandom</selected>
-                                       </control>
-                                       <control type="button">
-                                               <description>Repeat</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>$LOCALIZE[486]$INFO[Playlist.Repeat,: ]</label>
-                                               <onclick>XBMC.PlayerControl(Repeat)</onclick>
-                                       </control>
-                                       <!-- Buttons for Fullscreen Video -->
-                                       <control type="button">
-                                               <include>ButtonCommonValues2</include>
-                                               <label>13395</label>
-                                               <onclick>Dialog.Close(VideoOSD,true)</onclick>
-                                               <onclick>Skin.Reset(PlayerControlsSubMenuVisible)</onclick>
-                                               <onclick>XBMC.ActivateWindow(123)</onclick>
-                                               <visible>Window.IsVisible(FullScreenVideo)</visible>
-                                       </control>
-                                       <control type="button">
-                                               <include>ButtonCommonValues2</include>
-                                               <label>31002</label>
-                                               <onclick>Dialog.Close(VideoOSD,true)</onclick>
-                                               <onclick>Skin.Reset(PlayerControlsSubMenuVisible)</onclick>
-                                               <onclick>XBMC.ActivateWindow(124)</onclick>
-                                               <visible>Window.IsVisible(FullScreenVideo)</visible>
-                                       </control>
-                                       <control type="button">
-                                               <include>ButtonCommonValues2</include>
-                                               <label>298</label>
-                                               <onclick>Dialog.Close(VideoOSD,true)</onclick>
-                                               <onclick>Skin.Reset(PlayerControlsSubMenuVisible)</onclick>
-                                               <onclick>XBMC.ActivateWindow(125)</onclick>
-                                               <visible>Window.IsVisible(FullScreenVideo)</visible>
-                                       </control>
-                                       <control type="togglebutton">
-                                               <include>ButtonCommonValues2</include>
-                                               <label>31018</label>
-                                               <onclick>-</onclick>
-                                               <onclick>Close</onclick>
-                                               <onclick>XBMC.RunScript($INFO[Skin.String(SubtitleScript_Path)])</onclick>
-                                               <altclick>Skin.SetAddon(SubtitleScript_Path,xbmc.python.subtitles)</altclick>
-                                               <altclick>Close</altclick>
-                                               <altclick>XBMC.RunScript($INFO[Skin.String(SubtitleScript_Path)])</altclick>
-                                               <alttexturefocus border="5">button-focus2.png</alttexturefocus>
-                                               <alttexturenofocus>-</alttexturenofocus>
-                                               <usealttexture>IsEmpty(Skin.String(SubtitleScript_Path))</usealttexture>
-                                               <visible>false</visible>
-                                               <visible>Window.IsVisible(FullScreenVideo)</visible>
-                                       </control>
-                                       <control type="button">
-                                               <include>ButtonCommonValues2</include>
-                                               <label>31355</label>
-                                               <onclick>PlayerControl(ShowVideoMenu)</onclick>
-                                               <visible>VideoPlayer.HasMenu</visible>
-                                               <visible>Window.IsVisible(FullScreenVideo)</visible>
-                                       </control>
-                                       <!-- Buttons for Fullscreen Audio -->
-                                       <control type="button">
-                                               <include>ButtonCommonValues2</include>
-                                               <label>250</label>
-                                               <onclick>Dialog.Close(MusicOSD,true)</onclick>
-                                               <onclick>Skin.Reset(PlayerControlsSubMenuVisible)</onclick>
-                                               <onclick>Addon.Default.Set(xbmc.player.musicviz)</onclick>
-                                               <visible>Window.IsVisible(Visualisation)</visible>
-                                       </control>
-                                       <control type="button">
-                                               <include>ButtonCommonValues2</include>
-                                               <label>31005</label>
-                                               <onclick>Dialog.Close(MusicOSD,true)</onclick>
-                                               <onclick>Skin.Reset(PlayerControlsSubMenuVisible)</onclick>
-                                               <onclick>Addon.Default.OpenSettings(xbmc.player.musicviz)</onclick>
-                                               <visible>Window.IsVisible(Visualisation)</visible>
-                                       </control>
-                                       <control type="button">
-                                               <include>ButtonCommonValues2</include>
-                                               <label>31006</label>
-                                               <onclick>Dialog.Close(MusicOSD,true)</onclick>
-                                               <onclick>Skin.Reset(PlayerControlsSubMenuVisible)</onclick>
-                                               <onclick>XBMC.ActivateWindow(122)</onclick>
-                                               <visible>Window.IsVisible(Visualisation)</visible>
-                                       </control>
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>100</posy>
-                                               <width>298</width>
-                                               <height>10</height>
-                                               <texture>shelf_shadow.png</texture>
-                                       </control>
-                               </control>
-                       </control>
-               </control>
-       </include>
-</includes>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/LockSettings.xml b/addons/skin.touched/4x3Hirez/LockSettings.xml
deleted file mode 100644 (file)
index 81460c0..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-<window id="131">
-       <defaultcontrol>5</defaultcontrol>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>140</posx>
-               <posy>30</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1000</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="label">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>910</width>
-                       <label>$LOCALIZE[20043]</label>
-               </control>
-               <control type="group">
-                       <posx>930</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>1000</width>
-                       <height>840</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-               <control type="grouplist" id="5">
-                       <description>control area</description>
-                       <posx>20</posx>
-                       <posy>80</posy>
-                       <width>960</width>
-                       <height>720</height>
-                       <itemgap>-1</itemgap>
-                       <pagecontrol>60</pagecontrol>
-                       <onleft>28</onleft>
-                       <onright>60</onright>
-                       <onup>28</onup>
-                       <ondown>28</ondown>
-               </control>
-               <control type="button" id="7">
-                       <description>Default Button</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <height>55</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-               </control>
-               <control type="radiobutton" id="8">
-                       <description>Default RadioButton</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <height>55</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-               </control>
-               <control type="spincontrolex" id="9">
-                       <description>Default SpinControlex</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <height>55</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                       <aligny>center</aligny>
-                       <reverse>yes</reverse>
-               </control>
-               <control type="image" id="11">
-                       <description>separator image</description>
-                       <height>5</height>
-                       <texture>separator.png</texture>
-               </control>
-               <control type="grouplist" id="9000">
-                       <posx>20</posx>
-                       <posy>830</posy>
-                       <width>960</width>
-                       <height>50</height>
-                       <itemgap>10</itemgap>
-                       <align>center</align>
-                       <orientation>horizontal</orientation>
-                       <onleft>9000</onleft>
-                       <onright>9000</onright>
-                       <onup>9000</onup>
-                       <ondown>9000</ondown>
-                       <control type="button" id="28">
-                               <description>OK button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>186</label>
-                       </control>
-                       <control type="button" id="29">
-                               <description>Cancel button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>222</label>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/LoginScreen.xml b/addons/skin.touched/4x3Hirez/LoginScreen.xml
deleted file mode 100644 (file)
index 7e14c18..0000000
+++ /dev/null
@@ -1,134 +0,0 @@
-<window id="29">
-       <defaultcontrol></defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <controls>
-               <include>CommonBackground</include>
-               <include>CommonNowPlaying</include>
-               <control type="label">
-                       <description>Window label</description>
-                       <include>MediaWindowTitleCommons</include>
-                       <label>$LOCALIZE[20096]</label>
-               </control>
-               <control type="group">
-                       <include>Window_OpenClose_Animation_Zoom</include>
-                       <control type="label">
-                               <posx>295</posx>
-                               <posy>140</posy>
-                               <width>690</width>
-                               <height>40</height>
-                               <font>font13_title</font>
-                               <textcolor>grey2</textcolor>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <label>$LOCALIZE[31421]</label>
-                       </control>
-                       <control type="panel" id="52">
-                               <posx>295</posx>
-                               <posy>210</posy>
-                               <width>690</width>
-                               <height>401</height>
-                               <onleft>20</onleft>
-                               <onright>20</onright>
-                               <onup>52</onup>
-                               <ondown>52</ondown>
-                               <viewtype label="535">list</viewtype>
-                               <pagecontrol>60</pagecontrol>
-                               <scrolltime>200</scrolltime>
-                               <itemlayout height="115" width="690">
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>690</width>
-                                               <height>110</height>
-                                               <texture border="5">SubBack.png</texture>
-                                       </control>
-                                       <control type="image">
-                                               <posx>10</posx>
-                                               <posy>10</posy>
-                                               <width>80</width>
-                                               <height>90</height>
-                                               <texture>$INFO[ListItem.Icon]</texture>
-                                       </control>
-                                       <control type="label">
-                                               <posx>110</posx>
-                                               <posy>10</posy>
-                                               <width>580</width>
-                                               <height>40</height>
-                                               <font>font24_title</font>
-                                               <textcolor>grey2</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[ListItem.Label]</label>
-                                       </control>
-                                       <control type="label">
-                                               <posx>110</posx>
-                                               <posy>50</posy>
-                                               <width>580</width>
-                                               <height>40</height>
-                                               <font>font13</font>
-                                               <textcolor>grey2</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[ListItem.Label2]</label>
-                                       </control>
-                               </itemlayout>
-                               <focusedlayout height="115" width="580">
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>690</width>
-                                               <height>110</height>
-                                               <texture border="5">SubBack2.png</texture>
-                                               <include>VisibleFadeEffect</include>
-                                       </control>
-                                       <control type="image">
-                                               <posx>10</posx>
-                                               <posy>10</posy>
-                                               <width>90</width>
-                                               <height>80</height>
-                                               <texture>$INFO[ListItem.Icon]</texture>
-                                       </control>
-                                       <control type="label">
-                                               <posx>110</posx>
-                                               <posy>10</posy>
-                                               <width>580</width>
-                                               <height>40</height>
-                                               <font>font24_title</font>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[ListItem.Label]</label>
-                                       </control>
-                                       <control type="label">
-                                               <posx>110</posx>
-                                               <posy>50</posy>
-                                               <width>580</width>
-                                               <height>40</height>
-                                               <font>font13</font>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[ListItem.Label2]</label>
-                                       </control>
-                               </focusedlayout>
-                       </control>
-               </control>
-               <control type="panel" id="9002">
-                       <visible>!Window.IsActive(PlayerControls)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <include>SubMenuCommonLayout</include>
-                       <content>
-                               <item>
-                                       <label>13012</label>
-                                       <onclick>XBMC.Quit</onclick>
-                                       <icon>icon_shutdown.png</icon>
-                               </item>
-                       </content>
-               </control>
-               <include>BehindDialogFadeOut</include>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/MusicKaraokeLyrics.xml b/addons/skin.touched/4x3Hirez/MusicKaraokeLyrics.xml
deleted file mode 100644 (file)
index 892fde0..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-<window id="2009">
-       <onunload>Dialog.Close(MusicOSD)</onunload>
-       <controls>
-               <control type="karvisualisation" id="1">
-                       <description>visualisation</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>ScreenWidth</width>
-                       <height>ScreenHeight</height>
-                       <visibility>false</visibility>
-               </control>
-               <control type="image" id="2">
-                       <description>fullscreen image</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>ScreenWidth</width>
-                       <height>ScreenHeight</height>
-                       <visibility>false</visibility>
-               </control>
-               <control type="group">
-                       <posx>70r</posx>
-                       <posy>405</posy>
-                       <include>Window_OpenClose_Animation</include>
-                       <include>VisibleFadeEffect</include>
-                       <visible>!Window.IsVisible(MusicOSD)</visible>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>80</width>
-                               <height>150</height>
-                               <texture border="5">SubBack.png</texture>
-                       </control>
-                       <control type="button">
-                               <posx>10</posx>
-                               <posy>10</posy>
-                               <width>55</width>
-                               <height>55</height>
-                               <label>-</label>
-                               <texturefocus>icon_player2.png</texturefocus>
-                               <texturenofocus>icon_player2.png</texturenofocus>
-                               <onclick>ActivateWindow(MusicOSD)</onclick>
-                       </control>
-                       <control type="button">
-                               <posx>10</posx>
-                               <posy>85</posy>
-                               <width>55</width>
-                               <height>55</height>
-                               <label>-</label>
-                               <texturefocus>icon_keypad.png</texturefocus>
-                               <texturenofocus>icon_keypad.png</texturenofocus>
-                               <onclick>Number0</onclick>
-                       </control>
-               </control>
-               <control type="group">
-                       <visible>MusicPlayer.Offset(number).Exists + !IntegerGreaterThan(Player.TimeRemaining,20)</visible>
-                       <animation effect="slide" start="0,-64" end="0,0" time="100">Visible</animation>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>ScreenWidth</width>
-                               <height>64</height>
-                               <texture>header.png</texture>
-                       </control>
-                       <control type="label" id="402">
-                               <description>Next Song Name</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>ScreenWidth</width>
-                               <height>60</height>
-                               <font>font16</font>
-                               <textcolor>white</textcolor>
-                               <label>$LOCALIZE[209] : $INFO[MusicPlayer.offset(1).Title]</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                       </control>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/MusicOSD.xml b/addons/skin.touched/4x3Hirez/MusicOSD.xml
deleted file mode 100644 (file)
index 7acfa2f..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<window type="dialog" id="120">
-       <defaultcontrol></defaultcontrol>
-       <include>dialogeffect</include>
-       <onunload>Skin.Reset(PlayerControlsSubMenuVisible)</onunload>
-       <coordinates>
-               <system>1</system>
-               <posx>0</posx>
-               <posy>0</posy>
-       </coordinates>
-       <controls>
-               <include>PlayerControlCommons</include>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/MusicOverlay.xml b/addons/skin.touched/4x3Hirez/MusicOverlay.xml
deleted file mode 100644 (file)
index 510e6e3..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<window id="2903">
-       <defaultcontrol>-</defaultcontrol>
-       <controls>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/MusicVisualisation.xml b/addons/skin.touched/4x3Hirez/MusicVisualisation.xml
deleted file mode 100644 (file)
index 71f0342..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-<window id="2006">
-       <defaultcontrol>-</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <controls>
-               <control type="visualisation">
-                       <description>visualisation</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>ScreenWidth</width>
-                       <height>ScreenHeight</height>
-               </control>
-               <!-- codec & viz infos -->
-               <control type="group" id="0">
-                       <posx>0</posx>
-                       <posy>50</posy>
-                       <visible>Player.ShowCodec + ![Window.IsVisible(script-XBMC_Lyrics-main.xml) | Window.IsVisible(VisualisationSettings) | Window.IsVisible(VisualisationPresetList)]</visible>
-                       <animation effect="fade" time="200">VisibleChange</animation>
-                       <control type="image">
-                               <description>media info background image</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>1280</width>
-                               <height>105</height>
-                               <colordiffuse>AAFFFFFF</colordiffuse>
-                               <texture>black-back.png</texture>
-                       </control>
-                       <control type="label">
-                               <description>row 1 label</description>
-                               <posx>50</posx>
-                               <posy>10</posy>
-                               <label>-</label>
-                               <align>left</align>
-                               <label>$INFO[musicplayer.Codec,$LOCALIZE[21446]: ,]$INFO[musicplayer.Bitrate, · $LOCALIZE[623]: ,kbps]$INFO[musicplayer.bitspersample, · $LOCALIZE[612]: ,bit]$INFO[musicplayer.Samplerate, · $LOCALIZE[613]: ,kHz]$INFO[musicplayer.Channels, · $LOCALIZE[21444]: ]</label>
-                               <font>font12</font>
-                       </control>
-                       <control type="label">
-                               <description>row 2 label</description>
-                               <posx>50</posx>
-                               <posy>40</posy>
-                               <label>-</label>
-                               <align>left</align>
-                               <label>$INFO[Visualisation.Name] [I][COLOR=orange]($LOCALIZE[20166])[/COLOR][/I] · fps: $INFO[System.FPS]</label>
-                               <font>font12</font>
-                               <visible>Visualisation.Locked</visible>
-                       </control>
-                       <control type="label">
-                               <description>Unlocked row 2 label</description>
-                               <posx>50</posx>
-                               <posy>40</posy>
-                               <label>-</label>
-                               <align>left</align>
-                               <label>$INFO[Visualisation.Name] · fps: $INFO[System.FPS]</label>
-                               <font>font12</font>
-                               <visible>!Visualisation.Locked</visible>
-                       </control>
-                       <control type="label">
-                               <description>row 3 label</description>
-                               <posx>50</posx>
-                               <posy>70</posy>
-                               <label>-</label>
-                               <align>left</align>
-                               <label>$LOCALIZE[13388]: $INFO[Visualisation.Preset]</label>
-                               <font>font12</font>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/MyMusicNav.xml b/addons/skin.touched/4x3Hirez/MyMusicNav.xml
deleted file mode 100644 (file)
index def22a8..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-<window id="502">
-       <defaultcontrol always="true">50</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <views>50,500</views>
-       <onunload>Skin.Reset(MediaSubMenuVisible)</onunload>
-       <controls>
-               <include>CommonBackground</include>
-               <include>FileCountCommons</include>
-               <include>HomeButtonCommons</include>
-               <include>CommonNowPlaying</include>
-               <include>OptionsButtonCommons</include>
-               <control type="label">
-                       <description>Window label</description>
-                       <include>MediaWindowTitleCommons</include>
-                       <label>$LOCALIZE[10516]</label>
-               </control>
-               <control type="group">
-                       <include>Window_OpenClose_Animation_Zoom</include>
-                       <include>CommonRootView</include> <!-- view id = 50 -->
-                       <include>ThumbnailView</include> <!-- view id = 500 -->
-                       <include>ScrollArrowsCommons</include>
-               </control>
-               <include>MediaSubMenu</include>
-               <control type="group">
-                       <visible>Skin.HasSetting(MediaSubMenuVisible)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <control type="button">
-                               <description>Hidden button to close the sort when its focused</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>ScreenWidth</width>
-                               <height>ScreenHeight</height>
-                               <texturenofocus>-</texturenofocus>
-                               <texturefocus>-</texturefocus>
-                               <onclick>Skin.Reset(MediaSubMenuVisible)</onclick>
-                       </control>
-                       <control type="group">
-                               <posx>340r</posx>
-                               <posy>130</posy>
-                               <control type="image">
-                                       <description>Shadow Background</description>
-                                       <posx>-30</posx>
-                                       <posy>-30</posy>
-                                       <width>380</width>
-                                       <height>500</height>
-                                       <texture border="30">ShadowBorder.png</texture>
-                               </control>
-                               <control type="button">
-                                       <description>Panel Background image</description>
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>320</width>
-                                       <height>440</height>
-                                       <texturefocus border="5">SubBack.png</texturefocus>
-                                       <texturenofocus border="5">SubBack.png</texturenofocus>
-                                       <onclick>-</onclick>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Forground image</description>
-                                       <posx>10</posx>
-                                       <posy>10</posy>
-                                       <width>300</width>
-                                       <height>420</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Arrow image</description>
-                                       <posx>270</posx>
-                                       <posy>-34</posy>
-                                       <width>40</width>
-                                       <height>40</height>
-                                       <texture>arrow-big-up.png</texture>
-                               </control>
-                               <control type="grouplist">
-                                       <posx>11</posx>
-                                       <posy>10</posy>
-                                       <width>298</width>
-                                       <height>420</height>
-                                       <onleft>9000</onleft>
-                                       <onright>50</onright>
-                                       <onup>9000</onup>
-                                       <ondown>9000</ondown>
-                                       <itemgap>0</itemgap>
-                                       <control type="button" id="3">
-                                               <description>Sort by button</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>103</label>
-                                       </control>
-                                       <control type="togglebutton" id="4">
-                                               <description>Sort asc</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <alttexturefocus>button-focus2.png</alttexturefocus>
-                                               <alttexturenofocus>button-nofocus.png</alttexturenofocus>
-                                               <label>31051</label>
-                                               <altlabel>31050</altlabel>
-                                               <usealttexture>Container.SortDirection(Ascending)</usealttexture>
-                                       </control>
-                                       <control type="radiobutton" id="99">
-                                               <description>Library button</description>
-                                               <label>$LOCALIZE[29800]</label>
-                                               <onclick>Skin.Reset(MediaSubMenuVisible)</onclick>
-                                               <onclick>ReplaceWindow(MusicFiles)</onclick>
-                                               <selected>Window.IsVisible(MusicLibrary)</selected>
-                                               <include>ButtonCommonValues2</include>
-                                       </control>
-                                       <control type="button" id="8">
-                                               <description>Search</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>137</label>
-                                       </control>
-                                       <control type="radiobutton" id="16">
-                                               <description>PartyMode</description>
-                                               <label>589</label>
-                                               <include>ButtonCommonValues2</include>
-                                               <onclick>Skin.Reset(MediaSubMenuVisible)</onclick>
-                                       </control>
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>100</posy>
-                                               <width>298</width>
-                                               <height>10</height>
-                                               <texture>shelf_shadow.png</texture>
-                                       </control>
-                               </control>
-                       </control>
-               </control>
-               <include>ScrollOffsetLabel</include>
-               <include>BehindDialogFadeOut</include>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/MyMusicPlaylist.xml b/addons/skin.touched/4x3Hirez/MyMusicPlaylist.xml
deleted file mode 100644 (file)
index fb93f72..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-<window id="500">
-       <defaultcontrol always="true">50</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <views>50,500</views>
-       <onunload>Skin.Reset(MediaSubMenuVisible)</onunload>
-       <controls>
-               <include>CommonBackground</include>
-               <include>FileCountCommons</include>
-               <include>HomeButtonCommons</include>
-               <include>CommonNowPlaying</include>
-               <include>OptionsButtonCommons</include>
-               <control type="label">
-                       <description>Window label</description>
-                       <include>MediaWindowTitleCommons</include>
-                       <label>$LOCALIZE[10517]</label>
-               </control>
-               <control type="group">
-                       <include>Window_OpenClose_Animation_Zoom</include>
-                       <include>CommonRootView</include> <!-- view id = 50 -->
-                       <include>ThumbnailView</include> <!-- view id = 500 -->
-               </control>
-               <control type="panel" id="9002">
-                       <visible>!Window.IsActive(PlayerControls)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <include>SubMenuCommonLayout</include>
-                       <content>
-                               <item>
-                                       <label>31200</label>
-                                       <onclick>ParentDir</onclick>
-                                       <icon>icon_back.png</icon>
-                               </item>
-                       </content>
-               </control>
-               <control type="group">
-                       <visible>Skin.HasSetting(MediaSubMenuVisible)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <control type="button">
-                               <description>Hidden button to close the sort when its focused</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>ScreenWidth</width>
-                               <height>ScreenHeight</height>
-                               <texturenofocus>-</texturenofocus>
-                               <texturefocus>-</texturefocus>
-                               <onclick>Skin.Reset(MediaSubMenuVisible)</onclick>
-                       </control>
-                       <control type="group">
-                               <posx>340r</posx>
-                               <posy>130</posy>
-                               <control type="image">
-                                       <description>Shadow Background</description>
-                                       <posx>-30</posx>
-                                       <posy>-30</posy>
-                                       <width>380</width>
-                                       <height>500</height>
-                                       <texture border="30">ShadowBorder.png</texture>
-                               </control>
-                               <control type="button">
-                                       <description>Panel Background image</description>
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>320</width>
-                                       <height>440</height>
-                                       <texturefocus border="5">SubBack.png</texturefocus>
-                                       <texturenofocus border="5">SubBack.png</texturenofocus>
-                                       <onclick>-</onclick>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Forground image</description>
-                                       <posx>10</posx>
-                                       <posy>10</posy>
-                                       <width>300</width>
-                                       <height>420</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Arrow image</description>
-                                       <posx>270</posx>
-                                       <posy>-34</posy>
-                                       <width>40</width>
-                                       <height>40</height>
-                                       <texture>arrow-big-up.png</texture>
-                               </control>
-                               <control type="grouplist">
-                                       <posx>11</posx>
-                                       <posy>10</posy>
-                                       <width>298</width>
-                                       <height>420</height>
-                                       <onleft>9000</onleft>
-                                       <onright>50</onright>
-                                       <onup>9000</onup>
-                                       <ondown>9000</ondown>
-                                       <itemgap>0</itemgap>
-                                       <control type="radiobutton" id="20">
-                                               <description>Shuffle button</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>191</label>
-                                       </control>
-                                       <control type="button" id="26">
-                                               <description>Repeat button</description>
-                                               <textwidth>235</textwidth>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>-</label>
-                                       </control>
-                                       <control type="button" id="21">
-                                               <description>Save button</description>
-                                               <label>190</label>
-                                               <textwidth>235</textwidth>
-                                               <include>ButtonCommonValues2</include>
-                                       </control>
-                                       <control type="button" id="22">
-                                               <description>Clear button</description>
-                                               <label>192</label>
-                                               <textwidth>235</textwidth>
-                                               <include>ButtonCommonValues2</include>
-                                       </control>
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>100</posy>
-                                               <width>298</width>
-                                               <height>10</height>
-                                               <texture>shelf_shadow.png</texture>
-                                       </control>
-                               </control>
-                       </control>
-               </control>
-               <include>BehindDialogFadeOut</include>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/MyMusicPlaylistEditor.xml b/addons/skin.touched/4x3Hirez/MyMusicPlaylistEditor.xml
deleted file mode 100644 (file)
index 1cf29b0..0000000
+++ /dev/null
@@ -1,395 +0,0 @@
-<window id="503">
-       <defaultcontrol allways="true">6</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <onunload>Skin.Reset(MediaSubMenuVisible)</onunload>
-       <controls>
-               <include>CommonBackground</include>
-               <include>HomeButtonCommons</include>
-               <include>CommonNowPlaying</include>
-               <include>OptionsButtonCommons</include>
-               <control type="label">
-                       <description>Window label</description>
-                       <include>MediaWindowTitleCommons</include>
-                       <label>$LOCALIZE[10503]</label>
-               </control>
-               <control type="group">
-                       <posx>40</posx>
-                       <posy>130</posy>
-                       <include>Window_OpenClose_Animation_Zoom</include>
-                       <control type="label">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>590</width>
-                               <height>30</height>
-                               <font>font13_title</font>
-                               <textcolor>white</textcolor>
-                               <scroll>true</scroll>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <label>31058</label>
-                       </control>
-                       <control type="label">
-                               <description>number of files/pages in left list text label</description>
-                               <posx>0</posx>
-                               <posy>710</posy>
-                               <width>590</width>
-                               <font>font13</font>
-                               <align>left</align>
-                               <scroll>true</scroll>
-                               <textcolor>grey2</textcolor>
-                               <shadowcolor>black</shadowcolor>
-                               <label>($INFO[Container(50).NumItems]) $LOCALIZE[31025] - $LOCALIZE[31024] ($INFO[Container(50).CurrentPage]/$INFO[Container(50).NumPages])</label>
-                       </control>
-                       <control type="panel" id="50">
-                               <posx>0</posx>
-                               <posy>40</posy>
-                               <width>590</width>
-                               <height>660</height>
-                               <onleft>100</onleft>
-                               <onright>100</onright>
-                               <onup>50</onup>
-                               <ondown>50</ondown>
-                               <viewtype label="">list</viewtype>
-                               <pagecontrol>30</pagecontrol>
-                               <scrolltime>200</scrolltime>
-                               <itemlayout height="60" width="590">
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>590</width>
-                                               <height>60</height>
-                                               <texture border="5">ListNF.png</texture>
-                                       </control>
-                                       <control type="image">
-                                               <posx>10</posx>
-                                               <posy>5</posy>
-                                               <width>50</width>
-                                               <height>50</height>
-                                               <texture background="true">$INFO[ListItem.Icon]</texture>
-                                       </control>
-                                       <control type="label">
-                                               <posx>75</posx>
-                                               <posy>0</posy>
-                                               <width>410</width>
-                                               <height>60</height>
-                                               <font>font13</font>
-                                               <textcolor>white</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[ListItem.Label]</label>
-                                       </control>
-                                       <control type="label">
-                                               <posx>580</posx>
-                                               <posy>2</posy>
-                                               <width>400</width>
-                                               <height>30</height>
-                                               <font>font13</font>
-                                               <textcolor>grey2</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>right</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[ListItem.Label2]</label>
-                                       </control>
-                                       <control type="image">
-                                               <description>Rating value</description>
-                                               <posx>480</posx>
-                                               <posy>30</posy>
-                                               <width>100</width>
-                                               <height>25</height>
-                                               <aspectratio align="left">keep</aspectratio>
-                                               <texture fallback="light/left_rating/rating0.png">$INFO[ListItem.StarRating,light/left_rating/]</texture>
-                                       </control>
-                               </itemlayout>
-                               <focusedlayout height="60" width="590">
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>590</width>
-                                               <height>60</height>
-                                               <texture border="5">ListFO.png</texture>
-                                               <include>VisibleFadeEffect</include>
-                                       </control>
-                                       <control type="image">
-                                               <posx>10</posx>
-                                               <posy>5</posy>
-                                               <width>50</width>
-                                               <height>50</height>
-                                               <texture background="true">$INFO[ListItem.Icon]</texture>
-                                       </control>
-                                       <control type="label">
-                                               <posx>75</posx>
-                                               <posy>0</posy>
-                                               <width>410</width>
-                                               <height>60</height>
-                                               <font>font13</font>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[ListItem.Label]</label>
-                                       </control>
-                                       <control type="label">
-                                               <posx>580</posx>
-                                               <posy>2</posy>
-                                               <width>400</width>
-                                               <height>30</height>
-                                               <font>font13</font>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>right</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[ListItem.Label2]</label>
-                                       </control>
-                                       <control type="image">
-                                               <description>Rating value</description>
-                                               <posx>480</posx>
-                                               <posy>30</posy>
-                                               <width>100</width>
-                                               <height>25</height>
-                                               <aspectratio align="left">keep</aspectratio>
-                                               <texture fallback="dark/left_rating/rating0.png">$INFO[ListItem.StarRating,dark/left_rating/]</texture>
-                                       </control>
-                               </focusedlayout>
-                       </control>
-               </control>
-               <control type="group">
-                       <include>Window_OpenClose_Animation_Zoom</include>
-                       <posx>650</posx>
-                       <posy>130</posy>
-                       <control type="label">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>590</width>
-                               <height>30</height>
-                               <font>font13_title</font>
-                               <textcolor>white</textcolor>
-                               <scroll>true</scroll>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <label>31059</label>
-                       </control>
-                       <control type="label">
-                               <description>Page Count Label</description>
-                               <posx>590</posx>
-                               <posy>710</posy>
-                               <width>590</width>
-                               <font>font13</font>
-                               <align>right</align>
-                               <scroll>true</scroll>
-                               <textcolor>grey2</textcolor>
-                               <shadowcolor>black</shadowcolor>
-                               <label>($INFO[Container(100).NumItems]) $LOCALIZE[31025] - $LOCALIZE[31024] ($INFO[Container(100).CurrentPage]/$INFO[Container(100).NumPages])</label>
-                       </control>
-                       <control type="panel" id="100">
-                               <posx>0</posx>
-                               <posy>40</posy>
-                               <width>590</width>
-                               <height>660</height>
-                               <onleft>50</onleft>
-                               <onright>50</onright>
-                               <onup>100</onup>
-                               <ondown>100</ondown>
-                               <viewtype label="">list</viewtype>
-                               <pagecontrol>30</pagecontrol>
-                               <scrolltime>200</scrolltime>
-                               <itemlayout height="60" width="590">
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>590</width>
-                                               <height>60</height>
-                                               <texture border="5">ListNF.png</texture>
-                                       </control>
-                                       <control type="image">
-                                               <posx>10</posx>
-                                               <posy>5</posy>
-                                               <width>50</width>
-                                               <height>50</height>
-                                               <texture background="true">$INFO[ListItem.Icon]</texture>
-                                       </control>
-                                       <control type="label">
-                                               <posx>75</posx>
-                                               <posy>0</posy>
-                                               <width>410</width>
-                                               <height>60</height>
-                                               <font>font13</font>
-                                               <textcolor>white</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[ListItem.Label]</label>
-                                       </control>
-                                       <control type="label">
-                                               <posx>580</posx>
-                                               <posy>2</posy>
-                                               <width>400</width>
-                                               <height>30</height>
-                                               <font>font13</font>
-                                               <textcolor>grey2</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>right</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[ListItem.Label2]</label>
-                                       </control>
-                                       <control type="image">
-                                               <description>Rating value</description>
-                                               <posx>480</posx>
-                                               <posy>30</posy>
-                                               <width>100</width>
-                                               <height>25</height>
-                                               <aspectratio align="left">keep</aspectratio>
-                                               <texture fallback="light/left_rating/rating0.png">$INFO[ListItem.StarRating,light/left_rating/]</texture>
-                                       </control>
-                               </itemlayout>
-                               <focusedlayout height="60" width="590">
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>590</width>
-                                               <height>60</height>
-                                               <texture border="5">ListFO.png</texture>
-                                               <include>VisibleFadeEffect</include>
-                                       </control>
-                                       <control type="image">
-                                               <posx>10</posx>
-                                               <posy>5</posy>
-                                               <width>50</width>
-                                               <height>50</height>
-                                               <texture background="true">$INFO[ListItem.Icon]</texture>
-                                       </control>
-                                       <control type="label">
-                                               <posx>75</posx>
-                                               <posy>0</posy>
-                                               <width>410</width>
-                                               <height>60</height>
-                                               <font>font13</font>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[ListItem.Label]</label>
-                                       </control>
-                                       <control type="label">
-                                               <posx>580</posx>
-                                               <posy>2</posy>
-                                               <width>400</width>
-                                               <height>30</height>
-                                               <font>font13</font>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>right</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[ListItem.Label2]</label>
-                                       </control>
-                                       <control type="image">
-                                               <description>Rating value</description>
-                                               <posx>480</posx>
-                                               <posy>30</posy>
-                                               <width>100</width>
-                                               <height>25</height>
-                                               <aspectratio align="left">keep</aspectratio>
-                                               <texture fallback="dark/left_rating/rating0.png">$INFO[ListItem.StarRating,dark/left_rating/]</texture>
-                                       </control>
-                               </focusedlayout>
-                       </control>
-               </control>
-               <control type="panel" id="9002">
-                       <visible>!Window.IsActive(PlayerControls)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <include>SubMenuCommonLayout</include>
-                       <content>
-                               <item>
-                                       <label>31200</label>
-                                       <onclick>ParentDir</onclick>
-                                       <icon>icon_back.png</icon>
-                               </item>
-                       </content>
-               </control>
-               <control type="group">
-                       <visible>Skin.HasSetting(MediaSubMenuVisible)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <control type="button">
-                               <description>Hidden button to close the sort when its focused</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>ScreenWidth</width>
-                               <height>ScreenHeight</height>
-                               <texturenofocus>-</texturenofocus>
-                               <texturefocus>-</texturefocus>
-                               <onclick>Skin.Reset(MediaSubMenuVisible)</onclick>
-                       </control>
-                       <control type="group">
-                               <posx>340r</posx>
-                               <posy>130</posy>
-                               <control type="image">
-                                       <description>Shadow Background</description>
-                                       <posx>-30</posx>
-                                       <posy>-30</posy>
-                                       <width>380</width>
-                                       <height>500</height>
-                                       <texture border="30">ShadowBorder.png</texture>
-                               </control>
-                               <control type="button">
-                                       <description>Panel Background image</description>
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>320</width>
-                                       <height>440</height>
-                                       <texturefocus border="5">SubBack.png</texturefocus>
-                                       <texturenofocus border="5">SubBack.png</texturenofocus>
-                                       <onclick>-</onclick>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Forground image</description>
-                                       <posx>10</posx>
-                                       <posy>10</posy>
-                                       <width>300</width>
-                                       <height>420</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Arrow image</description>
-                                       <posx>270</posx>
-                                       <posy>-34</posy>
-                                       <width>40</width>
-                                       <height>40</height>
-                                       <texture>arrow-big-up.png</texture>
-                               </control>
-                               <control type="grouplist">
-                                       <posx>11</posx>
-                                       <posy>10</posy>
-                                       <width>298</width>
-                                       <height>420</height>
-                                       <onleft>9000</onleft>
-                                       <onright>50</onright>
-                                       <onup>9000</onup>
-                                       <ondown>9000</ondown>
-                                       <itemgap>0</itemgap>
-                                       <control type="button" id="6">
-                                               <label>31055</label>
-                                               <include>ButtonCommonValues2</include>
-                                       </control>
-                                       <control type="button" id="7">
-                                               <description>Save Button</description>
-                                               <label>31056</label>
-                                               <include>ButtonCommonValues2</include>
-                                               <onleft>50</onleft>
-                                       </control>
-                                       <control type="button" id="8">
-                                               <description>Clear button</description>
-                                               <label>31057</label>
-                                               <include>ButtonCommonValues2</include>
-                                       </control>
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>100</posy>
-                                               <width>298</width>
-                                               <height>10</height>
-                                               <texture>shelf_shadow.png</texture>
-                                       </control>
-                               </control>
-                       </control>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/MyMusicSongs.xml b/addons/skin.touched/4x3Hirez/MyMusicSongs.xml
deleted file mode 100644 (file)
index 8ee3a06..0000000
+++ /dev/null
@@ -1,119 +0,0 @@
-<window id="501">
-       <defaultcontrol always="true">50</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <views>50,500</views>
-       <onunload>Skin.Reset(MediaSubMenuVisible)</onunload>
-       <controls>
-               <include>CommonBackground</include>
-               <include>FileCountCommons</include>
-               <include>HomeButtonCommons</include>
-               <include>CommonNowPlaying</include>
-               <include>OptionsButtonCommons</include>
-               <control type="label">
-                       <description>Window label</description>
-                       <include>MediaWindowTitleCommons</include>
-                       <label>$LOCALIZE[31012]</label>
-               </control>
-               <control type="group">
-                       <include>Window_OpenClose_Animation_Zoom</include>
-                       <include>CommonRootView</include> <!-- view id = 50 -->
-                       <include>ThumbnailView</include> <!-- view id = 500 -->
-                       <include>ScrollArrowsCommons</include>
-               </control>
-               <include>MediaSubMenu</include>
-               <control type="group">
-                       <visible>Skin.HasSetting(MediaSubMenuVisible)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <control type="button">
-                               <description>Hidden button to close the sort when its focused</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>ScreenWidth</width>
-                               <height>ScreenHeight</height>
-                               <texturenofocus>-</texturenofocus>
-                               <texturefocus>-</texturefocus>
-                               <onclick>Skin.Reset(MediaSubMenuVisible)</onclick>
-                       </control>
-                       <control type="group">
-                               <posx>340r</posx>
-                               <posy>130</posy>
-                               <control type="image">
-                                       <description>Shadow Background</description>
-                                       <posx>-30</posx>
-                                       <posy>-30</posy>
-                                       <width>380</width>
-                                       <height>500</height>
-                                       <texture border="30">ShadowBorder.png</texture>
-                               </control>
-                               <control type="button">
-                                       <description>Panel Background image</description>
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>320</width>
-                                       <height>440</height>
-                                       <texturefocus border="5">SubBack.png</texturefocus>
-                                       <texturenofocus border="5">SubBack.png</texturenofocus>
-                                       <onclick>-</onclick>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Forground image</description>
-                                       <posx>10</posx>
-                                       <posy>10</posy>
-                                       <width>300</width>
-                                       <height>420</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Arrow image</description>
-                                       <posx>270</posx>
-                                       <posy>-34</posy>
-                                       <width>40</width>
-                                       <height>40</height>
-                                       <texture>arrow-big-up.png</texture>
-                               </control>
-                               <control type="grouplist">
-                                       <posx>11</posx>
-                                       <posy>10</posy>
-                                       <width>298</width>
-                                       <height>420</height>
-                                       <onleft>9000</onleft>
-                                       <onright>50</onright>
-                                       <onup>9000</onup>
-                                       <ondown>9000</ondown>
-                                       <itemgap>0</itemgap>
-                                       <control type="button" id="3">
-                                               <description>Sort by button</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>103</label>
-                                       </control>
-                                       <control type="togglebutton" id="4">
-                                               <description>Sort asc</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <alttexturefocus>button-focus2.png</alttexturefocus>
-                                               <alttexturenofocus>button-nofocus.png</alttexturenofocus>
-                                               <label>31051</label>
-                                               <altlabel>31050</altlabel>
-                                               <usealttexture>Container.SortDirection(Ascending)</usealttexture>
-                                       </control>
-                                       <control type="radiobutton" id="99">
-                                               <description>Library button</description>
-                                               <label>$LOCALIZE[29800]</label>
-                                               <onclick>Skin.Reset(MediaSubMenuVisible)</onclick>
-                                               <onclick>ReplaceWindow(MusicLibrary)</onclick>
-                                               <selected>Window.IsVisible(MusicLibrary)</selected>
-                                               <include>ButtonCommonValues2</include>
-                                       </control>
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>100</posy>
-                                               <width>298</width>
-                                               <height>10</height>
-                                               <texture>shelf_shadow.png</texture>
-                                       </control>
-                               </control>
-                       </control>
-               </control>
-               <include>ScrollOffsetLabel</include>
-               <include>BehindDialogFadeOut</include>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/MyPics.xml b/addons/skin.touched/4x3Hirez/MyPics.xml
deleted file mode 100644 (file)
index 2a97fd9..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-<window id="2">
-       <defaultcontrol always="true">50</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <views>50,500</views>
-       <onunload>Skin.Reset(MediaSubMenuVisible)</onunload>
-       <controls>
-               <include>CommonBackground</include>
-               <include>FileCountCommons</include>
-               <include>HomeButtonCommons</include>
-               <include>CommonNowPlaying</include>
-               <include>OptionsButtonCommons</include>
-               <control type="label">
-                       <description>Window label</description>
-                       <include>MediaWindowTitleCommons</include>
-                       <label>$LOCALIZE[1]</label>
-               </control>
-               <control type="group">
-                       <include>Window_OpenClose_Animation_Zoom</include>
-                       <include>CommonRootView</include> <!-- view id = 50 -->
-                       <include>ThumbnailView</include> <!-- view id = 500 -->
-                       <include>ScrollArrowsCommons</include>
-               </control>
-               <include>MediaSubMenu</include>
-               <control type="group">
-                       <visible>Skin.HasSetting(MediaSubMenuVisible)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <control type="button">
-                               <description>Hidden button to close the sort when its focused</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>ScreenWidth</width>
-                               <height>ScreenHeight</height>
-                               <texturenofocus>-</texturenofocus>
-                               <texturefocus>-</texturefocus>
-                               <onclick>Skin.Reset(MediaSubMenuVisible)</onclick>
-                       </control>
-                       <control type="group">
-                               <posx>340r</posx>
-                               <posy>130</posy>
-                               <control type="image">
-                                       <description>Shadow Background</description>
-                                       <posx>-30</posx>
-                                       <posy>-30</posy>
-                                       <width>380</width>
-                                       <height>500</height>
-                                       <texture border="30">ShadowBorder.png</texture>
-                               </control>
-                               <control type="button">
-                                       <description>Panel Background image</description>
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>320</width>
-                                       <height>440</height>
-                                       <texturefocus border="5">SubBack.png</texturefocus>
-                                       <texturenofocus border="5">SubBack.png</texturenofocus>
-                                       <onclick>-</onclick>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Forground image</description>
-                                       <posx>10</posx>
-                                       <posy>10</posy>
-                                       <width>300</width>
-                                       <height>420</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Arrow image</description>
-                                       <posx>270</posx>
-                                       <posy>-34</posy>
-                                       <width>40</width>
-                                       <height>40</height>
-                                       <texture>arrow-big-up.png</texture>
-                               </control>
-                               <control type="grouplist">
-                                       <posx>11</posx>
-                                       <posy>10</posy>
-                                       <width>298</width>
-                                       <height>420</height>
-                                       <onleft>9000</onleft>
-                                       <onright>50</onright>
-                                       <onup>9000</onup>
-                                       <ondown>9000</ondown>
-                                       <itemgap>0</itemgap>
-                                       <control type="button" id="3">
-                                               <description>Sort by button</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>103</label>
-                                       </control>
-                                       <control type="togglebutton" id="4">
-                                               <description>Sort asc</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <alttexturefocus>button-focus2.png</alttexturefocus>
-                                               <alttexturenofocus>button-nofocus.png</alttexturenofocus>
-                                               <label>31051</label>
-                                               <altlabel>31050</altlabel>
-                                               <usealttexture>Container.SortDirection(Ascending)</usealttexture>
-                                       </control>
-                                       <control type="button" id="6">
-                                               <description>Slideshow</description>
-                                               <textwidth>235</textwidth>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>108</label>
-                                               <onclick>Skin.Reset(MediaSubMenuVisible)</onclick>
-                                       </control>
-                                       <control type="button" id="7">
-                                               <description>Recersive Slideshow</description>
-                                               <textwidth>235</textwidth>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>361</label>
-                                               <onclick>Skin.Reset(MediaSubMenuVisible)</onclick>
-                                       </control>
-                                       <control type="radiobutton" id="9">
-                                               <description>Randomize Toggle</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>13319</label>
-                                       </control>
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>100</posy>
-                                               <width>298</width>
-                                               <height>10</height>
-                                               <texture>shelf_shadow.png</texture>
-                                       </control>
-                               </control>
-                       </control>
-               </control>
-               <include>ScrollOffsetLabel</include>
-               <include>BehindDialogFadeOut</include>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/MyPrograms.xml b/addons/skin.touched/4x3Hirez/MyPrograms.xml
deleted file mode 100644 (file)
index c8a87cb..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-<window id="1">
-       <defaultcontrol always="true">50</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <views>50,500</views>
-       <onunload>Skin.Reset(MediaSubMenuVisible)</onunload>
-       <controls>
-               <include>CommonBackground</include>
-               <include>FileCountCommons</include>
-               <include>HomeButtonCommons</include>
-               <include>CommonNowPlaying</include>
-               <include>OptionsButtonCommons</include>
-               <control type="label">
-                       <description>Window label</description>
-                       <include>MediaWindowTitleCommons</include>
-                       <label>$LOCALIZE[0]</label>
-               </control>
-               <control type="group">
-                       <include>Window_OpenClose_Animation_Zoom</include>
-                       <include>CommonRootView</include> <!-- view id = 50 -->
-                       <include>ThumbnailView</include> <!-- view id = 500 -->
-                       <include>ScrollArrowsCommons</include>
-               </control>
-               <include>MediaSubMenu</include>
-               <control type="group">
-                       <visible>Skin.HasSetting(MediaSubMenuVisible)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <control type="button">
-                               <description>Hidden button to close the sort when its focused</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>ScreenWidth</width>
-                               <height>ScreenHeight</height>
-                               <texturenofocus>-</texturenofocus>
-                               <texturefocus>-</texturefocus>
-                               <onclick>Skin.Reset(MediaSubMenuVisible)</onclick>
-                       </control>
-                       <control type="group">
-                               <posx>340r</posx>
-                               <posy>130</posy>
-                               <control type="image">
-                                       <description>Shadow Background</description>
-                                       <posx>-30</posx>
-                                       <posy>-30</posy>
-                                       <width>380</width>
-                                       <height>500</height>
-                                       <texture border="30">ShadowBorder.png</texture>
-                               </control>
-                               <control type="button">
-                                       <description>Panel Background image</description>
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>320</width>
-                                       <height>440</height>
-                                       <texturefocus border="5">SubBack.png</texturefocus>
-                                       <texturenofocus border="5">SubBack.png</texturenofocus>
-                                       <onclick>-</onclick>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Forground image</description>
-                                       <posx>10</posx>
-                                       <posy>10</posy>
-                                       <width>300</width>
-                                       <height>420</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Arrow image</description>
-                                       <posx>270</posx>
-                                       <posy>-34</posy>
-                                       <width>40</width>
-                                       <height>40</height>
-                                       <texture>arrow-big-up.png</texture>
-                               </control>
-                               <control type="grouplist">
-                                       <posx>11</posx>
-                                       <posy>10</posy>
-                                       <width>298</width>
-                                       <height>420</height>
-                                       <onleft>9000</onleft>
-                                       <onright>50</onright>
-                                       <onup>9000</onup>
-                                       <ondown>9000</ondown>
-                                       <itemgap>0</itemgap>
-                                       <control type="button" id="3">
-                                               <description>Sort by button</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>103</label>
-                                       </control>
-                                       <control type="togglebutton" id="4">
-                                               <description>Sort asc</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <alttexturefocus>button-focus2.png</alttexturefocus>
-                                               <alttexturenofocus>button-nofocus.png</alttexturenofocus>
-                                               <label>31051</label>
-                                               <altlabel>31050</altlabel>
-                                               <usealttexture>Container.SortDirection(Ascending)</usealttexture>
-                                       </control>
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>100</posy>
-                                               <width>298</width>
-                                               <height>10</height>
-                                               <texture>shelf_shadow.png</texture>
-                                       </control>
-                               </control>
-                       </control>
-               </control>
-               <include>ScrollOffsetLabel</include>
-               <include>BehindDialogFadeOut</include>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/MyVideoNav.xml b/addons/skin.touched/4x3Hirez/MyVideoNav.xml
deleted file mode 100644 (file)
index 05f86f3..0000000
+++ /dev/null
@@ -1,153 +0,0 @@
-<window id="25">
-       <defaultcontrol always="true">50</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <views>50,550,500,502,552</views>
-       <onunload>Skin.Reset(MediaSubMenuVisible)</onunload>
-       <controls>
-               <include>CommonBackground</include>
-               <include>FileCountCommons</include>
-               <include>HomeButtonCommons</include>
-               <include>CommonNowPlaying</include>
-               <include>OptionsButtonCommons</include>
-               <control type="label">
-                       <description>Window label</description>
-                       <include>MediaWindowTitleCommons</include>
-                       <label>$LOCALIZE[3]</label>
-               </control>
-               <control type="group">
-                       <include>Window_OpenClose_Animation_Zoom</include>
-                       <include>CommonRootViewVideo</include> <!-- view id = 50 -->
-                       <include>ThumbnailView</include> <!-- view id = 500 -->
-                       <include>WideIconView</include> <!-- view id = 502 -->
-                       <include>RootViewMetaDataVideo</include> <!-- view id = 550 -->
-                       <include>WideIconMetaDataView</include> <!-- view id = 552 -->
-                       <include>ScrollArrowsCommons</include>
-               </control>
-               <include>MediaSubMenu</include>
-               <control type="group">
-                       <visible>Skin.HasSetting(MediaSubMenuVisible)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <control type="button">
-                               <description>Hidden button to close the sort when its focused</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>ScreenWidth</width>
-                               <height>ScreenHeight</height>
-                               <texturenofocus>-</texturenofocus>
-                               <texturefocus>-</texturefocus>
-                               <onclick>Skin.Reset(MediaSubMenuVisible)</onclick>
-                       </control>
-                       <control type="group">
-                               <posx>340r</posx>
-                               <posy>130</posy>
-                               <control type="image">
-                                       <description>Shadow Background</description>
-                                       <posx>-30</posx>
-                                       <posy>-30</posy>
-                                       <width>380</width>
-                                       <height>500</height>
-                                       <texture border="30">ShadowBorder.png</texture>
-                               </control>
-                               <control type="button">
-                                       <description>Panel Background image</description>
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>320</width>
-                                       <height>440</height>
-                                       <texturefocus border="5">SubBack.png</texturefocus>
-                                       <texturenofocus border="5">SubBack.png</texturenofocus>
-                                       <onclick>-</onclick>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Forground image</description>
-                                       <posx>10</posx>
-                                       <posy>10</posy>
-                                       <width>300</width>
-                                       <height>420</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Arrow image</description>
-                                       <posx>270</posx>
-                                       <posy>-34</posy>
-                                       <width>40</width>
-                                       <height>40</height>
-                                       <texture>arrow-big-up.png</texture>
-                               </control>
-                               <control type="grouplist">
-                                       <posx>11</posx>
-                                       <posy>10</posy>
-                                       <width>298</width>
-                                       <height>420</height>
-                                       <onleft>9000</onleft>
-                                       <onright>50</onright>
-                                       <onup>9000</onup>
-                                       <ondown>9000</ondown>
-                                       <itemgap>0</itemgap>
-                                       <control type="button" id="3">
-                                               <description>Sort by button</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>103</label>
-                                       </control>
-                                       <control type="togglebutton" id="4">
-                                               <description>Sort asc</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <alttexturefocus>button-focus2.png</alttexturefocus>
-                                               <alttexturenofocus>button-nofocus.png</alttexturenofocus>
-                                               <label>31051</label>
-                                               <altlabel>31050</altlabel>
-                                               <usealttexture>Container.SortDirection(Ascending)</usealttexture>
-                                       </control>
-                                       <control type="radiobutton" id="14">
-                                               <description>Watched Toggle</description>
-                                               <textwidth>170</textwidth>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>20367</label>
-                                       </control>
-                                       <control type="button" id="8">
-                                               <description>Search</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>137</label>
-                                               <visible>false</visible>
-                                       </control>
-                                       <control type="radiobutton" id="7">
-                                               <description>Stack Toggle</description>
-                                               <textwidth>170</textwidth>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>346</label>
-                                       </control>
-                                       <control type="radiobutton" id="17">
-                                               <description>Flatten</description>
-                                               <textwidth>170</textwidth>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>20411</label>
-                                       </control>
-                                       <control type="radiobutton" id="16">
-                                               <description>PartyMode</description>
-                                               <label>589</label>
-                                               <include>ButtonCommonValues2</include>
-                                               <visible>Library.HasContent(MusicVideos)</visible>
-                                       </control>
-                                       <control type="radiobutton" id="11">
-                                               <description>Unlock Shares</description>
-                                               <textwidth>170</textwidth>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>20336</label>
-                                               <onclick>xbmc.mastermode</onclick>
-                                               <selected>system.ismaster</selected>
-                                               <visible>false</visible>
-                                       </control>
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>100</posy>
-                                               <width>298</width>
-                                               <height>10</height>
-                                               <texture>shelf_shadow.png</texture>
-                                       </control>
-                               </control>
-                       </control>
-               </control>
-               <include>ScrollOffsetLabel</include>
-               <include>BehindDialogFadeOut</include>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/MyVideoPlaylist.xml b/addons/skin.touched/4x3Hirez/MyVideoPlaylist.xml
deleted file mode 100644 (file)
index 8008bd6..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-<window id="500">
-       <defaultcontrol always="true">50</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <views>50,500</views>
-       <onunload>Skin.Reset(MediaSubMenuVisible)</onunload>
-       <controls>
-               <include>CommonBackground</include>
-               <include>FileCountCommons</include>
-               <include>HomeButtonCommons</include>
-               <include>CommonNowPlaying</include>
-               <include>OptionsButtonCommons</include>
-               <control type="label">
-                       <description>Window label</description>
-                       <include>MediaWindowTitleCommons</include>
-                       <label>$LOCALIZE[10522]</label>
-               </control>
-               <control type="group">
-                       <include>Window_OpenClose_Animation_Zoom</include>
-                       <include>CommonRootView</include> <!-- view id = 50 -->
-                       <include>ThumbnailView</include> <!-- view id = 500 -->
-               </control>
-               <control type="panel" id="9002">
-                       <visible>!Window.IsActive(PlayerControls)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <include>SubMenuCommonLayout</include>
-                       <content>
-                               <item>
-                                       <label>31200</label>
-                                       <onclick>ParentDir</onclick>
-                                       <icon>icon_back.png</icon>
-                               </item>
-                       </content>
-               </control>
-               <control type="group">
-                       <visible>Skin.HasSetting(MediaSubMenuVisible)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <control type="button">
-                               <description>Hidden button to close the sort when its focused</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>ScreenWidth</width>
-                               <height>ScreenHeight</height>
-                               <texturenofocus>-</texturenofocus>
-                               <texturefocus>-</texturefocus>
-                               <onclick>Skin.Reset(MediaSubMenuVisible)</onclick>
-                       </control>
-                       <control type="group">
-                               <posx>340r</posx>
-                               <posy>130</posy>
-                               <control type="image">
-                                       <description>Shadow Background</description>
-                                       <posx>-30</posx>
-                                       <posy>-30</posy>
-                                       <width>380</width>
-                                       <height>500</height>
-                                       <texture border="30">ShadowBorder.png</texture>
-                               </control>
-                               <control type="button">
-                                       <description>Panel Background image</description>
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>320</width>
-                                       <height>440</height>
-                                       <texturefocus border="5">SubBack.png</texturefocus>
-                                       <texturenofocus border="5">SubBack.png</texturenofocus>
-                                       <onclick>-</onclick>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Forground image</description>
-                                       <posx>10</posx>
-                                       <posy>10</posy>
-                                       <width>300</width>
-                                       <height>420</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Arrow image</description>
-                                       <posx>270</posx>
-                                       <posy>-34</posy>
-                                       <width>40</width>
-                                       <height>40</height>
-                                       <texture>arrow-big-up.png</texture>
-                               </control>
-                               <control type="grouplist">
-                                       <posx>11</posx>
-                                       <posy>10</posy>
-                                       <width>298</width>
-                                       <height>420</height>
-                                       <onleft>9000</onleft>
-                                       <onright>50</onright>
-                                       <onup>9000</onup>
-                                       <ondown>9000</ondown>
-                                       <itemgap>0</itemgap>
-                                       <control type="radiobutton" id="20">
-                                               <description>Shuffle button</description>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>191</label>
-                                       </control>
-                                       <control type="button" id="26">
-                                               <description>Repeat button</description>
-                                               <textwidth>235</textwidth>
-                                               <include>ButtonCommonValues2</include>
-                                               <label>-</label>
-                                       </control>
-                                       <control type="button" id="21">
-                                               <description>Save button</description>
-                                               <label>190</label>
-                                               <textwidth>235</textwidth>
-                                               <include>ButtonCommonValues2</include>
-                                       </control>
-                                       <control type="button" id="22">
-                                               <description>Clear button</description>
-                                               <label>192</label>
-                                               <textwidth>235</textwidth>
-                                               <include>ButtonCommonValues2</include>
-                                       </control>
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>100</posy>
-                                               <width>298</width>
-                                               <height>10</height>
-                                               <texture>shelf_shadow.png</texture>
-                                       </control>
-                               </control>
-                       </control>
-               </control>
-               <include>BehindDialogFadeOut</include>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/MyWeather.xml b/addons/skin.touched/4x3Hirez/MyWeather.xml
deleted file mode 100644 (file)
index dfba728..0000000
+++ /dev/null
@@ -1,723 +0,0 @@
-<window id="2600">
-       <defaultcontrol always="true">50</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <controls>
-               <include>CommonBackground</include>
-               <include>HomeButtonCommons</include>
-               <include>CommonNowPlaying</include>
-               <include>OptionsButtonCommons</include>
-               <control type="label">
-                       <description>Window label</description>
-                       <include>MediaWindowTitleCommons</include>
-                       <label>$LOCALIZE[8]</label>
-               </control>
-               <control type="button">
-                       <description>Options Button</description>
-                       <posx>64r</posx>
-                       <posy>25</posy>
-                       <width>64</width>
-                       <height>64</height>
-                       <texturenofocus>icon_system.png</texturenofocus>
-                       <texturefocus>icon_system.png</texturefocus>
-                       <onclick>ActivateWindow(MyWeatherSettings)</onclick>
-               </control>
-               <control type="group">
-                       <include>Window_OpenClose_Animation_Zoom</include>
-                       <control type="image">
-                               <description>Shadow Background</description>
-                               <posx>50</posx>
-                               <posy>140</posy>
-                               <width>1180</width>
-                               <height>680</height>
-                               <texture border="30">ShadowBorder.png</texture>
-                               <include>Window_OpenClose_Animation_Zoom</include>
-                       </control>
-                       <control type="group">
-                               <posx>80</posx>
-                               <posy>170</posy>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>500</width>
-                                       <height>620</height>
-                                       <texture border="5">SubBack.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>20</posx>
-                                       <posy>0</posy>
-                                       <width>460</width>
-                                       <height>90</height>
-                                       <aspectratio>stretch</aspectratio>
-                                       <texture>GlassTitleBar.png</texture>
-                               </control>
-                               <control type="label">
-                                       <description>header label</description>
-                                       <posx>20</posx>
-                                       <posy>10</posy>
-                                       <width>460</width>
-                                       <height>30</height>
-                                       <font>font13_title</font>
-                                       <label>31300</label>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>white</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="label">
-                                       <description>weather location label</description>
-                                       <posx>20</posx>
-                                       <posy>60</posy>
-                                       <width>460</width>
-                                       <height>30</height>
-                                       <font>font13_title</font>
-                                       <textcolor>white</textcolor>
-                                       <scroll>false</scroll>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[Weather.Location]</label>
-                               </control>
-                               <control type="label">
-                                       <description>update label</description>
-                                       <posx>20</posx>
-                                       <posy>80</posy>
-                                       <width>460</width>
-                                       <height>35</height>
-                                       <font>font12</font>
-                                       <label>$LOCALIZE[31301] - $INFO[Window.Property(Updated)]</label>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>grey2</textcolor>
-                               </control>
-                               <control type="label">
-                                       <description>current temp Value</description>
-                                       <posx>195</posx>
-                                       <posy>175</posy>
-                                       <width>180</width>
-                                       <height>40</height>
-                                       <font>WeatherTemp</font>
-                                       <align>right</align>
-                                       <aligny>top</aligny>
-                                       <label>$INFO[Window.Property(Current.Temperature)]</label>
-                                       <textcolor>white</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="label">
-                                       <description>current temp Value Units</description>
-                                       <posx>190</posx>
-                                       <posy>185</posy>
-                                       <width>100</width>
-                                       <height>40</height>
-                                       <font>font16caps</font>
-                                       <align>left</align>
-                                       <aligny>top</aligny>
-                                       <label>$INFO[System.TemperatureUnits]</label>
-                                       <textcolor>white</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="image">
-                                       <description>current weather icon</description>
-                                       <posx>230</posx>
-                                       <posy>135</posy>
-                                       <width>230</width>
-                                       <height>230</height>
-                                       <info>Window.Property(Current.ConditionIcon)</info>
-                                       <aspectratio>keep</aspectratio>
-                               </control>
-                               <control type="label">
-                                       <description>current condition label</description>
-                                       <posx>20</posx>
-                                       <posy>340</posy>
-                                       <width>460</width>
-                                       <height>30</height>
-                                       <info>Window.Property(Current.Condition)</info>
-                                       <wrapmultiline>true</wrapmultiline>
-                                       <font>font13</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>white</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="image">
-                                       <posx>20</posx>
-                                       <posy>390</posy>
-                                       <width>460</width>
-                                       <height>4</height>
-                                       <texture>separator.png</texture>
-                               </control>
-                               <control type="label">
-                                       <description>current feels like label</description>
-                                       <posx>170</posx>
-                                       <posy>400</posy>
-                                       <width>170</width>
-                                       <height>35</height>
-                                       <font>font13</font>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$LOCALIZE[402] :</label>
-                                       <textcolor>grey2</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="label">
-                                       <description>current dew label</description>
-                                       <posx>170</posx>
-                                       <posy>430</posy>
-                                       <width>170</width>
-                                       <height>35</height>
-                                       <font>font13</font>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$LOCALIZE[405] :</label>
-                                       <textcolor>grey2</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="label">
-                                       <description>current humidity label</description>
-                                       <posx>170</posx>
-                                       <posy>460</posy>
-                                       <width>170</width>
-                                       <height>35</height>
-                                       <font>font13</font>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$LOCALIZE[406] :</label>
-                                       <textcolor>grey2</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="label">
-                                       <description>current UV Index label</description>
-                                       <posx>170</posx>
-                                       <posy>490</posy>
-                                       <width>170</width>
-                                       <height>35</height>
-                                       <font>font13</font>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$LOCALIZE[403] :</label>
-                                       <textcolor>grey2</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="label">
-                                       <description>current Wind label</description>
-                                       <posx>170</posx>
-                                       <posy>520</posy>
-                                       <width>170</width>
-                                       <height>35</height>
-                                       <font>font13</font>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$LOCALIZE[404] :</label>
-                                       <textcolor>grey2</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="label">
-                                       <description>current feels like Value</description>
-                                       <posx>185</posx>
-                                       <posy>400</posy>
-                                       <width>300</width>
-                                       <height>35</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[Window.Property(Current.FeelsLike)]$INFO[System.TemperatureUnits]</label>
-                                       <textcolor>white</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="label">
-                                       <description>current dew Value</description>
-                                       <posx>185</posx>
-                                       <posy>430</posy>
-                                       <width>300</width>
-                                       <height>35</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[Window.Property(Current.DewPoint)]$INFO[System.TemperatureUnits]</label>
-                                       <textcolor>white</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="label">
-                                       <description>current humidity Value</description>
-                                       <posx>185</posx>
-                                       <posy>460</posy>
-                                       <width>300</width>
-                                       <height>35</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <info>Window.Property(Current.Humidity)</info>
-                                       <textcolor>white</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="label">
-                                       <description>current UV Index Value</description>
-                                       <posx>185</posx>
-                                       <posy>490</posy>
-                                       <width>300</width>
-                                       <height>35</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <info>Window.Property(Current.UVIndex)</info>
-                                       <textcolor>white</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="label">
-                                       <description>current Wind Value</description>
-                                       <posx>185</posx>
-                                       <posy>520</posy>
-                                       <width>300</width>
-                                       <height>35</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <info>Window.Property(Current.Wind)</info>
-                                       <textcolor>white</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                       </control>
-                       <control type="group">
-                               <posx>580</posx>
-                               <posy>170</posy>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>620</width>
-                                       <height>620</height>
-                                       <texture border="5">SubBack.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>20</posx>
-                                       <posy>0</posy>
-                                       <width>580</width>
-                                       <height>90</height>
-                                       <aspectratio>stretch</aspectratio>
-                                       <texture>GlassTitleBar.png</texture>
-                               </control>
-                               <control type="label">
-                                       <description>header label</description>
-                                       <posx>20</posx>
-                                       <posy>10</posy>
-                                       <width>580</width>
-                                       <height>30</height>
-                                       <font>font13_title</font>
-                                       <label>10508</label>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>white</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                               </control>
-                               <control type="group">
-                                       <description>day 0</description>
-                                       <posx>20</posx>
-                                       <posy>60</posy>
-                                       <control type="label">
-                                               <description>Day label</description>
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>460</width>
-                                               <height>35</height>
-                                               <font>font13_title</font>
-                                               <info>Window.Property(Day0.Title)</info>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>white</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                       </control>
-                                       <control type="image">
-                                               <description>day icon</description>
-                                               <posx>450</posx>
-                                               <posy>0</posy>
-                                               <height>120</height>
-                                               <width>120</width>
-                                               <info>Window.Property(Day0.OutlookIcon)</info>
-                                               <aspectratio align="right">keep</aspectratio>
-                                       </control>
-                                       <control type="label">
-                                               <description>high label</description>
-                                               <posx>40</posx>
-                                               <posy>50</posy>
-                                               <height>20</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$LOCALIZE[419] :</label>
-                                               <textcolor>grey2</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                               <visible>Weather.IsFetched</visible>
-                                       </control>
-                                       <control type="label">
-                                               <description>high value</description>
-                                               <posx>110</posx>
-                                               <posy>50</posy>
-                                               <height>20</height>
-                                               <label>$INFO[Window.Property(Day0.HighTemp)]$INFO[System.TemperatureUnits]</label>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>white</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                               <visible>!IsEmpty(Window.Property(Day0.HighTemp))</visible>
-                                       </control>
-                                       <control type="label">
-                                               <description>low label</description>
-                                               <posx>220</posx>
-                                               <posy>50</posy>
-                                               <height>20</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$LOCALIZE[418] :</label>
-                                               <textcolor>grey2</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                               <visible>Weather.IsFetched</visible>
-                                       </control>
-                                       <control type="label">
-                                               <description>low value</description>
-                                               <posx>290</posx>
-                                               <posy>50</posy>
-                                               <height>20</height>
-                                               <label>$INFO[Window.Property(Day0.LowTemp)]$INFO[System.TemperatureUnits]</label>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>white</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                               <visible>!IsEmpty(Window.Property(Day0.LowTemp))</visible>
-                                       </control>
-                                       <control type="label">
-                                               <description>conditions label</description>
-                                               <posx>40</posx>
-                                               <posy>80</posy>
-                                               <width>320</width>
-                                               <height>20</height>
-                                               <info>Window.Property(Day0.Outlook)</info>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>white</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                       </control>
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>120</posy>
-                                               <width>620</width>
-                                               <height>4</height>
-                                               <texture>separator.png</texture>
-                                       </control>
-                               </control>
-                               <control type="group">
-                                       <description>day 1</description>
-                                       <posx>20</posx>
-                                       <posy>190</posy>
-                                       <control type="label">
-                                               <description>Day label</description>
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>460</width>
-                                               <height>35</height>
-                                               <font>font13_title</font>
-                                               <info>Window.Property(Day1.Title)</info>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>white</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                       </control>
-                                       <control type="image">
-                                               <description>day icon</description>
-                                               <posx>450</posx>
-                                               <posy>0</posy>
-                                               <height>120</height>
-                                               <width>120</width>
-                                               <info>Window.Property(Day1.OutlookIcon)</info>
-                                               <aspectratio align="right">keep</aspectratio>
-                                       </control>
-                                       <control type="label">
-                                               <description>high label</description>
-                                               <posx>40</posx>
-                                               <posy>50</posy>
-                                               <height>20</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$LOCALIZE[419] :</label>
-                                               <textcolor>grey2</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                               <visible>Weather.IsFetched</visible>
-                                       </control>
-                                       <control type="label">
-                                               <description>high value</description>
-                                               <posx>110</posx>
-                                               <posy>50</posy>
-                                               <height>20</height>
-                                               <label>$INFO[Window.Property(Day1.HighTemp)]$INFO[System.TemperatureUnits]</label>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>white</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                               <visible>!IsEmpty(Window.Property(Day1.HighTemp))</visible>
-                                       </control>
-                                       <control type="label">
-                                               <description>low label</description>
-                                               <posx>220</posx>
-                                               <posy>50</posy>
-                                               <height>20</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$LOCALIZE[418] :</label>
-                                               <textcolor>grey2</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                               <visible>Weather.IsFetched</visible>
-                                       </control>
-                                       <control type="label">
-                                               <description>low value</description>
-                                               <posx>290</posx>
-                                               <posy>50</posy>
-                                               <height>20</height>
-                                               <label>$INFO[Window.Property(Day1.LowTemp)]$INFO[System.TemperatureUnits]</label>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>white</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                               <visible>!IsEmpty(Window.Property(Day1.LowTemp))</visible>
-                                       </control>
-                                       <control type="label">
-                                               <description>conditions label</description>
-                                               <posx>40</posx>
-                                               <posy>80</posy>
-                                               <width>320</width>
-                                               <height>20</height>
-                                               <info>Window.Property(Day1.Outlook)</info>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>white</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                       </control>
-                                       <control type="image">
-                                               <posx>20</posx>
-                                               <posy>120</posy>
-                                               <width>620</width>
-                                               <height>4</height>
-                                               <texture>separator.png</texture>
-                                       </control>
-                               </control>
-                               <control type="group">
-                                       <description>day 2</description>
-                                       <posx>20</posx>
-                                       <posy>320</posy>
-                                       <control type="label">
-                                               <description>Day label</description>
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>460</width>
-                                               <height>35</height>
-                                               <font>font13_title</font>
-                                               <info>Window.Property(Day2.Title)</info>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>white</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                       </control>
-                                       <control type="image">
-                                               <description>day icon</description>
-                                               <posx>450</posx>
-                                               <posy>0</posy>
-                                               <height>120</height>
-                                               <width>120</width>
-                                               <info>Window.Property(Day2.OutlookIcon)</info>
-                                               <aspectratio align="right">keep</aspectratio>
-                                       </control>
-                                       <control type="label">
-                                               <description>high label</description>
-                                               <posx>40</posx>
-                                               <posy>50</posy>
-                                               <height>20</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$LOCALIZE[419] :</label>
-                                               <textcolor>grey2</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                               <visible>Weather.IsFetched</visible>
-                                       </control>
-                                       <control type="label">
-                                               <description>high value</description>
-                                               <posx>110</posx>
-                                               <posy>50</posy>
-                                               <height>20</height>
-                                               <label>$INFO[Window.Property(Day2.HighTemp)]$INFO[System.TemperatureUnits]</label>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>white</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                               <visible>!IsEmpty(Window.Property(Day2.HighTemp))</visible>
-                                       </control>
-                                       <control type="label">
-                                               <description>low label</description>
-                                               <posx>220</posx>
-                                               <posy>50</posy>
-                                               <height>20</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$LOCALIZE[418] :</label>
-                                               <textcolor>grey2</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                               <visible>Weather.IsFetched</visible>
-                                       </control>
-                                       <control type="label">
-                                               <description>low value</description>
-                                               <posx>290</posx>
-                                               <posy>50</posy>
-                                               <height>20</height>
-                                               <label>$INFO[Window.Property(Day2.LowTemp)]$INFO[System.TemperatureUnits]</label>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>white</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                               <visible>!IsEmpty(Window.Property(Day2.LowTemp))</visible>
-                                       </control>
-                                       <control type="label">
-                                               <description>conditions label</description>
-                                               <posx>40</posx>
-                                               <posy>80</posy>
-                                               <width>320</width>
-                                               <height>20</height>
-                                               <info>Window.Property(Day2.Outlook)</info>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <shadowcolor>black</shadowcolor>
-                                               <textcolor>white</textcolor>
-                                       </control>
-                                       <control type="image">
-                                               <posx>20</posx>
-                                               <posy>120</posy>
-                                               <width>620</width>
-                                               <height>4</height>
-                                               <texture>separator.png</texture>
-                                       </control>
-                               </control>
-                               <control type="group">
-                                       <description>day 3</description>
-                                       <posx>20</posx>
-                                       <posy>450</posy>
-                                       <control type="label">
-                                               <description>Day label</description>
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>460</width>
-                                               <height>35</height>
-                                               <font>font13_title</font>
-                                               <info>Window.Property(Day3.Title)</info>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>white</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                       </control>
-                                       <control type="image">
-                                               <description>day icon</description>
-                                               <posx>450</posx>
-                                               <posy>0</posy>
-                                               <height>120</height>
-                                               <width>120</width>
-                                               <info>Window.Property(Day3.OutlookIcon)</info>
-                                               <aspectratio align="right">keep</aspectratio>
-                                       </control>
-                                       <control type="label">
-                                               <description>high label</description>
-                                               <posx>40</posx>
-                                               <posy>50</posy>
-                                               <height>20</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$LOCALIZE[419] :</label>
-                                               <textcolor>grey2</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                               <visible>Weather.IsFetched</visible>
-                                       </control>
-                                       <control type="label">
-                                               <description>high value</description>
-                                               <posx>110</posx>
-                                               <posy>50</posy>
-                                               <height>20</height>
-                                               <label>$INFO[Window.Property(Day3.HighTemp)]$INFO[System.TemperatureUnits]</label>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>white</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                               <visible>!IsEmpty(Window.Property(Day3.HighTemp))</visible>
-                                       </control>
-                                       <control type="label">
-                                               <description>low label</description>
-                                               <posx>220</posx>
-                                               <posy>50</posy>
-                                               <height>20</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <label>$LOCALIZE[418] :</label>
-                                               <textcolor>grey2</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                               <visible>Weather.IsFetched</visible>
-                                       </control>
-                                       <control type="label">
-                                               <description>low value</description>
-                                               <posx>290</posx>
-                                               <posy>50</posy>
-                                               <height>20</height>
-                                               <label>$INFO[Window.Property(Day3.LowTemp)]$INFO[System.TemperatureUnits]</label>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>white</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                               <visible>!IsEmpty(Window.Property(Day3.LowTemp))</visible>
-                                       </control>
-                                       <control type="label">
-                                               <description>conditions label</description>
-                                               <posx>40</posx>
-                                               <posy>80</posy>
-                                               <width>320</width>
-                                               <height>20</height>
-                                               <info>Window.Property(Day3.Outlook)</info>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>white</textcolor>
-                                               <shadowcolor>black</shadowcolor>
-                                       </control>
-                               </control>
-                       </control>
-               </control>
-               <control type="panel" id="9002">
-                       <visible>!Window.IsActive(PlayerControls)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <include>SubMenuCommonLayout</include>
-                       <content>
-                               <item>
-                                       <label>31200</label>
-                                       <onclick>ParentDir</onclick>
-                                       <icon>icon_back.png</icon>
-                               </item>
-                               <item>
-                                       <label>184</label>
-                                       <onclick>Weather.Refresh</onclick>
-                                       <icon>icon_refresh.png</icon>
-                               </item>
-                               <item>
-                                       <label>31201</label>
-                                       <onclick>Weather.LocationNext</onclick>
-                                       <icon>icon_city.png</icon>
-                               </item>
-                       </content>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/PlayerControls.xml b/addons/skin.touched/4x3Hirez/PlayerControls.xml
deleted file mode 100644 (file)
index 4285f17..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<window type="dialog" id="114">
-       <defaultcontrol></defaultcontrol>
-       <include>dialogeffect</include>
-       <visible>Player.HasMedia + Window.IsActive(PlayerControls) + !Window.IsActive(FullscreenVideo) + !Window.IsActive(Visualisation)</visible>
-       <onunload>Skin.Reset(PlayerControlsSubMenuVisible)</onunload>
-       <coordinates>
-               <system>1</system>
-               <posx>0</posx>
-               <posy>0</posy>
-       </coordinates>
-       <controls>
-               <include>PlayerControlCommons</include>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/Pointer.xml b/addons/skin.touched/4x3Hirez/Pointer.xml
deleted file mode 100644 (file)
index 54bf371..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<window id="105">
-       <defaultcontrol>1</defaultcontrol>
-       <coordinates>
-               <system>1</system>
-               <posx>0</posx>
-               <posy>0</posy>
-       </coordinates>
-       <controls>
-               <control type="image" id="1">
-                       <description>Pointer Image</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>32</width>
-                       <height>32</height>
-                       <texture>pointer-focus.png</texture>
-               </control>
-               <control type="image" id="2">
-                       <description>Pointer Focus Image</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>32</width>
-                       <height>32</height>
-                       <texture>pointer-focus.png</texture>
-               </control>
-               <control type="image" id="3">
-                       <description>Pointer Drag Image</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>32</width>
-                       <height>32</height>
-                       <texture>pointer-focus.png</texture>
-               </control>
-               <control type="image" id="4">
-                       <description>Pointer Click Image</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>32</width>
-                       <height>32</height>
-                       <texture>pointer-focus.png</texture>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/ProfileSettings.xml b/addons/skin.touched/4x3Hirez/ProfileSettings.xml
deleted file mode 100644 (file)
index 7b5435e..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-<window id="130">
-       <defaultcontrol>1</defaultcontrol>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>140</posx>
-               <posy>30</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1000</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="label" id="1">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>910</width>
-                       <label>$INFO[Window.Property(heading)]</label>
-               </control>
-               <control type="group">
-                       <posx>930</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>1000</width>
-                       <height>840</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-               <control type="image" id="2">
-                       <description>profile image</description>
-                       <posx>20</posx>
-                       <posy>80</posy>
-                       <width>250</width>
-                       <height>250</height>
-                       <align>left</align>
-                       <aspectratio>keep</aspectratio>
-                       <texture>unknown-user.png</texture>
-               </control>
-               <control type="label">
-                       <description>profile name label</description>
-                       <posx>300</posx>
-                       <posy>80</posy>
-                       <width>680</width>
-                       <height>25</height>
-                       <align>left</align>
-                       <font>font13_title</font>
-                       <textcolor>black</textcolor>
-                       <label>$LOCALIZE[20093]</label>
-               </control>
-               <control type="label" id="1000">
-                       <description>profile name Value</description>
-                       <posx>300</posx>
-                       <posy>110</posy>
-                       <width>680</width>
-                       <height>25</height>
-                       <align>left</align>
-                       <font>font16</font>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="label">
-                       <description>profile directory label</description>
-                       <posx>300</posx>
-                       <posy>180</posy>
-                       <width>680</width>
-                       <height>25</height>
-                       <align>left</align>
-                       <font>font13_title</font>
-                       <textcolor>black</textcolor>
-                       <label>$LOCALIZE[20070]</label>
-               </control>
-               <control type="label" id="1001">
-                       <description>profile directory Value</description>
-                       <posx>300</posx>
-                       <posy>210</posy>
-                       <width>680</width>
-                       <height>25</height>
-                       <align>left</align>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="grouplist" id="5">
-                       <description>control area</description>
-                       <posx>20</posx>
-                       <posy>350</posy>
-                       <width>960</width>
-                       <height>500</height>
-                       <itemgap>-1</itemgap>
-                       <pagecontrol>60</pagecontrol>
-                       <onleft>28</onleft>
-                       <onright>60</onright>
-                       <onup>28</onup>
-                       <ondown>28</ondown>
-               </control>
-               <control type="button" id="7">
-                       <description>Default Button</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <height>55</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-               </control>
-               <control type="radiobutton" id="8">
-                       <description>Default RadioButton</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <height>55</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-               </control>
-               <control type="spincontrolex" id="9">
-                       <description>Default SpinControlex</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <height>55</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                       <aligny>center</aligny>
-                       <reverse>yes</reverse>
-               </control>
-               <control type="image" id="11">
-                       <description>separator image</description>
-                       <height>5</height>
-                       <texture>separator.png</texture>
-               </control>
-               <control type="grouplist" id="9000">
-                       <posx>20</posx>
-                       <posy>830</posy>
-                       <width>960</width>
-                       <height>50</height>
-                       <itemgap>10</itemgap>
-                       <align>center</align>
-                       <orientation>horizontal</orientation>
-                       <onleft>9000</onleft>
-                       <onright>9000</onright>
-                       <onup>9000</onup>
-                       <ondown>9000</ondown>
-                       <control type="button" id="28">
-                               <description>OK button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>186</label>
-                       </control>
-                       <control type="button" id="29">
-                               <description>Cancel button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>222</label>
-                       </control>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/Settings.xml b/addons/skin.touched/4x3Hirez/Settings.xml
deleted file mode 100644 (file)
index fd9675d..0000000
+++ /dev/null
@@ -1,208 +0,0 @@
-<window id="4">
-       <defaultcontrol always="true">9000</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <controls>
-               <include>CommonBackground</include>
-               <include>HomeButtonCommons</include>
-               <include>CommonNowPlaying</include>
-               <control type="label">
-                       <description>Window label</description>
-                       <include>MediaWindowTitleCommons</include>
-                       <label>$LOCALIZE[5]</label>
-               </control>
-               <control type="panel" id="9002">
-                       <visible>!Window.IsActive(PlayerControls)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <include>SubMenuCommonLayout</include>
-                       <content>
-                               <item>
-                                       <label>31200</label>
-                                       <onclick>PreviousMenu</onclick>
-                                       <icon>icon_back.png</icon>
-                               </item>
-                               <item>
-                                       <label>13200</label>
-                                       <onclick>ActivateWindow(Profiles)</onclick>
-                                       <icon>icon_profile.png</icon>
-                               </item>
-                               <item>
-                                       <label>20077</label>
-                                       <onclick>ActivateWindow(1113)</onclick>
-                                       <icon>icon_skin.png</icon>
-                               </item>
-                               <item>
-                                       <label>130</label>
-                                       <onclick>ActivateWindow(SystemInfo)</onclick>
-                                       <icon>icon_systeminfo.png</icon>
-                               </item>
-                       </content>
-               </control>
-               <control type="panel" id="9000">
-                       <include>Window_OpenClose_Animation_Zoom</include>
-                       <posx>30</posx>
-                       <posy>110</posy>
-                       <width>1220</width>
-                       <height>740</height>
-                       <onleft>9000</onleft>
-                       <onright>9001</onright>
-                       <onup>9000</onup>
-                       <ondown>9000</ondown>
-                       <pagecontrol>-</pagecontrol>
-                       <scrolltime>300</scrolltime>
-                       <itemlayout height="180" width="600">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>620</width>
-                                       <height>200</height>
-                                       <texture border="5">SubBack.png</texture>
-                                       <bordertexture border="30">ShadowBorder.png</bordertexture>
-                                       <bordersize>20</bordersize>
-                               </control>
-                               <control type="image">
-                                       <posx>430</posx>
-                                       <posy>25</posy>
-                                       <width>150</width>
-                                       <height>145</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>40</posx>
-                                       <posy>40</posy>
-                                       <width>360</width>
-                                       <height>20</height>
-                                       <font>font24_title</font>
-                                       <textcolor>white</textcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="textbox">
-                                       <posx>40</posx>
-                                       <posy>70</posy>
-                                       <width>390</width>
-                                       <height>100</height>
-                                       <font>font12</font>
-                                       <textcolor>grey2</textcolor>
-                                       <align>left</align>
-                                       <label>$INFO[ListItem.Label2]</label>
-                               </control>
-                               <control type="image">
-                                       <posx>20</posx>
-                                       <posy>20</posy>
-                                       <width>200</width>
-                                       <height>160</height>
-                                       <texture>GlassOverlay.png</texture>
-                                       <colordiffuse>55FFFFFF</colordiffuse>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="180" width="600">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>620</width>
-                                       <height>200</height>
-                                       <texture border="5">SubBack.png</texture>
-                                       <bordertexture border="30">ShadowBorder.png</bordertexture>
-                                       <bordersize>20</bordersize>
-                               </control>
-                               <control type="image">
-                                       <posx>430</posx>
-                                       <posy>25</posy>
-                                       <width>150</width>
-                                       <height>145</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>40</posx>
-                                       <posy>40</posy>
-                                       <width>360</width>
-                                       <height>20</height>
-                                       <font>font24_title</font>
-                                       <textcolor>white</textcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="textbox">
-                                       <posx>40</posx>
-                                       <posy>70</posy>
-                                       <width>390</width>
-                                       <height>100</height>
-                                       <font>font12</font>
-                                       <textcolor>grey2</textcolor>
-                                       <align>left</align>
-                                       <label>$INFO[ListItem.Label2]</label>
-                               </control>
-                               <control type="image">
-                                       <posx>20</posx>
-                                       <posy>20</posy>
-                                       <width>200</width>
-                                       <height>160</height>
-                                       <texture>GlassOverlay.png</texture>
-                                       <colordiffuse>55FFFFFF</colordiffuse>
-                               </control>
-                       </focusedlayout>
-                       <content>
-                               <item id="1">
-                                       <label>480</label>
-                                       <label2>31400</label2>
-                                       <onclick>ActivateWindow(AppearanceSettings)</onclick>
-                                       <icon>icon_big_appearence.png</icon>
-                               </item>
-                               <item id="2">
-                                       <label>157</label>
-                                       <label2>31401</label2>
-                                       <onclick>ActivateWindow(VideosSettings)</onclick>
-                                       <icon>icon_big_video.png</icon>
-                               </item>
-                               <item id="3">
-                                       <label>2</label>
-                                       <label2>31402</label2>
-                                       <onclick>ActivateWindow(MusicSettings)</onclick>
-                                       <icon>icon_big_music.png</icon>
-                               </item>
-                               <item id="4">
-                                       <label>1</label>
-                                       <label2>31403</label2>
-                                       <onclick>ActivateWindow(PicturesSettings)</onclick>
-                                       <icon>icon_big_pictures.png</icon>
-                               </item>
-                               <item id="5">
-                                       <label>8</label>
-                                       <label2>31404</label2>
-                                       <onclick>ActivateWindow(WeatherSettings)</onclick>
-                                       <icon>icon_big_weather.png</icon>
-                               </item>
-                               <item id="6">
-                                       <label>24001</label>
-                                       <label2>31408</label2>
-                                       <onclick>ActivateWindow(AddonBrowser)</onclick>
-                                       <icon>icon_big_addons.png</icon>
-                               </item>
-                               <item id="7">
-                                       <label>705</label>
-                                       <label2>31405</label2>
-                                       <onclick>ActivateWindow(NetworkSettings)</onclick>
-                                       <icon>icon_big_network.png</icon>
-                               </item>
-                               <item id="8">
-                                       <label>13000</label>
-                                       <label2>31406</label2>
-                                       <onclick>ActivateWindow(SystemSettings)</onclick>
-                                       <icon>icon_big_system.png</icon>
-                               </item>
-                               <item id="9">
-                                       <label>166</label>
-                                       <label2>31407</label2>
-                                       <onclick>ActivateWindow(1111)</onclick>
-                                       <icon>icon_big_skin.png</icon>
-                                       <visible>false</visible>
-                               </item>
-                       </content>
-               </control>
-               <include>BehindDialogFadeOut</include>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/SettingsCategory.xml b/addons/skin.touched/4x3Hirez/SettingsCategory.xml
deleted file mode 100644 (file)
index 054a0ec..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-<window id="12">
-       <defaultcontrol>3</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <controls>
-               <include>CommonBackground</include>
-               <include>HomeButtonCommons</include>
-               <include>CommonNowPlaying</include>
-               <control type="label">
-                       <description>Window label</description>
-                       <include>MediaWindowTitleCommons</include>
-                       <label>$LOCALIZE[5]$INFO[Control.GetLabel(2), - ]</label>
-               </control>
-               <control type="panel" id="9002">
-                       <visible>!Window.IsActive(PlayerControls)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <include>SubMenuCommonLayout</include>
-                       <content>
-                               <item>
-                                       <label>31200</label>
-                                       <onclick>PreviousMenu</onclick>
-                                       <icon>icon_back.png</icon>
-                               </item>
-                       </content>
-               </control>
-               <control type="group">
-                       <include>Window_OpenClose_Animation_Zoom</include>
-                       <posx>50</posx>
-                       <posy>140</posy>
-                       <control type="grouplist" id="3">
-                               <description>button area</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>280</width>
-                               <height>720</height>
-                               <itemgap>-1</itemgap>
-                               <onleft>5</onleft>
-                               <onright>5</onright>
-                               <onup>3</onup>
-                               <ondown>3</ondown>
-                       </control>
-                       <control type="grouplist" id="5">
-                               <description>control area</description>
-                               <posx>300</posx>
-                               <posy>0</posy>
-                               <width>880</width>
-                               <height>720</height>
-                               <itemgap>0</itemgap>
-                               <pagecontrol>60</pagecontrol>
-                               <onleft>3</onleft>
-                               <onright>3</onright>
-                               <onup>5</onup>
-                               <ondown>5</ondown>
-                       </control>
-               </control>
-               <include>BehindDialogFadeOut</include>
-
-               <control type="button" id="10">
-                       <description>Default Category Button</description>
-                       <height>70</height>
-                       <textoffsetx>20</textoffsetx>
-                       <align>right</align>
-                       <aligny>center</aligny>
-                       <font>font24_title</font>
-                       <textcolor>white</textcolor>
-                       <focusedcolor>selected</focusedcolor>
-                       <texturefocus border="5">button-nofocus2.png</texturefocus>
-                       <texturenofocus border="5">button-nofocus2.png</texturenofocus>
-                       <pulseonselect>false</pulseonselect>
-               </control>
-               <control type="button" id="7">
-                       <description>Default Button</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <height>60</height>
-                       <font>font13</font>
-                       <textcolor>white</textcolor>
-                       <focusedcolor>black</focusedcolor>
-                       <texturefocus border="5">ListFO.png</texturefocus>
-                       <texturenofocus border="5">ListNF.png</texturenofocus>
-               </control>
-               <control type="radiobutton" id="8">
-                       <description>Default RadioButton</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <height>60</height>
-                       <font>font13</font>
-                       <textcolor>white</textcolor>
-                       <focusedcolor>black</focusedcolor>
-                       <texturefocus border="5">ListFO.png</texturefocus>
-                       <texturenofocus border="5">ListNF.png</texturenofocus>
-               </control>
-               <control type="spincontrolex" id="9">
-                       <description>Default SpinControlex</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <height>60</height>
-                       <font>font13</font>
-                       <textcolor>white</textcolor>
-                       <focusedcolor>black</focusedcolor>
-                       <texturefocus border="5">ListFO.png</texturefocus>
-                       <texturenofocus border="5">ListNF.png</texturenofocus>
-                       <aligny>center</aligny>
-                       <reverse>yes</reverse>
-               </control>
-               <control type="image" id="11">
-                       <description>separator image</description>
-                       <height>5</height>
-                       <texture>separator.png</texture>
-               </control>
-               <control type="label" id="2">
-                       <description>Fake Label so we can pass it on</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>0</width>
-                       <height>0</height>
-                       <font>-</font>
-                       <visible>false</visible>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/SettingsProfile.xml b/addons/skin.touched/4x3Hirez/SettingsProfile.xml
deleted file mode 100644 (file)
index 8c70caf..0000000
+++ /dev/null
@@ -1,234 +0,0 @@
-<window id="34">
-       <defaultcontrol always="true">2</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <controls>
-               <include>CommonBackground</include>
-               <include>HomeButtonCommons</include>
-               <include>CommonNowPlaying</include>
-               <control type="label">
-                       <description>Window label</description>
-                       <include>MediaWindowTitleCommons</include>
-                       <label>$LOCALIZE[10034]</label>
-               </control>
-               <control type="panel" id="9002">
-                       <visible>!Window.IsActive(PlayerControls)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <include>SubMenuCommonLayout</include>
-                       <content>
-                               <item>
-                                       <label>31200</label>
-                                       <onclick>PreviousMenu</onclick>
-                                       <icon>icon_back.png</icon>
-                               </item>
-                       </content>
-               </control>
-
-               <control type="group">
-                       <posx>40</posx>
-                       <posy>140</posy>
-                       <include>Window_OpenClose_Animation_Zoom</include>
-                       <control type="radiobutton" id ="4">
-                               <description>Enable Login screen</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>350</width>
-                               <height>60</height>
-                               <align>left</align>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>20096</label>
-                               <onleft>2</onleft>
-                               <onright>2</onright>
-                               <onup>4</onup>
-                               <ondown>4</ondown>
-                               <enable>!Window.IsVisible(ProfileSettings)</enable>
-                       </control>
-                       <control type="group">
-                               <posx>0</posx>
-                               <posy>80</posy>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>350</width>
-                                       <height>500</height>
-                                       <texture border="5">SubBack.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>10</posx>
-                                       <posy>20</posy>
-                                       <width>330</width>
-                                       <height>20</height>
-                                       <font>font12_title</font>
-                                       <textcolor>white</textcolor>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <label>$LOCALIZE[31010]</label>
-                               </control>
-                               <control type="image">
-                                       <posx>20</posx>
-                                       <posy>60</posy>
-                                       <width>310</width>
-                                       <height>250</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture fallback="unknown-user.png">$INFO[System.ProfileThumb]</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>10</posx>
-                                       <posy>330</posy>
-                                       <width>330</width>
-                                       <height>20</height>
-                                       <font>font13_title</font>
-                                       <textcolor>blue</textcolor>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[System.ProfileName]</label>
-                               </control>
-                       </control>
-                       <control type="label">
-                               <posx>370</posx>
-                               <posy>0</posy>
-                               <width>830</width>
-                               <height>60</height>
-                               <font>font13_title</font>
-                               <textcolor>white</textcolor>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <label>$LOCALIZE[31319]</label>
-                       </control>
-                       <control type="panel" id="2">
-                               <posx>370</posx>
-                               <posy>80</posy>
-                               <width>830</width>
-                               <height>560</height>
-                               <onleft>4</onleft>
-                               <onright>60</onright>
-                               <onup>53</onup>
-                               <ondown>53</ondown>
-                               <viewtype label="21371">list</viewtype>
-                               <pagecontrol>60</pagecontrol>
-                               <scrolltime>200</scrolltime>
-                               <itemlayout height="280" width="207">
-                                       <control type="image">
-                                               <posx>1</posx>
-                                               <posy>0</posy>
-                                               <width>207</width>
-                                               <height>280</height>
-                                               <texture border="5">SubBack.png</texture>
-                                       </control>
-                                       <control type="image">
-                                               <posx>10</posx>
-                                               <posy>10</posy>
-                                               <width>187</width>
-                                               <height>190</height>
-                                               <texture fallback="unknown-user.png">$INFO[Listitem.Icon]</texture>
-                                       </control>
-                                       <control type="label">
-                                               <posx>103</posx>
-                                               <posy>200</posy>
-                                               <width>197</width>
-                                               <height>25</height>
-                                               <font>font13</font>
-                                               <textcolor>white</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>center</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[ListItem.Label]</label>
-                                       </control>
-                                       <control type="label">
-                                               <posx>103</posx>
-                                               <posy>230</posy>
-                                               <width>197</width>
-                                               <height>20</height>
-                                               <font>font10_title</font>
-                                               <textcolor>grey2</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>center</align>
-                                               <aligny>center</aligny>
-                                               <label>$LOCALIZE[31320]</label>
-                                               <visible>!IsEmpty(ListItem.Label2)</visible>
-                                       </control>
-                                       <control type="label">
-                                               <posx>103</posx>
-                                               <posy>250</posy>
-                                               <width>197</width>
-                                               <height>20</height>
-                                               <font>font10</font>
-                                               <textcolor>grey2</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>center</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[ListItem.Label2]</label>
-                                       </control>
-                               </itemlayout>
-                               <focusedlayout height="280" width="207">
-                                       <control type="image">
-                                               <posx>1</posx>
-                                               <posy>0</posy>
-                                               <width>207</width>
-                                               <height>280</height>
-                                               <texture border="5">SubBack2.png</texture>
-                                       </control>
-                                       <control type="image">
-                                               <posx>10</posx>
-                                               <posy>10</posy>
-                                               <width>187</width>
-                                               <height>190</height>
-                                               <texture fallback="unknown-user.png">$INFO[Listitem.Icon]</texture>
-                                       </control>
-                                       <control type="label">
-                                               <posx>103</posx>
-                                               <posy>200</posy>
-                                               <width>197</width>
-                                               <height>25</height>
-                                               <font>font13</font>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>center</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[ListItem.Label]</label>
-                                       </control>
-                                       <control type="label">
-                                               <posx>103</posx>
-                                               <posy>230</posy>
-                                               <width>197</width>
-                                               <height>20</height>
-                                               <font>font10_title</font>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>center</align>
-                                               <aligny>center</aligny>
-                                               <label>$LOCALIZE[31320]</label>
-                                               <visible>!IsEmpty(ListItem.Label2)</visible>
-                                       </control>
-                                       <control type="label">
-                                               <posx>103</posx>
-                                               <posy>250</posy>
-                                               <width>197</width>
-                                               <height>20</height>
-                                               <font>font10</font>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <align>center</align>
-                                               <aligny>center</aligny>
-                                               <label>$INFO[ListItem.Label2]</label>
-                                       </control>
-                               </focusedlayout>
-                       </control>
-                       <control type="scrollbar" id="60">
-                               <posx>1060</posx>
-                               <posy>60</posy>
-                               <width>25</width>
-                               <height>530</height>
-                               <texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
-                               <texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
-                               <texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
-                               <textureslidernib>ScrollBarNib.png</textureslidernib>
-                               <textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
-                               <onleft>2</onleft>
-                               <onright>4</onright>
-                               <showonepage>false</showonepage>
-                               <orientation>vertical</orientation>
-                       </control>
-               </control>
-               <include>BehindDialogFadeOut</include>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/SettingsScreenCalibration.xml b/addons/skin.touched/4x3Hirez/SettingsScreenCalibration.xml
deleted file mode 100644 (file)
index 9b79adf..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-<window id="11">
-       <defaultcontrol>8</defaultcontrol>
-       <controls>
-               <control type="videowindow" id="20">
-                       <description>videowindow</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1280</width>
-                       <height>720</height>
-                       <visible>Player.HasVideo</visible>
-               </control>
-               <control type="group">
-                       <visible>!Player.HasVideo</visible>
-                       <include>CommonSettingsBackground</include>
-               </control>
-               <control type="image">
-                       <description>Overlay</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1280</width>
-                       <height>720</height>
-                       <texture>black-back.png</texture>
-                       <include>dialogeffect</include>
-               </control>
-               <control type="button">
-                       <description>Close Window button</description>
-                       <posx>100r</posx>
-                       <posy>0</posy>
-                       <width>64</width>
-                       <height>32</height>
-                       <label>-</label>
-                       <font>-</font>
-                       <onclick>PreviousMenu</onclick>
-                       <texturefocus>DialogCloseButton-focus.png</texturefocus>
-                       <texturenofocus>DialogCloseButton.png</texturenofocus>
-                       <onleft>1</onleft>
-                       <onright>1</onright>
-                       <onup>1</onup>
-                       <ondown>1</ondown>
-                       <visible>system.getbool(input.enablemouse)</visible>
-               </control>
-               <control type="mover" id="8">
-                       <description>top left mover</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>128</width>
-                       <height>128</height>
-                       <texturefocus>CalibrateTopLeft.png</texturefocus>
-                       <texturenofocus>-</texturenofocus>
-               </control>
-               <control type="mover" id="9">
-                       <description>right bottom mover</description>
-                       <posx>700</posx>
-                       <posy>500</posy>
-                       <width>128</width>
-                       <height>128</height>
-                       <texturefocus>CalibrateBottomRight.png</texturefocus>
-                       <texturenofocus>-</texturenofocus>
-               </control>
-               <control type="mover" id="10">
-                       <description>subtitle position mover</description>
-                       <posx>200</posx>
-                       <posy>500</posy>
-                       <width>512</width>
-                       <height>128</height>
-                       <texturefocus>CalibrateSubtitles.png</texturefocus>
-                       <texturenofocus>-</texturenofocus>
-               </control>
-               <control type="resize" id="11">
-                       <description>pixel aspect ratio box</description>
-                       <posx>0</posx>
-                       <posy>232</posy>
-                       <width>256</width>
-                       <height>256</height>
-                       <texturefocus>CalibratePixelRatio.png</texturefocus>
-                       <texturenofocus>-</texturenofocus>
-               </control>
-               <control type="group">
-                       <posx>20</posx>
-                       <posy>80</posy>
-                       <control type="label" id="2">
-                               <description>coordinates label</description>
-                               <posx>0</posx>
-                               <posy>10</posy>
-                               <width>1240</width>
-                               <label>-</label>
-                               <align>center</align>
-                               <font>font13caps</font>
-                       </control>
-                       <control type="label" id="3">
-                               <description>help information</description>
-                               <posx>0</posx>
-                               <posy>40</posy>
-                               <width>1240</width>
-                               <label>-</label>
-                               <align>center</align>
-                               <font>font13caps</font>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/SettingsSystemInfo.xml b/addons/skin.touched/4x3Hirez/SettingsSystemInfo.xml
deleted file mode 100644 (file)
index 031221b..0000000
+++ /dev/null
@@ -1,369 +0,0 @@
-<window id="7">
-       <defaultcontrol always="true">95</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <controls>
-               <include>CommonBackground</include>
-               <include>HomeButtonCommons</include>
-               <include>CommonNowPlaying</include>
-               <control type="label">
-                       <description>Window label</description>
-                       <include>MediaWindowTitleCommons</include>
-                       <label>$LOCALIZE[130]</label>
-               </control>
-               <control type="panel">
-                       <visible>!Window.IsActive(PlayerControls)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <include>SubMenuCommonLayout</include>
-                       <content>
-                               <item>
-                                       <label>31200</label>
-                                       <onclick>PreviousMenu</onclick>
-                                       <icon>icon_back.png</icon>
-                               </item>
-                       </content>
-               </control>
-               <control type="label" id="40">
-                       <description>Hiddenlabel to pass to above</description>
-                       <visible>false</visible>
-               </control>
-               <control type="group">
-                       <posx>50</posx>
-                       <posy>140</posy>
-                       <include>Window_OpenClose_Animation_Zoom</include>
-                       <control type="grouplist" id="9000">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>260</width>
-                               <height>481</height>
-                               <itemgap>-1</itemgap>
-                               <onup>9000</onup>
-                               <ondown>9000</ondown>
-                               <control type="button" id="95">
-                                       <description>Button Summary Values</description>
-                                       <height>70</height>
-                                       <width>280</width>
-                                       <textoffsetx>20</textoffsetx>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font24_title</font>
-                                       <textcolor>white</textcolor>
-                                       <focusedcolor>selected</focusedcolor>
-                                       <texturefocus border="5">button-nofocus2.png</texturefocus>
-                                       <texturenofocus border="5">button-nofocus2.png</texturenofocus>
-                                       <pulseonselect>false</pulseonselect>
-                                       <label>20037</label>
-                               </control>
-                               <control type="button" id="94">
-                                       <height>70</height>
-                                       <width>280</width>
-                                       <textoffsetx>20</textoffsetx>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font24_title</font>
-                                       <textcolor>white</textcolor>
-                                       <focusedcolor>selected</focusedcolor>
-                                       <texturefocus border="5">button-nofocus2.png</texturefocus>
-                                       <texturenofocus border="5">button-nofocus2.png</texturenofocus>
-                                       <pulseonselect>false</pulseonselect>
-                                       <label>13277</label>
-                               </control>
-                               <control type="button" id="96">
-                                       <description>Button Network</description>
-                                       <height>70</height>
-                                       <width>280</width>
-                                       <textoffsetx>20</textoffsetx>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font24_title</font>
-                                       <textcolor>white</textcolor>
-                                       <focusedcolor>selected</focusedcolor>
-                                       <texturefocus border="5">button-nofocus2.png</texturefocus>
-                                       <texturenofocus border="5">button-nofocus2.png</texturenofocus>
-                                       <pulseonselect>false</pulseonselect>
-                                       <label>13279</label>
-                               </control>
-                               <control type="button" id="97">
-                                       <description>Button Video</description>
-                                       <height>70</height>
-                                       <width>280</width>
-                                       <textoffsetx>20</textoffsetx>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font24_title</font>
-                                       <textcolor>white</textcolor>
-                                       <focusedcolor>selected</focusedcolor>
-                                       <texturefocus border="5">button-nofocus2.png</texturefocus>
-                                       <texturenofocus border="5">button-nofocus2.png</texturenofocus>
-                                       <pulseonselect>false</pulseonselect>
-                                       <label>13280</label>
-                               </control>
-                               <control type="button" id="98">
-                                       <description>Button Hardware</description>
-                                       <height>70</height>
-                                       <width>280</width>
-                                       <textoffsetx>20</textoffsetx>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <font>font24_title</font>
-                                       <textcolor>white</textcolor>
-                                       <focusedcolor>selected</focusedcolor>
-                                       <texturefocus border="5">button-nofocus2.png</texturefocus>
-                                       <texturenofocus border="5">button-nofocus2.png</texturenofocus>
-                                       <pulseonselect>false</pulseonselect>
-                                       <label>13281</label>
-                               </control>
-                       </control>
-                       <control type="group">
-                               <posx>300</posx>
-                               <posy>0</posy>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>880</width>
-                                       <height>60</height>
-                                       <texture border="5">ListNF.png</texture>
-                                       <visible>!IsEmpty(Control.GetLabel(2))</visible>
-                               </control>
-                               <control type="label" id="2">
-                                       <description>Label 2</description>
-                                       <posx>10</posx>
-                                       <posy>0</posy>
-                                       <width>860</width>
-                                       <height>60</height>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>-</label>
-                                       <font>font13</font>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>60</posy>
-                                       <width>880</width>
-                                       <height>60</height>
-                                       <texture border="5">ListNF.png</texture>
-                                       <visible>!IsEmpty(Control.GetLabel(3))</visible>
-                               </control>
-                               <control type="label" id="3">
-                                       <description>Label 3</description>
-                                       <posx>10</posx>
-                                       <posy>60</posy>
-                                       <width>860</width>
-                                       <height>60</height>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>-</label>
-                                       <font>font13</font>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>120</posy>
-                                       <width>880</width>
-                                       <height>60</height>
-                                       <texture border="5">ListNF.png</texture>
-                                       <visible>!IsEmpty(Control.GetLabel(4))</visible>
-                               </control>
-                               <control type="label" id="4">
-                                       <description>Label 4</description>
-                                       <posx>10</posx>
-                                       <posy>120</posy>
-                                       <width>860</width>
-                                       <height>60</height>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>-</label>
-                                       <font>font13</font>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>180</posy>
-                                       <width>880</width>
-                                       <height>60</height>
-                                       <texture border="5">ListNF.png</texture>
-                                       <visible>!IsEmpty(Control.GetLabel(5))</visible>
-                               </control>
-                               <control type="label" id="5">
-                                       <description>Label 5</description>
-                                       <posx>10</posx>
-                                       <posy>180</posy>
-                                       <width>860</width>
-                                       <height>60</height>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>-</label>
-                                       <font>font13</font>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>240</posy>
-                                       <width>880</width>
-                                       <height>60</height>
-                                       <texture border="5">ListNF.png</texture>
-                                       <visible>!IsEmpty(Control.GetLabel(6))</visible>
-                               </control>
-                               <control type="label" id="6">
-                                       <description>Label 6</description>
-                                       <posx>10</posx>
-                                       <posy>240</posy>
-                                       <width>860</width>
-                                       <height>60</height>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>-</label>
-                                       <font>font13</font>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>300</posy>
-                                       <width>880</width>
-                                       <height>60</height>
-                                       <texture border="5">ListNF.png</texture>
-                                       <visible>!IsEmpty(Control.GetLabel(7))</visible>
-                               </control>
-                               <control type="label" id="7">
-                                       <description>Label 7</description>
-                                       <posx>10</posx>
-                                       <posy>300</posy>
-                                       <width>860</width>
-                                       <height>60</height>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>-</label>
-                                       <font>font13</font>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>360</posy>
-                                       <width>880</width>
-                                       <height>60</height>
-                                       <texture border="5">ListNF.png</texture>
-                                       <visible>!IsEmpty(Control.GetLabel(8))</visible>
-                               </control>
-                               <control type="label" id="8">
-                                       <description>Label 8</description>
-                                       <posx>10</posx>
-                                       <posy>360</posy>
-                                       <width>860</width>
-                                       <height>60</height>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>-</label>
-                                       <font>font13</font>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>420</posy>
-                                       <width>880</width>
-                                       <height>60</height>
-                                       <texture border="5">ListNF.png</texture>
-                                       <visible>!IsEmpty(Control.GetLabel(9))</visible>
-                               </control>
-                               <control type="label" id="9">
-                                       <description>Label 9</description>
-                                       <posx>10</posx>
-                                       <posy>420</posy>
-                                       <width>860</width>
-                                       <height>60</height>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>-</label>
-                                       <font>font13</font>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>480</posy>
-                                       <width>880</width>
-                                       <height>60</height>
-                                       <texture border="5">ListNF.png</texture>
-                                       <visible>!IsEmpty(Control.GetLabel(10))</visible>
-                               </control>
-                               <control type="label" id="10">
-                                       <description>Label 10</description>
-                                       <posx>10</posx>
-                                       <posy>480</posy>
-                                       <width>860</width>
-                                       <height>60</height>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>-</label>
-                                       <font>font13</font>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>540</posy>
-                                       <width>880</width>
-                                       <height>60</height>
-                                       <texture border="5">ListNF.png</texture>
-                                       <visible>!IsEmpty(Control.GetLabel(11))</visible>
-                               </control>
-                               <control type="label" id="11">
-                                       <description>Label 11</description>
-                                       <posx>10</posx>
-                                       <posy>540</posy>
-                                       <width>860</width>
-                                       <height>60</height>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>-</label>
-                                       <font>font13</font>
-                               </control>
-                       </control>
-                       <control type="group">
-                               <posx>60</posx>
-                               <posy>220r</posy>
-                               <control type="label" id="52">
-                                       <description>XBMC BUILD Version</description>
-                                       <posx>1130</posx>
-                                       <posy>0</posy>
-                                       <width>730</width>
-                                       <label>144</label>
-                                       <align>right</align>
-                                       <textcolor>white</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                                       <font>font13_title</font>
-                               </control>
-                               <control type="label">
-                                       <description>CPU Text</description>
-                                       <posx>800</posx>
-                                       <posy>40</posy>
-                                       <width>800</width>
-                                       <height>25</height>
-                                       <label>$LOCALIZE[13271] $INFO[System.CPUUsage]</label>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>white</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                                       <font>font12_title</font>
-                               </control>
-                               <control type="progress">
-                                       <description>CPU BAR</description>
-                                       <posx>810</posx>
-                                       <posy>40</posy>
-                                       <width>320</width>
-                                       <height>25</height>
-                                       <info>System.CPUUsage</info>
-                               </control>
-                               <control type="label">
-                                       <description>Memory Text</description>
-                                       <posx>800</posx>
-                                       <posy>70</posy>
-                                       <width>800</width>
-                                       <height>25</height>
-                                       <label>$LOCALIZE[31309] $INFO[system.memory(used.percent)]</label>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>white</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                                       <font>font12_title</font>
-                               </control>
-                               <control type="progress">
-                                       <description>Memory BAR</description>
-                                       <posx>810</posx>
-                                       <posy>70</posy>
-                                       <width>320</width>
-                                       <height>25</height>
-                                       <info>system.memory(used)</info>
-                               </control>
-                       </control>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/SlideShow.xml b/addons/skin.touched/4x3Hirez/SlideShow.xml
deleted file mode 100644 (file)
index 778d873..0000000
+++ /dev/null
@@ -1,221 +0,0 @@
-<window id="2007">
-       <defaultcontrol>2</defaultcontrol>
-       <onunload>Skin.Reset(SlideShowShowOSD)</onunload>
-       <controls>
-               <control type="button">
-                       <description>Hidden button to close the keyboard when its focused</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>ScreenWidth</width>
-                       <height>ScreenHeight</height>
-                       <texturenofocus>-</texturenofocus>
-                       <texturefocus>-</texturefocus>
-                       <onclick>Skin.SetBool(SlideShowShowOSD)</onclick>
-               </control>
-               <control type="group">
-                       <visible>Skin.HasSetting(SlideShowShowOSD) + !Window.IsVisible(PictureInfo)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <include>CommonHeader</include>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>20</posy>
-                               <width>1280</width>
-                               <height>64</height>
-                               <texture>header.png</texture>
-                       </control>
-                       <control type="grouplist">
-                               <description>Top Left bar</description>
-                               <posx>0</posx>
-                               <posy>20</posy>
-                               <width>200</width>
-                               <height>64</height>
-                               <align>left</align>
-                               <itemgap>5</itemgap>
-                               <orientation>horizontal</orientation>
-                               <visible>Player.HasAudio</visible>
-                               <control type="button">
-                                       <description>Playlist Button</description>
-                                       <width>64</width>
-                                       <height>64</height>
-                                       <texturenofocus>icon_playlistmusic.png</texturenofocus>
-                                       <texturefocus>icon_playlistmusic.png</texturefocus>
-                                       <onclick>PreviousMenu</onclick>
-                                       <onclick>ActivateWindow(MusicPlaylist)</onclick>
-                               </control>
-                               <control type="image">
-                                       <width>2</width>
-                                       <height>62</height>
-                                       <texture>header-divide.png</texture>
-                               </control>
-                       </control>
-                       <control type="grouplist">
-                               <description>Top Right bar</description>
-                               <posx>1080r</posx>
-                               <posy>25</posy>
-                               <width>1000</width>
-                               <height>64</height>
-                               <align>right</align>
-                               <itemgap>5</itemgap>
-                               <orientation>horizontal</orientation>
-                               <control type="radiobutton">
-                                       <description>Show Audio Info Button</description>
-                                       <width>270</width>
-                                       <height>50</height>
-                                       <label>$LOCALIZE[544]</label>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <selected>Skin.HasSetting(SlideShowShowAudioInfo)</selected>
-                                       <texturenofocus border="5">floor_button.png</texturenofocus>
-                                       <texturefocus border="5">floor_buttonFO.png</texturefocus>
-                                       <onclick>Skin.ToggleSetting(SlideShowShowAudioInfo)</onclick>
-                                       <visible>Player.HasAudio</visible>
-                               </control>
-                               <control type="button">
-                                       <description>Image Info Button</description>
-                                       <width>200</width>
-                                       <height>50</height>
-                                       <label>$LOCALIZE[31357]</label>
-                                       <font>font13</font>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <texturenofocus border="5">floor_button.png</texturenofocus>
-                                       <texturefocus border="5">floor_buttonFO.png</texturefocus>
-                                       <onclick>ActivateWindow(PictureInfo)</onclick>
-                               </control>
-                               <control type="radiobutton">
-                                       <description>Fullscreen Button</description>
-                                       <posy>5</posy>
-                                       <width>230</width>
-                                       <height>50</height>
-                                       <radiowidth>36</radiowidth>
-                                       <radioheight>36</radioheight>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <texturenofocus border="5">floor_button.png</texturenofocus>
-                                       <texturefocus border="5">floor_buttonFO.png</texturefocus>
-                                       <label>31008</label>
-                                       <onclick>back</onclick>
-                                       <textureradiofocus flipx="true" flipy="true">GoFullscreen2.png</textureradiofocus>
-                                       <textureradionofocus flipx="true" flipy="true">GoFullscreen2.png</textureradionofocus>
-                               </control>
-                       </control>
-                       <control type="group">
-                               <posx>65r</posx>
-                               <posy>20</posy>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>2</width>
-                                       <height>62</height>
-                                       <texture>header-divide.png</texture>
-                               </control>
-                               <control type="button">
-                                       <description>Close Button</description>
-                                       <posx>5</posx>
-                                       <posy>0</posy>
-                                       <width>60</width>
-                                       <height>60</height>
-                                       <font>-</font>
-                                       <onclick>Skin.Reset(SlideShowShowOSD)</onclick>
-                                       <texturefocus>icon_close.png</texturefocus>
-                                       <texturenofocus>icon_close.png</texturenofocus>
-                               </control>
-                       </control>
-                       <control type="group">
-                               <posx>-10</posx>
-                               <posy>440</posy>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>90</width>
-                                       <height>90</height>
-                                       <colordiffuse>EEFFFFFF</colordiffuse>
-                                       <texture border="3">PlayerControls-Background.png</texture>
-                               </control>
-                               <control type="button">
-                                       <description>Previous Image</description>
-                                       <posx>20</posx>
-                                       <posy>10</posy>
-                                       <width>55</width>
-                                       <height>70</height>
-                                       <hitrect x="15" y="5" w="80" h="80" />
-                                       <label>-</label>
-                                       <font>-</font>
-                                       <texturefocus flipx="true">icon_arrowkey.png</texturefocus>
-                                       <texturenofocus flipx="true">icon_arrowkey.png</texturenofocus>
-                                       <onclick>left</onclick>
-                               </control>
-                       </control>
-                       <control type="group">
-                               <posx>80r</posx>
-                               <posy>440</posy>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>90</width>
-                                       <height>90</height>
-                                       <colordiffuse>EEFFFFFF</colordiffuse>
-                                       <texture border="3">PlayerControls-Background.png</texture>
-                               </control>
-                               <control type="button">
-                                       <description>Next Image</description>
-                                       <posx>15</posx>
-                                       <posy>10</posy>
-                                       <width>55</width>
-                                       <height>70</height>
-                                       <hitrect x="5" y="5" w="80" h="80" />
-                                       <label>-</label>
-                                       <font>-</font>
-                                       <texturefocus>icon_arrowkey.png</texturefocus>
-                                       <texturenofocus>icon_arrowkey.png</texturenofocus>
-                                       <onclick>right</onclick>
-                               </control>
-                       </control>
-               </control>
-               <!-- media infos -->
-               <control type="group">
-                       <posx>20</posx>
-                       <posy>160r</posy>
-                       <visible>Skin.HasSetting(SlideShowShowAudioInfo) + Player.HasMedia</visible>
-                       <include>VisibleFadeEffect</include>
-                       <control type="image">
-                               <description>cover image</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>150</width>
-                               <height>150</height>
-                               <info>MusicPlayer.Cover</info>
-                               <aspectratio>keep</aspectratio>
-                               <bordertexture border="8">ThumbShadow.png</bordertexture>
-                               <bordersize>8</bordersize>
-                       </control>
-                       <control type="label">
-                               <posx>160</posx>
-                               <posy>70</posy>
-                               <width>1000</width>
-                               <height>30</height>
-                               <font>font30_title</font>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <label>$INFO[MusicPlayer.Title]</label>
-                               <textcolor>white</textcolor>
-                               <shadowcolor>black</shadowcolor>
-                               <scroll>true</scroll>
-                       </control>
-                       <control type="label">
-                               <description>Album label</description>
-                               <posx>160</posx>
-                               <posy>105</posy>
-                               <width>1000</width>
-                               <height>25</height>
-                               <align>left</align>
-                               <font>font13</font>
-                               <label>$INFO[MusicPlayer.Album]</label>
-                               <textcolor>white</textcolor>
-                               <shadowcolor>black</shadowcolor>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/SmartPlaylistEditor.xml b/addons/skin.touched/4x3Hirez/SmartPlaylistEditor.xml
deleted file mode 100644 (file)
index 43fd5aa..0000000
+++ /dev/null
@@ -1,314 +0,0 @@
-<window id="136">
-       <defaultcontrol always="true">22</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>140</posx>
-               <posy>30</posy>
-       </coordinates>
-       <controls>
-               <control type="group">
-                       <visible>!Window.IsVisible(smartplaylistrule)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>1000</width>
-                               <height>60</height>
-                               <texture border="5">DialogHeader.png</texture>
-                       </control>
-                       <control type="label" id="2">
-                               <description>header label</description>
-                               <posx>20</posx>
-                               <posy>0</posy>
-                               <include>WindowTitleCommons</include>
-                               <width>910</width>
-                               <label>$LOCALIZE[21432]</label>
-                       </control>
-                       <control type="group">
-                               <posx>930</posx>
-                               <posy>0</posy>
-                               <include>DialogCloseButtonCommons</include>
-                       </control>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>60</posy>
-                               <width>1000</width>
-                               <height>840</height>
-                               <texture border="5">DialogBack.png</texture>
-                       </control>
-                       <control type="spincontrolex" id="22">
-                               <description>Set Playlist type</description>
-                               <posx>20</posx>
-                               <posy>80</posy>
-                               <width>960</width>
-                               <height>50</height>
-                               <label>467</label>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus>MenuItemNF.png</texturefocus>
-                               <texturenofocus>MenuItemNF.png</texturenofocus>
-                               <onright>22</onright>
-                               <onleft>22</onleft>
-                               <onup>9001</onup>
-                               <ondown>12</ondown>
-                       </control>
-                       <control type="label">
-                               <description>Name Label</description>
-                               <posx>20</posx>
-                               <posy>140</posy>
-                               <width>960</width>
-                               <height>20</height>
-                               <label>21433</label>
-                               <font>font13_title</font>
-                               <textcolor>black</textcolor>
-                               <align>center</align>
-                       </control>
-                       <control type="edit" id="12">
-                               <description>Name Button</description>
-                               <posx>20</posx>
-                               <posy>180</posy>
-                               <width>960</width>
-                               <height>50</height>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <align>center</align>
-                               <texturefocus>MenuItemNF.png</texturefocus>
-                               <texturenofocus>MenuItemNF.png</texturenofocus>
-                               <label>-</label>
-                               <onup>22</onup>
-                               <onleft>12</onleft>
-                               <onright>12</onright>
-                               <ondown>10</ondown>
-                       </control>
-                       <control type="label">
-                               <description>rules label</description>
-                               <posx>20</posx>
-                               <posy>240</posy>
-                               <width>960</width>
-                               <height>20</height>
-                               <label>21434</label>
-                               <font>font13_title</font>
-                               <textcolor>black</textcolor>
-                               <align>center</align>
-                       </control>
-                       <control type="list" id="10">
-                               <posx>20</posx>
-                               <posy>280</posy>
-                               <width>740</width>
-                               <height>250</height>
-                               <onup>9001</onup>
-                               <onleft>9000</onleft>
-                               <onright>60</onright>
-                               <ondown>12</ondown>
-                               <pagecontrol>60</pagecontrol>
-                               <scrolltime>200</scrolltime>
-                               <itemlayout height="50">
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>740</width>
-                                               <height>51</height>
-                                               <texture border="5">MenuItemNF.png</texture>
-                                       </control>
-                                       <control type="label">
-                                               <posx>10</posx>
-                                               <posy>0</posy>
-                                               <width>720</width>
-                                               <height>50</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <label>$INFO[ListItem.Label]</label>
-                                       </control>
-                               </itemlayout>
-                               <focusedlayout height="50">
-                                       <control type="image">
-                                               <posx>0</posx>
-                                               <posy>0</posy>
-                                               <width>740</width>
-                                               <height>51</height>
-                                               <texture border="5">MenuItemNF.png</texture>
-                                       </control>
-                                       <control type="label">
-                                               <posx>10</posx>
-                                               <posy>0</posy>
-                                               <width>720</width>
-                                               <height>50</height>
-                                               <font>font13</font>
-                                               <align>left</align>
-                                               <aligny>center</aligny>
-                                               <textcolor>black</textcolor>
-                                               <selectedcolor>selected</selectedcolor>
-                                               <label>[COLOR=blue] > [/COLOR] $INFO[ListItem.Label]</label>
-                                       </control>
-                               </focusedlayout>
-                       </control>
-                       <control type="group" id="9000">
-                               <posx>780</posx>
-                               <posy>280</posy>
-                               <control type="button" id="13">
-                                       <description>Add Rule Button</description>
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>200</width>
-                                       <height>50</height>
-                                       <label>15019</label>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <font>font12_title</font>
-                                       <texturefocus border="5">IconBack-focus.png</texturefocus>
-                                       <texturenofocus border="5">ListNF.png</texturenofocus>
-                                       <pulseonselect>false</pulseonselect>
-                                       <onup>18</onup>
-                                       <onleft>60</onleft>
-                                       <onright>10</onright>
-                                       <ondown>13</ondown>
-                               </control>
-                               <control type="button" id="14">
-                                       <description>Remove Rule Button</description>
-                                       <posx>0</posx>
-                                       <posy>55</posy>
-                                       <width>200</width>
-                                       <height>50</height>
-                                       <label>1210</label>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <font>font12_title</font>
-                                       <texturefocus border="5">IconBack-focus.png</texturefocus>
-                                       <texturenofocus border="5">ListNF.png</texturenofocus>
-                                       <pulseonselect>false</pulseonselect>
-                                       <onup>11</onup>
-                                       <onleft>60</onleft>
-                                       <onright>10</onright>
-                                       <ondown>14</ondown>
-                               </control>
-                               <control type="button" id="15">
-                                       <description>Edit Rule Button</description>
-                                       <posx>0</posx>
-                                       <posy>110</posy>
-                                       <width>200</width>
-                                       <height>50</height>
-                                       <label>21435</label>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <font>font12_title</font>
-                                       <texturefocus border="5">IconBack-focus.png</texturefocus>
-                                       <texturenofocus border="5">ListNF.png</texturenofocus>
-                                       <pulseonselect>false</pulseonselect>
-                                       <onup>13</onup>
-                                       <onleft>60</onleft>
-                                       <onright>10</onright>
-                                       <ondown>12</ondown>
-                               </control>
-                       </control>
-
-                       <control type="label">
-                               <description>Options Label</description>
-                               <posx>20</posx>
-                               <posy>550</posy>
-                               <width>960</width>
-                               <height>20</height>
-                               <label>31325</label>
-                               <font>font13_title</font>
-                               <textcolor>black</textcolor>
-                               <align>center</align>
-                       </control>
-                       <control type="spincontrolex" id="16">
-                               <posx>20</posx>
-                               <posy>590</posy>
-                               <width>960</width>
-                               <height>50</height>
-                               <label>21424</label>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus>MenuItemNF.png</texturefocus>
-                               <texturenofocus>MenuItemNF.png</texturenofocus>
-                               <onright>16</onright>
-                               <onleft>16</onleft>
-                               <onup>10</onup>
-                               <ondown>17</ondown>
-                       </control>
-
-                       <control type="spincontrolex" id="17">
-                               <posx>20</posx>
-                               <posy>645</posy>
-                               <width>960</width>
-                               <height>50</height>
-                               <label>21427</label>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus>MenuItemNF.png</texturefocus>
-                               <texturenofocus>MenuItemNF.png</texturenofocus>
-                               <onright>17</onright>
-                               <onleft>17</onleft>
-                               <onup>16</onup>
-                               <ondown>18</ondown>
-                       </control>
-
-                       <control type="spincontrolex" id="18">
-                               <posx>20</posx>
-                               <posy>700</posy>
-                               <width>750</width>
-                               <height>50</height>
-                               <label>21429</label>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus>MenuItemNF.png</texturefocus>
-                               <texturenofocus>MenuItemNF.png</texturenofocus>
-                               <onright>19</onright>
-                               <onleft>19</onleft>
-                               <onup>17</onup>
-                               <ondown>9001</ondown>
-                       </control>
-
-                       <control type="togglebutton" id="19">
-                               <posx>780</posx>
-                               <posy>700</posy>
-                               <width>200</width>
-                               <height>50</height>
-                               <font>font12_title</font>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <texturefocus border="5">IconBack-focus.png</texturefocus>
-                               <texturenofocus border="5">ListNF.png</texturenofocus>
-                               <alttexturefocus border="5">IconBack-focus.png</alttexturefocus>
-                               <alttexturenofocus border="5">ListNF.png</alttexturenofocus>
-                               <label>21431</label>
-                               <altlabel>21430</altlabel>
-                               <onright>18</onright>
-                               <onleft>18</onleft>
-                               <onup>17</onup>
-                               <ondown>9001</ondown>
-                       </control>
-                       <control type="grouplist" id="9002">
-                               <posx>20</posx>
-                               <posy>830</posy>
-                               <width>960</width>
-                               <height>50</height>
-                               <itemgap>20</itemgap>
-                               <align>center</align>
-                               <orientation>horizontal</orientation>
-                               <onleft>9000</onleft>
-                               <onright>9000</onright>
-                               <onup>50</onup>
-                               <ondown>49</ondown>
-                               <control type="button" id="20">
-                                       <description>OK Button</description>
-                                       <width>200</width>
-                                       <include>ButtonInfoDialogsCommonValues</include>
-                                       <label>186</label>
-                               </control>
-                               <control type="button" id="21">
-                                       <description>Cancel Button</description>
-                                       <width>200</width>
-                                       <include>ButtonInfoDialogsCommonValues</include>
-                                       <label>222</label>
-                               </control>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/SmartPlaylistRule.xml b/addons/skin.touched/4x3Hirez/SmartPlaylistRule.xml
deleted file mode 100644 (file)
index f1de6f1..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-<window id="137">
-       <defaultcontrol always="true">9001</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>140</posx>
-               <posy>260</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1000</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="label">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>910</width>
-                       <label>$LOCALIZE[21421]</label>
-               </control>
-               <control type="group">
-                       <posx>930</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>1000</width>
-                       <height>300</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-               <control type="label">
-                       <description>Rule match label</description>
-                       <posx>20</posx>
-                       <posy>70</posy>
-                       <width>960</width>
-                       <height>20</height>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <font>font13_title</font>
-                       <textcolor>black</textcolor>
-                       <label>21422</label>
-               </control>
-               <control type="group" id="9001">
-                       <control type="spincontrolex" id="15">
-                               <description>Rule Field</description>
-                               <posx>20</posx>
-                               <posy>110</posy>
-                               <width>450</width>
-                               <height>50</height>
-                               <font>-</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus border="5">MenuItemNF.png</texturefocus>
-                               <texturenofocus border="5">MenuItemNF.png</texturenofocus>
-                               <onright>16</onright>
-                               <onleft>16</onleft>
-                               <onup>9000</onup>
-                               <ondown>17</ondown>
-                       </control>
-                       <control type="label">
-                               <description>Rule Field label</description>
-                               <posx>25</posx>
-                               <posy>110</posy>
-                               <width>300</width>
-                               <height>50</height>
-                               <font>font13</font>
-                               <label>$INFO[Control.GetLabel(15)]</label>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <textcolor>black</textcolor>
-                       </control>
-                       <control type="spincontrolex" id="16">
-                               <description>Rule operator</description>
-                               <posx>510</posx>
-                               <posy>110</posy>
-                               <width>450</width>
-                               <height>50</height>
-                               <font>-</font>
-                               <texturefocus border="5">MenuItemNF.png</texturefocus>
-                               <texturenofocus border="5">MenuItemNF.png</texturenofocus>
-                               <onright>15</onright>
-                               <onleft>15</onleft>
-                               <onup>9000</onup>
-                               <ondown>17</ondown>
-                       </control>
-                       <control type="label">
-                               <description>Rule Field label</description>
-                               <posx>515</posx>
-                               <posy>110</posy>
-                               <width>300</width>
-                               <height>50</height>
-                               <font>font13</font>
-                               <label>$INFO[Control.GetLabel(16)]</label>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <textcolor>black</textcolor>
-                       </control>
-               </control>
-               <control type="button" id="17">
-                       <description>Value Button</description>
-                       <posx>20</posx>
-                       <posy>170</posy>
-                       <width>740</width>
-                       <height>50</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <aligny>center</aligny>
-                       <texturefocus border="5">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="5">MenuItemNF.png</texturenofocus>
-                       <label>-</label>
-                       <onup>9001</onup>
-                       <onleft>20</onleft>
-                       <onright>20</onright>
-                       <ondown>9000</ondown>
-               </control>
-               <control type="button" id="20">
-                       <description>Browse Button</description>
-                       <posx>760</posx>
-                       <posy>170</posy>
-                       <width>200</width>
-                       <height>50</height>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <texturefocus border="5">IconBack-focus.png</texturefocus>
-                       <texturenofocus border="5">ListNF.png</texturenofocus>
-                       <label>1024</label>
-                       <font>font12_title</font>
-                       <onup>9001</onup>
-                       <onleft>17</onleft>
-                       <onright>17</onright>
-                       <ondown>9000</ondown>
-               </control>
-               <control type="grouplist" id="9002">
-                       <posx>20</posx>
-                       <posy>290</posy>
-                       <width>960</width>
-                       <height>50</height>
-                       <itemgap>20</itemgap>
-                       <align>center</align>
-                       <orientation>horizontal</orientation>
-                       <onleft>9000</onleft>
-                       <onright>9000</onright>
-                       <onup>50</onup>
-                       <ondown>49</ondown>
-                       <control type="button" id="18">
-                               <description>OK Button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>186</label>
-                       </control>
-                       <control type="button" id="19">
-                               <description>Cancel Button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>222</label>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/Startup.xml b/addons/skin.touched/4x3Hirez/Startup.xml
deleted file mode 100644 (file)
index 817031e..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<window>
-       <defaultcontrol always="true">10</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <controls>
-               <include>CommonBackground</include>
-               <include>CommonNowPlaying</include>
-               <control type="button" id="10">
-                       <description>trigger</description>
-                       <onfocus>ReplaceWindow(Home)</onfocus>
-                       <texturenofocus>-</texturenofocus>
-                       <texturefocus>-</texturefocus>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/VideoFullScreen.xml b/addons/skin.touched/4x3Hirez/VideoFullScreen.xml
deleted file mode 100644 (file)
index ead0fba..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-<window id="2005">
- <defaultcontrol>-</defaultcontrol>
-       <controls>
-               <!-- codec info -->
-               <control type="group" id="0">
-                       <posx>0</posx>
-                       <posy>20</posy>
-                       <animation effect="fade" time="200">VisibleChange</animation>
-                       <control type="image">
-                               <description>media info background image</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>1280</width>
-                               <height>140</height>
-                               <colordiffuse>AAFFFFFF</colordiffuse>
-                               <texture>black-back.png</texture>
-                       </control>
-                       <control type="label" id="10">
-                               <description>row 1 label</description>
-                               <posx>50</posx>
-                               <posy>10</posy>
-                               <width>1180</width>
-                               <height>30</height>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <font>font12</font>
-                               <label>-</label>
-                       </control>
-                       <control type="label" id="11">
-                               <description>row 2 label</description>
-                               <posx>50</posx>
-                               <posy>40</posy>
-                               <width>1180</width>
-                               <height>30</height>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <font>font12</font>
-                               <label>-</label>
-                       </control>
-                       <control type="label" id="12">
-                               <description>row 3 label</description>
-                               <posx>50</posx>
-                               <posy>85</posy>
-                               <width>1180</width>
-                               <height>30</height>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <font>font12</font>
-                               <label>-</label>
-                       </control>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/VideoOSD.xml b/addons/skin.touched/4x3Hirez/VideoOSD.xml
deleted file mode 100644 (file)
index 40dda23..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<window type="dialog" id="2901">
-       <defaultcontrol></defaultcontrol>
-       <include>dialogeffect</include>
-       <onunload>Skin.Reset(PlayerControlsSubMenuVisible)</onunload>
-       <coordinates>
-               <system>1</system>
-               <posx>0</posx>
-               <posy>0</posy>
-       </coordinates>
-       <controls>
-               <include>PlayerControlCommons</include>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/VideoOSDBookmarks.xml b/addons/skin.touched/4x3Hirez/VideoOSDBookmarks.xml
deleted file mode 100644 (file)
index be1a0ab..0000000
+++ /dev/null
@@ -1,151 +0,0 @@
-<window id="125">
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>240</posx>
-               <posy>80</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <description>Shadow Background for dialogs without BehindDialogFadeOut include</description>
-                       <posx>-30</posx>
-                       <posy>-30</posy>
-                       <width>860</width>
-                       <height>860</height>
-                       <texture border="30">DialogShadow.png</texture>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>800</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>800</width>
-                       <height>740</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-               <control type="label">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>700</width>
-                       <label>$LOCALIZE[298]</label>
-               </control>
-               <control type="group">
-                       <posx>730</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="panel" id="11">
-                       <posx>20</posx>
-                       <posy>65</posy>
-                       <width>760</width>
-                       <height>620</height>
-                       <onleft>2</onleft>
-                       <onright>3</onright>
-                       <ondown>2</ondown>
-                       <onup>2</onup>
-                       <scrolltime>200</scrolltime>
-                       <viewtype label="536">icon</viewtype>
-                       <pagecontrol>-</pagecontrol>
-                       <itemlayout height="250" width="380">
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>0</posy>
-                                       <width>360</width>
-                                       <height>220</height>
-                                       <aspectratio>scale</aspectratio>
-                                       <texture>$INFO[ListItem.Icon]</texture>
-                                       <bordertexture border="8">ThumbShadow.png</bordertexture>
-                                       <bordersize>8</bordersize>
-                               </control>
-                               <control type="label">
-                                       <posx>190</posx>
-                                       <posy>220</posy>
-                                       <width>260</width>
-                                       <height>20</height>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <info>ListItem.Label</info>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="250" width="380">
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>0</posy>
-                                       <width>360</width>
-                                       <height>220</height>
-                                       <aspectratio>scale</aspectratio>
-                                       <texture>$INFO[ListItem.Icon]</texture>
-                                       <bordertexture border="8">ThumbShadow.png</bordertexture>
-                                       <bordersize>8</bordersize>
-                               </control>
-                               <control type="label">
-                                       <posx>190</posx>
-                                       <posy>220</posy>
-                                       <width>260</width>
-                                       <height>20</height>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <info>ListItem.Label</info>
-                               </control>
-                       </focusedlayout>
-               </control>
-               <control type="label">
-                       <description>Page Count Label</description>
-                       <posx>780</posx>
-                       <posy>700</posy>
-                       <width>500</width>
-                       <height>20</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <scroll>false</scroll>
-                       <align>right</align>
-                       <aligny>center</aligny>
-                       <label>$INFO[Container(11).NumItems,(,) $LOCALIZE[31025]]$INFO[Container(11).CurrentPage, - $LOCALIZE[31024] (]$INFO[Container(11).NumPages,/,)]</label>
-               </control>
-               <control type="grouplist" id="9000">
-                       <posx>20</posx>
-                       <posy>740</posy>
-                       <width>760</width>
-                       <height>50</height>
-                       <itemgap>5</itemgap>
-                       <align>center</align>
-                       <orientation>horizontal</orientation>
-                       <onleft>9000</onleft>
-                       <onright>9000</onright>
-                       <onup>11</onup>
-                       <ondown>11</ondown>
-                       <control type="button" id="2">
-                               <description>Create Bookmark button</description>
-                               <label>294</label>
-                               <width>250</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                       </control>
-                       <control type="button" id="3">
-                               <description>Clear Bookmark button</description>
-                               <label>296</label>
-                               <width>250</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                       </control>
-                       <control type="button" id="4">
-                               <description>Clear Bookmark button</description>
-                               <label>20406</label>
-                               <width>250</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <visible>videoplayer.content(episodes)</visible>
-                       </control>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/VideoOSDSettings.xml b/addons/skin.touched/4x3Hirez/VideoOSDSettings.xml
deleted file mode 100644 (file)
index e04ee0f..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-<window id="123">
-       <defaultcontrol>5</defaultcontrol>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>240</posx>
-               <posy>80</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <description>Shadow Background for dialogs without BehindDialogFadeOut include</description>
-                       <posx>-30</posx>
-                       <posy>-30</posy>
-                       <width>860</width>
-                       <height>860</height>
-                       <texture border="30">DialogShadow.png</texture>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>800</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>800</width>
-                       <height>740</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-               <control type="label">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>700</width>
-                       <label>$LOCALIZE[3] - $LOCALIZE[5]</label>
-                       <visible>Window.IsVisible(123)</visible>
-               </control>
-               <control type="label">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>700</width>
-                       <label>$LOCALIZE[292] - $LOCALIZE[5]</label>
-                       <visible>Window.IsVisible(124)</visible>
-               </control>
-               <control type="group">
-                       <posx>730</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="label" id="3">
-                       <description>No Settings Label</description>
-                       <posx>20</posx>
-                       <posy>180</posy>
-                       <width>760</width>
-                       <align>center</align>
-                       <label>13390</label>
-                       <font>font13_title</font>
-               </control>
-               <control type="grouplist" id="5">
-                       <description>control area</description>
-                       <posx>20</posx>
-                       <posy>60</posy>
-                       <width>760</width>
-                       <height>650</height>
-                       <itemgap>-1</itemgap>
-                       <pagecontrol>-</pagecontrol>
-                       <onleft>5</onleft>
-                       <onright>5</onright>
-                       <onup>5</onup>
-                       <ondown>5</ondown>
-               </control>
-               <control type="sliderex" id="10">
-                       <description>Default Slider</description>
-                       <height>55</height>
-                       <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="button" id="7">
-                       <description>Default Button</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <height>55</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-               </control>
-               <control type="radiobutton" id="8">
-                       <description>Default RadioButton</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <height>55</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-               </control>
-               <control type="spincontrolex" id="9">
-                       <description>Default SpinControlex</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <height>55</height>
-                       <font>font13</font>
-                       <textcolor>black</textcolor>
-                       <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                       <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                       <aligny>center</aligny>
-                       <reverse>yes</reverse>
-               </control>
-               <control type="image" id="11">
-                       <description>separator image</description>
-                       <height>5</height>
-                       <texture>separator.png</texture>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/VideoOverlay.xml b/addons/skin.touched/4x3Hirez/VideoOverlay.xml
deleted file mode 100644 (file)
index 28b36e8..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<window id="2904">
-       <defaultcontrol>-</defaultcontrol>
-       <controls>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/ViewsAddonBrowser.xml b/addons/skin.touched/4x3Hirez/ViewsAddonBrowser.xml
deleted file mode 100644 (file)
index a3243d9..0000000
+++ /dev/null
@@ -1,162 +0,0 @@
-<includes>
-       <include name="CommonRootViewAddons">
-               <control type="panel" id="50">
-                       <posx>50</posx>
-                       <posy>120</posy>
-                       <width>1180</width>
-                       <height>720</height>
-                       <onleft>2</onleft>
-                       <onright>60</onright>
-                       <onup>50</onup>
-                       <ondown>50</ondown>
-                       <viewtype label="535">list</viewtype>
-                       <pagecontrol>60</pagecontrol>
-                       <scrolltime>200</scrolltime>
-                       <itemlayout height="60" width="1180">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>1180</width>
-                                       <height>60</height>
-                                       <texture border="5">ListNF.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>5</posy>
-                                       <width>50</width>
-                                       <height>50</height>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>75</posx>
-                                       <posy>0</posy>
-                                       <width>1000</width>
-                                       <height>60</height>
-                                       <font>font16</font>
-                                       <textcolor>grey2</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>1130</posx>
-                                       <posy>2</posy>
-                                       <width>400</width>
-                                       <height>30</height>
-                                       <font>font13</font>
-                                       <textcolor>grey2</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Property(Addon.Status),, - ]$INFO[ListItem.Property(Addon.Version)]</label>
-                                       <visible>!stringcompare(ListItem.Property(Addon.Status),$LOCALIZE[305])</visible>
-                               </control>
-                               <control type="label">
-                                       <posx>1130</posx>
-                                       <posy>2</posy>
-                                       <width>400</width>
-                                       <height>30</height>
-                                       <font>font13</font>
-                                       <textcolor>grey2</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Property(Addon.Version)]</label>
-                                       <visible>stringcompare(ListItem.Property(Addon.Status),$LOCALIZE[305])</visible>
-                               </control>
-                               <control type="image">
-                                       <description>Rating value</description>
-                                       <posx>1030</posx>
-                                       <posy>30</posy>
-                                       <width>100</width>
-                                       <height>25</height>
-                                       <aspectratio align="left">keep</aspectratio>
-                                       <texture fallback="light/left_rating/rating0.png">$INFO[ListItem.Property(Addon.StarRating),light/left_rating/]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>1140</posx>
-                                       <posy>15</posy>
-                                       <width>30</width>
-                                       <height>30</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>light/OverlayWatched.png</texture>
-                                       <visible>stringcompare(ListItem.Label2,$LOCALIZE[305])</visible>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="60" width="1180">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>1180</width>
-                                       <height>60</height>
-                                       <texture border="5">ListFO.png</texture>
-                                       <include>VisibleFadeEffect</include>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>5</posy>
-                                       <width>50</width>
-                                       <height>50</height>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>75</posx>
-                                       <posy>0</posy>
-                                       <width>1000</width>
-                                       <height>60</height>
-                                       <font>font16</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>1130</posx>
-                                       <posy>2</posy>
-                                       <width>400</width>
-                                       <height>30</height>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Property(Addon.Status),, - ]$INFO[ListItem.Property(Addon.Version)]</label>
-                                       <visible>!stringcompare(ListItem.Property(Addon.Status),$LOCALIZE[305])</visible>
-                               </control>
-                               <control type="label">
-                                       <posx>1130</posx>
-                                       <posy>2</posy>
-                                       <width>400</width>
-                                       <height>30</height>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Property(Addon.Version)]</label>
-                                       <visible>stringcompare(ListItem.Property(Addon.Status),$LOCALIZE[305])</visible>
-                               </control>
-                               <control type="image">
-                                       <description>Rating value</description>
-                                       <posx>1030</posx>
-                                       <posy>30</posy>
-                                       <width>100</width>
-                                       <height>25</height>
-                                       <aspectratio align="left">keep</aspectratio>
-                                       <texture fallback="dark/left_rating/rating0.png">$INFO[ListItem.Property(Addon.StarRating),light/left_rating/]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>1140</posx>
-                                       <posy>15</posy>
-                                       <width>30</width>
-                                       <height>30</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>dark/OverlayWatched.png</texture>
-                                       <visible>stringcompare(ListItem.Label2,$LOCALIZE[305])</visible>
-                               </control>
-                       </focusedlayout>
-               </control>
-       </include>
-</includes>
diff --git a/addons/skin.touched/4x3Hirez/ViewsCommon.xml b/addons/skin.touched/4x3Hirez/ViewsCommon.xml
deleted file mode 100644 (file)
index 6b2c044..0000000
+++ /dev/null
@@ -1,931 +0,0 @@
-<includes>
-       <include name="CommonRootView">
-               <control type="panel" id="50">
-                       <posx>50</posx>
-                       <posy>120</posy>
-                       <width>1180</width>
-                       <height>720</height>
-                       <onleft>2</onleft>
-                       <onright>60</onright>
-                       <onup>50</onup>
-                       <ondown>50</ondown>
-                       <viewtype label="535">list</viewtype>
-                       <pagecontrol>60</pagecontrol>
-                       <scrolltime>200</scrolltime>
-                       <itemlayout height="60" width="1180">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>1180</width>
-                                       <height>60</height>
-                                       <texture border="5">ListNF.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>5</posy>
-                                       <width>50</width>
-                                       <height>50</height>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>75</posx>
-                                       <posy>0</posy>
-                                       <width>1000</width>
-                                       <height>60</height>
-                                       <font>font16</font>
-                                       <textcolor>grey2</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>1160</posx>
-                                       <posy>2</posy>
-                                       <width>400</width>
-                                       <height>30</height>
-                                       <font>font13</font>
-                                       <textcolor>grey2</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label2]</label>
-                               </control>
-                               <control type="image">
-                                       <description>Rating value</description>
-                                       <posx>1065</posx>
-                                       <posy>30</posy>
-                                       <width>100</width>
-                                       <height>25</height>
-                                       <aspectratio align="left">keep</aspectratio>
-                                       <texture fallback="light/left_rating/rating0.png">$INFO[ListItem.StarRating,light/left_rating/]</texture>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="60" width="1180">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>1180</width>
-                                       <height>60</height>
-                                       <texture border="5">ListFO.png</texture>
-                                       <include>VisibleFadeEffect</include>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>5</posy>
-                                       <width>50</width>
-                                       <height>50</height>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>75</posx>
-                                       <posy>0</posy>
-                                       <width>1000</width>
-                                       <height>60</height>
-                                       <font>font16</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>1160</posx>
-                                       <posy>2</posy>
-                                       <width>400</width>
-                                       <height>30</height>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label2]</label>
-                               </control>
-                               <control type="image">
-                                       <description>Rating value</description>
-                                       <posx>1065</posx>
-                                       <posy>30</posy>
-                                       <width>100</width>
-                                       <height>25</height>
-                                       <aspectratio align="left">keep</aspectratio>
-                                       <texture fallback="dark/left_rating/rating0.png">$INFO[ListItem.StarRating,dark/left_rating/]</texture>
-                               </control>
-                       </focusedlayout>
-               </control>
-       </include>
-       <include name="CommonRootViewVideo">
-               <control type="panel" id="50">
-                       <posx>50</posx>
-                       <posy>120</posy>
-                       <width>1180</width>
-                       <height>720</height>
-                       <onleft>2</onleft>
-                       <onright>60</onright>
-                       <onup>50</onup>
-                       <ondown>50</ondown>
-                       <viewtype label="535">list</viewtype>
-                       <pagecontrol>60</pagecontrol>
-                       <scrolltime>200</scrolltime>
-                       <itemlayout height="60" width="1180">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>1180</width>
-                                       <height>60</height>
-                                       <texture border="5">ListNF.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>5</posy>
-                                       <width>50</width>
-                                       <height>50</height>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>75</posx>
-                                       <posy>0</posy>
-                                       <width>1000</width>
-                                       <height>60</height>
-                                       <font>font16</font>
-                                       <textcolor>grey2</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>1130</posx>
-                                       <posy>2</posy>
-                                       <width>400</width>
-                                       <height>30</height>
-                                       <font>font13</font>
-                                       <textcolor>grey2</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label2]</label>
-                                       <visible>![Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
-                               </control>
-                               <control type="image">
-                                       <description>Rating value</description>
-                                       <posx>1030</posx>
-                                       <posy>30</posy>
-                                       <width>100</width>
-                                       <height>25</height>
-                                       <aspectratio align="left">keep</aspectratio>
-                                       <texture fallback="light/left_rating/rating0.png">$INFO[ListItem.StarRating,light/left_rating/]</texture>
-                                       <visible>![Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
-                               </control>
-                               <control type="label">
-                                       <posx>1070</posx>
-                                       <posy>2</posy>
-                                       <width>400</width>
-                                       <height>30</height>
-                                       <font>font13</font>
-                                       <textcolor>grey2</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label2]</label>
-                                       <visible>[Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
-                               </control>
-                               <control type="image">
-                                       <description>Rating value</description>
-                                       <posx>970</posx>
-                                       <posy>30</posy>
-                                       <width>100</width>
-                                       <height>25</height>
-                                       <aspectratio align="left">keep</aspectratio>
-                                       <texture fallback="light/left_rating/rating0.png">$INFO[ListItem.StarRating,light/left_rating/]</texture>
-                                       <visible>[Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
-                               </control>
-                               <control type="image">
-                                       <posx>1080</posx>
-                                       <posy>10</posy>
-                                       <width>60</width>
-                                       <height>40</height>
-                                       <texture>$INFO[ListItem.VideoResolution,light/,.png]</texture>
-                                       <visible>[Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
-                               </control>
-                               <control type="image">
-                                       <posx>1142</posx>
-                                       <posy>17</posy>
-                                       <width>25</width>
-                                       <height>25</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>OverlayWatching.png</texture>
-                                       <visible>ListItem.IsResumable</visible>
-                               </control>
-                               <control type="image">
-                                       <posx>1140</posx>
-                                       <posy>15</posy>
-                                       <width>30</width>
-                                       <height>30</height>
-                                       <texture>$INFO[ListItem.Overlay,light/]</texture>
-                                       <visible>!ListItem.IsResumable</visible>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="60" width="1180">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>1180</width>
-                                       <height>60</height>
-                                       <texture border="5">ListFO.png</texture>
-                                       <include>VisibleFadeEffect</include>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>5</posy>
-                                       <width>50</width>
-                                       <height>50</height>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>75</posx>
-                                       <posy>0</posy>
-                                       <width>1000</width>
-                                       <height>60</height>
-                                       <font>font16</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>1130</posx>
-                                       <posy>2</posy>
-                                       <width>400</width>
-                                       <height>30</height>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label2]</label>
-                                       <visible>![Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
-                               </control>
-                               <control type="image">
-                                       <description>Rating value</description>
-                                       <posx>1030</posx>
-                                       <posy>30</posy>
-                                       <width>100</width>
-                                       <height>25</height>
-                                       <aspectratio align="left">keep</aspectratio>
-                                       <texture fallback="dark/left_rating/rating0.png">$INFO[ListItem.StarRating,dark/left_rating/]</texture>
-                                       <visible>![Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
-                               </control>
-                               <control type="label">
-                                       <posx>1070</posx>
-                                       <posy>2</posy>
-                                       <width>400</width>
-                                       <height>30</height>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label2]</label>
-                                       <visible>[Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
-                               </control>
-                               <control type="image">
-                                       <description>Rating value</description>
-                                       <posx>970</posx>
-                                       <posy>30</posy>
-                                       <width>100</width>
-                                       <height>25</height>
-                                       <aspectratio align="left">keep</aspectratio>
-                                       <texture fallback="dark/left_rating/rating0.png">$INFO[ListItem.StarRating,dark/left_rating/]</texture>
-                                       <visible>[Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
-                               </control>
-                               <control type="image">
-                                       <posx>1080</posx>
-                                       <posy>10</posy>
-                                       <width>60</width>
-                                       <height>40</height>
-                                       <texture>$INFO[ListItem.VideoResolution,dark/,.png]</texture>
-                                       <visible>[Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
-                               </control>
-                               <control type="image">
-                                       <posx>1142</posx>
-                                       <posy>17</posy>
-                                       <width>25</width>
-                                       <height>25</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>OverlayWatching.png</texture>
-                                       <visible>ListItem.IsResumable</visible>
-                               </control>
-                               <control type="image">
-                                       <posx>1140</posx>
-                                       <posy>15</posy>
-                                       <width>30</width>
-                                       <height>30</height>
-                                       <texture>$INFO[ListItem.Overlay,dark/]</texture>
-                                       <visible>!ListItem.IsResumable</visible>
-                               </control>
-                       </focusedlayout>
-               </control>
-       </include>
-       <include name="ThumbnailView">
-               <control type="panel" id="500">
-                       <posx>50</posx>
-                       <posy>120</posy>
-                       <width>1180</width>
-                       <height>720</height>
-                       <onleft>2</onleft>
-                       <onright>60</onright>
-                       <onup>500</onup>
-                       <ondown>500</ondown>
-                       <viewtype label="21371">wide</viewtype>
-                       <pagecontrol>60</pagecontrol>
-                       <scrolltime>200</scrolltime>
-                       <preloaditems>2</preloaditems>
-                       <itemlayout condition="!Container.Content(Movies) + !Container.Content(Seasons) + !Container.Content(Episodes)" height="240" width="236">
-                               <control type="image">
-                                       <posx>5</posx>
-                                       <posy>5</posy>
-                                       <width>226</width>
-                                       <height>230</height>
-                                       <texture border="5">SubBack.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>10</posy>
-                                       <width>216</width>
-                                       <height>185</height>
-                                       <texture background="true">$INFO[Listitem.Icon]</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>119</posx>
-                                       <posy>200</posy>
-                                       <width>210</width>
-                                       <height>25</height>
-                                       <font>font12</font>
-                                       <textcolor>grey2</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <info>ListItem.Label</info>
-                               </control>
-                               <control type="image">
-                                       <posx>184</posx>
-                                       <posy>11</posy>
-                                       <width>40</width>
-                                       <height>30</height>
-                                       <texture>$INFO[ListItem.VideoResolution,light/,.png]</texture>
-                                       <visible>Container.Content(MusicVideos)</visible>
-                               </control>
-                               <control type="image">
-                                       <posx>195</posx>
-                                       <posy>170</posy>
-                                       <width>30</width>
-                                       <height>30</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>$INFO[ListItem.Overlay]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>5</posx>
-                                       <posy>5</posy>
-                                       <width>226</width>
-                                       <height>230</height>
-                                       <texture>GlassOverlay.png</texture>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout condition="!Container.Content(Movies) + !Container.Content(Seasons) + !Container.Content(Episodes)" height="240" width="236">
-                               <control type="image">
-                                       <posx>5</posx>
-                                       <posy>5</posy>
-                                       <width>226</width>
-                                       <height>230</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>10</posy>
-                                       <width>216</width>
-                                       <height>185</height>
-                                       <texture background="true">$INFO[Listitem.Icon]</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>119</posx>
-                                       <posy>200</posy>
-                                       <width>210</width>
-                                       <height>25</height>
-                                       <font>font12</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <info>ListItem.Label</info>
-                               </control>
-                               <control type="image">
-                                       <posx>184</posx>
-                                       <posy>11</posy>
-                                       <width>40</width>
-                                       <height>30</height>
-                                       <texture>$INFO[ListItem.VideoResolution,light/,.png]</texture>
-                                       <visible>Container.Content(MusicVideos)</visible>
-                               </control>
-                               <control type="image">
-                                       <posx>195</posx>
-                                       <posy>170</posy>
-                                       <width>30</width>
-                                       <height>30</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>$INFO[ListItem.Overlay]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>5</posx>
-                                       <posy>5</posy>
-                                       <width>226</width>
-                                       <height>230</height>
-                                       <texture>GlassOverlay.png</texture>
-                               </control>
-                       </focusedlayout>
-                       <itemlayout condition="Container.Content(Movies) | Container.Content(Seasons)" height="360" width="236">
-                               <control type="image">
-                                       <posx>5</posx>
-                                       <posy>5</posy>
-                                       <width>226</width>
-                                       <height>350</height>
-                                       <texture border="5">SubBack.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>15</posx>
-                                       <posy>15</posy>
-                                       <width>206</width>
-                                       <height>300</height>
-                                       <texture background="true">$INFO[Listitem.Icon]</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>119</posx>
-                                       <posy>320</posy>
-                                       <width>210</width>
-                                       <height>25</height>
-                                       <font>font12</font>
-                                       <textcolor>grey2</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <info>ListItem.Label</info>
-                               </control>
-                               <control type="image">
-                                       <posx>184</posx>
-                                       <posy>11</posy>
-                                       <width>40</width>
-                                       <height>30</height>
-                                       <texture>$INFO[ListItem.VideoResolution,light/,.png]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>195</posx>
-                                       <posy>280</posy>
-                                       <width>30</width>
-                                       <height>30</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>$INFO[ListItem.Overlay]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>5</posx>
-                                       <posy>5</posy>
-                                       <width>245</width>
-                                       <height>350</height>
-                                       <texture>GlassOverlay.png</texture>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout condition="Container.Content(Movies) | Container.Content(Seasons)" height="360" width="236">
-                               <control type="image">
-                                       <posx>5</posx>
-                                       <posy>5</posy>
-                                       <width>226</width>
-                                       <height>350</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>15</posx>
-                                       <posy>15</posy>
-                                       <width>206</width>
-                                       <height>300</height>
-                                       <texture background="true">$INFO[Listitem.Icon]</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>119</posx>
-                                       <posy>320</posy>
-                                       <width>210</width>
-                                       <height>25</height>
-                                       <font>font12</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <info>ListItem.Label</info>
-                               </control>
-                               <control type="image">
-                                       <posx>184</posx>
-                                       <posy>11</posy>
-                                       <width>40</width>
-                                       <height>30</height>
-                                       <texture>$INFO[ListItem.VideoResolution,light/,.png]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>195</posx>
-                                       <posy>280</posy>
-                                       <width>30</width>
-                                       <height>30</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>$INFO[ListItem.Overlay]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>5</posx>
-                                       <posy>5</posy>
-                                       <width>245</width>
-                                       <height>350</height>
-                                       <texture>GlassOverlay.png</texture>
-                               </control>
-                       </focusedlayout>
-                       <itemlayout condition="Container.Content(Episodes)" height="240" width="295">
-                               <control type="image">
-                                       <posx>5</posx>
-                                       <posy>5</posy>
-                                       <width>285</width>
-                                       <height>230</height>
-                                       <texture border="5">SubBack.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>10</posy>
-                                       <width>275</width>
-                                       <height>185</height>
-                                       <aspectratio>scale</aspectratio>
-                                       <texture background="true">$INFO[Listitem.Icon]</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>148</posx>
-                                       <posy>200</posy>
-                                       <width>275</width>
-                                       <height>25</height>
-                                       <font>font12</font>
-                                       <textcolor>grey2</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <info>ListItem.Label</info>
-                               </control>
-                               <control type="image">
-                                       <posx>245</posx>
-                                       <posy>10</posy>
-                                       <width>40</width>
-                                       <height>30</height>
-                                       <texture>$INFO[ListItem.VideoResolution,light/,.png]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>250</posx>
-                                       <posy>170</posy>
-                                       <width>30</width>
-                                       <height>30</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>$INFO[ListItem.Overlay]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>5</posx>
-                                       <posy>5</posy>
-                                       <width>226</width>
-                                       <height>230</height>
-                                       <texture>GlassOverlay.png</texture>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout condition="Container.Content(Episodes)" height="240" width="295">
-                               <control type="image">
-                                       <posx>5</posx>
-                                       <posy>5</posy>
-                                       <width>285</width>
-                                       <height>230</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>10</posy>
-                                       <width>275</width>
-                                       <height>185</height>
-                                       <aspectratio>scale</aspectratio>
-                                       <texture background="true">$INFO[Listitem.Icon]</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>148</posx>
-                                       <posy>200</posy>
-                                       <width>275</width>
-                                       <height>25</height>
-                                       <font>font12</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <info>ListItem.Label</info>
-                               </control>
-                               <control type="image">
-                                       <posx>245</posx>
-                                       <posy>10</posy>
-                                       <width>40</width>
-                                       <height>30</height>
-                                       <texture>$INFO[ListItem.VideoResolution,light/,.png]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>250</posx>
-                                       <posy>170</posy>
-                                       <width>30</width>
-                                       <height>30</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>$INFO[ListItem.Overlay]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>5</posx>
-                                       <posy>5</posy>
-                                       <width>226</width>
-                                       <height>230</height>
-                                       <texture>GlassOverlay.png</texture>
-                               </control>
-                       </focusedlayout>
-               </control>
-       </include>
-       <include name="WideIconView">
-               <control type="panel" id="502">
-                       <visible>!Container.Content(Movies) + !Container.Content(Episodes) + !Container.Content(Seasons) + !Container.Content(MusicVideos)</visible>
-                       <posx>40</posx>
-                       <posy>145</posy>
-                       <width>1200</width>
-                       <height>640</height>
-                       <onleft>502</onleft>
-                       <onright>502</onright>
-                       <onup>502</onup>
-                       <ondown>502</ondown>
-                       <pagecontrol>60</pagecontrol>
-                       <scrolltime>300</scrolltime>
-                       <preloaditems>2</preloaditems>
-                       <viewtype label="539">wide</viewtype>
-                       <itemlayout height="160" width="600">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>5</posy>
-                                       <width>590</width>
-                                       <height>155</height>
-                                       <texture border="5">SubBack.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>15</posy>
-                                       <width>570</width>
-                                       <height>110</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>5</posy>
-                                       <width>200</width>
-                                       <height>155</height>
-                                       <texture>GlassOverlay.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>10</posx>
-                                       <posy>130</posy>
-                                       <width>380</width>
-                                       <height>20</height>
-                                       <font>font13</font>
-                                       <textcolor>grey2</textcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>580</posx>
-                                       <posy>130</posy>
-                                       <width>380</width>
-                                       <height>20</height>
-                                       <font>font12</font>
-                                       <textcolor>grey2</textcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label2]</label>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="160" width="600">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>5</posy>
-                                       <width>590</width>
-                                       <height>155</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>15</posy>
-                                       <width>570</width>
-                                       <height>110</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>5</posy>
-                                       <width>200</width>
-                                       <height>155</height>
-                                       <texture>GlassOverlay.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>10</posx>
-                                       <posy>130</posy>
-                                       <width>380</width>
-                                       <height>20</height>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>580</posx>
-                                       <posy>130</posy>
-                                       <width>380</width>
-                                       <height>20</height>
-                                       <font>font12</font>
-                                       <textcolor>black</textcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label2]</label>
-                               </control>
-                       </focusedlayout>
-               </control>
-       </include>
-       <include name="DVDPostersView">
-               <control type="fixedlist" id="501">
-                       <visible>!Container.Content(LiveTV)</visible>
-                       <posx>40</posx>
-                       <posy>260</posy>
-                       <width>1200</width>
-                       <height>390</height>
-                       <onleft>57</onleft>
-                       <onright>57</onright>
-                       <onup>2</onup>
-                       <ondown>60</ondown>
-                       <viewtype label="31028">bigwrap</viewtype>
-                       <pagecontrol>60</pagecontrol>
-                       <scrolltime>200</scrolltime>
-                       <focusposition>2</focusposition>
-                       <orientation>horizontal</orientation>
-                       <preloaditems>4</preloaditems>
-                       <itemlayout height="350" width="240">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>240</width>
-                                       <height>350</height>
-                                       <aspectratio>stretch</aspectratio>
-                                       <texture border="5">SubBack.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>10</posy>
-                                       <width>220</width>
-                                       <height>330</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                                       <bordertexture>ThumbBorderGrey.png</bordertexture>
-                                       <bordersize>2</bordersize>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>240</width>
-                                       <height>350</height>
-                                       <texture>GlassOverlay.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>192</posx>
-                                       <posy>6</posy>
-                                       <width>40</width>
-                                       <height>30</height>
-                                       <texture>$INFO[ListItem.VideoResolution,light/,.png]</texture>
-                                       <visible>[Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="310" width="240">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>240</width>
-                                       <height>350</height>
-                                       <aspectratio>stretch</aspectratio>
-                                       <texture border="5">SubBack.png</texture>
-                                       <animation reversible="false" effect="zoom" center="auto" start="100" end="120" time="200">focus</animation>
-                                       <animation reversible="false" effect="zoom" center="auto" end="100" start="120" time="200">unfocus</animation>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>10</posy>
-                                       <width>220</width>
-                                       <height>330</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                                       <bordertexture>ThumbBorderGrey.png</bordertexture>
-                                       <bordersize>2</bordersize>
-                                       <animation reversible="false" effect="zoom" center="auto" start="100" end="120" time="200">focus</animation>
-                                       <animation reversible="false" effect="zoom" center="auto" end="100" start="120" time="200">unfocus</animation>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>240</width>
-                                       <height>350</height>
-                                       <texture>GlassOverlay.png</texture>
-                                       <animation reversible="false" effect="zoom" center="auto" start="100" end="120" time="200">focus</animation>
-                                       <animation reversible="false" effect="zoom" center="auto" end="100" start="120" time="200">unfocus</animation>
-                               </control>
-                               <control type="image">
-                                       <posx>192</posx>
-                                       <posy>6</posy>
-                                       <width>40</width>
-                                       <height>30</height>
-                                       <texture>$INFO[ListItem.VideoResolution,light/,.png]</texture>
-                                       <visible>[Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
-                                       <animation reversible="false" effect="slide" start="0,0" end="20,-30" time="200">focus</animation>
-                                       <animation reversible="false" effect="slide" end="0,0" start="20,-30" time="200">unfocus</animation>
-                               </control>
-                               <control type="image">
-                                       <posx>185</posx>
-                                       <posy>310</posy>
-                                       <width>35</width>
-                                       <height>35</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>$INFO[ListItem.Overlay]</texture>
-                                       <animation type="focus">
-                                               <effect type="fade" start="0" end="100" time="200" />
-                                               <effect type="slide" start="0,0" end="40,40" time="200" />
-                                       </animation>
-                                       <animation type="unfocus">
-                                               <effect type="fade" start="100" end="0" time="200" />
-                                               <effect type="slide" end="0,0" start="40,40" time="200" />
-                                       </animation>
-                               </control>
-                       </focusedlayout>
-               </control>
-               <control type="group">
-                       <visible>Control.IsVisible(501)</visible>
-                       <posx>0</posx>
-                       <posy>410</posy>
-                       <control type="button">
-                               <description>left Arrow</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>40</width>
-                               <height>60</height>
-                               <texturefocus>arrow-big-left.png</texturefocus>
-                               <texturenofocus>arrow-big-left.png</texturenofocus>
-                               <onclick>FirstPage</onclick>
-                               <visible>Container.HasPrevious</visible>
-                               <include>VisibleFadeEffect</include>
-                       </control>
-                       <control type="button">
-                               <description>right Arrow</description>
-                               <posx>40r</posx>
-                               <posy>0</posy>
-                               <width>40</width>
-                               <height>60</height>
-                               <texturefocus>arrow-big-right.png</texturefocus>
-                               <texturenofocus>arrow-big-right.png</texturenofocus>
-                               <onclick>LastPage</onclick>
-                               <visible>Container.HasNext</visible>
-                               <include>VisibleFadeEffect</include>
-                       </control>
-               </control>
-               <control type="label">
-                       <visible>Control.IsVisible(501)</visible>
-                       <posx>30</posx>
-                       <posy>160</posy>
-                       <width>1220</width>
-                       <height>30</height>
-                       <font>font28_title</font>
-                       <textcolor>white</textcolor>
-                       <scroll>true</scroll>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <label>$INFO[ListItem.Label]</label>
-               </control>
-               <control type="grouplist">
-                       <description>Media Codec Flagging Images</description>
-                       <visible>Control.IsVisible(501)</visible>
-                       <posx>0</posx>
-                       <posy>680</posy>
-                       <width>1280</width>
-                       <height>45</height>
-                       <align>center</align>
-                       <itemgap>2</itemgap>
-                       <orientation>horizontal</orientation>
-                       <include>VisibleFadeEffect</include>
-                       <include>VideoCodecFlaggingConditions</include>
-                       <include>AudioCodecFlaggingConditions</include>
-                       <include>AudioChannelsFlaggingConditions</include>
-                       <include>AspectCodecFlaggingConditions</include>
-                       <include>VideoTypeHackFlaggingConditions</include>
-               </control>
-       </include>
-</includes>
diff --git a/addons/skin.touched/4x3Hirez/ViewsMetaData.xml b/addons/skin.touched/4x3Hirez/ViewsMetaData.xml
deleted file mode 100644 (file)
index f81dc7c..0000000
+++ /dev/null
@@ -1,557 +0,0 @@
-<includes>
-       <include name="RootViewMetaDataVideo">
-               <control type="panel" id="550">
-                       <visible>Container.Content(Movies) | Container.Content(Episodes)</visible>
-                       <posx>50</posx>
-                       <posy>120</posy>
-                       <width>1180</width>
-                       <height>720</height>
-                       <onleft>2</onleft>
-                       <onright>60</onright>
-                       <onup>550</onup>
-                       <ondown>550</ondown>
-                       <viewtype label="31030">list</viewtype>
-                       <pagecontrol>60</pagecontrol>
-                       <scrolltime>200</scrolltime>
-                       <itemlayout condition="Container.Content(Movies)" height="180" width="1180">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>5</posy>
-                                       <width>1180</width>
-                                       <height>170</height>
-                                       <texture border="5">SubBack.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>5</posx>
-                                       <posy>10</posy>
-                                       <width>110</width>
-                                       <height>160</height>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>5</posy>
-                                       <width>210</width>
-                                       <height>170</height>
-                                       <texture>GlassOverlay.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>130</posx>
-                                       <posy>15</posy>
-                                       <width>940</width>
-                                       <height>25</height>
-                                       <font>font13_title</font>
-                                       <textcolor>white</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>130</posx>
-                                       <posy>45</posy>
-                                       <width>940</width>
-                                       <height>20</height>
-                                       <font>font13</font>
-                                       <textcolor>white</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Genre]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>1070</posx>
-                                       <posy>7</posy>
-                                       <width>400</width>
-                                       <height>30</height>
-                                       <font>font13</font>
-                                       <textcolor>grey2</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label2]</label>
-                               </control>
-                               <control type="image">
-                                       <description>Rating value</description>
-                                       <posx>970</posx>
-                                       <posy>35</posy>
-                                       <width>100</width>
-                                       <height>25</height>
-                                       <aspectratio align="left">keep</aspectratio>
-                                       <texture fallback="light/left_rating/rating0.png">$INFO[ListItem.StarRating,light/left_rating/]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>1080</posx>
-                                       <posy>15</posy>
-                                       <width>60</width>
-                                       <height>40</height>
-                                       <texture>$INFO[ListItem.VideoResolution,light/,.png]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>1142</posx>
-                                       <posy>22</posy>
-                                       <width>25</width>
-                                       <height>25</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>OverlayWatching.png</texture>
-                                       <visible>ListItem.IsResumable</visible>
-                               </control>
-                               <control type="image">
-                                       <posx>1140</posx>
-                                       <posy>20</posy>
-                                       <width>30</width>
-                                       <height>30</height>
-                                       <texture>$INFO[ListItem.Overlay,light/]</texture>
-                                       <visible>!ListItem.IsResumable</visible>
-                               </control>
-                               <control type="textbox">
-                                       <posx>130</posx>
-                                       <posy>65</posy>
-                                       <width>1030</width>
-                                       <height>95</height>
-                                       <font>font12</font>
-                                       <align>justify</align>
-                                       <textcolor>grey2</textcolor>
-                                       <label>$INFO[ListItem.Plot]</label>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout condition="Container.Content(Movies)" height="180" width="1180">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>5</posy>
-                                       <width>1180</width>
-                                       <height>170</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>5</posx>
-                                       <posy>10</posy>
-                                       <width>110</width>
-                                       <height>160</height>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>5</posy>
-                                       <width>210</width>
-                                       <height>170</height>
-                                       <texture>GlassOverlay.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>130</posx>
-                                       <posy>15</posy>
-                                       <width>940</width>
-                                       <height>25</height>
-                                       <font>font13_title</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>130</posx>
-                                       <posy>45</posy>
-                                       <width>940</width>
-                                       <height>20</height>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Genre]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>1070</posx>
-                                       <posy>7</posy>
-                                       <width>400</width>
-                                       <height>30</height>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label2]</label>
-                               </control>
-                               <control type="image">
-                                       <description>Rating value</description>
-                                       <posx>970</posx>
-                                       <posy>35</posy>
-                                       <width>100</width>
-                                       <height>25</height>
-                                       <aspectratio align="left">keep</aspectratio>
-                                       <texture fallback="dark/left_rating/rating0.png">$INFO[ListItem.StarRating,dark/left_rating/]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>1080</posx>
-                                       <posy>15</posy>
-                                       <width>60</width>
-                                       <height>40</height>
-                                       <texture>$INFO[ListItem.VideoResolution,dark/,.png]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>1142</posx>
-                                       <posy>22</posy>
-                                       <width>25</width>
-                                       <height>25</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>OverlayWatching.png</texture>
-                                       <visible>ListItem.IsResumable</visible>
-                               </control>
-                               <control type="image">
-                                       <posx>1140</posx>
-                                       <posy>20</posy>
-                                       <width>30</width>
-                                       <height>30</height>
-                                       <texture>$INFO[ListItem.Overlay,dark/]</texture>
-                                       <visible>ListItem.IsResumable</visible>
-                               </control>
-                               <control type="textbox">
-                                       <posx>130</posx>
-                                       <posy>65</posy>
-                                       <width>1030</width>
-                                       <height>95</height>
-                                       <font>font12</font>
-                                       <align>justify</align>
-                                       <textcolor>black</textcolor>
-                                       <label>$INFO[ListItem.Plot]</label>
-                               </control>
-                       </focusedlayout>
-                       <itemlayout condition="Container.Content(Episodes)" height="180" width="1180">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>5</posy>
-                                       <width>1180</width>
-                                       <height>170</height>
-                                       <texture border="5">SubBack.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>5</posx>
-                                       <posy>10</posy>
-                                       <width>230</width>
-                                       <height>160</height>
-                                       <aspectratio>scale</aspectratio>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>5</posy>
-                                       <width>200</width>
-                                       <height>170</height>
-                                       <texture>GlassOverlay.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>250</posx>
-                                       <posy>15</posy>
-                                       <width>820</width>
-                                       <height>25</height>
-                                       <font>font13_title</font>
-                                       <textcolor>white</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>250</posx>
-                                       <posy>45</posy>
-                                       <width>820</width>
-                                       <height>20</height>
-                                       <font>font13</font>
-                                       <textcolor>white</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Premiered,$LOCALIZE[20416] : ]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>1070</posx>
-                                       <posy>7</posy>
-                                       <width>400</width>
-                                       <height>30</height>
-                                       <font>font13</font>
-                                       <textcolor>grey2</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label2]</label>
-                               </control>
-                               <control type="image">
-                                       <description>Rating value</description>
-                                       <posx>970</posx>
-                                       <posy>35</posy>
-                                       <width>100</width>
-                                       <height>25</height>
-                                       <aspectratio align="left">keep</aspectratio>
-                                       <texture fallback="light/left_rating/rating0.png">$INFO[ListItem.StarRating,light/left_rating/]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>1080</posx>
-                                       <posy>15</posy>
-                                       <width>60</width>
-                                       <height>40</height>
-                                       <texture>$INFO[ListItem.VideoResolution,light/,.png]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>1142</posx>
-                                       <posy>22</posy>
-                                       <width>25</width>
-                                       <height>25</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>OverlayWatching.png</texture>
-                                       <visible>ListItem.IsResumable</visible>
-                               </control>
-                               <control type="image">
-                                       <posx>1140</posx>
-                                       <posy>20</posy>
-                                       <width>30</width>
-                                       <height>30</height>
-                                       <texture>$INFO[ListItem.Overlay,light/]</texture>
-                                       <visible>ListItem.IsResumable</visible>
-                               </control>
-                               <control type="textbox">
-                                       <posx>250</posx>
-                                       <posy>70</posy>
-                                       <width>910</width>
-                                       <height>83</height>
-                                       <font>font12</font>
-                                       <align>justify</align>
-                                       <textcolor>grey2</textcolor>
-                                       <label>$INFO[ListItem.Plot]</label>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout condition="Container.Content(Episodes)" height="165" width="1180">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>5</posy>
-                                       <width>1180</width>
-                                       <height>170</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>5</posx>
-                                       <posy>10</posy>
-                                       <width>230</width>
-                                       <height>160</height>
-                                       <aspectratio>scale</aspectratio>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>5</posy>
-                                       <width>200</width>
-                                       <height>170</height>
-                                       <texture>GlassOverlay.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>250</posx>
-                                       <posy>15</posy>
-                                       <width>820</width>
-                                       <height>25</height>
-                                       <font>font13_title</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>250</posx>
-                                       <posy>45</posy>
-                                       <width>820</width>
-                                       <height>20</height>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Premiered,$LOCALIZE[20416] : ]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>1070</posx>
-                                       <posy>7</posy>
-                                       <width>400</width>
-                                       <height>30</height>
-                                       <font>font13</font>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>selected</selectedcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label2]</label>
-                               </control>
-                               <control type="image">
-                                       <description>Rating value</description>
-                                       <posx>970</posx>
-                                       <posy>35</posy>
-                                       <width>100</width>
-                                       <height>25</height>
-                                       <aspectratio align="left">keep</aspectratio>
-                                       <texture fallback="dark/left_rating/rating0.png">$INFO[ListItem.StarRating,dark/left_rating/]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>1080</posx>
-                                       <posy>15</posy>
-                                       <width>60</width>
-                                       <height>40</height>
-                                       <texture>$INFO[ListItem.VideoResolution,dark/,.png]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>1142</posx>
-                                       <posy>22</posy>
-                                       <width>25</width>
-                                       <height>25</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture>OverlayWatching.png</texture>
-                                       <visible>ListItem.IsResumable</visible>
-                               </control>
-                               <control type="image">
-                                       <posx>1140</posx>
-                                       <posy>20</posy>
-                                       <width>30</width>
-                                       <height>30</height>
-                                       <texture>$INFO[ListItem.Overlay,dark/]</texture>
-                                       <visible>!ListItem.IsResumable</visible>
-                               </control>
-                               <control type="textbox">
-                                       <posx>250</posx>
-                                       <posy>70</posy>
-                                       <width>910</width>
-                                       <height>83</height>
-                                       <font>font12</font>
-                                       <align>justify</align>
-                                       <textcolor>black</textcolor>
-                                       <label>$INFO[ListItem.Plot]</label>
-                               </control>
-                       </focusedlayout>
-               </control>
-       </include>
-       <include name="WideIconMetaDataView">
-               <control type="panel" id="552">
-                       <visible>Container.Content(TVShows)</visible>
-                       <posx>40</posx>
-                       <posy>120</posy>
-                       <width>1200</width>
-                       <height>720</height>
-                       <onleft>502</onleft>
-                       <onright>502</onright>
-                       <onup>552</onup>
-                       <ondown>552</ondown>
-                       <pagecontrol>60</pagecontrol>
-                       <scrolltime>300</scrolltime>
-                       <preloaditems>2</preloaditems>
-                       <viewtype label="31031">list</viewtype>
-                       <itemlayout height="144" width="1200">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>5</posy>
-                                       <width>1200</width>
-                                       <height>134</height>
-                                       <texture border="5">SubBack.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>15</posy>
-                                       <width>610</width>
-                                       <height>114</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>5</posy>
-                                       <width>200</width>
-                                       <height>134</height>
-                                       <texture>GlassOverlay.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>630</posx>
-                                       <posy>15</posy>
-                                       <width>510</width>
-                                       <height>20</height>
-                                       <font>font13_title</font>
-                                       <textcolor>white</textcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>1180</posx>
-                                       <posy>15</posy>
-                                       <width>280</width>
-                                       <height>20</height>
-                                       <font>font12</font>
-                                       <textcolor>white</textcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label2]</label>
-                               </control>
-                               <control type="textbox">
-                                       <posx>630</posx>
-                                       <posy>35</posy>
-                                       <width>550</width>
-                                       <height>80</height>
-                                       <font>font12</font>
-                                       <align>justify</align>
-                                       <textcolor>grey2</textcolor>
-                                       <label>$INFO[ListItem.Plot]</label>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="144" width="1200">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>5</posy>
-                                       <width>1200</width>
-                                       <height>134</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>10</posx>
-                                       <posy>15</posy>
-                                       <width>610</width>
-                                       <height>114</height>
-                                       <aspectratio>keep</aspectratio>
-                                       <texture background="true">$INFO[ListItem.Icon]</texture>
-                               </control>
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>5</posy>
-                                       <width>200</width>
-                                       <height>134</height>
-                                       <texture>GlassOverlay.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>630</posx>
-                                       <posy>15</posy>
-                                       <width>510</width>
-                                       <height>20</height>
-                                       <font>font13_title</font>
-                                       <textcolor>black</textcolor>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label]</label>
-                               </control>
-                               <control type="label">
-                                       <posx>1180</posx>
-                                       <posy>15</posy>
-                                       <width>280</width>
-                                       <height>20</height>
-                                       <font>font12</font>
-                                       <textcolor>black</textcolor>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <label>$INFO[ListItem.Label2]</label>
-                               </control>
-                               <control type="textbox">
-                                       <posx>630</posx>
-                                       <posy>35</posy>
-                                       <width>550</width>
-                                       <height>80</height>
-                                       <font>font12</font>
-                                       <align>justify</align>
-                                       <textcolor>black</textcolor>
-                                       <label>$INFO[ListItem.Plot]</label>
-                               </control>
-                       </focusedlayout>
-               </control>
-       </include>
-</includes>
diff --git a/addons/skin.touched/4x3Hirez/VisualisationPresetList.xml b/addons/skin.touched/4x3Hirez/VisualisationPresetList.xml
deleted file mode 100644 (file)
index 9d522da..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-<window id="122">
-       <defaultcontrol>2</defaultcontrol>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>140</posx>
-               <posy>30</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1000</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="label">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>910</width>
-                       <label>$LOCALIZE[31048]</label>
-               </control>
-               <control type="group">
-                       <posx>930</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>1000</width>
-                       <height>840</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-               <control type="label" id="4">
-                       <description>No Settings Label</description>
-                       <posx>20</posx>
-                       <posy>250</posy>
-                       <width>960</width>
-                       <align>center</align>
-                       <label>13389</label>
-                       <font>font13_title</font>
-                       <textcolor>black</textcolor>
-               </control>
-               <control type="list" id="2">
-                       <posx>20</posx>
-                       <posy>80</posy>
-                       <width>960</width>
-                       <height>750</height>
-                       <onleft>2</onleft>
-                       <onright>2</onright>
-                       <onup>2</onup>
-                       <ondown>2</ondown>
-                       <pagecontrol>-</pagecontrol>
-                       <scrolltime>200</scrolltime>
-                       <itemlayout height="60">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>-2</posy>
-                                       <width>960</width>
-                                       <height>5</height>
-                                       <texture>separator.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>960</width>
-                                       <height>50</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>blue</selectedcolor>
-                                       <info>ListItem.Label</info>
-                               </control>
-                       </itemlayout>
-                       <focusedlayout height="60">
-                               <control type="image">
-                                       <posx>0</posx>
-                                       <posy>-2</posy>
-                                       <width>960</width>
-                                       <height>5</height>
-                                       <texture>separator.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>960</width>
-                                       <height>50</height>
-                                       <font>font13</font>
-                                       <align>left</align>
-                                       <aligny>center</aligny>
-                                       <textcolor>black</textcolor>
-                                       <selectedcolor>blue</selectedcolor>
-                                       <info>ListItem.Label</info>
-                               </control>
-                       </focusedlayout>
-               </control>
-               <control type="label">
-                       <description>number of files/pages in list text label</description>
-                       <posx>980</posx>
-                       <posy>850</posy>
-                       <width>300</width>
-                       <height>30</height>
-                       <font>font13</font>
-                       <align>right</align>
-                       <aligny>center</aligny>
-                       <scroll>true</scroll>
-                       <textcolor>black</textcolor>
-                       <label>($INFO[Container(2).NumItems]) $LOCALIZE[31025] - $LOCALIZE[31024] ($INFO[Container(2).CurrentPage]/$INFO[Container(2).NumPages])</label>
-               </control>
-       </controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/custom_skinsettings_1113.xml b/addons/skin.touched/4x3Hirez/custom_skinsettings_1113.xml
deleted file mode 100644 (file)
index 9ad3403..0000000
+++ /dev/null
@@ -1,333 +0,0 @@
-<window type="dialog" id="1113">
-       <defaultcontrol>91</defaultcontrol>
-       <allowoverlay>no</allowoverlay>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>140</posx>
-               <posy>30</posy>
-       </coordinates>
-       <controls>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>1000</width>
-                       <height>60</height>
-                       <texture border="5">DialogHeader.png</texture>
-               </control>
-               <control type="label">
-                       <description>header label</description>
-                       <posx>20</posx>
-                       <posy>0</posy>
-                       <include>WindowTitleCommons</include>
-                       <width>910</width>
-                       <label>20077</label>
-               </control>
-               <control type="group">
-                       <posx>930</posx>
-                       <posy>0</posy>
-                       <include>DialogCloseButtonCommons</include>
-               </control>
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>60</posy>
-                       <width>1000</width>
-                       <height>840</height>
-                       <texture border="5">DialogBack.png</texture>
-               </control>
-
-               <control type="group">
-                       <posx>20</posx>
-                       <posy>75</posy>
-                       <control type="button">
-                               <description>left Arrow</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>40</width>
-                               <height>40</height>
-                               <texturefocus>arrow-big-left.png</texturefocus>
-                               <texturenofocus>arrow-big-left.png</texturenofocus>
-                               <onclick>Control.Move(9,-1)</onclick>
-                               <include>VisibleFadeEffect</include>
-                               <visible>Container(9).HasPrevious</visible>
-                       </control>
-                       <control type="button" id="11001">
-                               <description>right Arrow</description>
-                               <posx>920</posx>
-                               <posy>0</posy>
-                               <width>40</width>
-                               <height>40</height>
-                               <texturefocus>arrow-big-right.png</texturefocus>
-                               <texturenofocus>arrow-big-right.png</texturenofocus>
-                               <onclick>Control.Move(9,1)</onclick>
-                               <include>VisibleFadeEffect</include>
-                               <visible>Container(9).HasNext</visible>
-                       </control>
-               </control>
-               <control type="grouplist" id="9">
-                       <description>button area</description>
-                       <posx>60</posx>
-                       <posy>70</posy>
-                       <width>880</width>
-                       <height>50</height>
-                       <itemgap>5</itemgap>
-                       <align>center</align>
-                       <orientation>horizontal</orientation>
-                       <onleft>9</onleft>
-                       <onright>9</onright>
-                       <onup>2</onup>
-                       <ondown>2</ondown>
-                       <control type="button" id="91">
-                               <description>Home Button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>10000</label>
-                               <onfocus>Skin.SetString(SkinSettings,1)</onfocus>
-                       </control>
-                       <control type="button" id="92">
-                               <description>Addon Button</description>
-                               <width>200</width>
-                               <include>ButtonInfoDialogsCommonValues</include>
-                               <label>24001</label>
-                               <onfocus>Skin.SetString(SkinSettings,2)</onfocus>
-                       </control>
-               </control>
-               <control type="grouplist" id="100">
-                       <description>control area</description>
-                       <posx>40</posx>
-                       <posy>140</posy>
-                       <width>920</width>
-                       <height>670</height>
-                       <itemgap>-1</itemgap>
-                       <pagecontrol>30</pagecontrol>
-                       <onup>9</onup>
-                       <ondown>9001</ondown>
-                       <onleft>2</onleft>
-                       <onright>30</onright>
-                       <visible>Skin.String(SkinSettings,1)</visible>
-                       <control type="label" id="101">
-                               <height>50</height>
-                               <width>920</width>
-                               <font>font13_title</font>
-                               <label>31500</label>
-                               <textcolor>black</textcolor>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                       </control>
-                       <control type="radiobutton" id="102">
-                               <description>Hide Videos</description>
-                               <height>55</height>
-                               <width>920</width>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                               <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                               <label>$LOCALIZE[3]</label>
-                               <onclick>Skin.ToggleSetting(HideHomeButtonVideo)</onclick>
-                               <selected>!Skin.HasSetting(HideHomeButtonVideo)</selected>
-                       </control>
-                       <control type="radiobutton" id="103">
-                               <description>Hide Movies</description>
-                               <height>55</height>
-                               <width>920</width>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                               <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                               <label>$LOCALIZE[20342]</label>
-                               <onclick>Skin.ToggleSetting(HideHomeButtonMovies)</onclick>
-                               <selected>!Skin.HasSetting(HideHomeButtonMovies)</selected>
-                               <enable>Library.HasContent(Movies)</enable>
-                       </control>
-                       <control type="radiobutton" id="104">
-                               <description>Hide TVShows</description>
-                               <height>55</height>
-                               <width>920</width>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                               <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                               <label>$LOCALIZE[20343]</label>
-                               <onclick>Skin.ToggleSetting(HideHomeButtonTVShows)</onclick>
-                               <selected>!Skin.HasSetting(HideHomeButtonTVShows)</selected>
-                               <enable>Library.HasContent(TVShows)</enable>
-               </control>
-                       <control type="radiobutton" id="105">
-                               <description>Hide Music</description>
-                               <height>55</height>
-                               <width>920</width>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                               <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                               <label>$LOCALIZE[2]</label>
-                               <onclick>Skin.ToggleSetting(HideHomeButtonMusic)</onclick>
-                               <selected>!Skin.HasSetting(HideHomeButtonMusic)</selected>
-                       </control>
-                       <control type="radiobutton" id="106">
-                               <description>Hide Pictures</description>
-                               <height>55</height>
-                               <width>920</width>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                               <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                               <label>$LOCALIZE[1]</label>
-                               <onclick>Skin.ToggleSetting(HideHomeButtonPictures)</onclick>
-                               <selected>!Skin.HasSetting(HideHomeButtonPictures)</selected>
-                       </control>
-                       <control type="radiobutton" id="107">
-                               <description>Hide Programs</description>
-                               <height>55</height>
-                               <width>920</width>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                               <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                               <label>$LOCALIZE[0]</label>
-                               <onclick>Skin.ToggleSetting(HideHomeButtonPrograms)</onclick>
-                               <selected>!Skin.HasSetting(HideHomeButtonPrograms)</selected>
-                       </control>
-                       <control type="label" id="110">
-                               <height>50</height>
-                               <width>920</width>
-                               <font>font13_title</font>
-                               <label>31502</label>
-                               <textcolor>black</textcolor>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                       </control>
-                       <control type="radiobutton" id="111">
-                               <description>Show Weather info and button</description>
-                               <height>55</height>
-                               <width>920</width>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                               <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                               <label>$LOCALIZE[31550]</label>
-                               <onclick>Skin.ToggleSetting(HideHomeButtonWeather)</onclick>
-                               <selected>!Skin.HasSetting(HideHomeButtonWeather)</selected>
-                       </control>
-                       <control type="radiobutton" id="112">
-                               <description>Videos Goes to root button</description>
-                               <height>55</height>
-                               <width>920</width>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                               <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                               <label>$LOCALIZE[31553]</label>
-                               <onclick>Skin.ToggleSetting(HomeVideosGoesToRoot)</onclick>
-                               <selected>Skin.HasSetting(HomeVideosGoesToRoot)</selected>
-                       </control>
-               </control>
-               <control type="grouplist" id="200">
-                       <description>control area</description>
-                       <posx>40</posx>
-                       <posy>140</posy>
-                       <width>920</width>
-                       <height>670</height>
-                       <itemgap>-1</itemgap>
-                       <pagecontrol>30</pagecontrol>
-                       <onup>9</onup>
-                       <ondown>9001</ondown>
-                       <onleft>2</onleft>
-                       <onright>30</onright>
-                       <visible>Skin.String(SkinSettings,2)</visible>
-                       <control type="label" id="201">
-                               <height>50</height>
-                               <width>920</width>
-                               <font>font13_title</font>
-                               <label>31501</label>
-                               <textcolor>black</textcolor>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                       </control>
-                       <control type="button" id="202">
-                               <description>Home Addon Button</description>
-                               <height>55</height>
-                               <width>920</width>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                               <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                               <label>$LOCALIZE[31551] 1</label>
-                               <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton1))]</label2>
-                               <onclick>Skin.SetAddon(HomeAddonButton1,xbmc.addon.video)</onclick>
-                       </control>
-                       <control type="button" id="203">
-                               <description>Home Addon Button</description>
-                               <height>55</height>
-                               <width>920</width>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                               <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                               <label>$LOCALIZE[31551] 2</label>
-                               <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton2))]</label2>
-                               <onclick>Skin.SetAddon(HomeAddonButton2,xbmc.addon.video)</onclick>
-                       </control>
-                       <control type="button" id="204">
-                               <description>Home Addon Button</description>
-                               <height>55</height>
-                               <width>920</width>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                               <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                               <label>$LOCALIZE[31551] 3</label>
-                               <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton3))]</label2>
-                               <onclick>Skin.SetAddon(HomeAddonButton3,xbmc.addon.video)</onclick>
-                       </control>
-                       <control type="button" id="205">
-                               <description>Home Addon Button</description>
-                               <height>55</height>
-                               <width>920</width>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                               <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                               <label>$LOCALIZE[31551] 4</label>
-                               <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton4))]</label2>
-                               <onclick>Skin.SetAddon(HomeAddonButton4,xbmc.addon.video)</onclick>
-                       </control>
-                       <control type="label" id="220">
-                               <height>50</height>
-                               <width>920</width>
-                               <font>font13_title</font>
-                               <label>31503</label>
-                               <textcolor>black</textcolor>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                       </control>
-                       <control type="button" id="221">
-                               <description>Subtitle Script Button</description>
-                               <height>55</height>
-                               <width>920</width>
-                               <font>font13</font>
-                               <textcolor>black</textcolor>
-                               <texturefocus border="0,2,0,2">MenuItemNF.png</texturefocus>
-                               <texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
-                               <label>$LOCALIZE[31552]</label>
-                               <label2>$INFO[system.addontitle(Skin.String(SubtitleScript_Path))]</label2>
-                               <onclick>Skin.SetAddon(SubtitleScript_Path,xbmc.python.subtitles)</onclick>
-                       </control>
-               </control>
-               <control type="scrollbar" id="30">
-                       <posx>975</posx>
-                       <posy>120</posy>
-                       <width>20</width>
-                       <height>670</height>
-                       <texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
-                       <texturesliderbar border="2,16,2,16">ScrollBarV_bar.png</texturesliderbar>
-                       <texturesliderbarfocus border="2,16,2,16">ScrollBarV_bar_focus.png</texturesliderbarfocus>
-                       <textureslidernib>ScrollBarNib.png</textureslidernib>
-                       <textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
-                       <onleft>2</onleft>
-                       <onright>9</onright>
-                       <showonepage>false</showonepage>
-                       <orientation>vertical</orientation>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/custom_volume_1112.xml b/addons/skin.touched/4x3Hirez/custom_volume_1112.xml
deleted file mode 100644 (file)
index 40ed021..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-<window id="1112" type="dialog">
-       <defaultcontrol always="true">9000</defaultcontrol>
-       <include>Window_OpenClose_Animation</include>
-       <controls>
-               <control type="button">
-                       <description>Hidden button to close the sort when its focused</description>
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>ScreenWidth</width>
-                       <height>ScreenHeight</height>
-                       <texturenofocus>-</texturenofocus>
-                       <texturefocus>-</texturefocus>
-                       <onclick>PreviousMenu</onclick>
-               </control>
-               <control type="group">
-                       <posx>205</posx>
-                       <posy>235r</posy>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>450</width>
-                               <height>80</height>
-                               <texture border="5">SubBack.png</texture>
-                       </control>
-                       <control type="image">
-                               <description>Panel Arrow image</description>
-                               <posx>100</posx>
-                               <posy>74</posy>
-                               <width>40</width>
-                               <height>40</height>
-                               <texture>arrow-big-down.png</texture>
-                       </control>
-                       <control type="progress">
-                               <description>Volume</description>
-                               <posx>20</posx>
-                               <posy>30</posy>
-                               <width>300</width>
-                               <height>20</height>
-                               <info>Player.Volume</info>
-                       </control>
-                       <control type="slider" id="1">
-                               <description>Volume Slider</description>
-                               <posx>20</posx>
-                               <posy>30</posy>
-                               <width>300</width>
-                               <height>15</height>
-                               <info>Player.Volume</info>
-                               <action>Volume</action>
-                               <texturesliderbar>seekslider.png</texturesliderbar>
-                               <textureslidernib>osd_slider_nibNF.png</textureslidernib>
-                               <textureslidernibfocus>osd_slider_nib.png</textureslidernibfocus>
-                       </control>
-                       <control type="label">
-                               <description>Volume Label</description>
-                               <posx>330</posx>
-                               <posy>30</posy>
-                               <width>100</width>
-                               <height>20</height>
-                               <label>$INFO[Player.Volume]</label>
-                               <font>font13</font>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                       </control>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/4x3Hirez/defaults.xml b/addons/skin.touched/4x3Hirez/defaults.xml
deleted file mode 100644 (file)
index d23b1de..0000000
+++ /dev/null
@@ -1,195 +0,0 @@
-<includes>
-       <default type="image">
-               <posx>0</posx>
-               <posy>0</posy>
-               <texture>-</texture>
-               <colorkey>0</colorkey>
-       </default>
-       <default type="label">
-               <posx>80</posx>
-               <posy>60</posy>
-               <label>-</label>
-               <font>font13</font>
-               <textcolor>white</textcolor>
-       </default>
-       <default type="fadelabel">
-               <posx>80</posx>
-               <posy>60</posy>
-               <font>font13</font>
-               <textcolor>white</textcolor>
-       </default>
-       <default type="button">
-               <posx>300</posx>
-               <posy>200</posy>
-               <width>300</width>
-               <height>42</height>
-               <texturefocus>button-focus.png</texturefocus>
-               <texturenofocus>button-nofocus.png</texturenofocus>
-               <font>font13</font>
-               <textcolor>white</textcolor>
-               <disabledcolor>grey3</disabledcolor>
-               <textoffsetx>10</textoffsetx>
-               <aligny>center</aligny>
-               <pulseonselect>no</pulseonselect>
-       </default>
-       <default type="togglebutton">
-               <posx>140</posx>
-               <posy>167</posy>
-               <width>20</width>
-               <height>20</height>
-               <texturefocus>scroll-up-focus.png</texturefocus>
-               <texturenofocus>scroll-up.png</texturenofocus>
-               <alttexturefocus>scroll-down-focus.png</alttexturefocus>
-               <alttexturenofocus>scroll-down.png</alttexturenofocus>
-               <textcolor>white</textcolor>
-               <label>-</label>
-               <font>font13</font>
-               <disabledcolor>grey3</disabledcolor>
-               <pulseonselect>no</pulseonselect>
-       </default>
-       <default type="textbox">
-               <posx>220</posx>
-               <posy>220</posy>
-               <width>410</width>
-               <height>215</height>
-               <align>left</align>
-               <textcolor>white</textcolor>
-               <font>font13</font>
-       </default>
-       <default type="progress">
-               <posx>100</posx>
-               <posy>325</posy>
-               <texturebg border="16,0,16,0">OSDProgressBack.png</texturebg>
-               <lefttexture>-</lefttexture>
-               <midtexture border="16,0,16,0">OSDProgressMid.png</midtexture>
-               <righttexture>-</righttexture>
-               <overlaytexture>-</overlaytexture>
-               <reveal>true</reveal>
-       </default>
-       <default type="spincontrol">
-               <posx>330</posx>
-               <posy>126</posy>
-               <spinwidth>45</spinwidth>
-               <spinheight>45</spinheight>
-               <textureup>Select_Up.png</textureup>
-               <texturedown>Select_Down.png</texturedown>
-               <textureupfocus>Select_Up.png</textureupfocus>
-               <texturedownfocus>Select_Down.png</texturedownfocus>
-               <align>right</align>
-               <width>33</width>
-               <height>22</height>
-               <font>font13</font>
-               <reverse>yes</reverse>
-               <textcolor>white</textcolor>
-               <disabledcolor>grey3</disabledcolor>
-               <subtype>text</subtype>
-               <textoffsetx>-5</textoffsetx>
-               <textoffsety>0</textoffsety>
-               <aligny>-</aligny>
-               <pulseonselect>no</pulseonselect>
-       </default>
-       <default type="spincontrolex">
-               <posx>530</posx>
-               <posy>160</posy>
-               <width>300</width>
-               <height>42</height>
-               <spinwidth>45</spinwidth>
-               <spinheight>45</spinheight>
-               <texturefocus>button-focus.png</texturefocus>
-               <texturenofocus>-</texturenofocus>
-               <textureup>Select_Up.png</textureup>
-               <texturedown>Select_Down.png</texturedown>
-               <textureupfocus>Select_Up.png</textureupfocus>
-               <texturedownfocus>Select_Down.png</texturedownfocus>
-               <font>font13</font>
-               <textcolor>white</textcolor>
-               <disabledcolor>grey3</disabledcolor>
-               <textoffsetx>10</textoffsetx>
-               <aligny>center</aligny>
-               <reverse>yes</reverse>
-               <pulseonselect>no</pulseonselect>
-       </default>
-       <default type="radiobutton">
-               <posx>300</posx>
-               <posy>200</posy>
-               <width>300</width>
-               <height>42</height>
-               <radiowidth>90</radiowidth>
-               <radioheight>45</radioheight>
-               <textureradiofocus>radiobutton-focus.png</textureradiofocus>
-               <textureradionofocus>radiobutton-nofocus.png</textureradionofocus>
-               <texturefocus>button-focus.png</texturefocus>
-               <texturenofocus>button-nofocus.png</texturenofocus>
-               <label>215</label>
-               <font>font13</font>
-               <textcolor>white</textcolor>
-               <disabledcolor>grey3</disabledcolor>
-               <textoffsetx>10</textoffsetx>
-               <aligny>center</aligny>
-               <pulseonselect>no</pulseonselect>
-       </default>
-       <default type="selectbutton">
-               <posx>490</posx>
-               <posy>335</posy>
-               <width>300</width>
-               <height>50</height>
-               <label>-</label>
-               <font>font12</font>
-               <texturefocus>-</texturefocus>
-               <texturenofocus>-</texturenofocus>
-               <texturebg>button-focus.png</texturebg>
-               <textureleft>scroll-left.png</textureleft>
-               <textureleftfocus>scroll-left-focus.png</textureleftfocus>
-               <textureright>scroll-right.png</textureright>
-               <texturerightfocus>scroll-right-focus.png</texturerightfocus>
-               <font>font13</font>
-               <textcolor>white</textcolor>
-               <disabledcolor>grey3</disabledcolor>
-               <aligny>center</aligny>
-       </default>
-       <default type="slider">
-               <controloffsetx>75</controloffsetx>
-               <controloffsety>0</controloffsety>
-       </default>
-       <default type="sliderex">
-               <height>35</height>
-               <textoffsetx>10</textoffsetx>
-               <aligny>center</aligny>
-               <texturefocus border="5">button-focus.png</texturefocus>
-               <texturenofocus border="5">button-nofocus.png</texturenofocus>
-               <sliderwidth>250</sliderwidth>
-               <sliderheight>20</sliderheight>
-               <texturesliderbar>osd_slider_bg.png</texturesliderbar>
-               <textureslidernib>osd_slider_nibNF.png</textureslidernib>
-               <textureslidernibfocus>osd_slider_nib.png</textureslidernibfocus>
-               <font>font12</font>
-               <textcolor>white</textcolor>
-               <disabledcolor>grey3</disabledcolor>
-       </default>
-       <default type="mover">
-               <posx>60</posx>
-               <posy>192</posy>
-               <texturefocus>button-focus.png</texturefocus>
-               <texturenofocus>button-nofocus.png</texturenofocus>
-       </default>
-       <default type="resize">
-               <posx>60</posx>
-               <posy>192</posy>
-               <texturefocus>button-focus.png</texturefocus>
-               <texturenofocus>button-nofocus.png</texturenofocus>
-       </default>
-       <default type="edit">
-               <posx>300</posx>
-               <posy>200</posy>
-               <width>300</width>
-               <height>42</height>
-               <texturefocus>button-focus.png</texturefocus>
-               <texturenofocus>button-nofocus.png</texturenofocus>
-               <font>font13</font>
-               <textcolor>white</textcolor>
-               <disabledcolor>grey3</disabledcolor>
-               <textoffsetx>10</textoffsetx>
-               <aligny>center</aligny>
-               <pulseonselect>no</pulseonselect>
-       </default>
-</includes>
\ No newline at end of file
diff --git a/addons/skin.touched/4x3Hirez/includes.xml b/addons/skin.touched/4x3Hirez/includes.xml
deleted file mode 100644 (file)
index 2b10b05..0000000
+++ /dev/null
@@ -1,628 +0,0 @@
-<includes>
-       <include file="defaults.xml" />
-       <include file="ViewsCommon.xml" />
-       <include file="ViewsMetaData.xml" />
-       <include file="ViewsAddonBrowser.xml" />
-       <include file="IncludesCodecFlagging.xml" />
-       <include file="IncludesPlayerControls.xml" />
-       <include file="IncludesKeypad.xml" />
-
-       <constant name="ScreenWidth">1280</constant>
-       <constant name="ScreenHeight">960</constant>
-       <constant name="FanartCrossfadeTime">500</constant>
-       <constant name="IconCrossfadeTime">400</constant>
-
-       <include name="CommonBackground">
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <aspectratio>scale</aspectratio>
-                       <width>ScreenWidth</width>
-                       <height>ScreenHeight</height>
-                       <texture>special://skin/background/background.png</texture>
-               </control>
-               <include>CommonHeader</include>
-               <control type="group">
-                       <visible>!Window.IsActive(PlayerControls)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>100</posy>
-                               <width>ScreenWidth</width>
-                               <height>10</height>
-                               <texture>shelf_shadow.png</texture>
-                       </control>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>20</posy>
-                               <width>ScreenWidth</width>
-                               <height>80</height>
-                               <texture border="0,0,0,2">header.png</texture>
-                       </control>
-                       <control type="button">
-                               <description>Previous Button</description>
-                               <posx>550</posx>
-                               <posy>30</posy>
-                               <width>45</width>
-                               <height>45</height>
-                               <label>-</label>
-                               <texturenofocus>PlayerControls2-PreviousNF.png</texturenofocus>
-                               <texturefocus>PlayerControls2-PreviousFO.png</texturefocus>
-                               <onclick>XBMC.PlayerControl(Previous)</onclick>
-                       </control>
-                       <control type="togglebutton">
-                               <description>Play Button</description>
-                               <posx>612</posx>
-                               <posy>23</posy>
-                               <width>56</width>
-                               <height>56</height>
-                               <label>-</label>
-                               <texturefocus>PlayerControls2-PlayFO.png</texturefocus>
-                               <texturenofocus>PlayerControls2-PlayNF.png</texturenofocus>
-                               <usealttexture>Player.Paused | Player.Forwarding | Player.Rewinding</usealttexture>
-                               <alttexturefocus>PlayerControls2-PauseFO.png</alttexturefocus>
-                               <alttexturenofocus>PlayerControls2-PauseNF.png</alttexturenofocus>
-                               <onclick>XBMC.PlayerControl(Play)</onclick>
-                       </control>
-                       <control type="button">
-                               <description>Next Button</description>
-                               <posx>680</posx>
-                               <posy>30</posy>
-                               <width>45</width>
-                               <height>45</height>
-                               <label>-</label>
-                               <texturenofocus>PlayerControls2-NextNF.png</texturenofocus>
-                               <texturefocus>PlayerControls2-NextFO.png</texturefocus>
-                               <onclick>XBMC.PlayerControl(Next)</onclick>
-                       </control>
-                       <control type="progress">
-                               <description>Progressbar</description>
-                               <posx>450</posx>
-                               <posy>83</posy>
-                               <width>380</width>
-                               <height>15</height>
-                               <info>Player.Progress</info>
-                       </control>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>64r</posy>
-                               <width>ScreenWidth</width>
-                               <height>64</height>
-                               <texture>floor.png</texture>
-                       </control>
-                       <control type="group">
-                               <posx>122r</posx>
-                               <posy>105r</posy>
-                               <visible>!Window.IsVisible(LoginScreen) + !Window.IsActive(InfoDialog)</visible>
-                               <include>VisibleFadeEffect</include>
-                               <control type="image">
-                                       <posx>16</posx>
-                                       <posy>80</posy>
-                                       <width>80</width>
-                                       <height>40</height>
-                                       <texture border="5">IconBack_reflect.png</texture>
-                               </control>
-                               <control type="button">
-                                       <description>Favourties Button</description>
-                                       <posx>16</posx>
-                                       <posy>0</posy>
-                                       <width>80</width>
-                                       <height>80</height>
-                                       <label>-</label>
-                                       <font>-</font>
-                                       <texturenofocus border="5">IconBack.png</texturenofocus>
-                                       <texturefocus border="5">IconBack-focus.png</texturefocus>
-                                       <onclick>ActivateWindow(Favourites)</onclick>
-                               </control>
-                               <control type="image">
-                                       <posx>28</posx>
-                                       <posy>12</posy>
-                                       <width>56</width>
-                                       <height>56</height>
-                                       <texture>icon_favourites.png</texture>
-                               </control>
-                               <control type="label">
-                                       <posx>6</posx>
-                                       <posy>82</posy>
-                                       <width>100</width>
-                                       <height>20</height>
-                                       <font>font11</font>
-                                       <textcolor>white</textcolor>
-                                       <shadowcolor>black</shadowcolor>
-                                       <align>center</align>
-                                       <aligny>center</aligny>
-                                       <label>$LOCALIZE[1036]</label>
-                               </control>
-                       </control>
-               </control>
-       </include>
-       <include name="CommonHeader">
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>ScreenWidth</width>
-                       <height>20</height>
-                       <texture>black.png</texture>
-               </control>
-               <control type="label">
-                       <description>XBMC label</description>
-                       <posx>5</posx>
-                       <posy>0</posy>
-                       <width>200</width>
-                       <height>18</height>
-                       <align>left</align>
-                       <aligny>center</aligny>
-                       <font>font10_title</font>
-                       <textcolor>white</textcolor>
-                       <label>XBMC</label>
-               </control>
-               <control type="label">
-                       <description>time label</description>
-                       <posx>200</posx>
-                       <posy>0</posy>
-                       <width>880</width>
-                       <height>18</height>
-                       <align>center</align>
-                       <aligny>center</aligny>
-                       <font>font10_title</font>
-                       <textcolor>white</textcolor>
-                       <label>$INFO[System.Time]</label>
-               </control>
-               <control type="progress">
-                       <description>Battery Percent</description>
-                       <posx>35r</posx>
-                       <posy>2</posy>
-                       <width>30</width>
-                       <height>15</height>
-                       <texturebg>BatteryBack.png</texturebg>
-                       <midtexture>BatteryFront.png</midtexture>
-                       <info>System.BatteryLevel</info>
-               </control>
-               <control type="label">
-                       <posx>45r</posx>
-                       <posy>0</posy>
-                       <width>200</width>
-                       <height>18</height>
-                       <font>font10_title</font>
-                       <textcolor>white</textcolor>
-                       <align>right</align>
-                       <aligny>center</aligny>
-                       <label>$INFO[System.BatteryLevel]</label>
-               </control>
-       </include>
-       <include name="BehindDialogFadeOut">
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>ScreenWidth</width>
-                       <height>ScreenHeight</height>
-                       <texture>black-back.png</texture>
-                       <animation effect="fade" time="400">Visible</animation>
-                       <animation effect="fade" time="200">Hidden</animation>
-                       <visible>Window.IsActive(ContextMenu) | Window.IsActive(MovieInformation) | Window.IsActive(MusicInformation) | Window.IsActive(SongInformation) | Window.IsActive(FileBrowser) | Window.IsActive(TextViewer) | Window.IsActive(AddonSettings) | Window.IsActive(ContentSettings) | Window.IsActive(SelectDialog) | Window.IsActive(FileStackingDialog) | Window.IsActive(MediaSource) | Window.IsActive(PictureInfo) | [Window.IsActive(NumericInput) + !Window.IsVisible(VirtualKeyboard)] | Window.IsActive(ProfileSettings) | Window.IsActive(LockSettings) | Window.IsActive(SmartPlaylistEditor) | Window.IsActive(SmartPlaylistRule) | Window.IsActive(script-RSS_Editor-rssEditor.xml) | Window.IsActive(script-RSS_Editor-setEditor.xml) | Window.IsActive(AddonInformation) | Window.IsActive(Favourites) | Window.IsActive(PictureInfo) | Window.IsActive(KaraokeLargeSelector) | Window.IsActive(custom_skinsettings_1113.xml)</visible>
-               </control>
-       </include>
-       <include name="MediaWindowTitleCommons">
-               <posx>300</posx>
-               <posy>64r</posy>
-               <width>680</width>
-               <height>64</height>
-               <align>center</align>
-               <aligny>center</aligny>
-               <font>font13_title</font>
-               <textcolor>white</textcolor>
-               <shadowcolor>black</shadowcolor>
-       </include>
-       <include name="WindowTitleCommons">
-               <height>60</height>
-               <align>left</align>
-               <aligny>center</aligny>
-               <font>font16</font>
-               <textcolor>white</textcolor>
-               <shadowcolor>black</shadowcolor>
-       </include>
-       <include name="FileCountCommons">
-               <control type="group">
-                       <posx>0</posx>
-                       <posy>35</posy>
-                       <include>Window_OpenClose_Animation</include>
-                       <control type="image">
-                               <posx>120r</posx>
-                               <posy>0</posy>
-                               <width>45</width>
-                               <height>45</height>
-                               <aspectratio>keep</aspectratio>
-                               <texture>filecount.png</texture>
-                       </control>
-                       <control type="label">
-                               <description>Page Count Label 1</description>
-                               <posx>130r</posx>
-                               <posy>2</posy>
-                               <width>500</width>
-                               <height>20</height>
-                               <font>font12</font>
-                               <textcolor>grey2</textcolor>
-                               <scroll>false</scroll>
-                               <align>right</align>
-                               <aligny>center</aligny>
-                               <label>$INFO[Window.Property(filter),$LOCALIZE[587] , - ]$INFO[Container.NumItems,, $LOCALIZE[31025]]</label>
-                       </control>
-                       <control type="label">
-                               <description>Page Count Label 2</description>
-                               <posx>130r</posx>
-                               <posy>22</posy>
-                               <width>500</width>
-                               <height>20</height>
-                               <font>font12</font>
-                               <textcolor>grey2</textcolor>
-                               <scroll>false</scroll>
-                               <align>right</align>
-                               <aligny>center</aligny>
-                               <label>$INFO[Container.CurrentPage,$LOCALIZE[31024] ]$INFO[Container.NumPages, of ,]</label>
-                       </control>
-               </control>
-       </include>
-       <include name="ScrollArrowsCommons">
-               <control type="scrollbar" id="60">
-                       <posx>25r</posx>
-                       <posy>120</posy>
-                       <width>17</width>
-                       <height>720</height>
-                       <texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
-                       <texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
-                       <texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
-                       <textureslidernib>ScrollBarNib.png</textureslidernib>
-                       <textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
-                       <onleft>60</onleft>
-                       <onright>60</onright>
-                       <ondown>60</ondown>
-                       <onup>60</onup>
-                       <showonepage>true</showonepage>
-                       <orientation>vertical</orientation>
-                       <visible>Container.Scrolling</visible>
-                       <animation effect="fade" time="150">Visible</animation>
-                       <animation effect="fade" time="150">Hidden</animation>
-               </control>
-       </include>
-       <include name="HomeButtonCommons">
-               <control type="button">
-                       <description>Home Button</description>
-                       <posx>0</posx>
-                       <posy>25</posy>
-                       <width>64</width>
-                       <height>64</height>
-                       <texturenofocus>icon_home.png</texturenofocus>
-                       <texturefocus>icon_home.png</texturefocus>
-                       <onclick>ActivateWindow(Home)</onclick>
-               </control>
-       </include>
-       <include name="OptionsButtonCommons">
-               <control type="button">
-                       <description>Options Button</description>
-                       <posx>64r</posx>
-                       <posy>25</posy>
-                       <width>64</width>
-                       <height>64</height>
-                       <texturenofocus>icon_system.png</texturenofocus>
-                       <texturefocus>icon_system.png</texturefocus>
-                       <onclick>Skin.ToggleSetting(MediaSubMenuVisible)</onclick>
-               </control>
-       </include>
-       <include name="DialogCloseButtonCommons">
-               <control type="image">
-                       <posx>0</posx>
-                       <posy>0</posy>
-                       <width>2</width>
-                       <height>59</height>
-                       <texture>header-divide.png</texture>
-               </control>
-               <control type="button">
-                       <description>Close Button</description>
-                       <posx>7</posx>
-                       <posy>0</posy>
-                       <width>60</width>
-                       <height>60</height>
-                       <font>-</font>
-                       <onclick>previousmenu</onclick>
-                       <texturefocus>icon_close.png</texturefocus>
-                       <texturenofocus>icon_close.png</texturenofocus>
-               </control>
-       </include>
-       <include name="MediaSubMenu">
-               <control type="button" id="19">
-                       <description>Filter button needed for panel below to work</description>
-                       <visible>false</visible>
-               </control>
-               <control type="panel" id="9002">
-                       <visible>!Window.IsActive(PlayerControls)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <include>SubMenuCommonLayout</include>
-                       <content>
-                               <item>
-                                       <label>31200</label>
-                                       <onclick>ParentDir</onclick>
-                                       <icon>icon_back.png</icon>
-                               </item>
-                               <item>
-                                       <label>31202</label>
-                                       <onclick>Container.NextViewMode</onclick>
-                                       <icon>icon_view.png</icon>
-                               </item>
-                               <item>
-                                       <label>587</label>
-                                       <onclick>SendClick(19)</onclick>
-                                       <icon>icon_filter.png</icon>
-                                       <visible>IsEmpty(Window.Property(filter))</visible>
-                               </item>
-                               <item>
-                                       <label>587</label>
-                                       <onclick>SendClick(19)</onclick>
-                                       <icon>icon_filter_on.png</icon>
-                                       <visible>!IsEmpty(Window.Property(filter))</visible>
-                               </item>
-                       </content>
-               </control>
-       </include>
-       <include name="SubMenuCommonLayout">
-               <include>Window_OpenClose_Animation</include>
-               <posx>10</posx>
-               <posy>105r</posy>
-               <width>620</width>
-               <height>120</height>
-               <onleft>9002</onleft>
-               <onright>9002</onright>
-               <onup>9001</onup>
-               <ondown>20</ondown>
-               <pagecontrol>-</pagecontrol>
-               <scrolltime>300</scrolltime>
-               <orientation>Horizontal</orientation>
-               <itemlayout height="200" width="112">
-                       <control type="image">
-                               <posx>16</posx>
-                               <posy>80</posy>
-                               <width>80</width>
-                               <height>40</height>
-                               <texture border="5">IconBack_reflect.png</texture>
-                       </control>
-                       <control type="image">
-                               <posx>16</posx>
-                               <posy>0</posy>
-                               <width>80</width>
-                               <height>80</height>
-                               <bordertexture border="5">IconBack.png</bordertexture>
-                               <bordersize>12</bordersize>
-                               <texture>$INFO[ListItem.Icon]</texture>
-                       </control>
-                       <control type="label">
-                               <posx>56</posx>
-                               <posy>82</posy>
-                               <width>100</width>
-                               <height>20</height>
-                               <font>font11</font>
-                               <textcolor>white</textcolor>
-                               <shadowcolor>black</shadowcolor>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <label>$INFO[ListItem.Label]</label>
-                       </control>
-               </itemlayout>
-               <focusedlayout height="200" width="112">
-                       <control type="image">
-                               <posx>16</posx>
-                               <posy>80</posy>
-                               <width>80</width>
-                               <height>40</height>
-                               <texture border="5">IconBack_reflect.png</texture>
-                       </control>
-                       <control type="image">
-                               <posx>16</posx>
-                               <posy>0</posy>
-                               <width>80</width>
-                               <height>80</height>
-                               <bordertexture border="5">IconBack-focus.png</bordertexture>
-                               <bordersize>12</bordersize>
-                               <texture>$INFO[ListItem.Icon]</texture>
-                       </control>
-                       <control type="label">
-                               <posx>56</posx>
-                               <posy>82</posy>
-                               <width>100</width>
-                               <height>20</height>
-                               <font>font11</font>
-                               <textcolor>white</textcolor>
-                               <shadowcolor>black</shadowcolor>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <label>$INFO[ListItem.Label]</label>
-                       </control>
-               </focusedlayout>
-       </include>
-       <include name="ButtonCommonValues2">
-               <height>60</height>
-               <width>298</width>
-               <textoffsetx>10</textoffsetx>
-               <textwidth>280</textwidth>
-               <textcolor>black</textcolor>
-               <align>left</align>
-               <aligny>center</aligny>
-               <font>font13</font>
-               <texturefocus>button-focus2.png</texturefocus>
-               <texturenofocus>button-nofocus.png</texturenofocus>
-               <pulseonselect>false</pulseonselect>
-       </include>
-       <include name="ButtonInfoDialogsCommonValues">
-               <height>50</height>
-               <width>158</width>
-               <align>center</align>
-               <aligny>center</aligny>
-               <font>font12_title</font>
-               <texturefocus border="5">IconBack-focus.png</texturefocus>
-               <texturenofocus border="5">ListNF.png</texturenofocus>
-               <pulseonselect>false</pulseonselect>
-       </include>
-       <include name="CommonNowPlaying">
-               <control type="group">
-                       <posx>110</posx>
-                       <posy>25</posy>
-                       <visible>Player.HasMedia + !Window.IsVisible(PlayerControls)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <control type="button">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>270</width>
-                               <height>67</height>
-                               <texturefocus border="8">IconBack.png</texturefocus>
-                               <texturenofocus border="8">IconBack.png</texturenofocus>
-                               <onclick>ActivateWindow(PlayerControls)</onclick>
-                       </control>
-                       <control type="fadelabel">
-                               <posx>10</posx>
-                               <posy>5</posy>
-                               <width>250</width>
-                               <height>15</height>
-                               <scrollout>false</scrollout>
-                               <pauseatend>3000</pauseatend>
-                               <label>$LOCALIZE[31040]</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font10_title</font>
-                               <textcolor>black</textcolor>
-                               <visible>!Player.Paused</visible>
-                       </control>
-                       <control type="fadelabel">
-                               <posx>10</posx>
-                               <posy>5</posy>
-                               <width>250</width>
-                               <height>15</height>
-                               <scrollout>false</scrollout>
-                               <pauseatend>3000</pauseatend>
-                               <label>$LOCALIZE[31043]</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font10_title</font>
-                               <textcolor>black</textcolor>
-                               <visible>Player.Paused</visible>
-                       </control>
-                       <control type="fadelabel">
-                               <posx>10</posx>
-                               <posy>24</posy>
-                               <width>250</width>
-                               <height>20</height>
-                               <scrollout>false</scrollout>
-                               <pauseatend>3000</pauseatend>
-                               <label>[B]$INFO[MusicPlayer.Title]$INFO[VideoPlayer.Title][/B]</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font12</font>
-                               <textcolor>black</textcolor>
-                       </control>
-                       <control type="fadelabel">
-                               <posx>10</posx>
-                               <posy>45</posy>
-                               <width>250</width>
-                               <height>15</height>
-                               <scrollout>false</scrollout>
-                               <pauseatend>3000</pauseatend>
-                               <label>[B]$INFO[MusicPlayer.Artist][/B]</label>
-                               <label>[B]$INFO[MusicPlayer.Album][/B]</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font10</font>
-                               <textcolor>black</textcolor>
-                               <visible>Player.HasAudio</visible>
-                       </control>
-                       <control type="fadelabel">
-                               <posx>10</posx>
-                               <posy>45</posy>
-                               <width>250</width>
-                               <height>15</height>
-                               <scrollout>false</scrollout>
-                               <pauseatend>3000</pauseatend>
-                               <label>[B]$INFO[VideoPlayer.Studio][/B]</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font10</font>
-                               <textcolor>black</textcolor>
-                               <visible>Player.HasVideo + VideoPlayer.Content(Movies)</visible>
-                       </control>
-                       <control type="fadelabel">
-                               <posx>10</posx>
-                               <posy>45</posy>
-                               <width>250</width>
-                               <height>15</height>
-                               <scrollout>false</scrollout>
-                               <pauseatend>3000</pauseatend>
-                               <label>[B]$INFO[VideoPlayer.TVShowTitle][/B]</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font10</font>
-                               <textcolor>black</textcolor>
-                               <visible>Player.HasVideo + VideoPlayer.Content(Episodes)</visible>
-                       </control>
-                       <control type="fadelabel">
-                               <posx>10</posx>
-                               <posy>45</posy>
-                               <width>250</width>
-                               <height>15</height>
-                               <scrollout>false</scrollout>
-                               <pauseatend>3000</pauseatend>
-                               <label>[B]$INFO[VideoPlayer.Artist][/B]</label>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <font>font10</font>
-                               <textcolor>black</textcolor>
-                               <visible>Player.HasVideo + VideoPlayer.Content(MusicVideos)</visible>
-                       </control>
-               </control>
-       </include>
-       <include name="ScrollOffsetLabel">
-               <control type="group">
-                       <visible>Container.Scrolling + [StringCompare(Container.SortMethod,$LOCALIZE[551]) | StringCompare(Container.SortMethod,$LOCALIZE[561]) | StringCompare(Container.SortMethod,$LOCALIZE[558]) | StringCompare(Container.SortMethod,$LOCALIZE[557]) | StringCompare(Container.SortMethod,$LOCALIZE[556])]</visible>
-                       <animation effect="fade" time="100">Visible</animation>
-                       <animation effect="fade" time="300">Hidden</animation>
-                       <posx>600</posx>
-                       <posy>410</posy>
-                       <width>320</width>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>80</width>
-                               <height>80</height>
-                               <texture border="5">IconBack.png</texture>
-                       </control>
-                       <control type="label">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>80</width>
-                               <height>80</height>
-                               <align>center</align>
-                               <aligny>center</aligny>
-                               <label>[B]$INFO[ListItem.SortLetter][/B]</label>
-                               <textcolor>black</textcolor>
-                               <font>font30</font>
-                       </control>
-               </control>
-       </include>
-       <include name="Window_OpenClose_Animation">
-               <animation effect="fade" time="250">WindowOpen</animation>
-               <animation effect="fade" time="250">WindowClose</animation>
-       </include>
-       <include name="Window_OpenClose_Animation_Zoom">
-               <animation type="WindowOpen" reversible="false">
-                       <effect type="zoom" start="80" end="100" center="640,480" easing="out" tween="back" time="300" />
-                       <effect type="fade" start="0" end="100" time="300" />
-               </animation>
-               <animation type="WindowClose" reversible="false">
-                       <effect type="zoom" start="100" end="80" center="640,480" easing="in" tween="back" time="300" />
-                       <effect type="fade" start="100" end="0" time="300" />
-               </animation>
-       </include>
-       <include name="dialogeffect">
-               <animation effect="fade" time="250">WindowOpen</animation>
-               <animation effect="fade" time="250">WindowClose</animation>
-       </include>
-       <include name="VisibleFadeEffect">
-               <animation effect="fade" time="300">Visible</animation>
-               <animation effect="fade" time="300">Hidden</animation>
-       </include>
-</includes>
diff --git a/addons/skin.touched/4x3Hirez/script-XBMC-Subtitles-main.xml b/addons/skin.touched/4x3Hirez/script-XBMC-Subtitles-main.xml
deleted file mode 100644 (file)
index 8cf823b..0000000
+++ /dev/null
@@ -1,418 +0,0 @@
-<window>
-       <allowoverlay>no</allowoverlay>
-       <include>Window_OpenClose_Animation_Zoom</include>
-       <coordinates>
-               <system>1</system>
-               <posx>0</posx>
-               <posy>0</posy>
-       </coordinates>
-       <controls>
-               <control type="group">
-                       <posx>240</posx>
-                       <posy>80</posy>
-                       <control type="image">
-                               <description>Shadow Background for dialogs without BehindDialogFadeOut include</description>
-                               <posx>-30</posx>
-                               <posy>-30</posy>
-                               <width>860</width>
-                               <height>860</height>
-                               <texture border="30">DialogShadow.png</texture>
-                       </control>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>800</width>
-                               <height>60</height>
-                               <texture border="5">DialogHeader.png</texture>
-                       </control>
-                       <control type="image">
-                               <posx>0</posx>
-                               <posy>60</posy>
-                               <width>800</width>
-                               <height>740</height>
-                               <texture border="5">DialogBack.png</texture>
-                       </control>
-                       <control type="label">
-                               <description>header label</description>
-                               <posx>20</posx>
-                               <posy>0</posy>
-                               <include>WindowTitleCommons</include>
-                               <width>700</width>
-                               <label>XBMC Subtitles</label>
-                       </control>
-                       <control type="group">
-                               <posx>730</posx>
-                               <posy>0</posy>
-                               <include>DialogCloseButtonCommons</include>
-                       </control>
-                       <control type="button">
-                               <description>Subtitle chooser Button</description>
-                               <posx>10</posx>
-                               <posy>70</posy>
-                               <width>250</width>
-                               <height>46</height>
-                               <label>-</label>
-                               <texturenofocus border="5">floor_button.png</texturenofocus>
-                               <texturefocus border="5">floor_buttonFO.png</texturefocus>
-                               <onclick>Skin.ToggleSetting(SubtitleSourceChooserVisible)</onclick>
-                       </control>
-                       <control type="image" id="110">
-                               <description>Service Logo</description>
-                               <posx>20</posx>
-                               <posy>75</posy>
-                               <width>230</width>
-                               <height>40</height>
-                               <aspectratio>keep</aspectratio>
-                       </control>
-                       <control type="label" id="100">
-                               <description>textarea</description>
-                               <posx>270</posx>
-                               <posy>70</posy>
-                               <width>490</width>
-                               <height>50</height>
-                               <font>font12_title</font>
-                               <textcolor>black</textcolor>
-                               <align>left</align>
-                               <aligny>center</aligny>
-                               <wrapmultiline>true</wrapmultiline>
-                       </control>
-                       <control type="group" id="250">
-                               <control type="group" id="111">
-                                       <control type="grouplist">
-                                               <posx>20</posx>
-                                               <posy>120</posy>
-                                               <width>760</width>
-                                               <height>40</height>
-                                               <align>center</align>
-                                               <orientation>horizontal</orientation>
-                                               <itemgap>5</itemgap>
-                                               <control type="image">
-                                                       <width>40</width>
-                                                       <height>40</height>
-                                                       <texture>DefaultIconInfo.png</texture>
-                                               </control>
-                                               <control type="label">
-                                                       <description>notification</description>
-                                                       <width min="1" max="720">auto</width>
-                                                       <height>40</height>
-                                                       <font>font13</font>
-                                                       <textcolor>black</textcolor>
-                                                       <label>$LOCALIZE[SCRIPT655]</label>
-                                                       <aligny>center</aligny>
-                                               </control>
-                                       </control>
-                               </control>
-                               <control type="list" id="120">
-                                       <posx>20</posx>
-                                       <posy>160</posy>
-                                       <width>760</width>
-                                       <height>540</height>
-                                       <onleft>120</onleft>
-                                       <onright>120</onright>
-                                       <onup>120</onup>
-                                       <ondown>120</ondown>
-                                       <viewtype label="535">list</viewtype>
-                                       <pagecontrol>-</pagecontrol>
-                                       <scrolltime>200</scrolltime>
-                                       <itemlayout width="760" height="60">
-                                               <control type="image">
-                                                       <posx>0</posx>
-                                                       <posy>-2</posy>
-                                                       <width>760</width>
-                                                       <height>5</height>
-                                                       <texture>separator.png</texture>
-                                               </control>
-                                               <control type="label">
-                                                       <posx>0</posx>
-                                                       <posy>5</posy>
-                                                       <width>700</width>
-                                                       <height>25</height>
-                                                       <font>font13</font>
-                                                       <aligny>center</aligny>
-                                                       <textcolor>black</textcolor>
-                                                       <selectedcolor>selected</selectedcolor>
-                                                       <align>left</align>
-                                                       <info>ListItem.Label2</info>
-                                                       <visible>ListItem.property(sync)</visible>
-                                               </control>
-                                               <control type="image">
-                                                       <posx>710</posx>
-                                                       <posy>5</posy>
-                                                       <width>50</width>
-                                                       <height>25</height>
-                                                       <texture border="5">flagging/blank.png</texture>
-                                                       <visible>ListItem.property(sync)</visible>
-                                               </control>
-                                               <control type="label">
-                                                       <posx>735</posx>
-                                                       <posy>5</posy>
-                                                       <width>50</width>
-                                                       <height>23</height>
-                                                       <font>font8_title</font>
-                                                       <aligny>center</aligny>
-                                                       <textcolor>white</textcolor>
-                                                       <align>center</align>
-                                                       <aligny>center</aligny>
-                                                       <label>[B]SYNC[/B]</label>
-                                                       <visible>ListItem.property(sync)</visible>
-                                               </control>
-                                               <control type="label">
-                                                       <posx>0</posx>
-                                                       <posy>5</posy>
-                                                       <width>760</width>
-                                                       <height>25</height>
-                                                       <font>font13</font>
-                                                       <aligny>center</aligny>
-                                                       <textcolor>black</textcolor>
-                                                       <selectedcolor>selected</selectedcolor>
-                                                       <align>left</align>
-                                                       <info>ListItem.Label2</info>
-                                                       <visible>!ListItem.property(sync)</visible>
-                                               </control>
-                                               <control type="image">
-                                                       <posx>0</posx>
-                                                       <posy>34</posy>
-                                                       <width>30</width>
-                                                       <height>20</height>
-                                                       <texture>$INFO[Listitem.Thumb]</texture>
-                                               </control>
-                                               <control type="label">
-                                                       <posx>35</posx>
-                                                       <posy>30</posy>
-                                                       <width>80</width>
-                                                       <height>25</height>
-                                                       <font>font12</font>
-                                                       <aligny>center</aligny>
-                                                       <textcolor>black</textcolor>
-                                                       <selectedcolor>selected</selectedcolor>
-                                                       <align>left</align>
-                                                       <info>ListItem.Label</info>
-                                               </control>
-                                               <control type="image">
-                                                       <posx>660</posx>
-                                                       <posy>30</posy>
-                                                       <width>100</width>
-                                                       <height>25</height>
-                                                       <aspectratio align="right">keep</aspectratio>
-                                                       <texture>$INFO[ListItem.ActualIcon,light/rating1to10/rating,.png]</texture>
-                                               </control>
-                                       </itemlayout>
-                                       <focusedlayout width="760" height="60">
-                                               <control type="image">
-                                                       <posx>0</posx>
-                                                       <posy>-2</posy>
-                                                       <width>760</width>
-                                                       <height>5</height>
-                                                       <texture>separator.png</texture>
-                                               </control>
-                                               <control type="label">
-                                                       <posx>0</posx>
-                                                       <posy>5</posy>
-                                                       <width>700</width>
-                                                       <height>25</height>
-                                                       <font>font13</font>
-                                                       <aligny>center</aligny>
-                                                       <textcolor>black</textcolor>
-                                                       <selectedcolor>selected</selectedcolor>
-                                                       <align>left</align>
-                                                       <info>ListItem.Label2</info>
-                                                       <visible>ListItem.property(sync)</visible>
-                                               </control>
-                                               <control type="image">
-                                                       <posx>710</posx>
-                                                       <posy>5</posy>
-                                                       <width>50</width>
-                                                       <height>25</height>
-                                                       <texture border="5">flagging/blank.png</texture>
-                                                       <visible>ListItem.property(sync)</visible>
-                                               </control>
-                                               <control type="label">
-                                                       <posx>735</posx>
-                                                       <posy>5</posy>
-                                                       <width>50</width>
-                                                       <height>23</height>
-                                                       <font>font8_title</font>
-                                                       <aligny>center</aligny>
-                                                       <textcolor>white</textcolor>
-                                                       <align>center</align>
-                                                       <aligny>center</aligny>
-                                                       <label>[B]SYNC[/B]</label>
-                                                       <visible>ListItem.property(sync)</visible>
-                                               </control>
-                                               <control type="label">
-                                                       <posx>0</posx>
-                                                       <posy>5</posy>
-                                                       <width>760</width>
-                                                       <height>25</height>
-                                                       <font>font13</font>
-                                                       <aligny>center</aligny>
-                                                       <textcolor>black</textcolor>
-                                                       <selectedcolor>selected</selectedcolor>
-                                                       <align>left</align>
-                                                       <info>ListItem.Label2</info>
-                                                       <visible>!ListItem.property(sync)</visible>
-                                               </control>
-                                               <control type="image">
-                                                       <posx>0</posx>
-                                                       <posy>34</posy>
-                                                       <width>30</width>
-                                                       <height>20</height>
-                                                       <texture>$INFO[Listitem.Thumb]</texture>
-                                               </control>
-                                               <control type="label">
-                                                       <posx>35</posx>
-                                                       <posy>30</posy>
-                                                       <width>80</width>
-                                                       <height>25</height>
-                                                       <font>font12</font>
-                                                       <aligny>center</aligny>
-                                                       <textcolor>black</textcolor>
-                                                       <selectedcolor>selected</selectedcolor>
-                                                       <align>left</align>
-                                                       <info>ListItem.Label</info>
-                                               </control>
-                                               <control type="image">
-                                                       <posx>660</posx>
-                                                       <posy>30</posy>
-                                                       <width>100</width>
-                                                       <height>25</height>
-                                                       <aspectratio align="right">keep</aspectratio>
-                                                       <texture>$INFO[ListItem.ActualIcon,light/rating1to10/rating,.png]</texture>
-                                               </control>
-                                       </focusedlayout>
-                               </control>
-                               <control type="label">
-                                       <description>number of files/pages in list text label</description>
-                                       <posx>780</posx>
-                                       <posy>750</posy>
-                                       <width>300</width>
-                                       <height>30</height>
-                                       <font>font13</font>
-                                       <align>right</align>
-                                       <aligny>center</aligny>
-                                       <scroll>true</scroll>
-                                       <textcolor>black</textcolor>
-                                       <label>($INFO[Container(120).NumItems]) $LOCALIZE[31025] - $LOCALIZE[31024] ($INFO[Container(120).CurrentPage]/$INFO[Container(120).NumPages])</label>
-                               </control>
-                       </control>
-               </control>
-               <control type="group">
-                       <visible>Skin.HasSetting(SubtitleSourceChooserVisible)</visible>
-                       <include>VisibleFadeEffect</include>
-                       <control type="button">
-                               <description>Hidden button to close the sort when its focused</description>
-                               <posx>0</posx>
-                               <posy>0</posy>
-                               <width>ScreenWidth</width>
-                               <height>ScreenHeight</height>
-                               <texturenofocus>-</texturenofocus>
-                               <texturefocus>-</texturefocus>
-                               <onclick>Skin.Reset(SubtitleSourceChooserVisible)</onclick>
-                       </control>
-                       <control type="group">
-                               <posx>330</posx>
-                               <posy>230</posy>
-                               <control type="image">
-                                       <description>Shadow Background</description>
-                                       <posx>-30</posx>
-                                       <posy>-30</posy>
-                                       <width>380</width>
-                                       <height>500</height>
-                                       <texture border="30">ShadowBorder.png</texture>
-                               </control>
-                               <control type="button">
-                                       <description>Panel Background image</description>
-                                       <posx>0</posx>
-                                       <posy>0</posy>
-                                       <width>320</width>
-                                       <height>440</height>
-                                       <texturefocus border="5">SubBack.png</texturefocus>
-                                       <texturenofocus border="5">SubBack.png</texturenofocus>
-                                       <onclick>-</onclick>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Forground image</description>
-                                       <posx>10</posx>
-                                       <posy>40</posy>
-                                       <width>300</width>
-                                       <height>390</height>
-                                       <texture border="5">SubBack2.png</texture>
-                               </control>
-                               <control type="image">
-                                       <description>Panel Arrow image</description>
-                                       <posx>50</posx>
-                                       <posy>-34</posy>
-                                       <width>40</width>
-                                       <height>40</height>
-                                       <texture>arrow-big-up.png</texture>
-                               </control>
-                               <control type="label">
-                                       <description>Available sources label</description>
-                                       <posx>10</posx>
-                                       <posy>5</posy>
-                                       <width>300</width>
-                                       <height>25</height>
-                                       <label>$LOCALIZE[SCRIPT760]</label>
-                                       <font>font12_title</font>
-                                       <align>center</align>
-                                       <aligny>top</aligny>
-                                       <textcolor>white</textcolor>
-                               </control>
-                               <control type="panel" id="150">
-                                       <posx>11</posx>
-                                       <posy>40</posy>
-                                       <width>298</width>
-                                       <height>390</height>
-                                       <onleft>150</onleft>
-                                       <onright>150</onright>
-                                       <onup>150</onup>
-                                       <ondown>150</ondown>
-                                       <viewtype label="535">list</viewtype>
-                                       <scrolltime>200</scrolltime>
-                                       <itemlayout width="298" height="60">
-                                               <control type="image">
-                                                       <posx>0</posx>
-                                                       <posy>0</posy>
-                                                       <width>298</width>
-                                                       <height>60</height>
-                                                       <texture>button-nofocus.png</texture>
-                                               </control>
-                                               <control type="label">
-                                                       <posx>149</posx>
-                                                       <posy>0</posy>
-                                                       <width>290</width>
-                                                       <height>60</height>
-                                                       <font>font13</font>
-                                                       <aligny>center</aligny>
-                                                       <textcolor>black</textcolor>
-                                                       <selectedcolor>selected</selectedcolor>
-                                                       <align>center</align>
-                                                       <info>ListItem.Label</info>
-                                               </control>
-                                       </itemlayout>
-                                       <focusedlayout width="298" height="60">
-                                               <control type="image">
-                                                       <posx>0</posx>
-                                                       <posy>0</posy>
-                                                       <width>298</width>
-                                                       <height>60</height>
-                                                       <texture>button-focus2.png</texture>
-                                               </control>
-                                               <control type="label">
-                                                       <posx>149</posx>
-                                                       <posy>0</posy>
-                                                       <width>290</width>
-                                                       <height>60</height>
-                                                       <font>font13</font>
-                                                       <aligny>center</aligny>
-                                                       <textcolor>black</textcolor>
-                                                       <selectedcolor>selected</selectedcolor>
-                                                       <align>center</align>
-                                                       <info>ListItem.Label</info>
-                                               </control>
-                                       </focusedlayout>
-                               </control>
-                       </control>
-               </control>
-       </controls>
-</window>
diff --git a/addons/skin.touched/addon.xml b/addons/skin.touched/addon.xml
deleted file mode 100644 (file)
index d0c10e9..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addon
-  id="skin.touched"
-  version="0.8.5"
-  name="Touched"
-  provider-name="Jezz_X">
-  <requires>
-    <import addon="xbmc.gui" version="3.00"/>
-  </requires>
-  <extension
-    point="xbmc.gui.skin"
-    defaultthemename="textures.xbt"
-    debugging="false">
-    <res width="1280" height="960" aspect="4:3" default="true" folder="4x3Hirez" />
-  </extension>
-  <extension point="xbmc.addon.metadata">
-    <summary lang="en">Touched skin by Jezz_X designed to be used on touch screen devices</summary>
-    <description lang="en">Skin designed from the ground up to be used on touch screen devices like the iPad</description>
-    <disclaimer lang="en">Do not use this skin unless you have either touch screen or a mouse connected or you may lose navigation</disclaimer>
-    <platform>all</platform>
-  </extension>
-</addon>
diff --git a/addons/skin.touched/background/background.png b/addons/skin.touched/background/background.png
deleted file mode 100644 (file)
index c1a58b1..0000000
Binary files a/addons/skin.touched/background/background.png and /dev/null differ
diff --git a/addons/skin.touched/background/movies.png b/addons/skin.touched/background/movies.png
deleted file mode 100644 (file)
index 256442f..0000000
Binary files a/addons/skin.touched/background/movies.png and /dev/null differ
diff --git a/addons/skin.touched/background/music.png b/addons/skin.touched/background/music.png
deleted file mode 100644 (file)
index b9a35ac..0000000
Binary files a/addons/skin.touched/background/music.png and /dev/null differ
diff --git a/addons/skin.touched/background/pictures.png b/addons/skin.touched/background/pictures.png
deleted file mode 100644 (file)
index 6964562..0000000
Binary files a/addons/skin.touched/background/pictures.png and /dev/null differ
diff --git a/addons/skin.touched/background/programs.png b/addons/skin.touched/background/programs.png
deleted file mode 100644 (file)
index d47f803..0000000
Binary files a/addons/skin.touched/background/programs.png and /dev/null differ
diff --git a/addons/skin.touched/background/tvshows.png b/addons/skin.touched/background/tvshows.png
deleted file mode 100644 (file)
index b8bd91f..0000000
Binary files a/addons/skin.touched/background/tvshows.png and /dev/null differ
diff --git a/addons/skin.touched/background/videos.png b/addons/skin.touched/background/videos.png
deleted file mode 100644 (file)
index f45b1c3..0000000
Binary files a/addons/skin.touched/background/videos.png and /dev/null differ
diff --git a/addons/skin.touched/colors/defaults.xml b/addons/skin.touched/colors/defaults.xml
deleted file mode 100644 (file)
index 802b33d..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<colors>
-       <color name="white">FFFFFFFF</color>
-       <color name="grey">FFb4b4b4</color>
-       <color name="grey2">FF999999</color>
-       <color name="grey3">FF505050</color>
-       <color name="black">FF000000</color>
-       <color name="blue">FF0084ff</color>
-       <color name="selected">FFEB9E17</color>
-</colors>
\ No newline at end of file
diff --git a/addons/skin.touched/fonts/DejaVuSans-Bold-Caps.ttf b/addons/skin.touched/fonts/DejaVuSans-Bold-Caps.ttf
deleted file mode 100644 (file)
index 5af21ea..0000000
Binary files a/addons/skin.touched/fonts/DejaVuSans-Bold-Caps.ttf and /dev/null differ
diff --git a/addons/skin.touched/fonts/DejaVuSans-Bold.ttf b/addons/skin.touched/fonts/DejaVuSans-Bold.ttf
deleted file mode 100644 (file)
index 54aade0..0000000
Binary files a/addons/skin.touched/fonts/DejaVuSans-Bold.ttf and /dev/null differ
diff --git a/addons/skin.touched/icon.png b/addons/skin.touched/icon.png
deleted file mode 100644 (file)
index b328845..0000000
Binary files a/addons/skin.touched/icon.png and /dev/null differ
diff --git a/addons/skin.touched/language/Chinese (Simple)/strings.xml b/addons/skin.touched/language/Chinese (Simple)/strings.xml
deleted file mode 100644 (file)
index 4dc0243..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<strings>
-  <!-- Misc labels -->
-  <string id="31000">更改你的</string>
-  <string id="31001">关闭</string>
-  <string id="31002">音频设置</string>
-  <string id="31003">IP</string>
-  <string id="31004">大写锁定</string>
-  <string id="31005">视觉效果选项</string>
-  <string id="31006">视觉效果预设</string>
-  <string id="31007">功能菜单</string>
-  <string id="31008">全屏</string>
-  <string id="31009">工作中...</string>
-  <string id="31010">当前登录为</string>
-  <string id="31011">N/A</string> <!-- Used for subtitle button in the OSD -->
-  <string id="31012">音乐 - 文件</string>
-
-  <string id="31024">页</string>
-  <string id="31025">项</string>
-  <!-- ViewType labels -->
-  <string id="31030">信息列表</string>
-  <string id="31031">宽信息列表</string>
-
-  <!-- Extra labels -->
-  <string id="31040">正在播放</string>
-
-  <string id="31042">播放</string>
-  <string id="31043">暂停</string>
-  <string id="31044">快进</string>
-  <string id="31045">回退</string>
-  <string id="31046">音频属性</string>
-  <string id="31047">当前预设</string>
-  <string id="31048">可视化效果设置</string>
-  <string id="31049">结束时间</string>
-  <string id="31050">排序: 升序</string>
-  <string id="31051">排序: 降序</string>
-
-
-  <!-- Playlist Editor labels -->
-  <string id="31055">打开播放列表</string>
-  <string id="31056">保存播放列表</string>
-  <string id="31057">关闭播放列表</string>
-  <string id="31058">系统音乐文件</string>
-  <string id="31059">当前播放列表</string>
-  <string id="31060">这是一个堆叠文件,请选择要播放的片段。</string>
-  
-  <!-- Submenu labels -->
-  <string id="31200">返回</string>
-  <string id="31201">位置</string>
-
-  <!-- Extra labels -->
-  <string id="31300">当前温度</string>
-  <string id="31301">最近修改</string>
-
-  <string id="31309">内存使用:</string>
-  <string id="31312">当前刮削器</string>
-  <string id="31313">选择刮削器</string>
-  <string id="31314">内容扫描选项</string>
-
-  <string id="31319">选择用户配置文件</string>
-  <string id="31320">最近登录</string>
-  <string id="31321">卡拉OK歌曲选择</string>
-  <string id="31322">首播</string>
-
-  <string id="31325">播放列表选项</string>
-
-  <!-- Video and Music OSD Labels  -->
-  <string id="31351">暂停</string>
-  <string id="31352">停止</string>
-  <string id="31353">快进</string>
-  <string id="31354">快退</string>
-  <string id="31355">电影菜单</string>
-  <string id="31356">下载字幕</string>
-
-  <!-- Skin Fontsets -->
-  <string id="31390">皮肤默认</string>
-  <string id="31391">基于Arial字体</string>
-
-  <!-- Description Labels  -->
-  <string id="31400">[B]设置用户界面[/B][CR][CR]变换皮肤 · 设置语言和区域 · 修改文件列表参数 · 设置屏幕保护</string>
-  <string id="31401">[B]设置视频参数[/B][CR][CR]管理视频资料库 · 设置视频播放参数 · 修改视频列表参数 · 设置字幕字体</string>
-  <string id="31402">[B]设置音乐参数[/B][CR][CR]管理音乐资料库 · 设置音乐播放参数 · 修改音乐列表参数 · 设置音乐提交 · 设置卡拉OK选项</string>
-  <string id="31403">[B]设置图片参数[/B][CR][CR]设置图片列表参数 · 设置幻灯片播放</string>
-  <string id="31404">[B]设置天气预报[/B][CR][CR]设置三个获取天气信息的城市</string>
-  <string id="31405">[B]设置网络参数[/B][CR][CR]设置通过UPnP和HTTP控制XBMC · 设置文件共享 · 设置互联网访问参数</string>
-  <string id="31406">[B]设置系统参数[/B][CR][CR]设置和校正显示器 · 设置音频输出 · 设置摇控器 · 设置节电参数 · 启用调试 · 设置管理员和锁定</string>
-  <string id="31407">[B]设置皮肤参数[/B][CR][CR]设置Confluence皮肤 · 增加和删除主菜单项 · 修改皮肤背景</string>
-  <string id="31408">[B]设置扩展功能[/B][CR][CR]管理你安装的扩展功能 · 在xbmc.org浏览并安装扩展功能 · 修改扩展功能设置</string>
-  
-  <string id="31421">选择您的用户配置文件[CR]登录并继续</string>
-</strings>
\ No newline at end of file
diff --git a/addons/skin.touched/language/Dutch/strings.xml b/addons/skin.touched/language/Dutch/strings.xml
deleted file mode 100644 (file)
index 7df80fd..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>
-<strings>
-  <!-- Misc labels -->
-  <string id="31000">Verander je</string>
-  <string id="31001">Sluiten</string>
-  <string id="31002">Geluidsinstellingen</string>
-  <string id="31003">IP</string>
-  <string id="31004">Caps[CR]Lock</string>
-  <string id="31005">Visualisatie Opties</string>
-  <string id="31006">Visualisatie standaardinstellingen</string>
-  <string id="31007">Context Menu</string>
-  <string id="31008">Volledig Scherm</string>
-  <string id="31009">Bezig...</string>
-  <string id="31010">Momenteel ingelogd als</string>
-  <string id="31011">N/A</string> <!-- Used for subtitle button in the OSD -->
-  <string id="31012">Muziek - Bestanden</string>
-
-  <string id="31024">Pagina</string>
-  <string id="31025">Items</string>
-  <!-- ViewType labels -->
-  <string id="31030">Info Lijst</string>
-  <string id="31031">Info Breed</string>
-
-  <!-- Extra labels -->
-  <string id="31040">Speel nu</string>
-
-  <string id="31042">SPELEN</string>
-  <string id="31043">GEPAUZEERD</string>
-  <string id="31044">VOORUITSPOELEN</string>
-  <string id="31045">TERUGSPOELEN</string>
-  <string id="31046">Geluidsinstellingen</string>
-  <string id="31047">Huidige Instellingen</string>
-  <string id="31048">Visualisatie Standaardinstellingen</string>
-  <string id="31049">End Time</string>
-  <string id="31050">Sorteren: Oplopend</string>
-  <string id="31051">Sorteren: Aflopend</string>
-
-
-  <!-- Playlist Editor labels -->
-  <string id="31055">Open playlist</string>
-  <string id="31056">Save playlist</string>
-  <string id="31057">Sluit playlist</string>
-  <string id="31058">Muziek bestanden</string>
-  <string id="31059">Huidige playlist</string>
-  <string id="31060">Dit bestand is gestapeld, selecteer het deel dat u wilt afspelen.</string>
-  
-  <!-- Submenu labels -->
-  <string id="31200">Terug</string>
-  <string id="31201">Locatie</string>
-
-  <!-- Extra labels -->
-  <string id="31300">Huidige temperatuur</string>
-  <string id="31301">Laatste update</string>
-
-  <string id="31309">Geheugen-verbruik:</string>
-  <string id="31312">Huidige Scraper</string>
-  <string id="31313">Kies een Scraper</string>
-  <string id="31314">Inhoudsscan opties</string>
-
-  <string id="31319">Beschikbare XBMC gebruikersprofielen</string>
-  <string id="31320">Laatste login</string>
-  <string id="31321">Karaoke liedjeskiezer</string>
-  <string id="31322">Uitgezonden</string>
-
-  <string id="31325">Playlist Opties</string>
-
-  <!-- Video and Music OSD Labels  -->
-  <string id="31351">Pauze</string>
-  <string id="31352">Stop</string>
-  <string id="31353">Vooruitspoelen</string>
-  <string id="31354">Terugspoelen</string>
-  <string id="31355">Video Menu</string>
-  <string id="31356">Ondertitels downloaden</string>
-
-  <!-- Skin Fontsets -->
-  <string id="31390">Standaard Skin</string>
-  <string id="31391">Arial lettertype</string>
-
-  <!-- Description Labels  -->
-  <string id="31400">Verander je Skin � Instellen van Taal en Land � Verander bestandslijst opties � Stel een screensaver in</string>
-  <string id="31401">Manage je video bibliotheek � Afspeelopties voor Video � Verander videolijst opties � Stel ondertitel font in</string>
-  <string id="31402">Manage je Muziek bibliotheek � Afspeelopties voor Muziek � Verander Muzieklijst opties � Stel liedjesaanbod in � Stel karaokeopties in</string>
-  <string id="31403">Stel fotolijst opties in � Configureer diashow</string>
-  <string id="31404">Stel drie steden in om weerinformatie te verzamelen</string>
-  <string id="31405">Instellingen voor bedienen XBMC via UPnP en HTTP � Instellingen voor delen van bestanden � Internet instellingen</string>
-  <string id="31406">Instellen en kalibreren van scherm � Configureer geluidsuitgang � Instellen van afstandsbediening � Instellingen voor energiebesparing � Zet debugging aan � Instellingen voor vergrendeling</string>
-  <string id="31407">Instellingen voor Confluence Skin � Toevoegen en verwijderen van Home menu items � Verander skin achtergrond</string>
-  <string id="31408">Manage je geïnstalleerde add-ons � Zoek en installeer add-ons op xbmc.org � Verander add-on instellingen</string>
-
-  <string id="31421">Kies je XBMC gebruikersprofiel[CR]om door te gaan</string>
-</strings>
\ No newline at end of file
diff --git a/addons/skin.touched/language/English/strings.xml b/addons/skin.touched/language/English/strings.xml
deleted file mode 100644 (file)
index a9b534f..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>
-<strings>
-  <!-- Misc labels -->
-  <string id="31000">Change Your</string>
-  <string id="31001">Close</string>
-  <string id="31002">Audio Settings</string>
-  <string id="31003">IP</string>
-  <string id="31004">Caps[CR]Lock</string>
-  <string id="31005">Visualization Options</string>
-  <string id="31006">Visualization Presets</string>
-  <string id="31007">Context Menu</string>
-  <string id="31008">Fullscreen</string>
-  <string id="31009">Working...</string>
-  <string id="31010">Currently logged in as</string>
-  <string id="31011">N/A</string> <!-- Used for subtitle button in the OSD -->
-  <string id="31012">Music - Files</string>
-
-  <string id="31024">Page</string>
-  <string id="31025">Items</string>
-  <!-- ViewType labels -->
-  <string id="31030">Info List</string>
-  <string id="31031">Info Wide</string>
-
-  <!-- Extra labels -->
-  <string id="31040">Now Playing</string>
-
-  <string id="31042">PLAYING</string>
-  <string id="31043">PAUSED</string>
-  <string id="31044">FAST FORWARD</string>
-  <string id="31045">REWIND</string>
-  <string id="31046">Audio Properties</string>
-  <string id="31047">Current Preset</string>
-  <string id="31048">Visualization Presets</string>
-  <string id="31049">End Time</string>
-  <string id="31050">Sort: Ascending</string>
-  <string id="31051">Sort: Descending</string>
-
-
-  <!-- Playlist Editor labels -->
-  <string id="31055">Open playlist</string>
-  <string id="31056">Save playlist</string>
-  <string id="31057">Close playlist</string>
-  <string id="31058">System music files</string>
-  <string id="31059">Current playlist</string>
-  <string id="31060">This file is stacked, select the part you want to play from.</string>
-  
-  <!-- Submenu labels -->
-  <string id="31200">Back</string>
-  <string id="31201">Location</string>
-  <string id="31202">View</string>
-
-  <!-- Extra labels -->
-  <string id="31300">Current Temp</string>
-  <string id="31301">Last Updated</string>
-
-  <string id="31309">Memory Used:</string>
-  <string id="31312">Current Scraper</string>
-  <string id="31313">Choose a Scraper</string>
-  <string id="31314">Content Scanning Options</string>
-
-  <string id="31319">Currently available XBMC user profiles</string>
-  <string id="31320">Last Logged In</string>
-  <string id="31321">Karaoke Song Selector</string>
-  <string id="31322">Aired</string>
-
-  <string id="31325">Playlist Options</string>
-
-  <!-- Video and Music OSD Labels  -->
-  <string id="31351">Pause</string>
-  <string id="31352">Stop</string>
-  <string id="31353">Fast Forward</string>
-  <string id="31354">Rewind</string>
-  <string id="31355">Video Menu</string>
-  <string id="31356">Download Subtitles</string>
-  <string id="31357">Image Info</string>
-
-  <!-- Skin Fontsets -->
-  <string id="31390">Skin default</string>
-  <string id="31391">Arial based</string>
-
-  <!-- Description Labels  -->
-  <string id="31400">Change the skin · Set language and region · Change file listing options · Set up a screensaver</string>
-  <string id="31401">Manage your video library · Set video playback options · Change video listing options · Set subtitle fonts</string>
-  <string id="31402">Manage your music library · Set music playback options · Change music listing options · Setup song submission · Set karaoke options</string>
-  <string id="31403">Set picture listing options · Configure slideshows</string>
-  <string id="31404">Set three cities to collect weather information</string>
-  <string id="31405">Setup control of XBMC via UPnP and HTTP · Configure file sharing · Set internet access options</string>
-  <string id="31406">Setup and calibrate displays · Configure audio output · Setup remote controls · Set power saving options · Enable debugging · Setup master lock</string>
-  <string id="31407">Setup the Confluence skin · Add and remove home menu items · Change skin backgrounds</string>
-  <string id="31408">Manage your installed Add-ons · Browse for and install Add-ons from xbmc.org · Modify Add-on settings</string>
-
-  <string id="31421">Select your XBMC user Profile[CR]to login and continue</string>
-
-  <!-- Skin Setting Headers  -->
-  <string id="31500">Home Menu Catagory Buttons</string>
-  <string id="31501">Home Page Add-on Quick Links</string>
-  <string id="31502">Miscellaneous Options</string>
-  <string id="31503">Media Window Add-ons</string>
-
-  <!-- Skin Setting Options  -->
-  <string id="31550">Home Screen Weather Info and button</string>
-  <string id="31551">Add-on Shortcut</string>
-  <string id="31552">Set Add-on to use for subtitles</string>
-  <string id="31553">"Videos" always goes to video root path</string>
-
-  </strings>
diff --git a/addons/skin.touched/language/Finnish/strings.xml b/addons/skin.touched/language/Finnish/strings.xml
deleted file mode 100644 (file)
index 35b34e6..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<strings>
-  <!-- Misc labels -->
-  <string id="31000">Määritä</string>
-  <string id="31001">Sulje</string>
-  <string id="31002">Ääniasetukset</string>
-  <string id="31003">IP</string>
-  <string id="31004">Caps[CR]Lock</string>
-  <string id="31005">Visualisoinnin asetukset</string>
-  <string id="31006">Visualisoinnin esiasetukset</string>
-  <string id="31007">Pikavalikko</string>
-  <string id="31008">Kokoruutu</string>
-  <string id="31009">Suoritetaan...</string>
-  <string id="31010">Kirjautunut käyttäjänä</string>
-  <string id="31011">N/A</string> <!-- Used for subtitle button in the OSD -->
-  <string id="31012">Musiikki - Tiedostot</string>
-
-  <string id="31024">Sivu</string>
-  <string id="31025">Kohdetta</string>
-
-  <!-- ViewType labels -->
-  <string id="31030">Lista ja tiedot</string>
-  <string id="31031">Leveät tiedot</string>
-
-  <!-- Extra labels -->
-  <string id="31040">Nyt toistetaan</string>
-
-  <string id="31042">TOISTETAAN</string>
-  <string id="31043">TAUKO</string>
-  <string id="31044">KELAUS ETEENPÄIN</string>
-  <string id="31045">KELAUS TAAKSEPÄIN</string>
-  <string id="31046">Ääniasetukset</string>
-  <string id="31047">Nykyinen esiasetus</string>
-  <string id="31048">Visualisoinnin esiasetukset</string>
-  <string id="31049">Päättymisaika</string>
-  <string id="31050">Järjestä: Nousevasti</string>
-  <string id="31051">Järjestä: Laskevasti</string>
-
-
-  <!-- Playlist Editor labels -->
-  <string id="31055">Avaa toistolista</string>
-  <string id="31056">Tallenna toistolista</string>
-  <string id="31057">Sulje toistolista</string>
-  <string id="31058">Musiikkitiedostot</string>
-  <string id="31059">Nykyinen toistolista</string>
-  <string id="31060">Tämä tiedosto on pinottu, valitse osa jonka haluat toistaa.</string>
-
-  <!-- Submenu labels -->
-  <string id="31200">Takaisin</string>
-  <string id="31201">Sijainti</string>
-  <string id="31202">Näkymä</string>
-
-  <!-- Extra labels -->
-  <string id="31300">Tämänhetkinen säätila</string>
-  <string id="31301">Viimeksi päivitetty</string>
-
-  <string id="31309">Käytetty muisti:</string>
-  <string id="31312">Nykyinen hakupaikka</string>
-  <string id="31313">Valitse hakupaikka</string>
-  <string id="31314">Sisällön hakuasetukset</string>
-
-  <string id="31319">Saatavilla olevat käyttäjäprofiilit</string>
-  <string id="31320">Viimeksi kirjauduttu</string>
-  <string id="31321">Karaoke kappaleen valinta</string>
-  <string id="31322">Esitetty</string>
-
-  <string id="31325">Toistolistan asetukset</string>
-
-  <!-- Video and Music OSD Labels  -->
-  <string id="31351">Tauko</string>
-  <string id="31352">Pysäytä</string>
-  <string id="31353">Kelaa eteenpäin</string>
-  <string id="31354">Kelaa taaksepäin</string>
-  <string id="31355">Elokuvavalikko</string>
-  <string id="31356">Lataa tekstitykset</string>
-  <string id="31357">Kuvan tiedot</string>
-
-  <!-- Skin Fontsets -->
-  <string id="31390">Ulkoasun oletus</string>
-  <string id="31391">Arial pohjainen</string>
-
-  <!-- Description Labels  -->
-  <string id="31400">Vaihda ulkoasua · Vaihda kieliasetuksia · Aseta tiedostolistauksen asetukset[CR]Aseta ruudunsäästäjä</string>
-  <string id="31401">Hallitse videokirjastoa · Aseta videotoiston asetukset · Vaihda videolistauksen asetuksia · Aseta tekstitysasetukset</string>
-  <string id="31402">Hallitse musiikkikirjastoa · Aseta musiikkitoiston asetukset · Vaihda musiikkilistauksen asetuksia · Aseta kappaleen lähetysasetuksia · Aseta karaoke-asetukset</string>
-  <string id="31403">Aseta kuvalistauksen asetukset · Määritä kuvaesityksiä</string>
-  <string id="31404">Aseta kolme kaupunkia joista noudetaan säätiedot</string>
-  <string id="31405">Aseta XBMC:n ohjaus UPNP:n ja HTTP:n kautta · Määritä tiedostojen jako · Aseta internet-asetukset</string>
-  <string id="31406">Aseta ja kalibroi näyttö · Määritä äänilähtö · Aseta kauko-ohjaus · Aseta sähkönsäästöasetukset · Ota debuggaus käyttöön · Muokkaa pääkäyttäjän lukituksia</string>
-  <string id="31407">Aseta Confluence-ulkoasun asetukset · Lisää ja poista päävalikon kohteita · Vaihda ulkoasun taustakuvia</string>
-  <string id="31408">Hallitse asennettuja lisäosia · Valitse ja asenna lisäosia xbmc.org:sta · Muokkaa lisäosien asetuksia</string>
-
-  <string id="31421">Valitse XBMC-käyttäjäprofiili[CR]kirjautuaksesi sisään</string>
-
-  <!-- Skin Setting Headers  -->
-  <string id="31500">Päävalikon kategoria-painikkeet</string>
-  <string id="31501">Päävalikon lisäosien pikavalinnat</string>
-  <string id="31502">Sekalaiset asetukset</string>
-  <string id="31503">Mediaikkunan lisäosat</string>
-
-  <!-- Skin Setting Options  -->
-  <string id="31550">Päävalikon säätiedot ja -painike</string>
-  <string id="31551">Lisäosan pikavalinta</string>
-  <string id="31552">Aseta tekstitykset-lisäosa</string>
-  <string id="31553">"Videot"-painike avaa aina "videot"-juurihakemiston</string>
-
-</strings>
diff --git a/addons/skin.touched/language/Korean/strings.xml b/addons/skin.touched/language/Korean/strings.xml
deleted file mode 100644 (file)
index 1e67880..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<strings>
-  <!-- Misc labels -->
-  <string id="31000">변경</string>
-  <string id="31001">닫기</string>
-  <string id="31002">오디오 설정</string>
-  <string id="31003">IP</string>
-  <string id="31004">Caps[CR]Lock</string>
-  <string id="31005">시각화 옵션</string>
-  <string id="31006">시각화 사전설정</string>
-  <string id="31007">컨텍스트 메뉴</string>
-  <string id="31008">전체 화면</string>
-  <string id="31009">작업중...</string>
-  <string id="31010">로그인한 프로파일</string>
-  <string id="31011">N/A</string> <!-- Used for subtitle button in the OSD -->
-  <string id="31012">음악 - 파일</string>
-  
-  <string id="31024">페이지</string>
-  <string id="31025">항목</string>
-
-  <!-- ViewType labels -->
-  <string id="31030">정보표시 목록</string>
-  <string id="31031">정보표시 배너</string>
-
-  <!-- Extra labels -->
-  <string id="31040">지금 재생중</string>
-
-  <string id="31042">재생중</string>
-  <string id="31043">일시정지</string>
-  <string id="31044">빠르게</string>
-  <string id="31045">뒤로</string>
-  <string id="31046">오디오 속성</string>
-  <string id="31047">현재 사전설정</string>
-  <string id="31048">시각화 사전설정</string>
-  <string id="31049">종료 시간</string>
-  <string id="31050">정렬: 오름차</string>
-  <string id="31051">정렬: 내림차</string>
-
-
-  <!-- Playlist Editor labels -->
-  <string id="31055">재생목록 열기</string>
-  <string id="31056">재생목록 저장</string>
-  <string id="31057">재생목록 닫기</string>
-  <string id="31058">시스템 음악 파일</string>
-  <string id="31059">현재 재생목록</string>
-  <string id="31060">이 파일은 연결되었습니다, 재생할 부분을 선택하세요.</string>
-
-  <!-- Submenu Icon labels -->
-  <string id="31200">뒤로</string>
-  <string id="31201">위치</string>
-
-  <!-- Extra labels -->
-  <string id="31300">현재 온도</string>
-  <string id="31301">마지막 업데이트</string>
-
-  <string id="31309">사용 메모리:</string>
-  <string id="31312">현재 자료수집기</string>
-  <string id="31313">자료수집기 선택</string>
-  <string id="31314">컨텐츠 검색 옵션</string>
-
-  <string id="31319">사용가능한 프로파일</string>
-  <string id="31320">마지막 로그인</string>
-  <string id="31321">노래방 노래 선택기</string>
-  <string id="31322">방송</string>
-
-  <string id="31325">재생목록 옵션</string>
-
-  <!-- Video and Music OSD Labels  -->
-  <string id="31351">일시정지</string>
-  <string id="31352">정지</string>
-  <string id="31353">빠르게</string>
-  <string id="31354">뒤로</string>
-  <string id="31355">비디오 메뉴</string>
-  <string id="31356">자막 다운로드</string>
-
-  <!-- Skin Fontsets -->
-  <string id="31390">스킨 기본값</string>
-  <string id="31391">Arial 기본값</string>
-
-  <!-- Description Labels  -->
-  <string id="31400">스킨 변경 · 언어 및 지역 설정 · 파일 목록 옵션 변경 · 화면보호기 설정</string>
-  <string id="31401">비디오 라이브러리 관리 · 비디오 재생 옵션 변경 · 비디오 목록 옵션 변경 · 자막 글꼴 설정</string>
-  <string id="31402">음악 라이브러리 관리 · 음악 재생 옵션 변경 · 음악 목록 옵션 변경 · 노래 전송 설정 · 노래방 옵션 설정</string>
-  <string id="31403">사진 목록 옵션 변경 · 슬라이드쇼 설정</string>
-  <string id="31404">날씨 정보를 수집할 세 도시 설정</string>
-  <string id="31405">UPnP 및 HTTP 를 통한 XBMC 제어 설정 · 파일 공유 설정 · 인터넷 접근 옵션 설정</string>
-  <string id="31406">화면 설정 및 조정 · 오디오 출력 설정 · 원격 제어 설정 · 전원 절약 옵션 설정 · 디버깅 사용 · 마스터 잠금 설정</string>
-  <string id="31407">Confluence 스킨 설정 · 홈 메뉴 항목 추가 및 제거 · 스킨 배경 변경</string>
-  <string id="31408">설치된 추가기능 관리 · xbmc.org 에서 추가기능 찾기 및 설치 · 추가기능 설정 변경</string>
-
-  <string id="31421">로그인할 XBMC 사용자 프로파일을[CR]선택하고 계속하세요</string>
-</strings>
diff --git a/addons/skin.touched/media/Textures.xbt b/addons/skin.touched/media/Textures.xbt
deleted file mode 100644 (file)
index f1aae69..0000000
Binary files a/addons/skin.touched/media/Textures.xbt and /dev/null differ
diff --git a/addons/visualization.dxspectrum/resources/language/Slovenian/strings.xml b/addons/visualization.dxspectrum/resources/language/Slovenian/strings.xml
new file mode 100644 (file)
index 0000000..fc8964a
--- /dev/null
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+    <!-- settings labels -->
+    <string id="30000">Način</string>
+    <string id="30001">Polno</string>
+    <string id="30002">Shema</string>
+    <string id="30003">Točke</string>
+    <string id="30004">Višina stolpcev</string>
+    <string id="30005">Majhna</string>
+    <string id="30006">Privzeto</string>
+    <string id="30007">Velika</string>
+    <string id="30008">Zelo velika</string>
+    <string id="30009">Hitrost</string>
+    <string id="30010">Zelo počasno</string>
+    <string id="30011">Počasno</string>
+    <string id="30012">Privzeto</string>
+    <string id="30013">Hitro</string>
+    <string id="30014">Zelo hitro</string>
+</strings>
diff --git a/addons/visualization.glspectrum/resources/language/Slovenian/strings.xml b/addons/visualization.glspectrum/resources/language/Slovenian/strings.xml
new file mode 100644 (file)
index 0000000..fc8964a
--- /dev/null
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+    <!-- settings labels -->
+    <string id="30000">Način</string>
+    <string id="30001">Polno</string>
+    <string id="30002">Shema</string>
+    <string id="30003">Točke</string>
+    <string id="30004">Višina stolpcev</string>
+    <string id="30005">Majhna</string>
+    <string id="30006">Privzeto</string>
+    <string id="30007">Velika</string>
+    <string id="30008">Zelo velika</string>
+    <string id="30009">Hitrost</string>
+    <string id="30010">Zelo počasno</string>
+    <string id="30011">Počasno</string>
+    <string id="30012">Privzeto</string>
+    <string id="30013">Hitro</string>
+    <string id="30014">Zelo hitro</string>
+</strings>
diff --git a/addons/visualization.milkdrop/resources/language/Slovenian/strings.xml b/addons/visualization.milkdrop/resources/language/Slovenian/strings.xml
new file mode 100644 (file)
index 0000000..e468dd4
--- /dev/null
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+    <!-- settings labels -->
+    <string id="30000">Samodejen čas prelivanja</string>
+    <string id="30001">Čas med predlogami</string>
+    <string id="30002">Dodaten naključen čas</string>
+    <string id="30003">Vključi anisotropično filtriranje</string>
+    <string id="30004">Vključi ostre prehode</string>
+    <string id="30005">Glasnost za ostre prehode</string>
+    <string id="30006">Povprečen čas med ostrimi prehodi</string>
+    <string id="30007">Največja frekvenca osveževanja</string>
+    <string id="30008">Vključi stereo 3D</string>
+    <string id="30009">Paket predlog</string>
+    <string id="30010">Uporabniška mapa s predlogami        </string>
+    <string id="30011">Način mešanja predlog</string>
+
+    <string id="30020">WA51 predloge</string>
+    <string id="30021">Winamp predloge</string>
+    <string id="30022">Uporabniško določena mapa s predlogami</string>
+
+    <!-- setting value formats -->
+    <string id="30050">%2.0f sekund</string>
+    <string id="30051">%2.0f %%</string>
+    <string id="30052">%2.0f fps</string>
+</strings>
diff --git a/addons/visualization.projectm/resources/language/Slovenian/strings.xml b/addons/visualization.projectm/resources/language/Slovenian/strings.xml
new file mode 100644 (file)
index 0000000..c8fa2ea
--- /dev/null
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+    <!-- settings labels -->
+    <string id="30000">Kakovost</string>
+    <string id="30001">Nizka</string>
+    <string id="30002">Srednja</string>
+    <string id="30003">Visoka</string>
+    <string id="30004">Najvišja</string>
+    <string id="30005">Način mešanja</string>
+    <string id="30006">Trajanje prelivanja med predlogami</string>
+    <string id="30007">Trajanje predlog</string>
+    <string id="30008">Občutljivost</string>
+    <string id="30009">Paket predlog</string>
+    <string id="30010">Privzet paket</string>
+    <string id="30011">Uporabniško določena mapa s predlogami</string>
+    <string id="30012">Uporabniško določena mapa</string>
+
+    <!-- setting value formats -->
+    <string id="30050">%2.0f sekund</string>
+    <string id="30051">%2.0f %%</string>
+</strings>
index 18befec..4886efc 100755 (executable)
@@ -171,7 +171,7 @@ MediaLibrary.prototype = {
                                        jQuery.post(JSON_RPC + '?SendRemoteKey', '{"jsonrpc": "2.0", "method": "Input.Home", "id": 1}', function(data){$('#spinner').hide();}, 'json');
                                        return;
                                case 'mute':
-                                       jQuery.post(JSON_RPC + '?SendRemoteKey', '{"jsonrpc": "2.0", "method": "Application.ToggleMute", "id": 1}', function(data){$('#spinner').hide();}, 'json');
+                                       jQuery.post(JSON_RPC + '?SendRemoteKey', '{"jsonrpc": "2.0", "method": "Application.SetMute", "params": { "mute": "toggle" }, "id": 1}', function(data){$('#spinner').hide();}, 'json');
                                        return;
                                case 'power':
                                        jQuery.post(JSON_RPC + '?SendRemoteKey', '{"jsonrpc": "2.0", "method": "System.Shutdown", "id": 1}', function(data){$('#spinner').hide();}, 'json');
@@ -179,7 +179,7 @@ MediaLibrary.prototype = {
                                case 'volumeup':
         jQuery.post(JSON_RPC + '?SendRemoteKey', '{"jsonrpc": "2.0", "method": "Application.GetProperties", "params": { "properties": [ "volume" ] }, "id": 1}', function(data){
                                                var volume = data.result.volume + 1;
-                                               jQuery.post(JSON_RPC + '?SendRemoteKey', '{"jsonrpc": "2.0", "method": "Application.SetVolume", "params": { "value": '+volume+' }, "id": 1}', function(data){
+                                               jQuery.post(JSON_RPC + '?SendRemoteKey', '{"jsonrpc": "2.0", "method": "Application.SetVolume", "params": { "volume": '+volume+' }, "id": 1}', function(data){
                                        
                                                $('#spinner').hide();
                                                 }, 'json');
@@ -188,7 +188,7 @@ MediaLibrary.prototype = {
                                case 'volumedown':
                                        jQuery.post(JSON_RPC + '?SendRemoteKey', '{"jsonrpc": "2.0", "method": "Application.GetProperties", "params": { "properties": [ "volume" ] }, "id": 1}', function(data){
                                                var volume = data.result.volume - 1;
-                                               jQuery.post(JSON_RPC + '?SendRemoteKey', '{"jsonrpc": "2.0", "method": "Application.SetVolume", "params": { "value": '+volume+' }, "id": 1}', function(data){
+                                               jQuery.post(JSON_RPC + '?SendRemoteKey', '{"jsonrpc": "2.0", "method": "Application.SetVolume", "params": { "volume": '+volume+' }, "id": 1}', function(data){
                                        
                                                $('#spinner').hide();
                                                 }, 'json');
@@ -265,7 +265,7 @@ MediaLibrary.prototype = {
                                libraryContainer.attr('id', 'libraryContainer')
                                                                .addClass('contentContainer');
                                $('#content').append(libraryContainer);
-                               jQuery.post(JSON_RPC + '?GetAlbums', '{"jsonrpc": "2.0", "method": "AudioLibrary.GetAlbums", "params": { "limits": { "start": 0 }, "properties": ["description", "theme", "mood", "style", "type", "label", "artist", "genre", "rating", "title", "year", "thumbnail"], "sort": { "method": "artist" } }, "id": 1}', jQuery.proxy(function(data) {
+                               jQuery.post(JSON_RPC + '?GetAlbums', '{"jsonrpc": "2.0", "method": "AudioLibrary.GetAlbums", "params": { "limits": { "start": 0 }, "properties": ["description", "theme", "mood", "style", "type", "albumlabel", "artist", "genre", "rating", "title", "year", "thumbnail"], "sort": { "method": "artist" } }, "id": 1}', jQuery.proxy(function(data) {
                                        if (data && data.result && data.result.albums) {
                                                this.albumList = data.result.albums;
                                                $.each($(this.albumList), jQuery.proxy(function(i, item) {
@@ -675,7 +675,7 @@ MediaLibrary.prototype = {
                                //check that clear worked.
                                jQuery.post(JSON_RPC + '?AddAlbumToPlaylist', '{"jsonrpc": "2.0", "method": "Playlist.Add", "params": { "playlistid": ' + this.playlists["audio"] + ', "item": { "albumid": ' + event.data.album.albumid + ' } }, "id": 1}', jQuery.proxy(function(data) {
                                        //play specific song in playlist
-                                       jQuery.post(JSON_RPC + '?PlaylistItemPlay', '{"jsonrpc": "2.0", "method": "Player.Open", "params": { "playlist": { "playlistid": ' + this.playlists["audio"] + ', "position": '+ event.data.itmnbr + ' } }, "id": 1}', function() {}, 'json');
+                                       jQuery.post(JSON_RPC + '?PlaylistItemPlay', '{"jsonrpc": "2.0", "method": "Player.Open", "params": { "item": { "playlistid": ' + this.playlists["audio"] + ', "position": '+ event.data.itmnbr + ' } }, "id": 1}', function() {}, 'json');
                                }, this), 'json');
                        }, this), 'json');
                },
@@ -782,7 +782,7 @@ MediaLibrary.prototype = {
                        }
                },
                startSlideshow: function(event) {
-                       jQuery.post(JSON_RPC + '?StartSlideshow', '{"jsonrpc": "2.0", "method": "Player.Open", "params": { "slideshow": { "recursive" : "true", "random":"true", "directory" : "' + this.replaceAll(event.data.directory.file, "\\", "\\\\") + '" } }, "id": 1}', null, 'json');
+                       jQuery.post(JSON_RPC + '?StartSlideshow', '{"jsonrpc": "2.0", "method": "Player.Open", "params": { "item": { "recursive" : "true", "random":"true", "path" : "' + this.replaceAll(event.data.directory.file, "\\", "\\\\") + '" } }, "id": 1}', null, 'json');
                },
                showDirectory: function(event) {
                        var directory = event.data.directory.file;
index e983c43..fb16f95 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -5,6 +5,7 @@ set -e
 autoreconf -vif
 autoreconf -vif lib/libid3tag/libid3tag
 autoreconf -vif xbmc/screensavers/rsxs-0.9
+autoreconf -vif xbmc/visualizations/Goom/goom2k4-0
 autoreconf -vif lib/libapetag
 autoreconf -vif lib/cpluff
 # order matters with libdvd and friends
index a4498a7..e290828 100755 (executable)
@@ -107,9 +107,9 @@ openmax_not_found="== Could not find libnvomx. OpenMax support disabled. =="
 ssh_not_found="== Could not find libssh. SSH FTP VFS support disabled. =="
 librtmp_not_found="== Could not find libRTMP. RTMP support disabled. =="
 librtmp_disabled="== RTMP support disabled. =="
-libnfs_not_found="== Could not find libnfs. NFS support disabled. =="
+libnfs_not_found="== Could not find libnfs. NFS client support disabled. =="
 libnfs_disabled="== NFS support disabled. =="
-libafpclient_not_found="== Could not find libafpclient. AFP support disabled. =="
+libafpclient_not_found="== Could not find libafpclient. AFP client support disabled. =="
 libafpclient_disabled="== AFP support disabled. =="
 libshairport_not_found="== Could not find libshairport. AirTunes support disabled. =="
 libshairport_disabled="== AirTunes support disabled. =="
@@ -123,8 +123,10 @@ libudev_not_found="== Could not find libudev. Will use polling to check for devi
 libudev_disabled="== udev support disabled. Will use polling to check for device changes. =="
 libusb_not_found="== Could not find libusb. Plug and play USB device support will not be available. =="
 libusb_disabled="== libusb disabled. Plug and play USB device support will not be available. =="
-libcec_not_found="== Could not find libcec. CEC device support will not be available. =="
-libcec_disabled="== libcec disabled. CEC device support will not be available. =="
+libcec_enabled="== libCEC enabled. =="
+libcec_disabled="== libCEC disabled. CEC adapter support will not be available. =="
+libcec_internal="== Using internal libCEC. =="
+libcec_external_missing="== libCEC was not found on your system.  =="
 
 # External library message strings
 external_libraries_enabled="== Use of all supported external libraries enabled. =="
@@ -398,9 +400,9 @@ AC_ARG_ENABLE([libusb],
 
 AC_ARG_ENABLE([libcec],
   [AS_HELP_STRING([--enable-libcec],
-  [enable libcec support (default is auto)])],
+  [enable libcec support (default is no)])],
   [use_libcec=$enableval],
-  [use_libcec=auto])
+  [use_libcec=no])
 
 ### External libraries options
 AC_ARG_ENABLE([external-libraries],
@@ -409,6 +411,12 @@ AC_ARG_ENABLE([external-libraries],
   [use_external_libraries=$enableval],
   [use_external_libraries=no])
 
+AC_ARG_ENABLE([external-libcec],
+  [AS_HELP_STRING([--enable-external-libcec],
+  [external libcec support (default is no) 'Linux only'])],
+  [use_external_libcec=$enableval],
+  [use_external_libcec=no])
+
 AC_ARG_ENABLE([external-ffmpeg],
   [AS_HELP_STRING([--enable-external-ffmpeg],
   [enable use of external ffmpeg libraries (default is no) 'Linux only'])],
@@ -959,6 +967,17 @@ else
   DISABLE_PROJECTM=0
 fi
 
+# skin touched
+use_skin_touched=no
+if [[ -f "addons/skin.touched/addon.xml" ]]; then 
+  use_skin_touched=yes
+  USE_SKIN_TOUCHED=1
+  AC_DEFINE([HAS_SKIN_TOUCHED], [1], [Whether to build skin touched.])
+else
+  USE_SKIN_TOUCHED=0
+fi
+
+
 # libRTMP
 if test "$use_librtmp" != "no"; then
   AC_CHECK_HEADERS([librtmp/log.h librtmp/amf.h librtmp/rtmp.h],,
@@ -1074,73 +1093,77 @@ if test "x$use_airtunes" != "xno"; then
   fi
 fi
 
-# libusb
-USE_LIBUSB=0
-if test "$host_vendor" = "apple" ; then
-  use_libusb="no"
-  AC_MSG_NOTICE($libusb_disabled)
-else
-  if test "$use_libusb" = "auto"; then
-    PKG_CHECK_MODULES([USB], [libusb],
-      use_libusb="yes"; USE_LIBUSB=1; [INCLUDES="$INCLUDES $USB_CFLAGS"; LIBS="$LIBS $USB_LIBS"; USE_LIBUSB=1]; \
-      AC_DEFINE([HAVE_LIBUSB],[1],["Define to 1 if libusb is installed"]),
-      use_libusb="no"; AC_MSG_RESULT($libusb_not_found))
-  elif test "$use_libusb" = "yes"; then
-    PKG_CHECK_MODULES([USB], [libusb],
-      use_libusb="yes"; USE_LIBUSB=1; [INCLUDES="$INCLUDES $USB_CFLAGS"; LIBS="$LIBS $USB_LIBS"; USE_LIBUSB=1]; \
-      AC_DEFINE([HAVE_LIBUSB],[1],["Define to 1 if libusb is installed"]),
-      use_libusb="no"; AC_MSG_ERROR($libusb_not_found))
-  else
-    use_libusb="no"
-    AC_MSG_NOTICE($libusb_disabled)
-  fi
-fi
-
 # udev
 USE_LIBUDEV=0
-if test "$use_libusb" = "yes"; then
   if test "$host_vendor" = "apple" ; then
+  use_libudev="no"
+  AC_MSG_NOTICE($libudev_disabled)
+else
+  if test "$use_libudev" = "auto"; then
+    PKG_CHECK_MODULES([UDEV], [libudev],
+      use_libudev="yes"; use_libusb="no"; USE_LIBUDEV=1; [INCLUDES="$INCLUDES $UDEV_CFLAGS"; LIBS="$LIBS $UDEV_LIBS"]; \
+      AC_DEFINE([HAVE_LIBUDEV],[1],["Define to 1 if libudev is installed"]),
+      AC_MSG_RESULT($libudev_not_found))
+  elif test "$use_libudev" = "yes" ; then
+    PKG_CHECK_MODULES([UDEV], [libudev],
+      use_libudev="yes"; use_libusb="no"; USE_LIBUDEV=1; [INCLUDES="$INCLUDES $UDEV_CFLAGS"; LIBS="$LIBS $UDEV_LIBS"]; \
+      AC_DEFINE([HAVE_LIBUDEV],[1],["Define to 1 if libudev is installed"]),
+      AC_MSG_ERROR($libudev_not_found))
     use_libudev="no"
     AC_MSG_NOTICE($libudev_disabled)
+  fi
+fi
+
+# libusb
+USE_LIBUSB=0
+if test "$use_libudev" != "yes"; then
+  if test "$host_vendor" = "apple" ; then
+    use_libusb="no"
+    AC_MSG_NOTICE($libusb_disabled)
   else
-    if test "$use_libudev" = "auto"; then
-      PKG_CHECK_MODULES([UDEV], [libudev],
-        use_libudev="yes"; use_libusb="no"; USE_LIBUDEV=1; [INCLUDES="$INCLUDES $UDEV_CFLAGS"; LIBS="$LIBS $UDEV_LIBS"]; \
-        AC_DEFINE([HAVE_LIBUDEV],[1],["Define to 1 if libudev is installed"]),
-           AC_MSG_RESULT($libudev_not_found))
-    elif test "$use_libudev" = "yes" ; then
-      PKG_CHECK_MODULES([UDEV], [libudev],
-        use_libudev="yes"; use_libusb="no"; USE_LIBUDEV=1; [INCLUDES="$INCLUDES $UDEV_CFLAGS"; LIBS="$LIBS $UDEV_LIBS"]; \
-        AC_DEFINE([HAVE_LIBUDEV],[1],["Define to 1 if libudev is installed"]),
-           AC_MSG_ERROR($libudev_not_found))
-    else
-      use_libudev="no"
-      AC_MSG_NOTICE($libudev_disabled)
+    if test "$use_libusb" = "auto"; then
+      PKG_CHECK_MODULES([USB], [libusb],
+        use_libusb="yes"; USE_LIBUSB=1; [INCLUDES="$INCLUDES $USB_CFLAGS"; LIBS="$LIBS $USB_LIBS"; USE_LIBUSB=1]; \
+        AC_DEFINE([HAVE_LIBUSB],[1],["Define to 1 if libusb is installed"]),
+        use_libusb="no"; AC_MSG_RESULT($libusb_not_found))
+    elif test "$use_libusb" = "yes"; then
+      PKG_CHECK_MODULES([USB], [libusb],
+        use_libusb="yes"; USE_LIBUSB=1; [INCLUDES="$INCLUDES $USB_CFLAGS"; LIBS="$LIBS $USB_LIBS"; USE_LIBUSB=1]; \
+        AC_DEFINE([HAVE_LIBUSB],[1],["Define to 1 if libusb is installed"]),
+        use_libusb="no"; AC_MSG_ERROR($libusb_not_found))
+      use_libusb="no"
+      AC_MSG_NOTICE($libusb_disabled)
     fi
   fi
 else
-  use_libudev="no"
-  AC_MSG_NOTICE($libudev_disabled)
+  use_libusb="no"
 fi
 
 # libcec
 USE_LIBCEC=0
-if test "$use_libcec" = "auto"; then
-  PKG_CHECK_MODULES([CEC], [libcec],
-    use_libcec="yes"; USE_LIBCEC=1; [INCLUDES="$INCLUDES $CEC_CFLAGS"; LIBS="$LIBS $CEC_LIBS";] \
-    AC_DEFINE([HAVE_LIBCEC],[1],["Define to 1 if libcec is installed"]),
-       use_libcec="no"; AC_MSG_RESULT($libcec_not_found))
-elif test "$use_libcec" = "yes"; then
-  PKG_CHECK_MODULES([CEC], [libcec],
-    use_libcec="yes"; USE_LIBCEC=1; [INCLUDES="$INCLUDES $CEC_CFLAGS"; LIBS="$LIBS $CEC_LIBS";] \
-    AC_DEFINE([HAVE_LIBCEC],[1],["Define to 1 if libcec is installed"]),
-       use_libcec="no"; AC_MSG_ERROR($libcec_not_found))
+if test "$use_libcec" = "yes"; then
+  USE_LIBCEC=1; AC_DEFINE([HAVE_LIBCEC],[1],["Define to 1 if libCEC is installed"])
+  AC_MSG_NOTICE($libcec_enabled)
 else
   use_libcec="no"
   AC_MSG_NOTICE($libcec_disabled)
 fi
 
 ### External libraries checks
+
+# external libcec
+USE_EXTERNAL_LIBCEC=0
+if test "$use_libcec" = "yes"; then
+  if test "$use_external_libcec" = "yes"; then
+    USE_EXTERNAL_LIBCEC=1; PKG_CHECK_MODULES([CEC], [libcec],
+      [INCLUDES="$INCLUDES $CEC_CFLAGS"; LIBS="$LIBS $CEC_LIBS"],
+      AC_MSG_ERROR($libcec_external_missing))
+  else
+    [INCLUDES="$INCLUDES -I\$(abs_top_srcdir)/lib/libcec/include"]
+    AC_MSG_NOTICE($libcec_internal)
+  fi
+fi
+
 # External FFmpeg
 if test "$use_external_ffmpeg" = "yes"; then
   FFMPEG_LIBNAMES="libavcodec libavfilter libavformat libavutil libpostproc libswscale"
@@ -1578,6 +1601,12 @@ else
   final_message="$final_message\n  ProjectM:\tNo"
 fi
 
+if test "$use_skin_touched" = "yes"; then
+  final_message="$final_message\n  Skin Touched:\tYes"
+else
+  final_message="$final_message\n  Skin Touched:\tNo"
+fi
+
 if test "$use_x11" = "yes"; then
   final_message="$final_message\n  X11:\t\tYes"
 else
@@ -1728,9 +1757,9 @@ else
 fi
 
 if test "$use_libnfs" != "no"; then
-  final_message="$final_message\n  libnfs support:\tYes"
+  final_message="$final_message\n  libnfs client support:Yes"
 else
-  final_message="$final_message\n  libnfs support:\tNo"
+  final_message="$final_message\n  libnfs client support:No"
 fi
 
 if test "x$use_libafpclient" != "xno"; then
@@ -1757,7 +1786,31 @@ else
   final_message="$final_message\n  Optical drive:\tNo"
 fi
 
+if test "x$use_libudev" != "xno"; then
+  final_message="$final_message\n  libudev support:\tYes"
+else
+  final_message="$final_message\n  libudev support:\tNo"
+fi
+
+if test "x$use_libusb" != "xno"; then
+  final_message="$final_message\n  libusb support:\tYes"
+else
+  final_message="$final_message\n  libusb support:\tNo"
+fi
+
+if test "$use_libcec" = "yes"; then
+  final_message="$final_message\n  libCEC support:\tYes"
+else
+  final_message="$final_message\n  libCEC support:\tNo"
+fi
+
 ### External libraries messages
+if test "$use_external_libcec" = "yes"; then
+  final_message="$final_message\n  External libCEC:\tYes"
+else
+  final_message="$final_message\n  External libCEC:\tNo"
+fi
+
 if test "$use_external_ffmpeg" = "yes"; then
   final_message="$final_message\n  External FFmpeg:\tYes"
 else
@@ -1823,7 +1876,12 @@ OUTPUT_FILES="Makefile \
     tools/TexturePacker/Makefile \
     tools/EventClients/Clients/OSXRemote/Makefile \
     xbmc/peripherals/bus/Makefile \
-    xbmc/peripherals/devices/Makefile"
+    xbmc/peripherals/devices/Makefile \
+    lib/libcec/Makefile"
+
+if test "$use_skin_touched" = "yes"; then
+OUTPUT_FILES+=" addons/skin.touched/media/Makefile"
+fi
 
 # Line below is used so we can use AM_INIT_AUTOMAKE. The corresponding
 # .dummy.am does nothing.
@@ -1841,6 +1899,7 @@ AC_SUBST(BUILD_DVDCSS)
 AC_SUBST(DISABLE_GOOM)
 AC_SUBST(DISABLE_RSXS)
 AC_SUBST(DISABLE_PROJECTM)
+AC_SUBST(USE_SKIN_TOUCHED)
 AC_SUBST(USE_EXTERNAL_FFMPEG)
 AC_SUBST(PYTHON_VERSION)
 AC_SUBST(OUTPUT_FILES)
@@ -1878,6 +1937,8 @@ AC_SUBST(USE_AIRTUNES)
 AC_SUBST(USE_LIBUDEV)
 AC_SUBST(USE_LIBUSB)
 AC_SUBST(USE_LIBCEC)
+AC_SUBST(USE_EXTERNAL_LIBCEC)
+
 
 # pushd and popd are not available in other shells besides bash, so implement
 # our own pushd/popd functions
@@ -2146,6 +2207,16 @@ XB_CONFIG_MODULE([lib/cpluff], [
     #LDFLAGS="$LDFLAGS -Wl,-read_only_relocs,suppress"    
 ], [0])
 
+XB_CONFIG_MODULE([lib/libcec], [
+  if test "$use_libcec" = "yes" && test "$use_external_libcec" = "no" ; then
+    cd libcec ; ./configure \
+      --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
+      --host=$host_alias \
+      --build=$build_alias \
+      --target=$target_alias CFLAGS="$CFLAGS" CC="$CC" CXX="$CXX"
+  fi    
+], [0])
+
 AC_OUTPUT
 
 final_message="$final_message\n  prefix:\t$prefix\n$dashes"
index 49397a5..53912fe 100644 (file)
   <string id="16321">DXVA 最优</string>
   <string id="16322">Spline36</string>
   <string id="16323">Spline36 优化</string>
+  <string id="16324">软件混合</string>
 
   <string id="16400">后处理</string>
 
   <string id="21366">字幕目录</string>
   <string id="21367">视频和相关字幕目录</string>
 
-  <string id="21369">使用鼠标</string>
+  <string id="21369">启用鼠标和触摸屏支持</string>
   <string id="21370">在播放媒体文件时播放导航声效</string>
   <string id="21371">缩略图</string>
   <string id="21372">强制 DVD 播放器区码</string>
 
   <string id="34201">未找到下一播放项目</string>
   <string id="34202">未找到上一播放项目</string>
+
+  <string id="35000">外部设备</string>
+
+  <string id="35001">通用 HID 设备</string>
+  <string id="35002">通用网络适配器</string>
+  <string id="35003">通用硬盘驱动器</string>
+  <string id="35004">此设备无可用设置。</string>
+  <string id="35005">新设备已配置</string>
+  <string id="35006">设备已移除</string>
+  <string id="35007">用于此设备的键盘映射</string>
+  <string id="35008">键盘映射已启用</string>
+
+  <string id="35500">位置</string>
+  <string id="35501">设备类型</string>
+  <string id="35502">名称</string>
+  <string id="35503">提供商</string>
+  <string id="35504">产品 ID</string>
+  
+  <string id="36000">Pulse-Eight CEC 适配器</string>
+  <string id="36001">Pulse-Eight Nyxboard</string>
+  <string id="36002">切换到键盘指令</string>
+  <string id="36003">切换到遥控器指令</string>
+  <string id="36004">按“user”键指令</string>
+  <string id="36005">启用指令模式切换</string>
+  <string id="36006">无法打开适配器</string>
+  <string id="36007">启动XBMC时开启设备</string>
+  <string id="36008">退出XBMC时关闭设备</string>
+  <string id="36009">激活屏幕保护程序时设备进入待机状态</string>
+  <string id="36010">退出XBMC时设为禁用资源</string>
+  <string id="36011">未检测到 CEC 端口。需人工设置。</string>
+  <string id="36012">未检测到 CEC 适配器。</string>
+  <string id="36013">不支持的 libcec 界面版本。%d 高于 XBMC 支持的版本(%d)</string>
+  <string id="36014">电视关闭时本计算机进入待机状态</string>
 </strings>
index d157ef3..c734803 100644 (file)
   <string id="21366">Subtitle folder</string>
   <string id="21367">Movie &amp; alternate subtitle directory</string>
 
-  <string id="21369">Enable mouse</string>
+  <string id="21369">Enable mouse and Touch Screen support</string>
   <string id="21370">Play navigation sounds during media playback</string>
   <string id="21371">Thumbnail</string>
   <string id="21372">Forced DVD player region</string>
index f6594c6..f986f38 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--Translator: Tadej Novak-->
 <!--Email: tadej@tano.si-->
-<!--Date of translation: 20/08/2011-->
+<!--Date of translation: 08/10/2011-->
 <!--$Revision$-->
 <strings>
   <string id="0">Programi</string>
 
   <string id="1260">Oznani storitve drugim sistemom preko Zeroconf</string>
 
+  <string id="1270">Dovoli XBMC sprejemanje vsebin AirPlay</string>
+  <string id="1271">Ime naprave</string>
+  <string id="1272">- Zaščiti z geslom</string>
+
   <string id="1300">Poljubna zvočna naprava</string>
   <string id="1301">Poljubna naprava za preusmeritev zvoka</string>
 
   <string id="16020">Razpletanje</string>
   <string id="16021">Bob</string>
   <string id="16022">Bob (obrnjeno)</string>
-  <string id="16023">Uporaba prepletanja</string>
+  <string id="16023"></string>
   <string id="16024">Preklic...</string>
   <string id="16025">Vnesite ime izvajalca</string>
   <string id="16026">Predvajanje ni uspelo</string>
   <string id="16034">Ne morem pridobiti pesmi iz baze</string>
   <string id="16035">Predvajalni seznam zabavnega načina</string>
   <string id="16036">Razpletanje (Polovično)</string>
+  <string id="16037">Uporabi razpletanje videa</string>
+  <string id="16038">Metoda razpletanja</string>
+  <string id="16039">Izključeno</string>
+  <string id="16040">Avtomatsko</string>
+  <string id="16041">Vključeno</string>
 
   <string id="16100">Vsi posnetki</string>
   <string id="16101">Nepogledani</string>
   <string id="16309">Sinc (programsko)</string>
   <string id="16310">Temporal</string>
   <string id="16311">Temporal/Spatial</string>
-  <string id="16312">(VDPAU)Zmanjševanje šuma</string>
-  <string id="16313">(VDPAU)Ostrenje</string>
+  <string id="16312">(VDPAU) Zmanjševanje šuma</string>
+  <string id="16313">(VDPAU) Ostrenje</string>
   <string id="16314">Inverse Telecine</string>
   <string id="16315">Lanczos3 optimalno</string>
   <string id="16316">Samodejno</string>
-  <string id="16317">Temporal (Half)</string>
-  <string id="16318">Temporal/Spatial (Half)</string>
+  <string id="16317">Temporal (Polovično)</string>
+  <string id="16318">Temporal/Spatial (Polovično)</string>
   <string id="16319">DXVA</string>
+  <string id="16320">DXVA Bob</string>
+  <string id="16321">DXVA Best</string>
+  <string id="16322">Spline36</string>
+  <string id="16323">Spline36 optimized</string>
+  <string id="16324">Programski Blend</string>
 
   <string id="16400">Post-procesiranje</string>
 
   <string id="20258">MythTV odjemalec</string>
   <string id="20259">Omrežni datotečni sistem (NFS)</string>
   <string id="20260">Varna lupina (SSH/SFTP)</string>
+  <string id="20261">Apple Filing protokol (AFP)</string>
 
   <string id="20300">Mapa spletnega strežnika (HTTP)</string>
   <string id="20301">Mapa spletnega strežnika (HTTPS)</string>
   <string id="20454">Listener</string>
   <string id="20455">Listeners</string>
   <string id="20456">Nastavi ozadje filmske zbirke</string>
+  <string id="20457">Filmska zbirka</string>
   <!-- up to 21329 is reserved for the video db !! !-->
 
   <string id="21330">Prikaži skrite datoteke in mape</string>
   <string id="21452">Prenesi več...</string>
   <string id="21453">Korenski datotečni sistem</string>
 
+  <string id="21460">Položaj podnapisov</string>
+  <string id="21461">Fiksno</string>
+  <string id="21462">Dno videa</string>
+  <string id="21463">Pod videom</string>
+  <string id="21464">Vrh videa</string>
+  <string id="21465">Nad videom</string>
+
   <string id="21800">Ime datoteke</string>
   <string id="21801">Pot datoteke</string>
   <string id="21802">Velikost datoteke</string>
   <string id="24073">Ni se mogoče povezati</string>
   <string id="24074">Potrebuje ponoven zagon</string>
   <string id="24075">Onemogoči</string>
+  <string id="24076">Zahtevan dodatek</string>
   <string id="24080">Poskusim ponovno povezati?</string>
   <string id="24089">Ponovni zagoni dodatkov</string>
   <string id="24090">Zakleni upravljalnik z dodatki</string>
   <string id="24097">Ga želite onemogočiti na vašem sistemu?</string>
   <string id="24098">Nedelujoč</string>
   <string id="24099">Želite preklopiti na to preobleko?</string>
+  <string id="24100">Za uporabo te funkcije potrebujete dodatek:</string>
+  <string id="24101">Želite prenesti ta dodatek?</string>
   <string id="25000">Obvestila</string>
 
   <!-- strings 29800 thru 29998 reserved strings used only in the default Project Mayhem III skin and not c++ code -->
 
   <string id="34201">Ni mogoče najti naslednjega predmeta za predvajanje</string>
   <string id="34202">Ni mogoče najti prejšnjega predmeta za predvajanje</string>
+
+  <string id="35000">Naprave</string>
+
+  <string id="35001">Generična naprava HID</string>
+  <string id="35002">Generični omrežni vmesnik</string>
+  <string id="35003">Generični disk</string>
+  <string id="35004">Za to napravo ni na voljo nobenih dodatnih nastavitev.</string>
+  <string id="35005">Dodana nova naprava</string>
+  <string id="35006">Odstranjena naprava</string>
+  <string id="35007">Bližnjice za uporabo te naprave</string>
+  <string id="35008">Vključene bližnjice</string>
+
+  <string id="35500">Lokacija</string>
+  <string id="35501">Razred</string>
+  <string id="35502">Ime</string>
+  <string id="35503">Proizvajalec</string>
+  <string id="35504">ID izdelka</string>
+
+  <string id="36000">Pulse-Eight CEC adapter</string>
+  <string id="36001">Pulse-Eight Nyxboard</string>
+  <string id="36002">Preklopi na upravljanje s stranjo tipkovnice</string>
+  <string id="36003">Preklopi na upravljanje s stranjo daljinskega upravljalnika</string>
+  <string id="36004">Pritisni gumb "uporabnik"</string>
+  <string id="36005">Vključi ukaz za menjavo strani</string>
+  <string id="36006">Ni mogoče odpreti adapterja</string>
+  <string id="36007">Vključi naprave ob zagonu XBMC</string>
+  <string id="36008">Izključi naprave ob izhodu iz XBMC</string>
+  <string id="36009">Postavi naprave v stanje pripravljenosti ob ohranjevalniku zaslona</string>
+  <string id="36010">Nastavi kot neaktiven vir ob izhodu iz XBMC</string>
+  <string id="36011">Ni mogoče zaznati vrat CEC. Nastavite jih ročno.</string>
+  <string id="36012">Ni mogoče zaznati adapterja CEC.</string>
+  <string id="36013">Nepodprta različica libcec. %d je višja, kot jo podpira XBMC (%d)</string>
+  <string id="36014">Postavi računalnik v stanje pripravljenosti, ko se ugasne TV</string>
 </strings>
index 97d0016..366cee5 100644 (file)
@@ -2,13 +2,13 @@
 <!--Translator: NFA (necipfazil)-->
 <!--Email: necipfazil@gmail.com-->
 <!--Date of translation: 06/07/2006-->
-<!--Translator: Özgür BASKIN (queeup)-->
-<!--Email: ozgur.baskin@gmail.com-->
-<!--Date of translation: 22/04/2011-->
 <!--Translator: K. Deniz-->
 <!--Email: blackpilot24@hotmail.com-->
-<!--Date of translation: 08/08/2011-->
-<!--Based on English strings commit 282f5a5b809ab387129f-->
+<!--Date of translation: 22/04/2011-->
+<!--Translator: Özgür BASKIN (queeup)-->
+<!--Email: ozgur.baskin@gmail.com-->
+<!--Date of translation: 05/10/2011-->
+<!--Based on English strings commit e5c43fdb27ec6976d55ec3f2fcfcc717d59163ab -->
 <strings>
   <string id="0">Programlar</string>
   <string id="1">Resimler</string>
@@ -19,7 +19,7 @@
   <string id="6">XBMC SVN</string>
   <string id="7">Dosya yöneticisi</string>
   <string id="8">Hava Durumu</string>
-  <string id="9">xbmc media merkezi</string>
+  <string id="9">xbmc medya merkezi</string>
 
   <string id="11">Pazartesi</string>
   <string id="12">Salı</string>
   <string id="560">ID</string>
   <string id="561">Dosya</string>
   <string id="562">Yıl</string>
-  <string id="563">Beğeni</string>
+  <string id="563">Derecelenirme</string>
   <string id="564">Tür</string>
   <string id="565">Kullanım</string>
   <string id="566">Albüm sanatçısı</string>
   <string id="1004">Yine de eklemek istiyor musunuz?</string>
 
   <string id="1006">IP adresi</string>
-  <string id="1007">Ağ bağlantısı ekle</string>
+  <string id="1007">Ağ konumu ekle</string>
   <string id="1008">Protokol</string>
   <string id="1009">Sunucu adresi</string>
   <string id="1010">Sunucu adı</string>
   <string id="1257">Otomatik olarak tanımlanan sisteme bağlanmak ister misiniz?</string>
 
   <string id="1260">Bu hizmetleri Zeroconf üzerinden diğer sistemlere bildir</string>
+  <string id="1270">XBMC'nin AirPlay içeriğini almasına izin ver</string>
+  <string id="1271">Aygıt adı</string>
+  <string id="1272">- Parola koruması kullan</string>
 
   <string id="1300">Özel ses aygıtı</string>
   <string id="1301">Özel passthrough aygıtı</string>
   <string id="12392">Saat</string>
   <string id="12393">Gün</string>
   <string id="12394">Toplam çalışma süresi</string>
+  <string id="12395">Pil düzeyi</string>
 
   <string id="12600">Hava Durumu</string>
 
 
   <string id="13100">Titreme filtresi</string>
   <string id="13101">Sürücü seçsin (yeniden başlatmak gerekir)</string>
+  
   <string id="13105">Dikey boşluk senkronizasyonu</string>
   <string id="13106">Devre dışı</string>
   <string id="13107">Video oynatılırken etkinleştir</string>
   <string id="13405">Küçük resim al</string>
   <string id="13406">Resim bilgisi</string>
   <string id="13407">%s önayarları</string>
-  <string id="13408">(IMDb kullanıcı beğenisi)</string>
+  <string id="13408">(IMDb kullanıcı derecelendirmesi)</string>
   <string id="13409">En İyi 250</string>
   <string id="13410">Last.fm'de bul</string>
   <string id="13411">Asgari fan hızı</string>
   <string id="13500">Ses/Video senkron biçimi</string>
   <string id="13501">Ses saati</string>
   <string id="13502">Video saati (Drop/Dupe audio)</string>
-  <string id="13503">Video saati (ses yeniden örnekleme)</string>
+  <string id="13503">Video saati (yeniden ses örnekleme)</string>
   <string id="13504">Azami yeniden örnekleme miktarı (%)</string>
   <string id="13505">Yeniden örnekleme kalitesi</string>
   <string id="13506">Düşük(hızlı)</string>
   <string id="16020">De-interlace</string>
   <string id="16021">Bob</string>
   <string id="16022">Bob (inverted)</string>
-  <string id="16023">Resim düzeltme</string>
+  <string id="16023"></string>
   <string id="16024">İptal ediliyor...</string>
   <string id="16025">Sanatçı adını girin</string>
   <string id="16026">Çalma başarısız</string>
   <string id="16033">Veritabanı açılamıyor.</string>
   <string id="16034">Veritabanından şarkılar alınamıyor.</string>
   <string id="16035">Parti modu çalma listesi</string>
-
+  <string id="16036">De-interlace (Yarım)</string>
+  <string id="16037">Deinterlace video</string>
+  <string id="16038">Deinterlace metodu</string>
+  <string id="16039">Kapalı</string>
+  <string id="16040">Otomatik</string>
+  <string id="16041">Açık</string>
+  
   <string id="16100">Bütün Videolar</string>
   <string id="16101">Seyredilmeyen</string>
   <string id="16102">Seyredilen</string>
   <string id="16317">Temporal (Yarım)</string>
   <string id="16318">Temporal/Spatial (Yarım)</string>
   <string id="16319">DXVA</string>
-
+  <string id="16320">DXVA Bob</string>
+  <string id="16321">DXVA Best</string>
+  <string id="16322">Spline36</string>
+  <string id="16323">Spline36 optimized</string>
+  <string id="16324">Software Blend</string>
+  
   <string id="16400">Post-processing</string>
 
   <string id="17500">Görüntü uyku zaman aşımı</string>
   <string id="20071">Taze ortam kaynaklarıyla başla</string>
   <string id="20072">Seçili klasörün yazılabilir ve klasör adının</string>
   <string id="20073">geçerli olduğundan emin olun</string>
-  <string id="20074">MPAA</string>
+  <string id="20074">MPAA derecelendirmesi</string>
   <string id="20075">Yönetici kilit kodunu gir</string>
   <string id="20076">Başlangıçta yönetici kilit kodunu sor</string>
   <string id="20077">Dış görünüm ayarları</string>
   <string id="20126">Oturumu kapat</string>
   <string id="20128">Kök dizine git</string>
   <string id="20129">Weave</string>
-  <string id="20130">Weave (inverted)</string>
+  <string id="20130">Weave (ters)</string>
   <string id="20131">Karıştır</string>
   <string id="20132">Video'yu yeniden başlat</string>
   <string id="20133">Ağ konumunu düzenle</string>
   <string id="20256">HTS Tvheadend istemcisi</string>
   <string id="20257">VDR Streamdev istemcisi</string>
   <string id="20258">MythTV istemcisi</string>
+  <string id="20259">Ağ Dosya Sistemi (NFS)</string>
+  <string id="20260">Güvenli Kabuk (SSH/SFTP)</string>
+  <string id="20261">Apple Filing Protocol (AFP)</string>
 
   <string id="20300">Web sunucu dizini (HTTP)</string>
   <string id="20301">Web sunucu dizini (HTTPS)</string>
   <string id="20303">Bu adımı atlayıp devam etme istiyor musunuz?</string>
   <string id="20304">RSS Beslemesi</string>
 
-  <string id="20306"></string>
   <string id="20307">İkincil DNS</string>
   <string id="20308">DHCP sunucusu:</string>
   <string id="20309">Yeni klasör yarat</string>
   <string id="20415">Yeni içerik için taranıyor</string>
   <string id="20416">İlk gösterim</string>
   <string id="20417">Yazar</string>
-  <string id="20418">Dosya ve klasör adlarını temizle</string>
+  <string id="20418"></string>
+  <string id="20419">Dosya görünümünde meta verileri gösterilsin mi?</string>
 
   <string id="20420">Asla</string>
   <string id="20421">Yalnızca bir sezon ise</string>
   <string id="20453">bölüm</string>
   <string id="20454">Dinleyici</string>
   <string id="20455">Dinleyiciler</string>
+  <string id="20456">Set movieset fanart</string>
+  <string id="20457">Movie set</string>
   <!-- up to 21329 is reserved for the video db !! !-->
 
   <string id="21330">Gizli dosya ve dizinleri göster</string>
   <string id="21373">Video çıkışı</string>
   <string id="21374">Video görüntü oranı</string>
   <string id="21375">Normal</string>
-  <string id="21376">Letterbox</string>
+  <string id="21376">Sinemaskop</string>
   <string id="21377">Geniş ekran</string>
   <string id="21378">480p'yi etkinleştir</string>
   <string id="21379">720p'ti etkinleştir</string>
   <string id="21452">Daha Fazla...</string>
   <string id="21453">Kök dosya sistemi</string>
 
+  <string id="21460">Altyazı konumu</string>
+  <string id="21461">Sabit</string>
+  <string id="21462">Videonun en altında</string>
+  <string id="21463">Videonun altında</string>
+  <string id="21464">Videonun en üstünde</string>
+  <string id="21465">Videonun üstünde</string>
+
   <string id="21800">Dosya adı</string>
   <string id="21801">Dosya yolu</string>
   <string id="21802">Dosya boyutu</string>
   <string id="24043">Kullanılabilir Güncelleştirmeler</string>
   <string id="24044">Bağımlılıklar karşılanmadı</string>
   <string id="24045">Eklenti doğru bir yapıya sahip değil</string>
+  <string id="24046">%s yüklü eklenti(ler) tarafından kullanılıyor</string>
+  <string id="24047">Bu eklenti kaldırılamaz</string>
+  <string id="24048">Geri alma</string>
 
   <string id="24050">Kullanılabilir Eklentiler</string>
   <string id="24051">Sürüm:</string>
   <string id="24073">Bağlanılamadı</string>
   <string id="24074">Yeniden başlatmak gerekiyor</string>
   <string id="24075">Devre dışı bırak</string>
+  <string id="24076">Eklenti Gerekli</string>
   <string id="24080">Yeniden bağlanılsın mı?</string>
   <string id="24089">Eklenti yeniden başlatmaları</string>
   <string id="24090">Eklenti yöneticisini kilitle</string>
 
+  <string id="24094">(geçerli)</string>
+  <string id="24095">(kara listede)</string>
   <string id="24096">Depodaki eklenti bozuk olarak işaretlenmiş.</string>
   <string id="24097">Sisteminizde devre dışı bırakmak ister misiniz?</string>
   <string id="24098">Bozuk</string>
   <string id="24099">Bu dış görünüme geçmek ister misiniz?</string>
+  <string id="24100">Bu özelliği kullanabilmek için indirmeniz gereken eklenti:</string>
+  <string id="24101">Bu eklentiyi indirmek istiyor musunuz?</string>
   <string id="25000">Bildirimler</string>
 
   <!-- strings 29800 thru 29998 reserved strings used only in the default Project Mayhem III skin and not c++ code -->
   <string id="33029">Ayrıntılar</string>
   <string id="33030">Outlook</string>
   <string id="33031">Coverflow</string>
-  <string id="33032">Metni Tercüme Et</string>
+  <string id="33032">Metni tercüme et</string>
   <string id="33033">%s kategorisinin harita listesi</string>
   <string id="33034">36 Saatlik</string>
   <string id="33035">Haritalar</string>
   <string id="33063">Seçenekler</string>
   <string id="33065">Düzenleyici</string>
   <string id="33066">About your</string>
-  <string id="33067">Star rating</string>
+  <string id="33067">Yıldız derecelendirmesi</string>
   <string id="33068">Arka Plan</string>
   <string id="33069">Arka Planlar</string>
   <string id="33070">Özel arka plan</string>
   <string id="34110">7.1</string>
   <!-- 34112-34200 reserved for future use -->
 
+  <string id="34201">Çalınacak sonraki öğeyi bulamıyor</string>
+  <string id="34202">Çalınacak önceki öğeyi bulamıyor</string>
+
+  <string id="35000">Çevre birimleri</string>
+
+  <string id="35001">Genel HID aygıtı</string>
+  <string id="35002">Genel ağ bağdaştırıcısı</string>
+  <string id="35003">Genel disk</string>
+  <string id="35004">Bu çevre birimi için ayar mevcut değil.</string>
+  <string id="35005">Yani aygıt yapılandırıldı</string>
+  <string id="35006">Aygıt kaldırıldı</string>
+  <string id="35007">Bu aygıt için kullanılacak keymap</string>
+  <string id="35008">Keymap etkin</string>
+
+  <string id="35500">Konum</string>
+  <string id="35501">Sınıf</string>
+  <string id="35502">Adı</string>
+  <string id="35503">Satıcı</string>
+  <string id="35504">Ürün Kimliği</string>
+  
+  <string id="36000">Pulse-Eight CEC bağdaştırıcısı</string>
+  <string id="36001">Pulse-Eight Nyxboard</string>
+  <string id="36002">Switch to keyboard side command</string>
+  <string id="36003">Switch to remote side command</string>
+  <string id="36004">Press "user" button command</string>
+  <string id="36005">Enable switch side commands</string>
+  <string id="36006">Bağdaştırıcı açılamıyor</string>
+  <string id="36007">Power on devices when starting XBMC</string>
+  <string id="36008">Power off devices when stopping XBMC</string>
+  <string id="36009">Put devices in standby mode when activating screensaver</string>
+  <string id="36010">Set as inactive source when stopping XBMC</string>
+  <string id="36011">CEC portu algılanamadı. El ile ayarla.</string>
+  <string id="36012">CEC bağdaştırıcısı algılanamadı.</string>
+  <string id="36013">Desteklenmeyen libcec arabirim sürümü. %d is greater than the version XBMC supports (%d)</string>
+  <string id="36014">Put this PC in standby mode when the TV is switched off</string>
 </strings>
diff --git a/lib/DllLibbluray.h b/lib/DllLibbluray.h
new file mode 100644 (file)
index 0000000..4ab8d47
--- /dev/null
@@ -0,0 +1,171 @@
+/*
+ *      Copyright (C) 2005-2009 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  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 XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+#pragma once
+#include "system.h"
+#ifdef HAVE_LIBBLURAY
+
+#include "DynamicDll.h"
+
+
+extern "C"
+{
+#include <libbluray/bluray.h>
+#include <libbluray/filesystem.h>
+#ifndef HAVE_LIBBLURAY_NOLOGCONTROL
+#include <libbluray/log_control.h>
+#endif
+}
+
+class DllLibblurayInterface
+{
+public:
+  virtual ~DllLibblurayInterface() {};
+  virtual uint32_t bd_get_titles(BLURAY *bd, uint8_t flags, uint32_t min_title_length)=0;
+  virtual BLURAY_TITLE_INFO* bd_get_title_info(BLURAY *bd, uint32_t title_idx, unsigned angle)=0;
+  virtual BLURAY_TITLE_INFO* bd_get_playlist_info(BLURAY *bd, uint32_t playlist, unsigned angle)=0;
+  virtual void bd_free_title_info(BLURAY_TITLE_INFO *title_info)=0;
+  virtual BLURAY *bd_open(const char* device_path, const char* keyfile_path)=0;
+  virtual void bd_close(BLURAY *bd)=0;
+  virtual int64_t bd_seek(BLURAY *bd, uint64_t pos)=0;
+  virtual int64_t bd_seek_time(BLURAY *bd, uint64_t tick)=0;
+  virtual int bd_read(BLURAY *bd, unsigned char *buf, int len)=0;
+  virtual int64_t bd_seek_chapter(BLURAY *bd, unsigned chapter)=0;
+  virtual int64_t bd_chapter_pos(BLURAY *bd, unsigned chapter)=0;
+  virtual uint32_t bd_get_current_chapter(BLURAY *bd)=0;
+  virtual int64_t bd_seek_mark(BLURAY *bd, unsigned mark)=0;
+  virtual int bd_select_playlist(BLURAY *bd, uint32_t playlist)=0;
+  virtual int bd_select_title(BLURAY *bd, uint32_t title)=0;
+  virtual int bd_select_angle(BLURAY *bd, unsigned angle)=0;
+  virtual void bd_seamless_angle_change(BLURAY *bd, unsigned angle)=0;
+  virtual uint64_t bd_get_title_size(BLURAY *bd)=0;
+  virtual uint32_t bd_get_current_title(BLURAY *bd)=0;
+  virtual unsigned bd_get_current_angle(BLURAY *bd)=0;
+  virtual uint64_t bd_tell(BLURAY *bd)=0;
+  virtual uint64_t bd_tell_time(BLURAY *bd)=0;
+  virtual BD_FILE_OPEN bd_register_file(BD_FILE_OPEN p)=0;
+  virtual BD_DIR_OPEN bd_register_dir(BD_DIR_OPEN p)=0;
+
+#ifndef HAVE_LIBBLURAY_NOLOGCONTROL
+  virtual void     bd_set_debug_handler(BD_LOG_FUNC)=0;
+  virtual void     bd_set_debug_mask(uint32_t mask)=0;
+  virtual uint32_t bd_get_debug_mask(void)=0;
+#endif
+};
+
+class DllLibbluray : public DllDynamic, DllLibblurayInterface
+{
+  DECLARE_DLL_WRAPPER(DllLibbluray, DLL_PATH_LIBBLURAY)
+#ifdef HAVE_LIBBBLURAY_HAVE_LIBBLURAY_NOANGLE
+  DEFINE_METHOD3(uint32_t,            bd_get_titles,          (BLURAY *p1, uint8_t p2))
+  DEFINE_METHOD3(BLURAY_TITLE_INFO*,  bd_get_title_info,      (BLURAY *p1, uint32_t p2))
+  DEFINE_METHOD3(BLURAY_TITLE_INFO*,  bd_get_playlist_info,   (BLURAY *p1, uint32_t p2))
+#else
+  DEFINE_METHOD3(uint32_t,            bd_get_titles,          (BLURAY *p1, uint8_t p2, uint32_t p3))
+  DEFINE_METHOD3(BLURAY_TITLE_INFO*,  bd_get_title_info,      (BLURAY *p1, uint32_t p2, unsigned p3))
+  DEFINE_METHOD3(BLURAY_TITLE_INFO*,  bd_get_playlist_info,   (BLURAY *p1, uint32_t p2, unsigned p3))
+#endif
+  DEFINE_METHOD1(void,                bd_free_title_info,     (BLURAY_TITLE_INFO *p1))
+  DEFINE_METHOD2(BLURAY*,             bd_open,                (const char* p1, const char* p2))
+  DEFINE_METHOD1(void,                bd_close,               (BLURAY *p1))
+  DEFINE_METHOD2(int64_t,             bd_seek,                (BLURAY *p1, uint64_t p2))
+  DEFINE_METHOD2(int64_t,             bd_seek_time,           (BLURAY *p1, uint64_t p2))
+  DEFINE_METHOD3(int,                 bd_read,                (BLURAY *p1, unsigned char *p2, int p3))
+  DEFINE_METHOD2(int64_t,             bd_seek_chapter,        (BLURAY *p1, unsigned p2))
+  DEFINE_METHOD2(int64_t,             bd_chapter_pos,         (BLURAY *p1, unsigned p2))
+  DEFINE_METHOD1(uint32_t,            bd_get_current_chapter, (BLURAY *p1))
+  DEFINE_METHOD2(int64_t,             bd_seek_mark,           (BLURAY *p1, unsigned p2))
+  DEFINE_METHOD2(int,                 bd_select_playlist,     (BLURAY *p1, uint32_t p2))
+  DEFINE_METHOD2(int,                 bd_select_title,        (BLURAY *p1, uint32_t p2))
+  DEFINE_METHOD2(int,                 bd_select_angle,        (BLURAY *p1, unsigned p2))
+  DEFINE_METHOD2(void,                bd_seamless_angle_change,(BLURAY *p1, unsigned p2))
+  DEFINE_METHOD1(uint64_t,            bd_get_title_size,      (BLURAY *p1))
+  DEFINE_METHOD1(uint32_t,            bd_get_current_title,   (BLURAY *p1))
+  DEFINE_METHOD1(unsigned,            bd_get_current_angle,   (BLURAY *p1))
+  DEFINE_METHOD1(uint64_t,            bd_tell,                (BLURAY *p1))
+  DEFINE_METHOD1(uint64_t,            bd_tell_time,           (BLURAY *p1))
+  DEFINE_METHOD1(BD_FILE_OPEN,        bd_register_file,       (BD_FILE_OPEN p1))
+  DEFINE_METHOD1(BD_DIR_OPEN,         bd_register_dir,        (BD_DIR_OPEN p1))
+
+#ifndef HAVE_LIBBLURAY_NOLOGCONTROL
+  DEFINE_METHOD1(void,                bd_set_debug_handler,   (BD_LOG_FUNC p1))
+  DEFINE_METHOD1(void,                bd_set_debug_mask,      (uint32_t p1))
+  DEFINE_METHOD0(uint32_t,            bd_get_debug_mask)
+#endif
+
+  BEGIN_METHOD_RESOLVE()
+    RESOLVE_METHOD(bd_get_titles)
+    RESOLVE_METHOD(bd_get_title_info)
+    RESOLVE_METHOD(bd_get_playlist_info)
+    RESOLVE_METHOD_RENAME(bd_free_title_info,   bd_free_title_info)
+    RESOLVE_METHOD_RENAME(bd_open,              bd_open)
+    RESOLVE_METHOD_RENAME(bd_close,             bd_close)
+    RESOLVE_METHOD_RENAME(bd_seek,              bd_seek)
+    RESOLVE_METHOD_RENAME(bd_seek_time,         bd_seek_time)
+    RESOLVE_METHOD_RENAME(bd_read,              bd_read)
+    RESOLVE_METHOD_RENAME(bd_seek_chapter,      bd_seek_chapter)
+    RESOLVE_METHOD_RENAME(bd_chapter_pos,       bd_chapter_pos)
+    RESOLVE_METHOD_RENAME(bd_get_current_chapter, bd_get_current_chapter)
+    RESOLVE_METHOD_RENAME(bd_seek_mark,         bd_seek_mark)
+    RESOLVE_METHOD_RENAME(bd_select_playlist,   bd_select_playlist)
+    RESOLVE_METHOD_RENAME(bd_select_title,      bd_select_title)
+    RESOLVE_METHOD_RENAME(bd_select_angle,      bd_select_angle)
+    RESOLVE_METHOD_RENAME(bd_seamless_angle_change, bd_seamless_angle_change)
+    RESOLVE_METHOD_RENAME(bd_get_title_size,    bd_get_title_size)
+    RESOLVE_METHOD_RENAME(bd_get_current_title, bd_get_current_title)
+    RESOLVE_METHOD_RENAME(bd_get_current_angle, bd_get_current_angle)
+    RESOLVE_METHOD_RENAME(bd_tell,              bd_tell)
+    RESOLVE_METHOD_RENAME(bd_tell_time,         bd_tell_time)
+    RESOLVE_METHOD_RENAME(bd_register_file,     bd_register_file)
+    RESOLVE_METHOD_RENAME(bd_register_dir,      bd_register_dir)
+    RESOLVE_METHOD(bd_set_debug_handler)
+    RESOLVE_METHOD(bd_set_debug_mask)
+    RESOLVE_METHOD(bd_get_debug_mask)
+#ifndef HAVE_LIBBLURAY_NOLOGCONTROL
+    RESOLVE_METHOD(bd_set_debug_handler)
+    RESOLVE_METHOD(bd_set_debug_mask)
+    RESOLVE_METHOD(bd_get_debug_mask)
+#endif
+  END_METHOD_RESOLVE()
+
+#ifdef HAVE_LIBBBLURAY_HAVE_LIBBLURAY_NOANGLE
+  uint32_t bd_get_titles(BLURAY *bd, uint8_t flags, uint32_t min_title_length)
+      {return bd_get_titles_noangle(bd, flags);           }
+  BLURAY_TITLE_INFO* bd_get_title_info(BLURAY *bd, uint32_t title_idx, unsigned angle)
+      {return bd_get_title_info_noangle(bd, title_idx);   }
+  BLURAY_TITLE_INFO* bd_get_playlist_info(BLURAY *bd, uint32_t playlist, unsigned angle)
+      {return bd_get_playlist_info_noangle(bd, playlist); }
+#endif
+
+public:
+  static void       file_close(BD_FILE_H *file);
+  static int64_t    file_seek(BD_FILE_H *file, int64_t offset, int32_t origin);
+  static int64_t    file_tell(BD_FILE_H *file);
+  static int        file_eof(BD_FILE_H *file);
+  static int64_t    file_read(BD_FILE_H *file, uint8_t *buf, int64_t size);
+  static int64_t    file_write(BD_FILE_H *file, const uint8_t *buf, int64_t size);
+  static BD_FILE_H *file_open(const char* filename, const char *mode);
+  static void      dir_close(BD_DIR_H *dir);
+  static int       dir_read(BD_DIR_H *dir, BD_DIRENT *entry);
+  static BD_DIR_H *dir_open(const char* dirname);
+  static void      bluray_logger(const char* msg);
+};
+
+#endif
index 8206b18..b4a8091 100644 (file)
@@ -5,6 +5,16 @@
 #include "XEventUtils.h"
 #endif
 
+// a cautious wrapper around strncpy
+char *strncpy_null_terminated(char *dest, const char *src, size_t n)
+{
+  char *result = strncpy(dest, src, n);
+  if(n>0) {
+    dest[n-1] = '\0';
+  }
+  return result;
+}
+
 CmdExtract::CmdExtract()
 {
   TotalFileCount=0;
@@ -90,7 +100,7 @@ void CmdExtract::ExtractArchiveInit(CommandData *Cmd,Archive &Arc)
 #endif
 
   if (*Cmd->Password!=0)
-    strcpy(Password,Cmd->Password);
+    strncpy_null_terminated(Password,Cmd->Password, MAXPASSWORD);
   PasswordAll=(*Cmd->Password!=0);
 
   DataIO.UnpVolume=false;
@@ -249,7 +259,7 @@ bool CmdExtract::ExtractCurrentFile(CommandData *Cmd,Archive &Arc,int HeaderSize
   char ArcFileName[NM];
 
   IntToExt(Arc.NewLhd.FileName,Arc.NewLhd.FileName);
-  strcpy(ArcFileName,Arc.NewLhd.FileName);
+  strncpy_null_terminated(ArcFileName,Arc.NewLhd.FileName, NM);
 
   wchar ArcFileNameW[NM];
   *ArcFileNameW=0;
@@ -297,7 +307,7 @@ bool CmdExtract::ExtractCurrentFile(CommandData *Cmd,Archive &Arc,int HeaderSize
     char Name[NM];
     WideToChar(ArcFileNameW,Name);
     if (IsNameUsable(Name))
-    strcpy(ArcFileName,Name);
+      strncpy_null_terminated(ArcFileName,Name, NM);
   }
 #endif
 
@@ -329,7 +339,7 @@ bool CmdExtract::ExtractCurrentFile(CommandData *Cmd,Archive &Arc,int HeaderSize
   if ((Arc.NewLhd.Flags & (LHD_SPLIT_BEFORE/*|LHD_SOLID*/)) && FirstFile)
   {
     char CurVolName[NM];
-    strcpy(CurVolName,ArcName);
+    strncpy_null_terminated(CurVolName,ArcName, NM);
 
     VolNameToFirstName(ArcName,ArcName,(Arc.NewMhd.Flags & MHD_NEWNUMBERING) != 0);
     if (stricomp(ArcName,CurVolName)!=0 && FileExist(ArcName))
@@ -351,7 +361,7 @@ bool CmdExtract::ExtractCurrentFile(CommandData *Cmd,Archive &Arc,int HeaderSize
       }
     }
 #endif
-    strcpy(ArcName,CurVolName);
+    strncpy_null_terminated(ArcName,CurVolName, NM);
   }
 #endif
 
@@ -393,7 +403,7 @@ bool CmdExtract::ExtractCurrentFile(CommandData *Cmd,Archive &Arc,int HeaderSize
           if (Cmd->Callback==NULL ||
               Cmd->Callback(UCM_NEEDPASSWORD,Cmd->UserData,(LONG)Cmd->Password,sizeof(Cmd->Password))==-1)
             return(false);
-        strcpy(Password,Cmd->Password);
+        strncpy_null_terminated(Password,Cmd->Password, MAXPASSWORD);
 
 #else
         if (!GetPassword(PASSWORD_FILE,ArcFileName,Password,sizeof(Password)))
@@ -430,7 +440,7 @@ bool CmdExtract::ExtractCurrentFile(CommandData *Cmd,Archive &Arc,int HeaderSize
       WideToChar(Cmd->ExtrPathW,DestFileName);
     else
 #endif
-      strcpy(DestFileName,Cmd->ExtrPath);
+      strncpy_null_terminated(DestFileName,Cmd->ExtrPath, NM);
 
 
 #ifndef SFX_MODULE
@@ -551,7 +561,7 @@ bool CmdExtract::ExtractCurrentFile(CommandData *Cmd,Archive &Arc,int HeaderSize
 #ifdef RARDLL
     if (*Cmd->DllDestName)
     {
-      strncpy(DestFileName,Cmd->DllDestName,sizeof(DestFileName));
+      strncpy_null_terminated(DestFileName,Cmd->DllDestName,sizeof(DestFileName));
       *DestFileNameW=0;
       if (Cmd->DllOpMode!=RAR_EXTRACT)
         ExtrFile=false;
diff --git a/lib/addons/script.module.pil/Imaging-1.1.7-access.patch b/lib/addons/script.module.pil/Imaging-1.1.7-access.patch
new file mode 100644 (file)
index 0000000..dd51f4a
--- /dev/null
@@ -0,0 +1,13 @@
+diff -rupN Imaging-1.1.7/libImaging/Access.c Imaging-1.1.7-mod/libImaging/Access.c
+--- Imaging-1.1.7/libImaging/Access.c  2009-10-31 20:44:12.000000000 -0400
++++ Imaging-1.1.7-mod/libImaging/Access.c      2011-10-10 19:40:22.000000000 -0400
+@@ -32,7 +32,7 @@ add_item(const char* mode)
+ {
+     UINT32 i = hash(mode);
+     /* printf("hash %s => %d\n", mode, i); */
+-    if (access_table[i].mode) {
++    if (access_table[i].mode && (strcmp(mode, access_table[i].mode) != 0)) {
+         fprintf(stderr, "AccessInit: hash collision: %d for both %s and %s\n",
+                 i, mode, access_table[i].mode);
+         exit(1);
+
diff --git a/lib/addons/script.module.pil/Imaging-1.1.7-crosscompiling-0.1.patch b/lib/addons/script.module.pil/Imaging-1.1.7-crosscompiling-0.1.patch
new file mode 100644 (file)
index 0000000..ccd7afd
--- /dev/null
@@ -0,0 +1,34 @@
+diff -Naur Imaging-1.1.7/setup.py Imaging-1.1.7.patch/setup.py
+--- Imaging-1.1.7/setup.py     2011-04-17 09:31:07.000000000 +0200
++++ Imaging-1.1.7.patch/setup.py       2011-04-17 09:54:20.880047886 +0200
+@@ -147,7 +147,6 @@
+             add_directory(library_dirs, "/opt/local/lib")
+             add_directory(include_dirs, "/opt/local/include")
+-        add_directory(library_dirs, "/usr/local/lib")
+         # FIXME: check /opt/stuff directories here?
+         prefix = sysconfig.get_config_var("prefix")
+@@ -199,22 +198,6 @@
+             add_directory(include_dirs, include_root)
+         #
+-        # add standard directories
+-
+-        # look for tcl specific subdirectory (e.g debian)
+-        if _tkinter:
+-            tcl_dir = "/usr/include/tcl" + TCL_VERSION
+-            if os.path.isfile(os.path.join(tcl_dir, "tk.h")):
+-                add_directory(include_dirs, tcl_dir)
+-
+-        # standard locations
+-        add_directory(library_dirs, "/usr/local/lib")
+-        add_directory(include_dirs, "/usr/local/include")
+-
+-        add_directory(library_dirs, "/usr/lib")
+-        add_directory(include_dirs, "/usr/include")
+-
+-        #
+         # insert new dirs *before* default libs, to avoid conflicts
+         # between Python PYD stub libs and real libraries
diff --git a/lib/addons/script.module.pil/Imaging-1.1.7-setuptools-0.1.patch b/lib/addons/script.module.pil/Imaging-1.1.7-setuptools-0.1.patch
new file mode 100644 (file)
index 0000000..a59ea79
--- /dev/null
@@ -0,0 +1,12 @@
+diff -Naur Imaging-1.1.7/setup.py Imaging-1.1.7.patch/setup.py
+--- Imaging-1.1.7/setup.py     2009-11-15 17:06:10.000000000 +0100
++++ Imaging-1.1.7.patch/setup.py       2011-04-17 09:31:07.545708559 +0200
+@@ -83,7 +83,7 @@
+ # --------------------------------------------------------------------
+ from distutils import sysconfig
+-from distutils.core import Extension, setup
++from setuptools import Extension, setup
+ from distutils.command.build_ext import build_ext
+ try:
index bc8696c..a1f4d00 100644 (file)
@@ -11,8 +11,13 @@ ARCHIVE_TOOL=tar
 ARCHIVE_TOOL_FLAGS=xf
 
 ifeq ($(OSTYPE),Darwin)
-include ../../../tools/darwin/depends/config.site.mk
-PYTHON=$(prefix_path)/bin/python
+include @abs_top_srcdir@/tools/darwin/depends/Makefile.include
+include @abs_top_srcdir@/tools/darwin/depends/config.site.mk
+export TARBALLS_LOCATION=.
+export PYTHONXCPREFIX=$(PREFIX)
+export LDFLAGS+=-L$(PREFIX)/lib
+PYTHON=$(TOOLCHAIN)/bin/python
+PYTHONCROSS=--cross-compile
 else
 PYTHON=@PYTHON@
 endif
@@ -32,10 +37,17 @@ $(ARCHIVE):
 $(SOURCE): $(ARCHIVE)
        -rm -rf $(SOURCE)
        $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(ARCHIVE)
+       if test "$(OSTYPE)" = "Darwin"; then \
+       cd $(SOURCE); \
+       patch -p1 < ../Imaging-1.1.7-crosscompiling-0.1.patch; \
+       patch -p1 < ../Imaging-1.1.7-setuptools-0.1.patch; \
+       patch -p1 < ../Imaging-1.1.7-access.patch; \
+       sed -ie "s|"darwin"|"darwinNot"|g" "setup.py"; \
+       fi
 
 $(DESTDIR): $(SOURCE)
        -rm -rf $(DESTDIR)
-       pushd $(SOURCE) && $(PYTHON) setup.py build --build-lib $(DESTDIR); popd
+       pushd $(SOURCE) && $(PYTHON) setup.py build $(PYTHONCROSS) --build-lib $(DESTDIR); popd
 else
 $(DESTDIR):
        @true
index e713e24..6c19e89 100644 (file)
@@ -28,7 +28,7 @@
 typedef struct DVDSubContext
 {
   uint8_t  colormap[4];
-  uint8_t  alpha[4];
+  uint8_t  alpha[256];
   uint32_t palette[16];
   int      has_palette;
 } DVDSubContext;
index df3bccf..5177850 100644 (file)
@@ -18,7 +18,7 @@ index bea2646..e713e24 100644
 +typedef struct DVDSubContext
 +{
 +  uint8_t  colormap[4];
-+  uint8_t  alpha[4];
++  uint8_t  alpha[256];
 +  uint32_t palette[16];
 +  int      has_palette;
 +} DVDSubContext;
diff --git a/lib/libcec/Makefile.in b/lib/libcec/Makefile.in
new file mode 100644 (file)
index 0000000..4343cfb
--- /dev/null
@@ -0,0 +1,51 @@
+#  Download and build libCEC
+#
+#  Usage:
+#    make download
+#    make bootstrap
+#    make configure
+#    make
+
+# lib name, version
+LIBNAME=libcec
+VERSION=0.6
+ARCHIVE=$(LIBNAME)-$(VERSION)
+
+# download location and format
+ARCHIVE_BASE_URL=http://github.com/Pulse-Eight/$(LIBNAME)/tarball/
+ARCHIVE_EXTRACTED_DIR=Pulse-Eight-libcec-d9ba5be
+ARCHIVE_URL=$(ARCHIVE_BASE_URL)$(ARCHIVE)
+ARCHIVE_TOOL=tar
+ARCHIVE_TOOL_FLAGS=xf
+ARCHIVE_ADD_EXTENSION=.tar.gz
+RETRIEVE_TOOL=/usr/bin/curl
+RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(ARCHIVE)$(ARCHIVE_ADD_EXTENSION)
+
+# configuration
+PREFIX ?= @abs_top_srcdir@/lib/libcec
+LIBCEC_CONFIGOPTS ?= --prefix=$(PREFIX)
+CONFIGURE=./configure CFLAGS=-D_FILE_OFFSET_BITS=64 $(LIBCEC_CONFIGOPTS)
+
+all: libcec.a
+
+download: distclean
+       $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(ARCHIVE_URL)
+       $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(ARCHIVE)$(ARCHIVE_ADD_EXTENSION)
+       rm -f $(ARCHIVE)$(ARCHIVE_ADD_EXTENSION)
+       mv $(ARCHIVE_EXTRACTED_DIR) $(LIBNAME)
+       mkdir -p include/libcec
+       cp $(LIBNAME)/include/* include/libcec
+
+libcec.a:
+       make -C $(LIBNAME)
+       cp $(LIBNAME)/src/lib/.libs/libcec.a libcec.a
+
+clean:
+       rm -f libcec.a
+       make -C $(LIBNAME) clean
+
+distclean:
+       rm -f $(ARCHIVE) libcec.a Makefile
+       rm -rf include
+       rm -rf $(LIBNAME)
+       rm -rf $(ARCHIVE_DIR)
index dd7e9d2..5fe233b 100644 (file)
@@ -99,20 +99,20 @@ $(srcdir)/frametype.c: $(srcdir)/frametype.gperf Makefile.am
        cd $(srcdir) &&  \
        gperf -tCcTonD -K id -N id3_frametype_lookup -s -3 -k '*'  \
                frametype.gperf |  \
-       sed -e 's/\(struct id3_frametype\);/\1/' |  \
-       sed -e '/\$$''Id: /s/\$$//g' >frametype.c
+       $(SED) -e 's/\(struct id3_frametype\);/\1/' |  \
+       $(SED) -e '/\$$''Id: /s/\$$//g' >frametype.c
 
 $(srcdir)/compat.c: $(srcdir)/compat.gperf Makefile.am
        cd $(srcdir) &&  \
        gperf -tCcTonD -K id -N id3_compat_lookup -s -3 -k '*'  \
                compat.gperf |  \
-       sed -e 's/\(struct id3_compat\);/\1/' |  \
-       sed -e '/\$$''Id: /s/\$$//g' >compat.c
+       $(SED) -e 's/\(struct id3_compat\);/\1/' |  \
+       $(SED) -e '/\$$''Id: /s/\$$//g' >compat.c
 
 $(srcdir)/genre.dat: $(srcdir)/genre.dat.in $(srcdir)/genre.dat.sed Makefile.am
        cd $(srcdir) &&  \
-       sed -n -f genre.dat.sed genre.dat.in |  \
-       sed -e '/\$$''Id: /s/\$$//g' >genre.dat
+       $(SED) -n -f genre.dat.sed genre.dat.in |  \
+       $(SED) -e '/\$$''Id: /s/\$$//g' >genre.dat
 
 libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck
index cf5faf6..d2d6fc1 100644 (file)
@@ -7,7 +7,7 @@ CALL dlextract.bat libbluray %FILES%
 
 cd %TMP_PATH%
 
-xcopy libbluray-8e5d24-win32\include\libbluray "%CUR_PATH%\include\libbluray" /E /Q /I /Y
-copy libbluray-8e5d24-win32\bin\libbluray.dll "%XBMC_PATH%\system\players\dvdplayer\" /Y
+xcopy libbluray-8e5d24-win32-1\include\libbluray "%CUR_PATH%\include\libbluray" /E /Q /I /Y
+copy libbluray-8e5d24-win32-1\bin\libbluray.dll "%XBMC_PATH%\system\players\dvdplayer\" /Y
 
 cd %LOC_PATH%
index 3d38ed0..845f5fa 100644 (file)
@@ -1,2 +1,2 @@
 ; filename                          source of the file
-libbluray-8e5d24-win32.7z           http://mirrors.xbmc.org/build-deps/win32/
+libbluray-8e5d24-win32-1.7z         http://mirrors.xbmc.org/build-deps/win32/
index 2a776bc..b0970d2 100644 (file)
@@ -8,7 +8,8 @@ CALL dlextract.bat libcec %FILES%
 cd %TMP_PATH%
 
 xcopy libcec\include\* "%CUR_PATH%\include\libcec" /E /Q /I /Y
-xcopy libcec\*.dll "%CUR_PATH%\lib\." /Y
-xcopy libcec\*.lib "%CUR_PATH%\lib\." /Y
 
-cd %LOC_PATH%
\ No newline at end of file
+copy libcec\libcec.dll "%XBMC_PATH%\system\."
+copy libcec\pthreadVC2.dll "%XBMC_PATH%\system\."
+
+cd %LOC_PATH%
index 9019c8b..b3a9005 100644 (file)
@@ -1,2 +1,3 @@
 ; filename                        mirror                                      source of the file
-libcec2.zip                       http://xbmc.opdenkamp.eu/                   http://packages.pulse-eight.net/
+
+libcec6.zip                       http://xbmc.opdenkamp.eu/                   http://packages.pulse-eight.net/
index ee54a23..f0061b6 100644 (file)
@@ -7,7 +7,7 @@ CALL dlextract.bat libplist %FILES%
 
 cd %TMP_PATH%
 
-xcopy libplist-1.7-win32\include\* "%CUR_PATH%\include\" /E /Q /I /Y
-xcopy libplist-1.7-win32\bin\* "%XBMC_PATH%\system\" /E /Q /I /Y
+xcopy libplist-1.7-win32-2\include\* "%CUR_PATH%\include\" /E /Q /I /Y
+xcopy libplist-1.7-win32-2\bin\* "%XBMC_PATH%\system\" /E /Q /I /Y
 
 cd %LOC_PATH%
index 5edc4f4..affb546 100644 (file)
@@ -1,2 +1,2 @@
 ; filename                          source of the file
-libplist-1.7-win32.7z               http://mirrors.xbmc.org/build-deps/win32/
+libplist-1.7-win32-2.7z               http://mirrors.xbmc.org/build-deps/win32/
index d564a39..32a69b1 100644 (file)
     <ClCompile Include="..\..\xbmc\filesystem\CacheCircular.cpp" />
     <ClCompile Include="..\..\xbmc\filesystem\FileNFS.cpp" />
     <ClCompile Include="..\..\xbmc\filesystem\FilePipe.cpp" />
+    <ClCompile Include="..\..\xbmc\filesystem\FileUPnP.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\iso9660.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\ISO9660Directory.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\FileUDF.cpp" />
     <ClCompile Include="..\..\xbmc\threads\Event.cpp" />
     <ClCompile Include="..\..\xbmc\threads\LockFree.cpp" />
     <ClCompile Include="..\..\xbmc\threads\platform\Implementation.cpp" />
+    <ClInclude Include="..\..\xbmc\filesystem\FileUPnP.h" />
     <ClInclude Include="..\..\xbmc\threads\platform\win\Implementation.cpp" />
     <ClCompile Include="..\..\xbmc\threads\SystemClock.cpp" />
     <ClCompile Include="..\..\xbmc\threads\Thread.cpp" />
index d59d68e..4032e44 100644 (file)
     <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\pyrendercapture.cpp">
       <Filter>interfaces\python\xbmcmodule</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\xbmc\filesystem\FileUPnP.cpp">
+      <Filter>filesystem</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\xbmc\win32\pch.h">
     <ClInclude Include="..\..\xbmc\threads\platform\win\Implementation.cpp">
       <Filter>threads\platform\win</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\xbmc\filesystem\FileUPnP.h">
+      <Filter>filesystem</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\xbmc\win32\XBMC_PC.rc">
       <Filter>win32</Filter>
     </CustomBuild>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
index 174800d..3c4a65d 100644 (file)
       <space>Highlight</space>
     </keyboard>
   </FileBrowser>
+  <ShutdownMenu>
+    <keyboard>
+      <s>Back</s>
+    </keyboard>
+  </ShutdownMenu>
+  <AddonInformation>
+    <keyboard>
+      <i>Back</i>
+    </keyboard>
+  </AddonInformation>
 </keymap>
index cb2d6db..0584303 100644 (file)
@@ -1,6 +1,6 @@
 include Makefile.include
 
-BUILDTOOLS = gas-preprocessor help2man m4 autoconf automake libtool pkg-config yasm cmake tar dpkg
+BUILDTOOLS = gas-preprocessor help2man m4 autoconf automake libtool pkg-config yasm cmake sed tar dpkg
 
 SUBDIRS := \
        Backrow pcre expat gettext readline sqlite3 \
@@ -13,10 +13,11 @@ SUBDIRS := \
        libmicrohttpd libmodplug libbluray libyajl \
        libgpg-error libgcrypt afpfs-ng \
        libplist libshairport \
-       samba python26 mysqlclient boost \
+        samba python26 distribute distutilscross \
+       mysqlclient boost \
 
 ifeq ($(DARWIN), ios)
-  EXCLUDED = libcrystalhd libGLEW libsdl libsdl_mixer libsdl_image
+  EXCLUDED = libusb libcrystalhd libGLEW libsdl libsdl_mixer libsdl_image
 else
   EXCLUDED = Backrow
 endif
diff --git a/tools/darwin/depends/distribute/Makefile b/tools/darwin/depends/distribute/Makefile
new file mode 100644 (file)
index 0000000..7b1b595
--- /dev/null
@@ -0,0 +1,32 @@
+include ../Makefile.include
+
+# lib name, version
+APPNAME=distribute
+VERSION=0.6.21
+SOURCE=$(APPNAME)-$(VERSION)
+ARCHIVE=$(SOURCE).tar.gz
+
+# configuration settings
+export PATH:=$(TOOLCHAIN)/bin:$(PATH)
+
+APP=$(SOURCE)/bin/$(APPNAME)
+APPBIN=$(TOOLCHAIN)/bin/$(APPNAME)
+
+all: $(APPBIN)
+
+$(TARBALLS_LOCATION)/$(ARCHIVE):
+       $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
+
+$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
+       rm -rf $(SOURCE)
+       $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
+       echo $(SOURCE) > .gitignore
+
+$(APPBIN): $(SOURCE)
+       cd $(SOURCE); $(TOOLCHAIN)/bin/python setup.py install --prefix=$(TOOLCHAIN)
+
+clean:
+       rm -rf $(SOURCE)
+
+distclean::
+       rm -rf $(SOURCE)
diff --git a/tools/darwin/depends/distutilscross/Makefile b/tools/darwin/depends/distutilscross/Makefile
new file mode 100644 (file)
index 0000000..6352708
--- /dev/null
@@ -0,0 +1,32 @@
+include ../Makefile.include
+
+# lib name, version
+APPNAME=distutilscross
+VERSION=0.1
+SOURCE=$(APPNAME)-$(VERSION)
+ARCHIVE=$(SOURCE).tar.gz
+
+# configuration settings
+export PATH:=$(TOOLCHAIN)/bin:$(PATH)
+
+APP=$(SOURCE)/bin/$(APPNAME)
+APPBIN=$(TOOLCHAIN)/bin/$(APPNAME)
+
+all: $(APPBIN)
+
+$(TARBALLS_LOCATION)/$(ARCHIVE):
+       $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
+
+$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
+       rm -rf $(SOURCE)
+       $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
+       echo $(SOURCE) > .gitignore
+
+$(APPBIN): $(SOURCE)
+       cd $(SOURCE); $(TOOLCHAIN)/bin/python setup.py install --prefix=$(TOOLCHAIN)
+
+clean:
+       rm -rf $(SOURCE)
+
+distclean::
+       rm -rf $(SOURCE)
diff --git a/tools/darwin/depends/libcec/Makefile b/tools/darwin/depends/libcec/Makefile
new file mode 100644 (file)
index 0000000..7f6e12f
--- /dev/null
@@ -0,0 +1,38 @@
+include ../Makefile.include
+
+# lib name, version
+LIBNAME=libcec
+VERSION=0.6
+SOURCE=$(LIBNAME)-$(VERSION)
+ARCHIVE=$(SOURCE).tar.gz
+
+# configuration settings
+CONFIGURE=./configure --prefix=$(PREFIX)
+
+LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib
+
+all: $(LIBDYLIB) .installed
+
+$(TARBALLS_LOCATION)/$(ARCHIVE):
+       $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
+
+$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
+       rm -rf $(SOURCE)
+       $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
+       echo $(SOURCE) > .gitignore
+       cd $(SOURCE); autoreconf -vif
+       cd $(SOURCE); $(CONFIGURE)
+
+$(LIBDYLIB): $(SOURCE)
+       make -j 1 -C $(SOURCE)
+
+.installed:
+       make -C $(SOURCE) install
+       touch $@
+
+clean:
+       rm -rf $(SOURCE) .installed
+
+distclean::
+       rm -rf $(SOURCE) .installed
+
diff --git a/tools/darwin/depends/libusb/Makefile b/tools/darwin/depends/libusb/Makefile
new file mode 100644 (file)
index 0000000..294a7aa
--- /dev/null
@@ -0,0 +1,36 @@
+include ../Makefile.include
+
+# lib name, version
+LIBNAME=libusb
+VERSION=0.1.12
+SOURCE=$(LIBNAME)-$(VERSION)
+ARCHIVE=$(SOURCE).tar.gz
+
+# configuration settings
+CONFIGURE=./configure --prefix=$(PREFIX)
+
+LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib
+
+all: $(LIBDYLIB) .installed
+
+$(TARBALLS_LOCATION)/$(ARCHIVE):
+       $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
+
+$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
+       rm -rf $(SOURCE)
+       $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
+       echo $(SOURCE) > .gitignore
+       cd $(SOURCE); $(CONFIGURE)
+
+$(LIBDYLIB): $(SOURCE)
+       make -j 1 -C $(SOURCE)
+
+.installed:
+       make -C $(SOURCE) install
+       touch $@
+
+clean:
+       rm -rf $(SOURCE) .installed
+
+distclean::
+       rm -rf $(SOURCE) .installed
index 7d976c3..5f814b0 100644 (file)
@@ -28,9 +28,9 @@ $(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
        echo $(SOURCE) > .gitignore
        cd $(SOURCE); $(CONFIGURE)
        if test "$(DARWIN)" = "ios"; then \
-               sed -i "" -e "s|CFLAG= |CFLAG=-arch armv7 -isysroot ${platform_sdk_path} |" "$(SOURCE)/Makefile"; \
-               sed -i "" -e "s|-arch i386|-arch armv7|" "$(SOURCE)/Makefile"; \
-               sed -i "" -e "s|static volatile sig_atomic_t intr_signal;|static volatile intr_signal;|" "$(SOURCE)/crypto/ui/ui_openssl.c"; \
+               sed -ie "s|CFLAG= |CFLAG=-arch armv7 -isysroot ${platform_sdk_path} |" "$(SOURCE)/Makefile"; \
+               sed -ie "s|-arch i386|-arch armv7|" "$(SOURCE)/Makefile"; \
+               sed -ie "s|static volatile sig_atomic_t intr_signal;|static volatile intr_signal;|" "$(SOURCE)/crypto/ui/ui_openssl.c"; \
        fi
 
 $(LIBDYLIB): $(SOURCE)
index 01d1323..b07b413 100644 (file)
@@ -12,14 +12,14 @@ ARCHIVE=$(SOURCE).tar.bz2
 
 # configuration settings
 CONFIGURE=./configure --prefix=$(PREFIX) --enable-shared \
-  --disable-toolbox-glue
+  --disable-toolbox-glue --disable-framework
 
 CONFIGURE_NATIVE= CFLAGS="" CXXFLAGS="" LDFLAGS="" CPPFLAGS="" \
   CPP="/usr/bin/cpp" \
   CC="gcc-4.2" \
   CXX="g++-4.2" \
   LD="ld" \
-  ./configure
+  ./configure --prefix=$(TOOLCHAIN) --enable-shared --disable-toolbox-glue --disable-framework
 
 LIBDYLIB=$(SOURCE)/libpython2.6.dylib
 
@@ -39,6 +39,7 @@ $(LIBDYLIB): $(TARBALLS_LOCATION)/$(ARCHIVE)
        cd $(SOURCE); mv python.exe hostpython
        cd $(SOURCE); mv Parser/pgen Parser/hostpgen
        cd $(SOURCE); mv libpython2.6.a hostlibpython2.6.a
+       cd $(SOURCE); make install HOSTPYTHON=./hostpython
        cd $(SOURCE); make distclean
        cd $(SOURCE); patch -p1 <../Python-2.6.5-xcompile.patch
        cd $(SOURCE); $(CONFIGURE)
index 51c115d..f923940 100644 (file)
@@ -9,7 +9,14 @@ ARCHIVE=$(SOURCE).tar.bz2
 # configuration settings
 export OPT=$(CFLAGS)
 CONFIGURE=./configure --prefix=$(PREFIX) \
-  --enable-shared --disable-toolbox-glue --enable-unicode=ucs4
+  --enable-shared --disable-toolbox-glue --disable-framework --enable-unicode=ucs4
+
+CONFIGURE_NATIVE= CFLAGS="" CXXFLAGS="" LDFLAGS="" CPPFLAGS="" \
+  CPP="/usr/bin/cpp" \
+  CC="gcc-4.2" \
+  CXX="g++-4.2" \
+  LD="ld" \
+  ./configure --prefix=$(TOOLCHAIN) --enable-shared --disable-toolbox-glue --disable-framework
 
 LIBDYLIB=$(SOURCE)/libpython2.6.dylib
 
@@ -24,6 +31,10 @@ $(LIBDYLIB): $(TARBALLS_LOCATION)/$(ARCHIVE)
        echo $(SOURCE) > .gitignore
        # http://bugs.python.org/issue6869
        cd $(SOURCE); patch -p1 < ../Python-2.6-ctypes.patch
+       cd $(SOURCE); $(CONFIGURE_NATIVE)
+       cd $(SOURCE); make -j $(MAKE_JOBS)
+       cd $(SOURCE); make install
+       cd $(SOURCE); make distclean
        cd $(SOURCE); $(CONFIGURE)
        # python2.6 has an issue detecting and using the same version of openssl in configure and setup.py
        # this forces python2.6 hashlib to be compatible with osx 10.4 boxes.
diff --git a/tools/darwin/depends/sed/Makefile b/tools/darwin/depends/sed/Makefile
new file mode 100644 (file)
index 0000000..d07ea3b
--- /dev/null
@@ -0,0 +1,38 @@
+include ../Makefile.include
+
+# lib name, version
+APPNAME=sed
+VERSION=4.2.1
+SOURCE=$(APPNAME)-$(VERSION)
+ARCHIVE=$(SOURCE).tar.gz
+
+# configuration settings
+export PATH:=$(TOOLCHAIN)/bin:$(PATH)
+CONFIGURE=./configure --prefix=$(TOOLCHAIN)
+
+APP=$(SOURCE)/bin/$(APPNAME)
+APPBIN=$(TOOLCHAIN)/bin/$(APPNAME)
+
+all: $(APPBIN)
+
+$(TARBALLS_LOCATION)/$(ARCHIVE):
+       $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
+
+$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
+       rm -rf $(SOURCE)
+       $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
+       echo $(SOURCE) > .gitignore
+       cd $(SOURCE); $(CONFIGURE)
+
+$(APP): $(SOURCE)
+       make -j $(MAKE_JOBS) -C $(SOURCE)
+
+$(APPBIN):
+       make $(APP)
+       make -C $(SOURCE) install
+
+clean:
+       make -C $(SOURCE) clean
+
+distclean::
+       rm -rf $(SOURCE)
index ec9fdc9..cba4899 100644 (file)
@@ -1291,10 +1291,11 @@ void CApplication::StartAirplayServer()
 #ifdef HAS_AIRPLAY
   if (g_guiSettings.GetBool("services.airplay") && m_network.IsAvailable())
   {
+    int listenPort = g_advancedSettings.m_airPlayPort;
     CStdString password = g_guiSettings.GetString("services.airplaypassword");
     bool usePassword = g_guiSettings.GetBool("services.useairplaypassword");
     
-    if (CAirPlayServer::StartServer(9091, true))
+    if (CAirPlayServer::StartServer(listenPort, true))
     {
       CAirPlayServer::SetCredentials(usePassword, password);
       std::map<std::string, std::string> txt;
@@ -1302,17 +1303,18 @@ void CApplication::StartAirplayServer()
       txt["features"] = "0x77";
       txt["model"] = "AppleTV2,1";
       txt["srcvers"] = "101.28";
-      CZeroconf::GetInstance()->PublishService("servers.airplay", "_airplay._tcp", "XBMC", 9091, txt);
+      CZeroconf::GetInstance()->PublishService("servers.airplay", "_airplay._tcp", "XBMC", listenPort, txt);
     }
   }
 #endif
 #ifdef HAS_AIRTUNES
   if (g_guiSettings.GetBool("services.airplay") && m_network.IsAvailable())
   {   
+    int listenPort = g_advancedSettings.m_airTunesPort;  
     CStdString password = g_guiSettings.GetString("services.airplaypassword");
     bool usePassword = g_guiSettings.GetBool("services.useairplaypassword");
       
-    if (!CAirTunesServer::StartServer(5000, true, usePassword, password))
+    if (!CAirTunesServer::StartServer(listenPort, true, usePassword, password))
     {
       CLog::Log(LOGERROR, "Failed to start AirTunes Server");
     }
@@ -4338,7 +4340,8 @@ void CApplication::CheckScreenSaverAndDPMS()
   // * Are we playing a video and it is not paused?
   if ((IsPlayingVideo() && !m_pPlayer->IsPaused())
       // * Are we playing some music in fullscreen vis?
-      || (IsPlayingAudio() && g_windowManager.GetActiveWindow() == WINDOW_VISUALISATION))
+      || (IsPlayingAudio() && g_windowManager.GetActiveWindow() == WINDOW_VISUALISATION 
+          && !g_guiSettings.GetString("musicplayer.visualisation").IsEmpty()))
   {
     ResetScreenSaverTimer();
     return;
index 3944f72..1a2aeaa 100644 (file)
@@ -282,7 +282,8 @@ const infomap network_labels[] = {{ "isdhcp",            NETWORK_IS_DHCP },
                                   { "ipaddress",         NETWORK_IP_ADDRESS }, //labels from here
                                   { "linkstate",         NETWORK_LINK_STATE },
                                   { "macaddress",        NETWORK_MAC_ADDRESS },
-                                  { "subnetaddress",     NETWORK_SUBNET_ADDRESS },
+                                  { "subnetaddress",     NETWORK_SUBNET_MASK }, //subnetaddress is misleading/wrong. should be deprecated. use subnetmask in stead
+                                  { "subnetmask",        NETWORK_SUBNET_MASK },
                                   { "gatewayaddress",    NETWORK_GATEWAY_ADDRESS },
                                   { "dns1address",       NETWORK_DNS1_ADDRESS },
                                   { "dns2address",       NETWORK_DNS2_ADDRESS },
@@ -1524,7 +1525,7 @@ CStdString CGUIInfoManager::GetLabel(int info, int contextWindow)
         return iface->GetCurrentIPAddress();
     }
     break;
-  case NETWORK_SUBNET_ADDRESS:
+  case NETWORK_SUBNET_MASK:
     {
       CNetworkInterface* iface = g_application.getNetwork().GetFirstConnectedInterface();
       if (iface)
@@ -1652,6 +1653,7 @@ bool CGUIInfoManager::GetInt(int &value, int info, int contextWindow, const CGUI
   if (info >= LISTITEM_START && info <= LISTITEM_END)
     return GetItemInt(value, item, info);
 
+  value = 0;
   switch( info )
   {
     case PLAYER_VOLUME:
@@ -1731,7 +1733,6 @@ bool CGUIInfoManager::GetInt(int &value, int info, int contextWindow, const CGUI
       value = g_powerManager.BatteryLevel();
       return true;
   }
-  value = 0;
   return false;
 }
 
index 7e6c386..70517b4 100644 (file)
@@ -183,7 +183,7 @@ namespace INFO
 #define NETWORK_MAC_ADDRESS         191
 #define NETWORK_IS_DHCP             192
 #define NETWORK_LINK_STATE          193
-#define NETWORK_SUBNET_ADDRESS      194
+#define NETWORK_SUBNET_MASK         194
 #define NETWORK_GATEWAY_ADDRESS     195
 #define NETWORK_DNS1_ADDRESS        196
 #define NETWORK_DNS2_ADDRESS        197
index a921a17..16941ee 100644 (file)
@@ -313,7 +313,7 @@ void CURL::Parse(const CStdString& strURL1)
   SetFileName(m_strFileName);
 
   /* decode urlencoding on this stuff */
-  if( m_strProtocol.Equals("rar") || m_strProtocol.Equals("zip") || m_strProtocol.Equals("musicsearch"))
+  if(URIUtils::ProtocolHasEncodedHostname(m_strProtocol))
   {
     Decode(m_strHostName);
     // Validate it as it is likely to contain a filename
@@ -555,7 +555,7 @@ CStdString CURL::GetWithoutUserDetails() const
 
   if (m_strHostName != "")
   {
-    if (m_strProtocol.Equals("rar") || m_strProtocol.Equals("zip"))
+    if (URIUtils::ProtocolHasParentInHostname(m_strProtocol))
       strURL += CURL(m_strHostName).GetWithoutUserDetails();
     else
       strURL += m_strHostName;
@@ -617,7 +617,7 @@ CStdString CURL::GetWithoutFilename() const
 
   if (m_strHostName != "")
   {
-    if( m_strProtocol.Equals("rar") || m_strProtocol.Equals("zip") || m_strProtocol.Equals("musicsearch"))
+    if( URIUtils::ProtocolHasEncodedHostname(m_strProtocol) )
       strURL += URLEncodeInline(m_strHostName);
     else
       strURL += m_strHostName;
index 2984ff6..3ab0b78 100644 (file)
@@ -223,7 +223,7 @@ CStdString CUtil::GetTitleFromPath(const CStdString& strFileNameAndPath, bool bI
   else if (path.Left(24).Equals("special://videoplaylists"))
     strFilename = g_localizeStrings.Get(136);
 
-  else if ((url.GetProtocol() == "rar" || url.GetProtocol() == "zip") && strFilename.IsEmpty())
+  else if (URIUtils::ProtocolHasParentInHostname(url.GetProtocol()) && strFilename.IsEmpty())
     strFilename = URIUtils::GetFileName(url.GetHostName());
 
   // now remove the extension if needed
index 309ceb2..8e58578 100644 (file)
@@ -235,6 +235,8 @@ bool CGUIWindowAddonBrowser::OnClick(int iItem)
     CGUIDialogAddonInfo::ShowForItem(item);
     return true;
   }
+  if (item->GetPath().Equals("addons://search/"))
+    return Update(item->GetPath());
 
   return CGUIMediaWindow::OnClick(iItem);
 }
index 399f76e..3cc4a93 100644 (file)
@@ -195,6 +195,9 @@ bool CRepositoryUpdateJob::DoWork()
   database.Open();
   for (unsigned int i=0;i<addons.size();++i)
   {
+    // manager told us to feck off
+    if (ShouldCancel(0,0))
+      break;
     if (!CAddonInstaller::Get().CheckDependencies(addons[i]))
       addons[i]->Props().broken = g_localizeStrings.Get(24044);
 
index dfdf935..5a1e631 100644 (file)
@@ -178,6 +178,8 @@ bool CIOSAudioRenderer::Initialize(IAudioCallback* pCallback, const CStdString&
 
   m_DoRunout = 0;
 
+  m_drc      = 0;
+
   return true;
 }
 
@@ -300,7 +302,7 @@ unsigned int CIOSAudioRenderer::AddPackets(const void* data, DWORD len)
 
     uint8_t outData[length];
     // remap the audio channels using the frame count
-    m_remap.Remap((void*)data, outData, frames);
+    m_remap.Remap((void*)data, outData, frames, m_drc);
 
     status = m_Buffer->Write(outData, length);
     // return the number of input bytes we accepted
@@ -325,7 +327,8 @@ float CIOSAudioRenderer::GetDelay()
 
 float CIOSAudioRenderer::GetCacheTime()
 {
-  return (float)(m_BufferLen - GetSpace()) / (float)m_BytesPerSec;
+  unsigned int nBufferLenFull = (m_BufferLen / m_Channels) * m_DataChannels;
+  return (float)(nBufferLenFull - GetSpace()) / (float)m_BytesPerSec;
 }
 
 float CIOSAudioRenderer::GetCacheTotal()
index 54a8216..5d9aef3 100644 (file)
@@ -49,6 +49,7 @@ class CIOSAudioRenderer : public IAudioRenderer
     virtual long GetCurrentVolume() const;
     virtual void Mute(bool bMute);
     virtual bool SetCurrentVolume(long nVolume);
+    virtual void SetDynamicRangeCompression(long drc) { m_drc = drc; }
     virtual void WaitCompletion();
 
     // Unimplemented IAudioRenderer methods
@@ -93,6 +94,8 @@ class CIOSAudioRenderer : public IAudioRenderer
     unsigned int m_Channels;
     bool m_Passthrough;
 
+    long m_drc;
+
   };
 
 #endif
index 92743ea..ba30ab0 100644 (file)
@@ -182,9 +182,6 @@ COverlayQuadsDX::COverlayQuadsDX(CDVDOverlaySSA* o, double pts)
   if(!convert_quad(o, pts, width, height, quads))
     return;
   
-  if (quads.count == 0)
-    return;
-
   float u, v;
   if(!LoadTexture(quads.size_x
                 , quads.size_y
index dad5001..7526a04 100644 (file)
@@ -291,9 +291,6 @@ COverlayGlyphGL::COverlayGlyphGL(CDVDOverlaySSA* o, double pts)
   if(!convert_quad(o, pts, width, height, quads))
     return;
 
-  if (quads.count == 0)
-    return;
-
   glGenTextures(1, &m_texture);
   glEnable(GL_TEXTURE_2D);
   glBindTexture(GL_TEXTURE_2D, m_texture);
index 182eed4..3014901 100644 (file)
@@ -202,6 +202,9 @@ bool convert_quad(CDVDOverlaySSA* o, double pts, int width, int height, SQuads&
     quads.count++;
   }
 
+  if (quads.count == 0)
+    return false;
+
   while(quads.size_x > (int)g_Windowing.GetMaxTextureSize())
     quads.size_x /= 2;
 
index 4e0bdde..721bf37 100644 (file)
@@ -771,8 +771,7 @@ bool CDVDVideoCodecVDA::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options)
       uint32_t sps_size = VDA_RB16(spc);
       if (sps_size)
         parseh264_sps(spc+3, sps_size-1, &interlaced, &m_max_ref_frames);
-      if (false)
-      //if (interlaced)
+      if (interlaced)
       {
         CFRelease(avcCData);
         return false;
index 538606d..f90ed90 100644 (file)
@@ -664,6 +664,7 @@ bool CDecoder::Open(AVCodecContext *avctx, enum PixelFormat fmt, unsigned int su
 #endif
   }
 
+  m_state = DXVA_OPEN;
   return true;
 }
 
@@ -802,6 +803,7 @@ bool CDecoder::OpenTarget(const GUID &guid)
 bool CDecoder::OpenDecoder()
 {
   SAFE_RELEASE(m_decoder);
+  m_context->decoder = NULL;
 
   m_context->surface_count = m_refs + 1 + 1 + m_shared; // refs + 1 decode + 1 libavcodec safety + processor buffer
 
index 27a2997..8d86fa8 100644 (file)
 #ifdef HAVE_LIBBLURAY
 
 #include "DVDInputStreamBluray.h"
-#include "DynamicDll.h"
 #include "utils/log.h"
 #include "utils/URIUtils.h"
 #include "filesystem/File.h"
 #include "filesystem/Directory.h"
+#include "DllLibbluray.h"
 
 #define LIBBLURAY_BYTESEEK 0
 
-extern "C"
-{
-#include <libbluray/bluray.h>
-#include <libbluray/filesystem.h>
-#ifndef HAVE_LIBBLURAY_NOLOGCONTROL
-#include <libbluray/log_control.h>
-#endif
-}
-
-class DllLibblurayInterface
-{
-public:
-  virtual ~DllLibblurayInterface() {};
-  virtual uint32_t bd_get_titles(BLURAY *bd, uint8_t flags, uint32_t min_title_length)=0;
-  virtual BLURAY_TITLE_INFO* bd_get_title_info(BLURAY *bd, uint32_t title_idx, unsigned angle)=0;
-  virtual BLURAY_TITLE_INFO* bd_get_playlist_info(BLURAY *bd, uint32_t playlist, unsigned angle)=0;
-  virtual void bd_free_title_info(BLURAY_TITLE_INFO *title_info)=0;
-  virtual BLURAY *bd_open(const char* device_path, const char* keyfile_path)=0;
-  virtual void bd_close(BLURAY *bd)=0;
-  virtual int64_t bd_seek(BLURAY *bd, uint64_t pos)=0;
-  virtual int64_t bd_seek_time(BLURAY *bd, uint64_t tick)=0;
-  virtual int bd_read(BLURAY *bd, unsigned char *buf, int len)=0;
-  virtual int64_t bd_seek_chapter(BLURAY *bd, unsigned chapter)=0;
-  virtual int64_t bd_chapter_pos(BLURAY *bd, unsigned chapter)=0;
-  virtual uint32_t bd_get_current_chapter(BLURAY *bd)=0;
-  virtual int64_t bd_seek_mark(BLURAY *bd, unsigned mark)=0;
-  virtual int bd_select_playlist(BLURAY *bd, uint32_t playlist)=0;
-  virtual int bd_select_title(BLURAY *bd, uint32_t title)=0;
-  virtual int bd_select_angle(BLURAY *bd, unsigned angle)=0;
-  virtual void bd_seamless_angle_change(BLURAY *bd, unsigned angle)=0;
-  virtual uint64_t bd_get_title_size(BLURAY *bd)=0;
-  virtual uint32_t bd_get_current_title(BLURAY *bd)=0;
-  virtual unsigned bd_get_current_angle(BLURAY *bd)=0;
-  virtual uint64_t bd_tell(BLURAY *bd)=0;
-  virtual uint64_t bd_tell_time(BLURAY *bd)=0;
-  virtual BD_FILE_OPEN bd_register_file(BD_FILE_OPEN p)=0;
-  virtual BD_DIR_OPEN bd_register_dir(BD_DIR_OPEN p)=0;
-
-#ifndef HAVE_LIBBLURAY_NOLOGCONTROL
-  virtual void     bd_set_debug_handler(BD_LOG_FUNC)=0;
-  virtual void     bd_set_debug_mask(uint32_t mask)=0;
-  virtual uint32_t bd_get_debug_mask(void)=0;
-#endif
-};
-
-class DllLibbluray : public DllDynamic, DllLibblurayInterface
-{
-  DECLARE_DLL_WRAPPER(DllLibbluray, DLL_PATH_LIBBLURAY)
-#ifdef HAVE_LIBBBLURAY_HAVE_LIBBLURAY_NOANGLE
-  DEFINE_METHOD3(uint32_t,            bd_get_titles,          (BLURAY *p1, uint8_t p2))
-  DEFINE_METHOD3(BLURAY_TITLE_INFO*,  bd_get_title_info,      (BLURAY *p1, uint32_t p2))
-  DEFINE_METHOD3(BLURAY_TITLE_INFO*,  bd_get_playlist_info,   (BLURAY *p1, uint32_t p2))
-#else
-  DEFINE_METHOD3(uint32_t,            bd_get_titles,          (BLURAY *p1, uint8_t p2, uint32_t p3))
-  DEFINE_METHOD3(BLURAY_TITLE_INFO*,  bd_get_title_info,      (BLURAY *p1, uint32_t p2, unsigned p3))
-  DEFINE_METHOD3(BLURAY_TITLE_INFO*,  bd_get_playlist_info,   (BLURAY *p1, uint32_t p2, unsigned p3))
-#endif
-  DEFINE_METHOD1(void,                bd_free_title_info,     (BLURAY_TITLE_INFO *p1))
-  DEFINE_METHOD2(BLURAY*,             bd_open,                (const char* p1, const char* p2))
-  DEFINE_METHOD1(void,                bd_close,               (BLURAY *p1))
-  DEFINE_METHOD2(int64_t,             bd_seek,                (BLURAY *p1, uint64_t p2))
-  DEFINE_METHOD2(int64_t,             bd_seek_time,           (BLURAY *p1, uint64_t p2))
-  DEFINE_METHOD3(int,                 bd_read,                (BLURAY *p1, unsigned char *p2, int p3))
-  DEFINE_METHOD2(int64_t,             bd_seek_chapter,        (BLURAY *p1, unsigned p2))
-  DEFINE_METHOD2(int64_t,             bd_chapter_pos,         (BLURAY *p1, unsigned p2))
-  DEFINE_METHOD1(uint32_t,            bd_get_current_chapter, (BLURAY *p1))
-  DEFINE_METHOD2(int64_t,             bd_seek_mark,           (BLURAY *p1, unsigned p2))
-  DEFINE_METHOD2(int,                 bd_select_playlist,     (BLURAY *p1, uint32_t p2))
-  DEFINE_METHOD2(int,                 bd_select_title,        (BLURAY *p1, uint32_t p2))
-  DEFINE_METHOD2(int,                 bd_select_angle,        (BLURAY *p1, unsigned p2))
-  DEFINE_METHOD2(void,                bd_seamless_angle_change,(BLURAY *p1, unsigned p2))
-  DEFINE_METHOD1(uint64_t,            bd_get_title_size,      (BLURAY *p1))
-  DEFINE_METHOD1(uint32_t,            bd_get_current_title,   (BLURAY *p1))
-  DEFINE_METHOD1(unsigned,            bd_get_current_angle,   (BLURAY *p1))
-  DEFINE_METHOD1(uint64_t,            bd_tell,                (BLURAY *p1))
-  DEFINE_METHOD1(uint64_t,            bd_tell_time,           (BLURAY *p1))
-  DEFINE_METHOD1(BD_FILE_OPEN,        bd_register_file,       (BD_FILE_OPEN p1))
-  DEFINE_METHOD1(BD_DIR_OPEN,         bd_register_dir,        (BD_DIR_OPEN p1))
-
-#ifndef HAVE_LIBBLURAY_NOLOGCONTROL
-  DEFINE_METHOD1(void,                bd_set_debug_handler,   (BD_LOG_FUNC p1))
-  DEFINE_METHOD1(void,                bd_set_debug_mask,      (uint32_t p1))
-  DEFINE_METHOD0(uint32_t,            bd_get_debug_mask)
-#endif
-
-  BEGIN_METHOD_RESOLVE()
-#ifdef HAVE_LIBBBLURAY_HAVE_LIBBLURAY_NOANGLE
-    RESOLVE_METHOD_RENAME(bd_get_titles,        bd_get_titles_noangle)
-    RESOLVE_METHOD_RENAME(bd_get_title_info,    bd_get_title_info_noangle)
-    RESOLVE_METHOD_RENAME(bd_get_playlist_info, bd_get_playlist_info_noangle)
-#else
-    RESOLVE_METHOD(bd_get_titles)
-    RESOLVE_METHOD(bd_get_title_info)
-    RESOLVE_METHOD(bd_get_playlist_info)
-#endif
-    RESOLVE_METHOD_RENAME(bd_free_title_info,   bd_free_title_info)
-    RESOLVE_METHOD_RENAME(bd_open,              bd_open)
-    RESOLVE_METHOD_RENAME(bd_close,             bd_close)
-    RESOLVE_METHOD_RENAME(bd_seek,              bd_seek)
-    RESOLVE_METHOD_RENAME(bd_seek_time,         bd_seek_time)
-    RESOLVE_METHOD_RENAME(bd_read,              bd_read)
-    RESOLVE_METHOD_RENAME(bd_seek_chapter,      bd_seek_chapter)
-    RESOLVE_METHOD_RENAME(bd_chapter_pos,       bd_chapter_pos)
-    RESOLVE_METHOD_RENAME(bd_get_current_chapter, bd_get_current_chapter)
-    RESOLVE_METHOD_RENAME(bd_seek_mark,         bd_seek_mark)
-    RESOLVE_METHOD_RENAME(bd_select_playlist,   bd_select_playlist)
-    RESOLVE_METHOD_RENAME(bd_select_title,      bd_select_title)
-    RESOLVE_METHOD_RENAME(bd_select_angle,      bd_select_angle)
-    RESOLVE_METHOD_RENAME(bd_seamless_angle_change, bd_seamless_angle_change)
-    RESOLVE_METHOD_RENAME(bd_get_title_size,    bd_get_title_size)
-    RESOLVE_METHOD_RENAME(bd_get_current_title, bd_get_current_title)
-    RESOLVE_METHOD_RENAME(bd_get_current_angle, bd_get_current_angle)
-    RESOLVE_METHOD_RENAME(bd_tell,              bd_tell)
-    RESOLVE_METHOD_RENAME(bd_tell_time,         bd_tell_time)
-    RESOLVE_METHOD_RENAME(bd_register_file,     bd_register_file)
-    RESOLVE_METHOD_RENAME(bd_register_dir,      bd_register_dir)
-#ifndef HAVE_LIBBLURAY_NOLOGCONTROL
-    RESOLVE_METHOD(bd_set_debug_handler)
-    RESOLVE_METHOD(bd_set_debug_mask)
-    RESOLVE_METHOD(bd_get_debug_mask)
-#endif
-  END_METHOD_RESOLVE()
-
-#ifdef HAVE_LIBBBLURAY_HAVE_LIBBLURAY_NOANGLE
-  uint32_t bd_get_titles(BLURAY *bd, uint8_t flags, uint32_t min_title_length)
-      {return bd_get_titles_noangle(bd, flags);           }
-  BLURAY_TITLE_INFO* bd_get_title_info(BLURAY *bd, uint32_t title_idx, unsigned angle)
-      {return bd_get_title_info_noangle(bd, title_idx);   }
-  BLURAY_TITLE_INFO* bd_get_playlist_info(BLURAY *bd, uint32_t playlist, unsigned angle)
-      {return bd_get_playlist_info_noangle(bd, playlist); }
-#endif
-};
-
-
 using namespace std;
 using namespace XFILE;
 
@@ -183,7 +49,7 @@ static bool is_udf_iso_path(const char* filename)
   return bResult;
 }
 
-static void file_close(BD_FILE_H *file)
+void DllLibbluray::file_close(BD_FILE_H *file)
 {
   if (file)
   {
@@ -194,17 +60,17 @@ static void file_close(BD_FILE_H *file)
   }
 }
 
-static int64_t file_seek(BD_FILE_H *file, int64_t offset, int32_t origin)
+int64_t DllLibbluray::file_seek(BD_FILE_H *file, int64_t offset, int32_t origin)
 {
   return static_cast<CFile*>(file->internal)->Seek(offset, origin);
 }
 
-static int64_t file_tell(BD_FILE_H *file)
+int64_t DllLibbluray::file_tell(BD_FILE_H *file)
 {
   return static_cast<CFile*>(file->internal)->GetPosition();
 }
 
-static int file_eof(BD_FILE_H *file)
+int DllLibbluray::file_eof(BD_FILE_H *file)
 {
   if(static_cast<CFile*>(file->internal)->GetPosition() == static_cast<CFile*>(file->internal)->GetLength())
     return 1;
@@ -212,17 +78,17 @@ static int file_eof(BD_FILE_H *file)
     return 0;
 }
 
-static int64_t file_read(BD_FILE_H *file, uint8_t *buf, int64_t size)
+int64_t DllLibbluray::file_read(BD_FILE_H *file, uint8_t *buf, int64_t size)
 {
   return static_cast<CFile*>(file->internal)->Read(buf, size);
 }
 
-static int64_t file_write(BD_FILE_H *file, const uint8_t *buf, int64_t size)
+int64_t DllLibbluray::file_write(BD_FILE_H *file, const uint8_t *buf, int64_t size)
 {
     return -1;
 }
 
-static BD_FILE_H *file_open(const char* filename, const char *mode)
+BD_FILE_H * DllLibbluray::file_open(const char* filename, const char *mode)
 {
     BD_FILE_H *file = new BD_FILE_H;
 
@@ -271,7 +137,7 @@ struct SDirState
   int           curr;
 };
 
-static void dir_close(BD_DIR_H *dir)
+void DllLibbluray::dir_close(BD_DIR_H *dir)
 {
   if (dir)
   {
@@ -282,7 +148,7 @@ static void dir_close(BD_DIR_H *dir)
 }
 
 
-static int dir_read(BD_DIR_H *dir, BD_DIRENT *entry)
+int DllLibbluray::dir_read(BD_DIR_H *dir, BD_DIRENT *entry)
 {
     SDirState* state = static_cast<SDirState*>(dir->internal);
 
@@ -296,7 +162,7 @@ static int dir_read(BD_DIR_H *dir, BD_DIRENT *entry)
     return 0;
 }
 
-static BD_DIR_H *dir_open(const char* dirname)
+BD_DIR_H *DllLibbluray::dir_open(const char* dirname)
 {
     CLog::Log(LOGDEBUG, "CDVDInputStreamBluray - Opening dir %s\n", dirname);
     SDirState *st = new SDirState();
@@ -326,7 +192,7 @@ static BD_DIR_H *dir_open(const char* dirname)
 
 
 #ifndef HAVE_LIBBLURAY_NOLOGCONTROL
-static void bluray_logger(const char* msg)
+void DllLibbluray::bluray_logger(const char* msg)
 {
   CLog::Log(LOGDEBUG, "CDVDInputStreamBluray::Logger - %s", msg);
 }
@@ -377,10 +243,10 @@ bool CDVDInputStreamBluray::Open(const char* strFile, const std::string& content
   if (!m_dll)
     return false;
 
-  m_dll->bd_register_dir(dir_open);
-  m_dll->bd_register_file(file_open);
+  m_dll->bd_register_dir(DllLibbluray::dir_open);
+  m_dll->bd_register_file(DllLibbluray::file_open);
 #ifndef HAVE_LIBBLURAY_NOLOGCONTROL
-  m_dll->bd_set_debug_handler(bluray_logger);
+  m_dll->bd_set_debug_handler(DllLibbluray::bluray_logger);
   m_dll->bd_set_debug_mask(DBG_CRIT);
 #endif
 
index 84e636e..6f88e3e 100644 (file)
@@ -78,7 +78,8 @@ void CDVDOverlayRenderer::Render(DVDPictureRenderer* pPicture, CDVDOverlaySSA* p
     DWORD color = img->color;
     BYTE alpha = (BYTE)(color &0xff);
 
-    if(alpha == 255)
+    // fully transparent or width or height is 0 -> not displayed
+    if(alpha == 255 || img->w == 0 || img->h == 0)
     {
       img = img->next;
       continue;
index 681e61c..10d7afe 100644 (file)
@@ -1226,10 +1226,7 @@ void CDVDPlayer::ProcessAudioData(CDemuxStream* pStream, DemuxPacket* pPacket)
   CheckStartCaching(m_CurrentAudio);
 
   CheckContinuity(m_CurrentAudio, pPacket);
-  if(pPacket->dts != DVD_NOPTS_VALUE)
-    m_CurrentAudio.dts = pPacket->dts;
-  else if(pPacket->pts != DVD_NOPTS_VALUE)
-    m_CurrentAudio.dts = pPacket->pts;
+  UpdateTimestamps(m_CurrentAudio, pPacket);
 
   bool drop = false;
   if (CheckPlayerInit(m_CurrentAudio, DVDPLAYER_AUDIO))
@@ -1279,10 +1276,7 @@ void CDVDPlayer::ProcessVideoData(CDemuxStream* pStream, DemuxPacket* pPacket)
   if( pPacket->iSize != 4) //don't check the EOF_SEQUENCE of stillframes
   {
     CheckContinuity(m_CurrentVideo, pPacket);
-    if(pPacket->dts != DVD_NOPTS_VALUE)
-      m_CurrentVideo.dts = pPacket->dts;
-    else if(pPacket->pts != DVD_NOPTS_VALUE)
-      m_CurrentVideo.dts = pPacket->pts;
+    UpdateTimestamps(m_CurrentVideo, pPacket);
   }
 
   bool drop = false;
@@ -1307,10 +1301,8 @@ void CDVDPlayer::ProcessSubData(CDemuxStream* pStream, DemuxPacket* pPacket)
 
     m_CurrentSubtitle.stream = (void*)pStream;
   }
-  if(pPacket->dts != DVD_NOPTS_VALUE)
-    m_CurrentSubtitle.dts = pPacket->dts;
-  else if(pPacket->pts != DVD_NOPTS_VALUE)
-    m_CurrentSubtitle.dts = pPacket->pts;
+
+  UpdateTimestamps(m_CurrentSubtitle, pPacket);
 
   bool drop = false;
   if (CheckPlayerInit(m_CurrentSubtitle, DVDPLAYER_SUBTITLE))
@@ -1336,10 +1328,7 @@ void CDVDPlayer::ProcessTeletextData(CDemuxStream* pStream, DemuxPacket* pPacket
 
     m_CurrentTeletext.stream = (void*)pStream;
   }
-  if(pPacket->dts != DVD_NOPTS_VALUE)
-    m_CurrentTeletext.dts = pPacket->dts;
-  else if(pPacket->pts != DVD_NOPTS_VALUE)
-    m_CurrentTeletext.dts = pPacket->pts;
+  UpdateTimestamps(m_CurrentTeletext, pPacket);
 
   bool drop = false;
   if (CheckPlayerInit(m_CurrentTeletext, DVDPLAYER_TELETEXT))
@@ -1600,6 +1589,17 @@ bool CDVDPlayer::CheckPlayerInit(CCurrentStream& current, unsigned int source)
   return false;
 }
 
+void CDVDPlayer::UpdateTimestamps(CCurrentStream& current, DemuxPacket* pPacket)
+{
+  double dts = current.dts;
+  /* update stored values */
+  if(pPacket->dts != DVD_NOPTS_VALUE)
+    dts = pPacket->dts;
+  else if(pPacket->pts != DVD_NOPTS_VALUE)
+    dts = pPacket->pts;
+
+  current.dts = dts;
+}
 void CDVDPlayer::CheckContinuity(CCurrentStream& current, DemuxPacket* pPacket)
 {
   if (m_playSpeed < DVD_PLAYSPEED_PAUSE)
index b6ebee2..9ceca9c 100644 (file)
@@ -291,6 +291,7 @@ protected:
   bool CheckSceneSkip(CCurrentStream& current);
   bool CheckPlayerInit(CCurrentStream& current, unsigned int source);
   bool CheckStartCaching(CCurrentStream& current);
+  void UpdateTimestamps(CCurrentStream& current, DemuxPacket* pPacket);
   void SendPlayerMessage(CDVDMsg* pMsg, unsigned int target);
 
   bool ReadPacket(DemuxPacket*& packet, CDemuxStream*& stream);
index 6df0247..c607b5c 100644 (file)
@@ -55,6 +55,8 @@ ICodec* CodecFactory::CreateCodec(const CStdString& strFileType)
     return new DVDPlayerCodec();
   else if (strFileType.Equals("shn"))
     return new DVDPlayerCodec();
+  else if (strFileType.Equals("mka"))
+    return new DVDPlayerCodec();
   else if (strFileType.Equals("flac"))
     return new FLACCodec();
   else if (strFileType.Equals("wav"))
index d5b597e..a10575c 100644 (file)
@@ -426,6 +426,7 @@ void CGUIDialogMediaSource::UpdateButtons()
     return;
 
   CONTROL_ENABLE_ON_CONDITION(CONTROL_OK, !m_paths->Get(0)->GetPath().IsEmpty() && !m_name.IsEmpty());
+  CONTROL_ENABLE_ON_CONDITION(CONTROL_PATH_ADD, !m_paths->Get(0)->GetPath().IsEmpty());
   CONTROL_ENABLE_ON_CONDITION(CONTROL_PATH_REMOVE, m_paths->Size() > 1);
   // name
   SET_CONTROL_LABEL2(CONTROL_NAME, m_name);
index 192487c..8336773 100644 (file)
@@ -64,7 +64,7 @@ bool CAFPDirectory::ResolveSymlink( const CStdString &dirName, const CStdString
   URIUtils::AddSlashAtEnd(fullpath);
   fullpath += fileName;
   
-  resolvedUrl.Reset();
+  CPasswordManager::GetInstance().AuthenticateURL(resolvedUrl);
   resolvedUrl.SetProtocol("afp");
   resolvedUrl.SetHostName(gAfpConnection.GetConnectedIp());   
   
@@ -210,7 +210,7 @@ bool CAFPDirectory::GetDirectory(const CStdString& strPath, CFileItemList &items
             //resolve symlinks
             if(S_ISLNK(info.st_mode))
             {
-              CURL linkUrl;
+              CURL linkUrl(url);
               if(!ResolveSymlink(strDirName, strFile, &info, linkUrl))
               {
                 lock.Leave();              
index 50c5153..df7d258 100644 (file)
@@ -249,18 +249,29 @@ bool CFile::Open(const CStdString& strFileName, unsigned int flags)
     {
       // the file implementation decided this item should use a different implementation.
       // the exception will contain the new implementation.
-
       CLog::Log(LOGDEBUG,"File::Open - redirecting implementation for %s", strFileName.c_str());
       SAFE_DELETE(m_pFile);
       if (pRedirectEx && pRedirectEx->m_pNewFileImp)
       {
+        auto_ptr<CURL> pNewUrl(pRedirectEx->m_pNewUrl);
         m_pFile = pRedirectEx->m_pNewFileImp;
         delete pRedirectEx;
-
-        if (!m_pFile->Open(url))
+        
+        if (pNewUrl.get())
         {
-          SAFE_DELETE(m_pFile);
-          return false;
+          if (!m_pFile->Open(*pNewUrl))
+          {
+            SAFE_DELETE(m_pFile);
+            return false;
+          }
+        }
+        else
+        {        
+          if (!m_pFile->Open(url))
+          {
+            SAFE_DELETE(m_pFile);
+            return false;
+          }
         }
       }
     }
@@ -330,6 +341,8 @@ bool CFile::OpenForWrite(const CStdString& strFileName, bool bOverWrite)
 
 bool CFile::Exists(const CStdString& strFileName, bool bUseCache /* = true */)
 {
+  CURL url;
+  
   try
   {
     if (strFileName.IsEmpty())
@@ -344,7 +357,7 @@ bool CFile::Exists(const CStdString& strFileName, bool bUseCache /* = true */)
         return false;
     }
 
-    CURL url(URIUtils::SubstitutePath(strFileName));
+    url = URIUtils::SubstitutePath(strFileName);
 
     auto_ptr<IFile> pFile(CFileFactory::CreateLoader(url));
     if (!pFile.get())
@@ -358,6 +371,33 @@ bool CFile::Exists(const CStdString& strFileName, bool bUseCache /* = true */)
     e.writelog(__FUNCTION__);
   }
 #endif
+  catch (CRedirectException *pRedirectEx)
+  {
+    // the file implementation decided this item should use a different implementation.
+    // the exception will contain the new implementation and optional a redirected URL.
+    CLog::Log(LOGDEBUG,"File::Exists - redirecting implementation for %s", strFileName.c_str());
+    if (pRedirectEx && pRedirectEx->m_pNewFileImp)
+    {
+      auto_ptr<IFile> pImp(pRedirectEx->m_pNewFileImp);
+      auto_ptr<CURL> pNewUrl(pRedirectEx->m_pNewUrl);
+      delete pRedirectEx;
+        
+      if (pNewUrl.get())
+      {
+        if (pImp.get() && !pImp->Exists(*pNewUrl))
+        {
+          return false;
+        }
+      }
+      else     
+      {
+        if (pImp.get() && !pImp->Exists(url))
+        {
+          return false;
+        }
+      }
+    }
+  }
   catch(...)
   {
     CLog::Log(LOGERROR, "%s - Unhandled exception", __FUNCTION__);
@@ -373,14 +413,15 @@ int CFile::Stat(struct __stat64 *buffer)
 
 int CFile::Stat(const CStdString& strFileName, struct __stat64* buffer)
 {
+  CURL url;
+  
   try
   {
-    CURL url(URIUtils::SubstitutePath(strFileName));
-
+    url = URIUtils::SubstitutePath(strFileName);
+    
     auto_ptr<IFile> pFile(CFileFactory::CreateLoader(url));
     if (!pFile.get())
       return false;
-
     return pFile->Stat(url, buffer);
   }
 #ifndef _LINUX
@@ -389,6 +430,33 @@ int CFile::Stat(const CStdString& strFileName, struct __stat64* buffer)
     e.writelog(__FUNCTION__);
   }
 #endif
+  catch (CRedirectException *pRedirectEx)
+  {
+    // the file implementation decided this item should use a different implementation.
+    // the exception will contain the new implementation and optional a redirected URL.
+    CLog::Log(LOGDEBUG,"File::Stat - redirecting implementation for %s", strFileName.c_str());
+    if (pRedirectEx && pRedirectEx->m_pNewFileImp)
+    {
+      auto_ptr<IFile> pImp(pRedirectEx->m_pNewFileImp);
+      auto_ptr<CURL> pNewUrl(pRedirectEx->m_pNewUrl);
+      delete pRedirectEx;
+        
+      if (pNewUrl.get())
+      {
+        if (pImp.get() && !pImp->Stat(*pNewUrl, buffer))
+        {
+          return false;
+        }
+      }
+      else     
+      {
+        if (pImp.get() && !pImp->Stat(url, buffer))
+        {
+          return false;
+        }
+      }
+    }
+  }
   catch(...)
   {
     CLog::Log(LOGERROR, "%s - Unhandled exception", __FUNCTION__);
index 89db63f..44fb91d 100644 (file)
@@ -71,8 +71,8 @@ CAfpConnection::CAfpConnection()
  , m_LastActive(0)
  , m_pAfpServer(NULL)
  , m_pAfpVol(NULL)
- , m_pAfpClient((struct libafpclient*)malloc(sizeof(struct libafpclient)))
  , m_pAfpUrl((struct afp_url*)malloc(sizeof(struct afp_url)))
+ , m_pAfpClient((struct libafpclient*)malloc(sizeof(struct libafpclient)))
  , m_pLibAfp(new DllLibAfp())
  , m_bDllInited(false)
 {
@@ -645,7 +645,7 @@ bool CFileAFP::OpenForWrite(const CURL& url, bool bOverWrite)
   if (bOverWrite)
   {
     CLog::Log(LOGWARNING, "FileAFP::OpenForWrite() called with overwriting enabled! - %s", strPath.c_str());
-    ret = gAfpConnection.GetImpl()->afp_wrap_creat(gAfpConnection.GetVolume(), strPath.c_str(), 0);
+    ret = gAfpConnection.GetImpl()->afp_wrap_creat(gAfpConnection.GetVolume(), strPath.c_str(), S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
   }
 
   ret = gAfpConnection.GetImpl()->afp_wrap_open(gAfpConnection.GetVolume(), strPath.c_str(), O_RDWR, &m_pFp);
index 9e515f8..d9e1349 100644 (file)
@@ -68,6 +68,7 @@
 #ifdef HAS_FILESYSTEM_AFP
 #include "FileAFP.h"
 #endif
+#include "FileUPnP.h"
 #include "PipesManager.h"
 #include "FilePipe.h"
 #include "FileMusicDatabase.h"
@@ -169,6 +170,7 @@ IFile* CFileFactory::CreateLoader(const CURL& url)
     else if (strProtocol == "afp") return new CFileAFP();
 #endif
     else if (strProtocol == "pipe") return new CFilePipe();    
+    else if (strProtocol == "upnp") return new CFileUPnP();
   }
 
   CLog::Log(LOGWARNING, "%s - Unsupported protocol(%s) in %s", __FUNCTION__, strProtocol.c_str(), url.Get().c_str() );
diff --git a/xbmc/filesystem/FileUPnP.cpp b/xbmc/filesystem/FileUPnP.cpp
new file mode 100644 (file)
index 0000000..665e096
--- /dev/null
@@ -0,0 +1,87 @@
+/*
+ *      Copyright (C) 2011 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  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 XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#include "FileUPnP.h"
+#include "UPnPDirectory.h"
+#include "FileFactory.h"
+#include "FileItem.h"
+#include "utils/log.h"
+
+using namespace XFILE;
+
+CFileUPnP::CFileUPnP()
+{
+}
+
+CFileUPnP::~CFileUPnP()
+{
+}
+
+bool CFileUPnP::Open(const CURL& url)
+{
+  CFileItem item_new;
+  if (CUPnPDirectory::GetResource(url.Get(), item_new))
+  {
+    //CLog::Log(LOGDEBUG,"FileUPnP - file redirect to %s.", item_new.GetPath().c_str());
+    IFile *pNewImp = CFileFactory::CreateLoader(item_new.GetPath());    
+    CURL *pNewUrl = new CURL(item_new.GetPath());    
+    if (pNewImp)
+    {
+      throw new CRedirectException(pNewImp, pNewUrl);
+    }
+    SAFE_DELETE(pNewUrl);    
+  }
+  return false;
+}
+
+int CFileUPnP::Stat(const CURL& url, struct __stat64* buffer)
+{
+  CFileItem item_new;
+  if (CUPnPDirectory::GetResource(url.Get(), item_new))
+  {
+    //CLog::Log(LOGDEBUG,"FileUPnP - file redirect to %s.", item_new.GetPath().c_str());
+    IFile *pNewImp = CFileFactory::CreateLoader(item_new.GetPath());
+    CURL *pNewUrl = new CURL(item_new.GetPath());
+    if (pNewImp)
+    {
+      throw new CRedirectException(pNewImp, pNewUrl);
+    }
+    SAFE_DELETE(pNewUrl);
+  }
+  return -1;
+}
+
+bool CFileUPnP::Exists(const CURL& url)
+{
+  CFileItem item_new;
+  if (CUPnPDirectory::GetResource(url.Get(), item_new))
+  {
+    //CLog::Log(LOGDEBUG,"FileUPnP - file redirect to %s.", item_new.GetPath().c_str());
+    IFile *pNewImp = CFileFactory::CreateLoader(item_new.GetPath());
+    CURL *pNewUrl = new CURL(item_new.GetPath());
+    if (pNewImp)
+    {
+      throw new CRedirectException(pNewImp, pNewUrl);
+    }
+    SAFE_DELETE(pNewUrl);
+  }
+  return false;
+}
diff --git a/xbmc/filesystem/FileUPnP.h b/xbmc/filesystem/FileUPnP.h
new file mode 100644 (file)
index 0000000..3d31364
--- /dev/null
@@ -0,0 +1,42 @@
+#pragma once
+/*
+ *      Copyright (C) 2011 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  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 XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#include "IFile.h"
+
+namespace XFILE
+{
+  class CFileUPnP : public IFile
+  {
+    public:
+      CFileUPnP();
+      virtual ~CFileUPnP();
+      virtual bool Open(const CURL& url);      
+      virtual bool Exists(const CURL& url);
+      virtual int Stat(const CURL& url, struct __stat64* buffer);
+      
+      virtual unsigned int Read(void* lpBuf, int64_t uiBufSize) {return -1;}
+      virtual int64_t Seek(int64_t iFilePosition, int iWhence = SEEK_SET) {return -1;}
+      virtual void Close(){}
+      virtual int64_t GetPosition() {return -1;}
+      virtual int64_t GetLength() {return -1;}
+  };
+}
index a1a4b2f..7cd8d3f 100644 (file)
@@ -128,5 +128,15 @@ bool CHTTPDirectory::Exists(const char* strPath)
 {
   CFileCurl http;
   CURL url(strPath);
-  return http.Exists(url);
+  struct __stat64 buffer;
+
+  if( http.Stat(url, &buffer) != 0 )
+  {
+    return false;
+  }
+
+  if (buffer.st_mode == _S_IFDIR)
+         return true;
+
+  return false;
 }
index a17a811..2ad7f1a 100644 (file)
@@ -105,9 +105,14 @@ class CRedirectException
 {
 public:
   IFile *m_pNewFileImp;
-
-  CRedirectException() : m_pNewFileImp(NULL) { }
-  CRedirectException(IFile *pNewFileImp) : m_pNewFileImp(pNewFileImp) { }
+  CURL  *m_pNewUrl;
+
+  CRedirectException() : m_pNewFileImp(NULL), m_pNewUrl(NULL) { }
+  
+  CRedirectException(IFile *pNewFileImp, CURL *pNewUrl=NULL) 
+  : m_pNewFileImp(pNewFileImp)
+  , m_pNewUrl(pNewUrl) 
+  { }
 };
 
 }
index e517bb9..467df2b 100644 (file)
@@ -35,6 +35,7 @@ SRCS=AddonsDirectory.cpp \
      FileSpecialProtocol.cpp \
      FileTuxBox.cpp \
      FileUDF.cpp \
+     FileUPnP.cpp \
      FileZip.cpp \
      FTPDirectory.cpp \
      FTPParse.cpp \
index c01f4a3..7c886b1 100644 (file)
@@ -170,136 +170,6 @@ bool CBaseTexture::LoadFromFile(const CStdString& texturePath, unsigned int maxW
     return false;
   }
 
-#if 0
-//#if defined(__APPLE__) && defined(__arm__)
-  XFILE::CFile file;
-  UInt8 *imageBuff      = NULL;
-  int64_t imageBuffSize = 0;
-
-  //open path and read data to buffer
-  //this handles advancedsettings.xml pathsubstitution
-  //and resulting networking
-  if (file.Open(texturePath, 0))
-  {
-    imageBuffSize =file.GetLength();
-    imageBuff = new UInt8[imageBuffSize];
-    imageBuffSize = file.Read(imageBuff, imageBuffSize);
-    file.Close();
-  }
-  else
-  {
-    CLog::Log(LOGERROR, "Texture manager unable to open file %s", texturePath.c_str());
-    return false;
-  }
-
-  if (imageBuffSize <= 0)
-  {
-    CLog::Log(LOGERROR, "Texture manager read texture file failed.");
-    delete [] imageBuff;
-    return false;
-  }
-
-  // create the image from buffer;
-  CGImageSourceRef imageSource;
-  // create a CFDataRef using CFDataCreateWithBytesNoCopy and kCFAllocatorNull for deallocator.
-  // this allows us to do a nocopy reference and we handle the free of imageBuff
-  CFDataRef cfdata = CFDataCreateWithBytesNoCopy(NULL, imageBuff, imageBuffSize, kCFAllocatorNull);
-  imageSource = CGImageSourceCreateWithData(cfdata, NULL);   
-    
-  if (imageSource == nil)
-  {
-    CLog::Log(LOGERROR, "Texture manager unable to load file: %s", CSpecialProtocol::TranslatePath(texturePath).c_str());
-    CFRelease(cfdata);
-    delete [] imageBuff;
-    return false;
-  }
-
-  CGImageRef image = CGImageSourceCreateImageAtIndex(imageSource, 0, NULL);
-
-  int rotate = 0;
-  if (autoRotate)
-  { // get the orientation of the image for displaying it correctly
-    CFDictionaryRef imagePropertiesDictionary = CGImageSourceCopyPropertiesAtIndex(imageSource,0, NULL);
-    if (imagePropertiesDictionary != nil)
-    {
-      CFNumberRef orientation = (CFNumberRef)CFDictionaryGetValue(imagePropertiesDictionary, kCGImagePropertyOrientation);
-      if (orientation != nil)
-      {
-        int value = 0;
-        CFNumberGetValue(orientation, kCFNumberIntType, &value);
-        if (value)
-          rotate = value - 1;
-      }
-      CFRelease(imagePropertiesDictionary);
-    }
-  }
-
-  CFRelease(imageSource);
-
-  unsigned int width  = CGImageGetWidth(image);
-  unsigned int height = CGImageGetHeight(image);
-
-  m_hasAlpha = (CGImageGetAlphaInfo(image) != kCGImageAlphaNone);
-
-  if (originalWidth)
-    *originalWidth = width;
-  if (originalHeight)
-    *originalHeight = height;
-
-  // check texture size limits and limit to screen size - preserving aspectratio of image  
-  if ( width > g_Windowing.GetMaxTextureSize() || height > g_Windowing.GetMaxTextureSize() )
-  {
-    float aspect;
-
-    if ( width > height )
-    {
-      aspect = (float)width / (float)height;
-      width  = g_Windowing.GetWidth();
-      height = (float)width / (float)aspect;
-    }
-    else
-    {
-      aspect = (float)height / (float)width;
-      height = g_Windowing.GetHeight();
-      width  = (float)height / (float)aspect;
-    }
-    CLog::Log(LOGDEBUG, "Texture manager texture clamp:new texture size: %i x %i", width, height);
-  }
-
-  // use RGBA to skip swizzling
-  Allocate(width, height, XB_FMT_RGBA8);
-  m_orientation = rotate;
-    
-  CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
-
-  // hw convert jmpeg to RGBA
-  CGContextRef context = CGBitmapContextCreate(m_pixels,
-    width, height, 8, GetPitch(), colorSpace,
-    kCGImageAlphaPremultipliedLast | kCGBitmapByteOrder32Big);
-
-  CGColorSpaceRelease(colorSpace);
-
-  // Flip so that it isn't upside-down
-  //CGContextTranslateCTM(context, 0, height);
-  //CGContextScaleCTM(context, 1.0f, -1.0f);
-  #if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
-    CGContextClearRect(context, CGRectMake(0, 0, width, height));
-  #else
-    #if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
-    // (just a way of checking whether we're running in 10.5 or later)
-    if (CGContextDrawLinearGradient == 0)
-      CGContextClearRect(context, CGRectMake(0, 0, width, height));
-    else
-    #endif
-      CGContextSetBlendMode(context, kCGBlendModeCopy);
-  #endif
-  //CGContextSetBlendMode(context, kCGBlendModeCopy);
-  CGContextDrawImage(context, CGRectMake(0, 0, width, height), image);
-  CGContextRelease(context);
-  CGImageRelease(image);
-  CFRelease(cfdata);
-  delete [] imageBuff;
-#else
   //ImageLib is sooo sloow for jpegs. Try our own decoder first. If it fails, fall back to ImageLib.
   if (URIUtils::GetExtension(texturePath).Equals(".jpg") || URIUtils::GetExtension(texturePath).Equals(".tbn"))
   {
@@ -384,7 +254,6 @@ bool CBaseTexture::LoadFromFile(const CStdString& texturePath, unsigned int maxW
     }
   }
   dll.ReleaseImage(&image);
-#endif
 
   ClampToEdge();
 
index 99dd586..7701712 100644 (file)
@@ -90,8 +90,8 @@ void CGLTexture::LoadToGPU()
     m_textureWidth = maxSize;
   }
 
-  GLenum format;
-  GLint numcomponents;
+  GLenum format = GL_BGRA;
+  GLint numcomponents = GL_RGBA;
 
   switch (m_format)
   {
@@ -111,8 +111,6 @@ void CGLTexture::LoadToGPU()
     break;
   case XB_FMT_A8R8G8B8:
   default:
-    format = GL_BGRA;
-    numcomponents = GL_RGBA;
     break;
   }
 
index 782e559..1274c1f 100644 (file)
@@ -309,7 +309,9 @@ static const ActionMapping windows[] =
         {"musicoverlay"             , WINDOW_DIALOG_MUSIC_OVERLAY},
         {"videooverlay"             , WINDOW_DIALOG_VIDEO_OVERLAY},
         {"startwindow"              , WINDOW_START},
-        {"startup"                  , WINDOW_STARTUP_ANIM}};
+        {"startup"                  , WINDOW_STARTUP_ANIM},
+        {"peripherals"              , WINDOW_DIALOG_PERIPHERAL_MANAGER},
+        {"peripheralsettings"       , WINDOW_DIALOG_PERIPHERAL_SETTINGS}};
 
 static const ActionMapping mousecommands[] =
 {
index 68107a8..8a4372c 100644 (file)
@@ -52,7 +52,7 @@ JSON_STATUS CApplicationOperations::GetProperties(const CStdString &method, ITra
 JSON_STATUS CApplicationOperations::SetVolume(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
 {
   int oldVolume = g_application.GetVolume();
-  int volume = (int)parameterObject["value"].asInteger();
+  int volume = (int)parameterObject["volume"].asInteger();
   
   g_application.SetVolume(volume);
 
@@ -61,10 +61,15 @@ JSON_STATUS CApplicationOperations::SetVolume(const CStdString &method, ITranspo
   return GetPropertyValue("volume", result);
 }
 
-JSON_STATUS CApplicationOperations::ToggleMute(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
+JSON_STATUS CApplicationOperations::SetMute(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
 {
-  g_application.getApplicationMessenger().SendAction(CAction(ACTION_MUTE));
-  return GetPropertyValue("volume", result);
+  if ((parameterObject["mute"].isString() && parameterObject["mute"].asString().compare("toggle") == 0) ||
+      (parameterObject["mute"].isBoolean() && parameterObject["mute"].asBoolean() != g_application.IsMuted()))
+    g_application.getApplicationMessenger().SendAction(CAction(ACTION_MUTE));
+  else if (!parameterObject["mute"].isBoolean() && !parameterObject["mute"].isString())
+    return InvalidParams;
+
+  return GetPropertyValue("muted", result);
 }
 
 JSON_STATUS CApplicationOperations::Quit(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
index 033d82f..139a29a 100644 (file)
@@ -32,7 +32,7 @@ namespace JSONRPC
     static JSON_STATUS GetProperties(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
 
     static JSON_STATUS SetVolume(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
-    static JSON_STATUS ToggleMute(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
+    static JSON_STATUS SetMute(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
 
     static JSON_STATUS Quit(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
   private:
index 9fa535d..fa2e17c 100644 (file)
@@ -176,12 +176,8 @@ JSON_STATUS CAudioLibrary::GetRecentlyAddedAlbums(const CStdString &method, ITra
   if (!musicdatabase.Open())
     return InternalError;
 
-  int amount = (int)parameterObject["albums"].asInteger();
-  if (amount < 0)
-    amount = 0;
-
   VECALBUMS albums;
-  if (musicdatabase.GetRecentlyAddedAlbums(albums, (unsigned int)amount))
+  if (musicdatabase.GetRecentlyAddedAlbums(albums))
   {
     CFileItemList items;
 
@@ -208,7 +204,7 @@ JSON_STATUS CAudioLibrary::GetRecentlyAddedSongs(const CStdString &method, ITran
   if (!musicdatabase.Open())
     return InternalError;
 
-  int amount = (int)parameterObject["albums"].asInteger();
+  int amount = (int)parameterObject["albumlimit"].asInteger();
   if (amount < 0)
     amount = 0;
 
@@ -248,20 +244,13 @@ JSON_STATUS CAudioLibrary::Scan(const CStdString &method, ITransportLayer *trans
 
 JSON_STATUS CAudioLibrary::Export(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
 {
-  CStdString path = parameterObject["path"].asString();
-  bool singleFile = parameterObject["singlefile"].asBoolean();
-
-  if (!singleFile && path.IsEmpty())
-    return InvalidParams;
-
   CStdString cmd;
-  if (singleFile)
-    cmd.Format("exportlibrary(music, true, %s, %s, %s)",
-      parameterObject["images"].asBoolean() ? "true" : "false",
-      parameterObject["overwrite"].asBoolean() ? "true" : "false",
-      parameterObject["actorthumbs"].asBoolean() ? "true" : "false");
+  if (parameterObject["options"].isMember("path"))
+    cmd.Format("exportlibrary(music, false, %s)", parameterObject["options"]["path"].asString());
   else
-    cmd.Format("exportlibrary(music, false, %s)", path);
+    cmd.Format("exportlibrary(music, true, %s, %s)",
+      parameterObject["options"]["images"].asBoolean() ? "true" : "false",
+      parameterObject["options"]["overwrite"].asBoolean() ? "true" : "false");
 
   g_application.getApplicationMessenger().ExecBuiltIn(cmd);
   return ACK;
index 108f291..867f689 100644 (file)
@@ -116,80 +116,85 @@ void CFileItemHandler::HandleFileItem(const char *ID, bool allowFile, const char
   bool hasFileField = false;
   bool hasThumbnailField = false;
 
-  for (unsigned int i = 0; i < validFields.size(); i++)
+  if (item.get())
   {
-    CStdString field = validFields[i].asString();
-
-    if (field == "file")
-      hasFileField = true;
-    if (field == "thumbnail")
-      hasThumbnailField = true;
-  }
-
-  if (allowFile && hasFileField)
-  {
-    if (item->HasVideoInfoTag() && !item->GetVideoInfoTag()->GetPath().IsEmpty())
-        object["file"] = item->GetVideoInfoTag()->GetPath().c_str();
-    if (item->HasMusicInfoTag() && !item->GetMusicInfoTag()->GetURL().IsEmpty())
-      object["file"] = item->GetMusicInfoTag()->GetURL().c_str();
+    for (unsigned int i = 0; i < validFields.size(); i++)
+    {
+      CStdString field = validFields[i].asString();
 
-    if (!object.isMember("file"))
-      object["file"] = item->GetPath().c_str();
-  }
+      if (field == "file")
+        hasFileField = true;
+      if (field == "thumbnail")
+        hasThumbnailField = true;
+    }
 
-  if (ID)
-  {
-    if (stricmp(ID, "genreid") == 0)
+    if (allowFile && hasFileField)
     {
-      CStdString genre = item->GetPath();
-      genre.TrimRight('/');
-      object[ID] = atoi(genre.c_str());
+      if (item->HasVideoInfoTag() && !item->GetVideoInfoTag()->GetPath().IsEmpty())
+          object["file"] = item->GetVideoInfoTag()->GetPath().c_str();
+      if (item->HasMusicInfoTag() && !item->GetMusicInfoTag()->GetURL().IsEmpty())
+        object["file"] = item->GetMusicInfoTag()->GetURL().c_str();
+
+      if (!object.isMember("file"))
+        object["file"] = item->GetPath().c_str();
     }
-    else if (item->HasMusicInfoTag() && item->GetMusicInfoTag()->GetDatabaseId() > 0)
-      object[ID] = (int)item->GetMusicInfoTag()->GetDatabaseId();
-    else if (item->HasVideoInfoTag() && item->GetVideoInfoTag()->m_iDbId > 0)
-      object[ID] = item->GetVideoInfoTag()->m_iDbId;
 
-    if (stricmp(ID, "id") == 0)
+    if (ID)
     {
-      if (item->HasMusicInfoTag())
-        object["type"] = "song";
-      else if (item->HasVideoInfoTag())
+      if (stricmp(ID, "genreid") == 0)
       {
-        switch (item->GetVideoContentType())
-        {
-          case VIDEODB_CONTENT_EPISODES:
-            object["type"] = "episode";
-            break;
-
-          case VIDEODB_CONTENT_MUSICVIDEOS:
-            object["type"] = "musicvideo";
-            break;
+        CStdString genre = item->GetPath();
+        genre.TrimRight('/');
+        object[ID] = atoi(genre.c_str());
+      }
+      else if (item->HasMusicInfoTag() && item->GetMusicInfoTag()->GetDatabaseId() > 0)
+        object[ID] = (int)item->GetMusicInfoTag()->GetDatabaseId();
+      else if (item->HasVideoInfoTag() && item->GetVideoInfoTag()->m_iDbId > 0)
+        object[ID] = item->GetVideoInfoTag()->m_iDbId;
 
-          case VIDEODB_CONTENT_MOVIES:
-            object["type"] = "movie";
-            break;
+      if (stricmp(ID, "id") == 0)
+      {
+        if (item->HasMusicInfoTag())
+          object["type"] = "song";
+        else if (item->HasVideoInfoTag())
+        {
+          switch (item->GetVideoContentType())
+          {
+            case VIDEODB_CONTENT_EPISODES:
+              object["type"] = "episode";
+              break;
+
+            case VIDEODB_CONTENT_MUSICVIDEOS:
+              object["type"] = "musicvideo";
+              break;
+
+            case VIDEODB_CONTENT_MOVIES:
+              object["type"] = "movie";
+              break;
+          }
         }
-      }
-      else if (item->HasPictureInfoTag())
-        object["type"] = "picture";
+        else if (item->HasPictureInfoTag())
+          object["type"] = "picture";
 
-      if (!object.isMember("type"))
-        object["type"] = "unknown";
+        if (!object.isMember("type"))
+          object["type"] = "unknown";
+      }
     }
-  }
 
-  if (hasThumbnailField)
-    object["thumbnail"] = item->GetThumbnailImage().c_str();
+    if (hasThumbnailField)
+      object["thumbnail"] = item->GetThumbnailImage().c_str();
 
-  if (item->HasVideoInfoTag())
-    FillDetails(item->GetVideoInfoTag(), item, validFields, object);
-  if (item->HasMusicInfoTag())
-    FillDetails(item->GetMusicInfoTag(), item, validFields, object);
-  if (item->HasPictureInfoTag())
-    FillDetails(item->GetPictureInfoTag(), item, validFields, object);
+    if (item->HasVideoInfoTag())
+      FillDetails(item->GetVideoInfoTag(), item, validFields, object);
+    if (item->HasMusicInfoTag())
+      FillDetails(item->GetMusicInfoTag(), item, validFields, object);
+    if (item->HasPictureInfoTag())
+      FillDetails(item->GetPictureInfoTag(), item, validFields, object);
 
-  object["label"] = item->GetLabel().c_str();
+    object["label"] = item->GetLabel().c_str();
+  }
+  else
+    object = CVariant(CVariant::VariantTypeNull);
 
   if (resultname)
   {
index 37e9155..d53856d 100644 (file)
@@ -55,7 +55,7 @@ JSON_STATUS CFileOperations::GetRootDirectory(const CStdString &method, ITranspo
       }
     }
 
-    CVariant param = parameterObject["properties"];
+    CVariant param(CVariant::VariantTypeObject);
     param["properties"] = CVariant(CVariant::VariantTypeArray);
     param["properties"].append("file");
 
index 71ae484..13c4afa 100644 (file)
@@ -206,7 +206,7 @@ bool CJSONRPC::HandleMethodCall(const CVariant& request, CVariant& response, ITr
     JSONRPC::MethodCall method;
     CVariant params;
 
-    if ((errorCode = CJSONServiceDescription::CheckCall(methodName, request["params"], client, isNotification, method, params)) == OK)
+    if ((errorCode = CJSONServiceDescription::CheckCall(methodName, request["params"], transport, client, isNotification, method, params)) == OK)
       errorCode = method(methodName, transport, client, params, result);
     else
       result = params;
index f396439..d771a43 100644 (file)
@@ -87,6 +87,7 @@ JsonRpcMethodMap CJSONServiceDescription::m_methodMaps[] = {
 // Player
   { "Player.GetActivePlayers",                      CPlayerOperations::GetActivePlayers },
   { "Player.GetProperties",                         CPlayerOperations::GetProperties },
+  { "Player.GetItem",                               CPlayerOperations::GetItem },
 
   { "Player.PlayPause",                             CPlayerOperations::PlayPause },
   { "Player.Stop",                                  CPlayerOperations::Stop },
@@ -182,7 +183,7 @@ JsonRpcMethodMap CJSONServiceDescription::m_methodMaps[] = {
 // Application operations
   { "Application.GetProperties",                    CApplicationOperations::GetProperties },
   { "Application.SetVolume",                        CApplicationOperations::SetVolume },
-  { "Application.ToggleMute",                       CApplicationOperations::ToggleMute },
+  { "Application.SetMute",                          CApplicationOperations::SetMute },
   { "Application.Quit",                             CApplicationOperations::Quit },
 
 // XBMC operations
@@ -535,49 +536,52 @@ JSON_STATUS CJSONServiceDescription::Print(CVariant &result, ITransportLayer *tr
   return OK;
 }
 
-JSON_STATUS CJSONServiceDescription::CheckCall(const char* const method, const CVariant &requestParameters, IClient *client, bool notification, MethodCall &methodCall, CVariant &outputParameters)
+JSON_STATUS CJSONServiceDescription::CheckCall(const char* const method, const CVariant &requestParameters, ITransportLayer *transport, IClient *client, bool notification, MethodCall &methodCall, CVariant &outputParameters)
 {
   CJsonRpcMethodMap::JsonRpcMethodIterator iter = m_actionMap.find(method);
   if (iter != m_actionMap.end())
   {
-    if (client != NULL && (client->GetPermissionFlags() & iter->second.permission) == iter->second.permission && (!notification || (iter->second.permission & OPERATION_PERMISSION_NOTIFICATION) == iter->second.permission))
+    if (transport != NULL && (transport->GetCapabilities() & iter->second.transportneed) == iter->second.transportneed)
     {
-      methodCall = iter->second.method;
+      if (client != NULL && (client->GetPermissionFlags() & iter->second.permission) == iter->second.permission && (!notification || (iter->second.permission & OPERATION_PERMISSION_NOTIFICATION) == iter->second.permission))
+      {
+        methodCall = iter->second.method;
 
-      // Count the number of actually handled (present)
-      // parameters
-      unsigned int handled = 0;
-      CVariant errorData = CVariant(CVariant::VariantTypeObject);
-      errorData["method"] = iter->second.name;
+        // Count the number of actually handled (present)
+        // parameters
+        unsigned int handled = 0;
+        CVariant errorData = CVariant(CVariant::VariantTypeObject);
+        errorData["method"] = iter->second.name;
 
-      // Loop through all the parameters to check
-      for (unsigned int i = 0; i < iter->second.parameters.size(); i++)
-      {
-        // Evaluate the current parameter
-        JSON_STATUS status = checkParameter(requestParameters, iter->second.parameters.at(i), i, outputParameters, handled, errorData);
-        if (status != OK)
+        // Loop through all the parameters to check
+        for (unsigned int i = 0; i < iter->second.parameters.size(); i++)
+        {
+          // Evaluate the current parameter
+          JSON_STATUS status = checkParameter(requestParameters, iter->second.parameters.at(i), i, outputParameters, handled, errorData);
+          if (status != OK)
+          {
+            // Return the error data object in the outputParameters reference
+            outputParameters = errorData;
+            return status;
+          }
+        }
+
+        // Check if there were unnecessary parameters
+        if (handled < requestParameters.size())
         {
-          // Return the error data object in the outputParameters reference
+          errorData["message"] = "Too many parameters";
           outputParameters = errorData;
-          return status;
+          return InvalidParams;
         }
-      }
 
-      // Check if there were unnecessary parameters
-      if (handled < requestParameters.size())
-      {
-        errorData["message"] = "Too many parameters";
-        outputParameters = errorData;
-        return InvalidParams;
+        return OK;
       }
-
-      return OK;
+      else
+        return BadPermission;
     }
-    else
-      return BadPermission;
   }
-  else
-    return MethodNotFound;
+
+  return MethodNotFound;
 }
 
 void CJSONServiceDescription::printType(const JSONSchemaTypeDefinition &type, bool isParameter, bool isGlobal, bool printDefault, bool printDescriptions, CVariant &output)
index 27b51d2..38cbbb6 100644 (file)
@@ -352,7 +352,7 @@ namespace JSONRPC
      actual C/C++ implementation of the method to the "methodCall" parameter and checks the
      given parameters from the request against the json schema description for the given method.
      */
-    static JSON_STATUS CheckCall(const char* const method, const CVariant &requestParameters, IClient *client, bool notification, MethodCall &methodCall, CVariant &outputParameters);
+    static JSON_STATUS CheckCall(const char* const method, const CVariant &requestParameters, ITransportLayer *transport, IClient *client, bool notification, MethodCall &methodCall, CVariant &outputParameters);
 
   private:
     static bool prepareDescription(std::string &description, CVariant &descriptionObject, std::string &name);
index 7da7891..db66808 100644 (file)
 #include "Application.h"
 #include "Util.h"
 #include "PlayListPlayer.h"
+#include "playlists/PlayList.h"
 #include "guilib/GUIWindowManager.h"
 #include "GUIUserMessages.h"
 #include "pictures/GUIWindowSlideShow.h"
 #include "interfaces/Builtins.h"
-#include "PlayListPlayer.h"
 #include "PartyModeManager.h"
 #include "ApplicationMessenger.h"
 #include "FileItem.h"
+#include "VideoLibrary.h"
+#include "video/VideoDatabase.h"
+#include "AudioLibrary.h"
 
 using namespace JSONRPC;
 using namespace PLAYLIST;
@@ -86,6 +89,92 @@ JSON_STATUS CPlayerOperations::GetProperties(const CStdString &method, ITranspor
   return OK;
 }
 
+JSON_STATUS CPlayerOperations::GetItem(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
+{
+  PlayerType player = GetPlayer(parameterObject["playerid"]);
+  CFileItemPtr fileItem;
+
+  switch (player)
+  {
+    case Video:
+    case Audio:
+    {
+      if (g_application.CurrentFileItem().GetLabel().empty())
+      {
+        CFileItem tmpItem;
+        if (player == Video)
+          CVideoLibrary::FillFileItem(g_application.CurrentFile(), tmpItem);
+        else
+          CAudioLibrary::FillFileItem(g_application.CurrentFile(), tmpItem);
+
+        fileItem = CFileItemPtr(new CFileItem(tmpItem));
+      }
+      else
+        fileItem = CFileItemPtr(new CFileItem(g_application.CurrentFileItem()));
+
+      if (player == Video)
+      {
+        bool additionalInfo = false;
+        for (CVariant::const_iterator_array itr = parameterObject["properties"].begin_array(); itr != parameterObject["properties"].end_array(); itr++)
+        {
+          CStdString fieldValue = itr->asString();
+          if (fieldValue == "cast" || fieldValue == "set" || fieldValue == "setid" || fieldValue == "showlink" || fieldValue == "resume")
+            additionalInfo = true;
+        }
+
+        if (additionalInfo)
+        {
+          CVideoDatabase videodatabase;
+          if (videodatabase.Open())
+          {
+            switch (fileItem->GetVideoContentType())
+            {
+              case VIDEODB_CONTENT_MOVIES:
+                videodatabase.GetMovieInfo("", *(fileItem->GetVideoInfoTag()), fileItem->GetVideoInfoTag()->m_iDbId);
+                break;
+
+              case VIDEODB_CONTENT_MUSICVIDEOS:
+                videodatabase.GetMusicVideoInfo("", *(fileItem->GetVideoInfoTag()), fileItem->GetVideoInfoTag()->m_iDbId);
+                break;
+
+              case VIDEODB_CONTENT_EPISODES:
+                videodatabase.GetEpisodeInfo("", *(fileItem->GetVideoInfoTag()), fileItem->GetVideoInfoTag()->m_iDbId);
+                break;
+
+              case VIDEODB_CONTENT_TVSHOWS:
+              case VIDEODB_CONTENT_MOVIE_SETS:
+              default:
+                break;
+            }
+
+            videodatabase.Close();
+          }
+        }
+      }
+      break;
+    }
+
+    case Picture:
+    {
+      CGUIWindowSlideShow *slideshow = (CGUIWindowSlideShow*)g_windowManager.GetWindow(WINDOW_SLIDESHOW);
+      if (!slideshow)
+        return FailedToExecute;
+
+      CFileItemList slides;
+      slideshow->GetSlideShowContents(slides);
+      fileItem = slides[slideshow->CurrentSlide() - 1];
+      break;
+    }
+
+    case None:
+    default:
+      return FailedToExecute;
+  }
+
+  HandleFileItem("id", true, "item", fileItem, parameterObject, parameterObject["properties"], result, false);
+  return OK;
+}
+
 JSON_STATUS CPlayerOperations::PlayPause(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
 {
   CGUIWindowSlideShow *slideshow = NULL;
index 23628c0..5a40a3e 100644 (file)
@@ -41,6 +41,7 @@ namespace JSONRPC
   public:
     static JSON_STATUS GetActivePlayers(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSON_STATUS GetProperties(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
+    static JSON_STATUS GetItem(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
 
     static JSON_STATUS PlayPause(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSON_STATUS Stop(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
index 45ca76a..fec6147 100644 (file)
@@ -685,46 +685,50 @@ namespace JSONRPC
                   "\"resume\", \"artistid\", \"albumid\", \"tvshowid\", \"setid\" ]"
       "}"
     "}",
-    "\"List.Items.All\": {"
-      "\"type\": \"array\","
-      "\"items\": { "
-        "\"extends\": [ \"Video.Details.File\", \"Audio.Details.Media\" ],"
-        "\"properties\": {"
-          "\"id\": { \"$ref\": \"Library.Id\" },"
-          "\"type\": { \"type\": \"string\", \"enum\": [ \"unknown\", \"movie\", \"episode\", \"musicvideo\", \"song\", \"picture\" ] },"
-          "\"albumartist\": { \"type\": \"string\" },"
-          "\"album\": { \"type\": \"string\" },"
-          "\"track\": { \"type\": \"integer\" },"
-          "\"duration\": { \"type\": \"integer\" },"
-          "\"comment\": { \"type\": \"string\" },"
-          "\"lyrics\": { \"type\": \"string\" },"
-          "\"musicbrainztrackid\": { \"type\": \"string\" },"
-          "\"musicbrainzartistid\": { \"type\": \"string\" },"
-          "\"trailer\": { \"type\": \"string\" },"
-          "\"tagline\": { \"type\": \"string\" },"
-          "\"plotoutline\": { \"type\": \"string\" },"
-          "\"originaltitle\": { \"type\": \"string\" },"
-          "\"writer\": { \"type\": \"string\" },"
-          "\"studio\": { \"type\": \"string\" },"
-          "\"mpaa\": { \"type\": \"string\" },"
-          "\"cast\": { \"$ref\": \"Video.Cast\" },"
-          "\"country\": { \"type\": \"string\" },"
-          "\"imdbnumber\": { \"type\": \"string\" },"
-          "\"premiered\": { \"type\": \"string\" },"
-          "\"productioncode\": { \"type\": \"string\" },"
-          "\"set\": { \"$ref\": \"Array.String\" },"
-          "\"showlink\": { \"type\": \"string\" },"
-          "\"top250\": { \"type\": \"integer\" },"
-          "\"votes\": { \"type\": \"string\" },"
-          "\"firstaired\": { \"type\": \"string\" },"
-          "\"season\": { \"type\": \"integer\" },"
-          "\"episode\": { \"type\": \"integer\" },"
-          "\"showtitle\": { \"type\": \"string\" },"
-          "\"artistid\": { \"$ref\": \"Library.Id\" },"
-          "\"albumid\": { \"$ref\": \"Library.Id\" },"
-          "\"setid\": { \"$ref\": \"Array.Integer\" },"
-          "\"tvshowid\": { \"$ref\": \"Library.Id\" }"
-        "}"
+    "\"List.Item.All\": {"
+      "\"extends\": [ \"Video.Details.File\", \"Audio.Details.Media\" ],"
+      "\"properties\": {"
+        "\"id\": { \"$ref\": \"Library.Id\" },"
+        "\"type\": { \"type\": \"string\", \"enum\": [ \"unknown\", \"movie\", \"episode\", \"musicvideo\", \"song\", \"picture\" ] },"
+        "\"albumartist\": { \"type\": \"string\" },"
+        "\"album\": { \"type\": \"string\" },"
+        "\"track\": { \"type\": \"integer\" },"
+        "\"duration\": { \"type\": \"integer\" },"
+        "\"comment\": { \"type\": \"string\" },"
+        "\"lyrics\": { \"type\": \"string\" },"
+        "\"musicbrainztrackid\": { \"type\": \"string\" },"
+        "\"musicbrainzartistid\": { \"type\": \"string\" },"
+        "\"trailer\": { \"type\": \"string\" },"
+        "\"tagline\": { \"type\": \"string\" },"
+        "\"plotoutline\": { \"type\": \"string\" },"
+        "\"originaltitle\": { \"type\": \"string\" },"
+        "\"writer\": { \"type\": \"string\" },"
+        "\"studio\": { \"type\": \"string\" },"
+        "\"mpaa\": { \"type\": \"string\" },"
+        "\"cast\": { \"$ref\": \"Video.Cast\" },"
+        "\"country\": { \"type\": \"string\" },"
+        "\"imdbnumber\": { \"type\": \"string\" },"
+        "\"premiered\": { \"type\": \"string\" },"
+        "\"productioncode\": { \"type\": \"string\" },"
+        "\"set\": { \"$ref\": \"Array.String\" },"
+        "\"showlink\": { \"type\": \"string\" },"
+        "\"top250\": { \"type\": \"integer\" },"
+        "\"votes\": { \"type\": \"string\" },"
+        "\"firstaired\": { \"type\": \"string\" },"
+        "\"season\": { \"type\": \"integer\" },"
+        "\"episode\": { \"type\": \"integer\" },"
+        "\"showtitle\": { \"type\": \"string\" },"
+        "\"artistid\": { \"$ref\": \"Library.Id\" },"
+        "\"albumid\": { \"$ref\": \"Library.Id\" },"
+        "\"setid\": { \"$ref\": \"Array.Integer\" },"
+        "\"tvshowid\": { \"$ref\": \"Library.Id\" }"
+      "}"
+    "}",
+    "\"List.Item.File\": {"
+      "\"extends\": \"List.Item.All\","
+      "\"properties\": {"
+        "\"file\": { \"type\": \"string\", \"required\": true },"
+        "\"filetype\": { \"type\": \"string\", \"enum\": [ \"file\", \"directory\" ], \"required\": true }"
       "}"
     "}",
     "\"List.Items.Sources\": {"
@@ -736,16 +740,6 @@ namespace JSONRPC
         "}"
       "}"
     "}",
-    "\"List.Items.Files\": {"
-      "\"extends\": \"List.Items.All\","
-      "\"items\": { "
-        "\"type\": \"object\","
-        "\"properties\": {"
-          "\"file\": { \"type\": \"string\", \"required\": true },"
-          "\"filetype\": { \"type\": \"string\", \"enum\": [ \"file\", \"directory\" ], \"required\": true }"
-        "}"
-      "}"
-    "}",
     "\"System.Property.Name\": {"
       "\"type\": \"string\","
       "\"enum\": [ \"canshutdown\", \"cansuspend\", \"canhibernate\", \"canreboot\" ]"
@@ -932,6 +926,21 @@ namespace JSONRPC
       "],"
       "\"returns\":  { \"$ref\": \"Player.Property.Value\", \"required\": true }"
     "}",
+    "\"Player.GetItem\": {"
+      "\"type\": \"method\","
+      "\"description\": \"Retrieves the currently played item\","
+      "\"transport\": \"Response\","
+      "\"permission\": \"ReadData\","
+      "\"params\": ["
+        "{ \"name\": \"playerid\", \"$ref\": \"Player.Id\", \"required\": true },"
+        "{ \"name\": \"properties\", \"$ref\": \"List.Fields.All\" }"
+      "],"
+      "\"returns\": { \"type\": \"object\","
+        "\"properties\": {"
+          "\"item\": { \"$ref\": \"List.Item.All\", \"required\": true }"
+        "}"
+      "}"
+    "}",
     "\"Player.PlayPause\": {"
       "\"type\": \"method\","
       "\"description\": \"Pauses or unpause playback and returns the new state\","
@@ -1209,7 +1218,7 @@ namespace JSONRPC
       "\"returns\": { \"type\": \"object\","
         "\"properties\": {"
           "\"limits\": { \"$ref\": \"List.LimitsReturned\", \"required\": true },"
-          "\"items\": { \"$ref\": \"List.Items.All\", \"required\": true }"
+          "\"items\": { \"type\": \"array\", \"items\": { \"$ref\": \"List.Item.All\" }, \"required\": true }"
         "}"
       "}"
     "}",
@@ -1289,6 +1298,7 @@ namespace JSONRPC
     "}",
     "\"Files.Download\": {"
       "\"type\": \"method\","
+      "\"description\": \"Provides a way to download a given file (e.g. providing an URL to the real file location)\","
       "\"transport\": [ \"Response\", \"FileDownload\" ],"
       "\"permission\": \"ReadData\","
       "\"params\": ["
@@ -1303,6 +1313,7 @@ namespace JSONRPC
     "}",
     "\"Files.GetDirectory\": {"
       "\"type\": \"method\","
+      "\"description\": \"Get the directories and files in the given directory\","
       "\"transport\": \"Response\","
       "\"permission\": \"ReadData\","
       "\"params\": ["
@@ -1315,7 +1326,7 @@ namespace JSONRPC
         "\"type\": \"object\","
         "\"properties\": {"
           "\"limits\": { \"$ref\": \"List.LimitsReturned\", \"required\": true },"
-          "\"files\": { \"$ref\": \"List.Items.Files\", \"required\": true }"
+          "\"files\": { \"type\": \"array\", \"items\": { \"$ref\": \"List.Item.File\" }, \"required\": true }"
         "}"
       "}"
     "}",
@@ -1437,7 +1448,6 @@ namespace JSONRPC
       "\"transport\": \"Response\","
       "\"permission\": \"ReadData\","
       "\"params\": ["
-        "{ \"name\": \"albums\", \"$ref\": \"List.Amount\" },"
         "{ \"name\": \"properties\", \"$ref\": \"Audio.Fields.Album\" },"
         "{ \"name\": \"limits\", \"$ref\": \"List.Limits\" },"
         "{ \"name\": \"sort\", \"$ref\": \"List.Sort\" }"
@@ -1458,7 +1468,7 @@ namespace JSONRPC
       "\"transport\": \"Response\","
       "\"permission\": \"ReadData\","
       "\"params\": ["
-        "{ \"name\": \"albums\", \"$ref\": \"List.Amount\", \"description\": \"The amount of recently added albums from which to return the songs\" },"
+        "{ \"name\": \"albumlimit\", \"$ref\": \"List.Amount\", \"description\": \"The amount of recently added albums from which to return the songs\" },"
         "{ \"name\": \"properties\", \"$ref\": \"Audio.Fields.Song\" },"
         "{ \"name\": \"limits\", \"$ref\": \"List.Limits\" },"
         "{ \"name\": \"sort\", \"$ref\": \"List.Sort\" }"
@@ -1507,10 +1517,20 @@ namespace JSONRPC
       "\"transport\": \"Response\","
       "\"permission\": \"WriteFile\","
       "\"params\": ["
-        "{ \"name\": \"singlefile\", \"type\": \"boolean\", \"default\": true, \"description\": \"Whether to export the data into one or multiple files\" },"
-        "{ \"name\": \"images\", \"type\": \"boolean\", \"default\": false, \"description\": \"Whether to export thumbnails and fanart images\" },"
-        "{ \"name\": \"overwrite\", \"type\": \"boolean\", \"default\": false, \"description\": \"Whether to overwrite existing exported files\" },"
-        "{ \"name\": \"path\", \"type\": \"string\", \"default\": \"\", \"description\": \"Path to the directory to where the data should be exported\" }"
+        "{ \"name\": \"options\", \"type\": ["
+            "{ \"type\": \"object\", \"required\": true, \"additionalProperties\": false,"
+              "\"properties\": {"
+                "\"path\": { \"type\": \"string\", \"required\": true, \"minLength\": 1, \"description\": \"Path to the directory to where the data should be exported\" }"
+              "}"
+            "},"
+            "{ \"type\": \"object\", \"required\": true, \"additionalProperties\": false,"
+              "\"properties\": {"
+                "\"overwrite\": { \"type\": \"boolean\", \"default\": false, \"description\": \"Whether to overwrite existing exported files\" },"
+                "\"images\": { \"type\": \"boolean\", \"default\": false, \"description\": \"Whether to export thumbnails and fanart images\" }"
+              "}"
+            "}"
+          "]"
+        "}"
       "],"
       "\"returns\": \"string\""
     "}",
@@ -1816,11 +1836,21 @@ namespace JSONRPC
       "\"transport\": \"Response\","
       "\"permission\": \"WriteFile\","
       "\"params\": ["
-        "{ \"name\": \"singlefile\", \"type\": \"boolean\", \"default\": true, \"description\": \"Whether to export the data into one or multiple files\" },"
-        "{ \"name\": \"images\", \"type\": \"boolean\", \"default\": false, \"description\": \"Whether to export thumbnails and fanart images\" },"
-        "{ \"name\": \"actorthumbs\", \"type\": \"boolean\", \"default\": false, \"description\": \"Whether to export actor thumbnails\" },"
-        "{ \"name\": \"overwrite\", \"type\": \"boolean\", \"default\": false, \"description\": \"Whether to overwrite existing exported files\" },"
-        "{ \"name\": \"path\", \"type\": \"string\", \"default\": \"\", \"description\": \"Path to the directory to where the data should be exported\" }"
+        "{ \"name\": \"options\", \"type\": ["
+            "{ \"type\": \"object\", \"required\": true, \"additionalProperties\": false,"
+              "\"properties\": {"
+                "\"path\": { \"type\": \"string\", \"required\": true, \"minLength\": 1, \"description\": \"Path to the directory to where the data should be exported\" }"
+              "}"
+            "},"
+            "{ \"type\": \"object\", \"required\": true, \"additionalProperties\": false,"
+              "\"properties\": {"
+                "\"overwrite\": { \"type\": \"boolean\", \"default\": false, \"description\": \"Whether to overwrite existing exported files\" },"
+                "\"images\": { \"type\": \"boolean\", \"default\": false, \"description\": \"Whether to export thumbnails and fanart images\" },"
+                "\"actorthumbs\": { \"type\": \"boolean\", \"default\": false, \"description\": \"Whether to export actor thumbnails\" }"
+              "}"
+            "}"
+          "]"
+        "}"
       "],"
       "\"returns\": \"string\""
     "}",
@@ -1946,17 +1976,23 @@ namespace JSONRPC
       "\"transport\": \"Response\","
       "\"permission\": \"ControlPlayback\","
       "\"params\": ["
-        "{ \"name\": \"value\", \"type\": \"integer\", \"minimum\": 0, \"maximum\": 100, \"required\": true }"
+        "{ \"name\": \"volume\", \"type\": \"integer\", \"minimum\": 0, \"maximum\": 100, \"required\": true }"
       "],"
       "\"returns\": \"integer\""
     "}",
-    "\"Application.ToggleMute\": {"
+    "\"Application.SetMute\": {"
       "\"type\": \"method\","
       "\"description\": \"Toggle mute/unmute\","
       "\"transport\": \"Response\","
       "\"permission\": \"ControlPlayback\","
-      "\"params\": [],"
-      "\"returns\": { \"type\": \"integer\", \"description\": \"New volume\" }"
+      "\"params\": ["
+        "{ \"name\": \"mute\", \"required\": true, \"type\": ["
+            "{ \"type\": \"boolean\", \"required\": true },"
+            "{ \"type\": \"string\", \"enum\": [ \"toggle\" ], \"required\": true }"
+          "]"
+        "}"
+      "],"
+      "\"returns\": { \"type\": \"boolean\", \"description\": \"Mute state\" }"
     "}",
     "\"Application.Quit\": {"
       "\"type\": \"method\","
index 8053cf3..7e27d94 100644 (file)
@@ -344,20 +344,14 @@ JSON_STATUS CVideoLibrary::Scan(const CStdString &method, ITransportLayer *trans
 
 JSON_STATUS CVideoLibrary::Export(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
 {
-  CStdString path = parameterObject["path"].asString();
-  bool singleFile = parameterObject["singlefile"].asBoolean();
-
-  if (!singleFile && path.IsEmpty())
-    return InvalidParams;
-
   CStdString cmd;
-  if (singleFile)
-    cmd.Format("exportlibrary(video, true, %s, %s, %s)",
-      parameterObject["images"].asBoolean() ? "true" : "false",
-      parameterObject["overwrite"].asBoolean() ? "true" : "false",
-      parameterObject["actorthumbs"].asBoolean() ? "true" : "false");
+  if (parameterObject["options"].isMember("path"))
+    cmd.Format("exportlibrary(video, false, %s)", parameterObject["options"]["path"].asString());
   else
-    cmd.Format("exportlibrary(video, false, %s)", path);
+    cmd.Format("exportlibrary(video, true, %s, %s, %s)",
+      parameterObject["options"]["images"].asBoolean() ? "true" : "false",
+      parameterObject["options"]["overwrite"].asBoolean() ? "true" : "false",
+      parameterObject["options"]["actorthumbs"].asBoolean() ? "true" : "false");
 
   g_application.getApplicationMessenger().ExecBuiltIn(cmd);
   return ACK;
index e7e1c5c..08a601e 100644 (file)
     ],
     "returns":  { "$ref": "Player.Property.Value", "required": true }
   },
+       "Player.GetItem": {
+    "type": "method",
+    "description": "Retrieves the currently played item",
+    "transport": "Response",
+    "permission": "ReadData",
+    "params": [
+      { "name": "playerid", "$ref": "Player.Id", "required": true },
+      { "name": "properties", "$ref": "List.Fields.All" }
+    ],
+    "returns": { "type": "object",
+      "properties": {
+        "item": { "$ref": "List.Item.All", "required": true }
+      }
+    }
+  },
   "Player.PlayPause": {
     "type": "method",
     "description": "Pauses or unpause playback and returns the new state",
     "returns": { "type": "object",
       "properties": {
         "limits": { "$ref": "List.LimitsReturned", "required": true },
-        "items": { "$ref": "List.Items.All", "required": true }
+                               "items": { "type": "array", "items": { "$ref": "List.Item.All" }, "required": true }
       }
     }
   },
   },
   "Files.Download": {
     "type": "method",
+               "description": "Provides a way to download a given file (e.g. providing an URL to the real file location)",
     "transport": [ "Response", "FileDownload" ],
     "permission": "ReadData",
     "params": [
   },
   "Files.GetDirectory": {
     "type": "method",
+               "description": "Get the directories and files in the given directory",
     "transport": "Response",
     "permission": "ReadData",
     "params": [
       "type": "object",
       "properties": {
         "limits": { "$ref": "List.LimitsReturned", "required": true },
-        "files": { "$ref": "List.Items.Files", "required": true }
+                               "files": { "type": "array", "items": { "$ref": "List.Item.File" }, "required": true }
       }
     }
   },
     "transport": "Response",
     "permission": "ReadData",
     "params": [
-      { "name": "albums", "$ref": "List.Amount" },
       { "name": "properties", "$ref": "Audio.Fields.Album" },
       { "name": "limits", "$ref": "List.Limits" },
       { "name": "sort", "$ref": "List.Sort" }
     "transport": "Response",
     "permission": "ReadData",
     "params": [
-      { "name": "albums", "$ref": "List.Amount", "description": "The amount of recently added albums from which to return the songs" },
+      { "name": "albumlimit", "$ref": "List.Amount", "description": "The amount of recently added albums from which to return the songs" },
       { "name": "properties", "$ref": "Audio.Fields.Song" },
       { "name": "limits", "$ref": "List.Limits" },
       { "name": "sort", "$ref": "List.Sort" }
     "transport": "Response",
     "permission": "WriteFile",
     "params": [
-      { "name": "singlefile", "type": "boolean", "default": true, "description": "Whether to export the data into one or multiple files" },
-      { "name": "images", "type": "boolean", "default": false, "description": "Whether to export thumbnails and fanart images" },
-      { "name": "overwrite", "type": "boolean", "default": false, "description": "Whether to overwrite existing exported files" },
-      { "name": "path", "type": "string", "default": "", "description": "Path to the directory to where the data should be exported" }
+                       { "name": "options", "type": [
+                                       { "type": "object", "required": true, "additionalProperties": false,
+                                               "properties": {
+                                                       "path": { "type": "string", "required": true, "minLength": 1, "description": "Path to the directory to where the data should be exported" }
+                                               }
+                                       },
+                                       { "type": "object", "required": true, "additionalProperties": false,
+                                               "properties": {
+                                                       "overwrite": { "type": "boolean", "default": false, "description": "Whether to overwrite existing exported files" },
+                                                       "images": { "type": "boolean", "default": false, "description": "Whether to export thumbnails and fanart images" }
+                                               }
+                                       }
+                               ]
+                       }
     ],
     "returns": "string"
   },
     "transport": "Response",
     "permission": "WriteFile",
     "params": [
-      { "name": "singlefile", "type": "boolean", "default": true, "description": "Whether to export the data into one or multiple files" },
-      { "name": "images", "type": "boolean", "default": false, "description": "Whether to export thumbnails and fanart images" },
-      { "name": "actorthumbs", "type": "boolean", "default": false, "description": "Whether to export actor thumbnails" },
-      { "name": "overwrite", "type": "boolean", "default": false, "description": "Whether to overwrite existing exported files" },
-      { "name": "path", "type": "string", "default": "", "description": "Path to the directory to where the data should be exported" }
+                       { "name": "options", "type": [
+                                       { "type": "object", "required": true, "additionalProperties": false,
+                                               "properties": {
+                                                       "path": { "type": "string", "required": true, "minLength": 1, "description": "Path to the directory to where the data should be exported" }
+                                               }
+                                       },
+                                       { "type": "object", "required": true, "additionalProperties": false,
+                                               "properties": {
+                                                       "overwrite": { "type": "boolean", "default": false, "description": "Whether to overwrite existing exported files" },
+                                                       "images": { "type": "boolean", "default": false, "description": "Whether to export thumbnails and fanart images" },
+                                                       "actorthumbs": { "type": "boolean", "default": false, "description": "Whether to export actor thumbnails" }
+                                               }
+                                       }
+                               ]
+                       }
     ],
     "returns": "string"
   },
     "transport": "Response",
     "permission": "ControlPlayback",
     "params": [
-      { "name": "value", "type": "integer", "minimum": 0, "maximum": 100, "required": true }
+      { "name": "volume", "type": "integer", "minimum": 0, "maximum": 100, "required": true }
     ],
     "returns": "integer"
   },
-  "Application.ToggleMute": {
+  "Application.SetMute": {
     "type": "method",
     "description": "Toggle mute/unmute",
     "transport": "Response",
     "permission": "ControlPlayback",
-    "params": [],
-    "returns": { "type": "integer", "description": "New volume" }
+    "params": [
+                       { "name": "mute", "required": true, "type": [
+                                       { "type": "boolean", "required": true },
+                                       { "type": "string", "enum": [ "toggle" ], "required": true }
+                               ]
+                       }
+               ],
+    "returns": { "type": "boolean", "description": "Mute state" }
   },
   "Application.Quit": {
     "type": "method",
index 734038f..e176c1d 100644 (file)
                 "resume", "artistid", "albumid", "tvshowid", "setid" ]
     }
   },
-  "List.Items.All": {
-    "type": "array",
-    "items": { 
-      "extends": [ "Video.Details.File", "Audio.Details.Media" ],
-      "properties": {
-        "id": { "$ref": "Library.Id" },
-        "type": { "type": "string", "enum": [ "unknown", "movie", "episode", "musicvideo", "song", "picture" ] },
-        "albumartist": { "type": "string" },
-        "album": { "type": "string" },
-        "track": { "type": "integer" },
-        "duration": { "type": "integer" },
-        "comment": { "type": "string" },
-        "lyrics": { "type": "string" },
-        "musicbrainztrackid": { "type": "string" },
-        "musicbrainzartistid": { "type": "string" },
-        "trailer": { "type": "string" },
-        "tagline": { "type": "string" },
-        "plotoutline": { "type": "string" },
-        "originaltitle": { "type": "string" },
-        "writer": { "type": "string" },
-        "studio": { "type": "string" },
-        "mpaa": { "type": "string" },
-        "cast": { "$ref": "Video.Cast" },
-        "country": { "type": "string" },
-        "imdbnumber": { "type": "string" },
-        "premiered": { "type": "string" },
-        "productioncode": { "type": "string" },
-        "set": { "$ref": "Array.String" },
-        "showlink": { "type": "string" },
-        "top250": { "type": "integer" },
-        "votes": { "type": "string" },
-        "firstaired": { "type": "string" },
-        "season": { "type": "integer" },
-        "episode": { "type": "integer" },
-        "showtitle": { "type": "string" },
-        "artistid": { "$ref": "Library.Id" },
-        "albumid": { "$ref": "Library.Id" },
-        "setid": { "$ref": "Array.Integer" },
-        "tvshowid": { "$ref": "Library.Id" }
-      }
-    }
+  "List.Item.All": {
+    "extends": [ "Video.Details.File", "Audio.Details.Media" ],
+               "properties": {
+                       "id": { "$ref": "Library.Id" },
+                       "type": { "type": "string", "enum": [ "unknown", "movie", "episode", "musicvideo", "song", "picture" ] },
+                       "albumartist": { "type": "string" },
+                       "album": { "type": "string" },
+                       "track": { "type": "integer" },
+                       "duration": { "type": "integer" },
+                       "comment": { "type": "string" },
+                       "lyrics": { "type": "string" },
+                       "musicbrainztrackid": { "type": "string" },
+                       "musicbrainzartistid": { "type": "string" },
+                       "trailer": { "type": "string" },
+                       "tagline": { "type": "string" },
+                       "plotoutline": { "type": "string" },
+                       "originaltitle": { "type": "string" },
+                       "writer": { "type": "string" },
+                       "studio": { "type": "string" },
+                       "mpaa": { "type": "string" },
+                       "cast": { "$ref": "Video.Cast" },
+                       "country": { "type": "string" },
+                       "imdbnumber": { "type": "string" },
+                       "premiered": { "type": "string" },
+                       "productioncode": { "type": "string" },
+                       "set": { "$ref": "Array.String" },
+                       "showlink": { "type": "string" },
+                       "top250": { "type": "integer" },
+                       "votes": { "type": "string" },
+                       "firstaired": { "type": "string" },
+                       "season": { "type": "integer" },
+                       "episode": { "type": "integer" },
+                       "showtitle": { "type": "string" },
+                       "artistid": { "$ref": "Library.Id" },
+                       "albumid": { "$ref": "Library.Id" },
+                       "setid": { "$ref": "Array.Integer" },
+                       "tvshowid": { "$ref": "Library.Id" }
+               }
+  },
+       "List.Item.File": {
+    "extends": "List.Item.All",
+    "properties": {
+                       "file": { "type": "string", "required": true },
+                       "filetype": { "type": "string", "enum": [ "file", "directory" ], "required": true }
+               }
   },
   "List.Items.Sources": {
     "type": "array",
       }
     }
   },
-  "List.Items.Files": {
-    "extends": "List.Items.All",
-    "items": { 
-      "type": "object",
-      "properties": {
-        "file": { "type": "string", "required": true },
-        "filetype": { "type": "string", "enum": [ "file", "directory" ], "required": true }
-      }
-    }
-  },
   "System.Property.Name": {
     "type": "string",
     "enum": [ "canshutdown", "cansuspend", "canhibernate", "canreboot" ]
index 9d49efb..bde2676 100644 (file)
@@ -208,7 +208,6 @@ EVENT_RESULT CGUIWindowVisualisation::OnMouseEvent(const CPoint &point, const CM
 
 void CGUIWindowVisualisation::FrameMove()
 {
-  g_application.ResetScreenSaver(); //why here?
   // check for a tag change
   const CMusicInfoTag* tag = g_infoManager.GetCurrentSongTag();
   if (tag && *tag != m_tag)
index 8dea547..d4c58e4 100644 (file)
@@ -677,7 +677,7 @@ int CAirPlayServer::CTCPClient::ProcessRequest( CStdString& responseHeader,
           {
             double tmpDouble = 0;
             m_pLibPlist->plist_get_real_val(tmpNode, &tmpDouble);
-            position = tmpDouble;
+            position = (float)tmpDouble;
           }
 
           tmpNode = m_pLibPlist->plist_dict_get_item(dict, "Content-Location");
@@ -686,7 +686,11 @@ int CAirPlayServer::CTCPClient::ProcessRequest( CStdString& responseHeader,
             char *tmpStr = NULL;
             m_pLibPlist->plist_get_string_val(tmpNode, &tmpStr);
             location=tmpStr;
+#ifdef TARGET_WINDOWS
+            m_pLibPlist->plist_free_string_val(tmpStr);
+#else
             free(tmpStr);
+#endif
           }
 
           if (dict)
@@ -717,7 +721,7 @@ int CAirPlayServer::CTCPClient::ProcessRequest( CStdString& responseHeader,
         start += strlen("Start-Position: ");
         int end = body.Find('\n', start);
         CStdString positionStr = body.Mid(start, end - start);
-        position = atof(positionStr.c_str());
+        position = (float)atof(positionStr.c_str());
       }
     }
 
index 1b52d86..5a8669d 100644 (file)
@@ -318,18 +318,20 @@ bool CAirTunesServer::Initialize(const CStdString &password)
   int numArgs = 3;
   CStdString hwStr;
   CStdString pwStr;
+  CStdString portStr;
 
   Deinitialize();
 
   hwStr.Format("--mac=%s", m_macAddress.c_str());
   pwStr.Format("--password=%s",password.c_str());
+  portStr.Format("--server_port=%d",m_port);
 
   if (!password.empty())
   {
     numArgs++;
   }
 
-  char *argv[] = { "--apname=XBMC", "--server_port=5000", (char*) hwStr.c_str(), (char *)pwStr.c_str(), NULL };
+  char *argv[] = { "--apname=XBMC", (char*) portStr.c_str(), (char*) hwStr.c_str(), (char *)pwStr.c_str(), NULL };
 
   if (m_pLibShairport->Load())
   {
index 8a4fe8f..a67c5e0 100644 (file)
@@ -36,7 +36,10 @@ public:
   virtual void        plist_get_string_val  (plist_t node,            char **val                        )=0;
   virtual void        plist_get_real_val    (plist_t node,            double *val                       )=0;
   virtual plist_t     plist_dict_get_item   (plist_t node,            const char* key                   )=0;
-  virtual void        plist_free            (plist_t plist                                              )=0;  
+  virtual void        plist_free            (plist_t plist                                              )=0;
+#ifdef TARGET_WINDOWS
+  virtual void        plist_free_string_val (char *val                                                  )=0;
+#endif
 
 };
 
@@ -50,6 +53,9 @@ class DllLibPlist : public DllDynamic, DllLibPlistInterface
   DEFINE_METHOD2(void,          plist_get_real_val,   (plist_t p1,      double *p2))
   DEFINE_METHOD2(plist_t,       plist_dict_get_item,  (plist_t p1,      const char* p2))
   DEFINE_METHOD3(void,          plist_from_bin,       (const char *p1,  uint32_t p2, plist_t *p3))
+#ifdef TARGET_WINDOWS
+  DEFINE_METHOD1(void,          plist_free_string_val, (char *p1))
+#endif
 
 
   BEGIN_METHOD_RESOLVE()
@@ -60,6 +66,9 @@ class DllLibPlist : public DllDynamic, DllLibPlistInterface
     RESOLVE_METHOD_RENAME(plist_get_real_val,     plist_get_real_val)
     RESOLVE_METHOD_RENAME(plist_get_string_val,   plist_get_string_val)
     RESOLVE_METHOD_RENAME(plist_dict_get_item,    plist_dict_get_item)
+#ifdef TARGET_WINDOWS
+    RESOLVE_METHOD_RENAME(plist_free_string_val,  plist_free_string_val)
+#endif
 
   END_METHOD_RESOLVE()
 };
index fdb0894..5592f39 100644 (file)
@@ -1,3 +1,24 @@
+/*
+ *      Copyright (C) 2005-2011 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  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 XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
 #include "TCPServer.h"
 #include <stdio.h>
 #include <stdlib.h>
index 500b4bc..c952ab9 100644 (file)
@@ -1,4 +1,25 @@
 #pragma once
+/*
+ *      Copyright (C) 2005-2011 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  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 XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
 #include <vector>
 #include <sys/socket.h>
 #include "interfaces/IAnnouncer.h"
index 46d3478..0ecd6c9 100644 (file)
@@ -256,6 +256,9 @@ static CGEventRef tapEventCallback(CGEventTapProxy proxy, CGEventType type, CGEv
   CGEventTapEnable(m_eventPort, TRUE);
 
   CFRunLoopRun();
+  CFRelease(runLoopSource);
+  CFRelease(m_eventPort);
+  m_eventPort = NULL;
 }
 
 - (id)init
index 40bda0b..8d68b3f 100644 (file)
@@ -27,7 +27,7 @@
 #include "devices/PeripheralNIC.h"
 #include "devices/PeripheralNyxboard.h"
 #include "devices/PeripheralTuner.h"
-#ifdef HAVE_LIBCEC
+#if defined(HAVE_LIBCEC)
 #include "devices/PeripheralCecAdapter.h"
 #endif
 #include "bus/PeripheralBusUSB.h"
@@ -204,80 +204,74 @@ bool CPeripherals::HasPeripheralWithFeature(const PeripheralFeature feature, Per
 
 CPeripheral *CPeripherals::CreatePeripheral(CPeripheralBus &bus, const PeripheralType type, const CStdString &strLocation, int iVendorId /* = 0 */, int iProductId /* = 0 */)
 {
-  CPeripheral *peripheral = GetPeripheralAtLocation(strLocation, bus.Type());
-
-  /* only create a new device instances if there's no device at the given location */
-  if (!peripheral)
+  CPeripheral *peripheral = NULL;
+  /* check whether there's something mapped in peripherals.xml */
+  PeripheralType mappedType = type;
+  CStdString strDeviceName;
+  int iMappingPtr = GetMappingForDevice(bus, type, iVendorId, iProductId);
+  bool bHasMapping(iMappingPtr >= 0);
+  if (bHasMapping)
   {
-    /* check whether there's something mapped in peripherals.xml */
-    PeripheralType mappedType = type;
-    CStdString strDeviceName;
-    int iMappingPtr = GetMappingForDevice(bus, type, iVendorId, iProductId);
-    bool bHasMapping(iMappingPtr >= 0);
-    if (bHasMapping)
-    {
-      mappedType    = m_mappings[iMappingPtr].m_mappedTo;
-      strDeviceName = m_mappings[iMappingPtr].m_strDeviceName;
-    }
-    else
-    {
-      /* don't create instances for devices that aren't mapped in peripherals.xml */
-      return NULL;
-    }
-
-    switch(mappedType)
-    {
-    case PERIPHERAL_HID:
-      peripheral = new CPeripheralHID(type, bus.Type(), strLocation, strDeviceName, iVendorId, iProductId);
-      break;
-
-    case PERIPHERAL_NIC:
-      peripheral = new CPeripheralNIC(type, bus.Type(), strLocation, strDeviceName, iVendorId, iProductId);
-      break;
-
-    case PERIPHERAL_DISK:
-      peripheral = new CPeripheralDisk(type, bus.Type(), strLocation, strDeviceName, iVendorId, iProductId);
-      break;
-
-    case PERIPHERAL_NYXBOARD:
-      peripheral = new CPeripheralNyxboard(type, bus.Type(), strLocation, strDeviceName, iVendorId, iProductId);
-      break;
-
-    case PERIPHERAL_TUNER:
-      peripheral = new CPeripheralTuner(type, bus.Type(), strLocation, strDeviceName, iVendorId, iProductId);
-      break;
-
-    case PERIPHERAL_BLUETOOTH:
-      peripheral = new CPeripheralBluetooth(type, bus.Type(), strLocation, strDeviceName, iVendorId, iProductId);
-      break;
+    mappedType    = m_mappings[iMappingPtr].m_mappedTo;
+    strDeviceName = m_mappings[iMappingPtr].m_strDeviceName;
+  }
+  else
+  {
+    /* don't create instances for devices that aren't mapped in peripherals.xml */
+    return NULL;
+  }
 
-#ifdef HAVE_LIBCEC
-    case PERIPHERAL_CEC:
-      peripheral = new CPeripheralCecAdapter(type, bus.Type(), strLocation, strDeviceName, iVendorId, iProductId);
-      break;
+  switch(mappedType)
+  {
+  case PERIPHERAL_HID:
+    peripheral = new CPeripheralHID(type, bus.Type(), strLocation, strDeviceName, iVendorId, iProductId);
+    break;
+
+  case PERIPHERAL_NIC:
+    peripheral = new CPeripheralNIC(type, bus.Type(), strLocation, strDeviceName, iVendorId, iProductId);
+    break;
+
+  case PERIPHERAL_DISK:
+    peripheral = new CPeripheralDisk(type, bus.Type(), strLocation, strDeviceName, iVendorId, iProductId);
+    break;
+
+  case PERIPHERAL_NYXBOARD:
+    peripheral = new CPeripheralNyxboard(type, bus.Type(), strLocation, strDeviceName, iVendorId, iProductId);
+    break;
+
+  case PERIPHERAL_TUNER:
+    peripheral = new CPeripheralTuner(type, bus.Type(), strLocation, strDeviceName, iVendorId, iProductId);
+    break;
+
+  case PERIPHERAL_BLUETOOTH:
+    peripheral = new CPeripheralBluetooth(type, bus.Type(), strLocation, strDeviceName, iVendorId, iProductId);
+    break;
+
+#if defined(HAVE_LIBCEC)
+  case PERIPHERAL_CEC:
+    peripheral = new CPeripheralCecAdapter(type, bus.Type(), strLocation, strDeviceName, iVendorId, iProductId);
+    break;
 #endif
 
-    default:
-      peripheral = new CPeripheral(type, bus.Type(), strLocation, strDeviceName, iVendorId, iProductId);
-      break;
-    }
+  default:
+    break;
+  }
 
-    if (peripheral)
+  if (peripheral)
+  {
+    /* try to initialise the new peripheral
+     * Initialise() will make sure that each device is only initialised once */
+    if (peripheral->Initialise())
     {
-      /* try to initialise the new peripheral
-       * Initialise() will make sure that each device is only initialised once */
-      if (peripheral->Initialise())
-      {
-        if (!bHasMapping)
-          peripheral->SetHidden(true);
-        bus.Register(peripheral);
-      }
-      else
-      {
-        CLog::Log(LOGDEBUG, "%s - failed to initialise peripheral on '%s'", __FUNCTION__, strLocation.c_str());
-        delete peripheral;
-        peripheral = NULL;
-      }
+      if (!bHasMapping)
+        peripheral->SetHidden(true);
+      bus.Register(peripheral);
+    }
+    else
+    {
+      CLog::Log(LOGDEBUG, "%s - failed to initialise peripheral on '%s'", __FUNCTION__, strLocation.c_str());
+      delete peripheral;
+      peripheral = NULL;
     }
   }
 
index baba6f2..2595a9c 100644 (file)
@@ -1,11 +1,11 @@
 SRCS=PeripheralBus.cpp
 
-ifeq (@USE_LIBUSB@,1)
 ifeq (@USE_LIBUDEV@,1)
 SRCS+=linux/PeripheralBusUSBLibUdev.cpp
-else
-SRCS+=linux/PeripheralBusUSBLibUSB.cpp
 endif
+
+ifeq (@USE_LIBUSB@,1)
+SRCS+=linux/PeripheralBusUSBLibUSB.cpp
 endif
 
 ifeq ($(findstring osx,@ARCH@),osx)
index 4b680e5..9adff51 100644 (file)
@@ -159,7 +159,7 @@ void CPeripheralBus::RegisterNewDevices(const PeripheralScanResults &results)
   for (unsigned int iResultPtr = 0; iResultPtr < results.m_results.size(); iResultPtr++)
   {
     PeripheralScanResult result = results.m_results.at(iResultPtr);
-    if (!HasPeripheral(result.m_strLocation) && result.m_type != PERIPHERAL_UNKNOWN)
+    if (!HasPeripheral(result.m_strLocation))
       g_peripherals.CreatePeripheral(*this, result.m_type, result.m_strLocation, result.m_iVendorId, result.m_iProductId);
   }
 }
index b0e87c8..876b561 100644 (file)
@@ -21,7 +21,9 @@
 
 #include "PeripheralBusUSBLibUdev.h"
 #include "peripherals/Peripherals.h"
+extern "C" {
 #include <libudev.h>
+}
 #include <usb.h>
 #include <poll.h>
 #include "utils/log.h"
index ea9d0ed..3bcd954 100644 (file)
@@ -30,6 +30,7 @@ using namespace PERIPHERALS;
 #include <IOKit/usb/IOUSBLib.h>
 #include <IOKit/hid/IOHIDLib.h>
 #include <IOKit/hid/IOHIDKeys.h>
+#include <IOKit/serial/IOSerialKeys.h>
 
 typedef struct USBDevicePrivateData {
   CPeripheralBusUSB     *refCon;
@@ -132,7 +133,7 @@ void CPeripheralBusUSB::DeviceDetachCallback(void *refCon, io_service_t service,
     }
     privateDataRef->refCon->ScanForDevices();
     
-    CLog::Log(LOGDEBUG, "HID Device Detach:%s, %s\n",
+    CLog::Log(LOGDEBUG, "USB Device Detach:%s, %s\n",
       privateDataRef->deviceName.c_str(), privateDataRef->result.m_strLocation.c_str());
     result = IOObjectRelease(privateDataRef->notification);
     delete privateDataRef;
@@ -185,11 +186,10 @@ void CPeripheralBusUSB::DeviceAttachCallback(CPeripheralBusUSB* refCon, io_itera
     result = (*deviceInterface)->GetLocationID(   deviceInterface, &locationId);
     result = (*deviceInterface)->GetDeviceClass(  deviceInterface, &bDeviceClass);
 
-    // we only care about usb devices with an HID interface class
     io_service_t usbInterface;
     io_iterator_t interface_iterator;
     IOUSBFindInterfaceRequest  request;
-    request.bInterfaceClass    = kUSBHIDInterfaceClass;
+    request.bInterfaceClass    = kIOUSBFindInterfaceDontCare;
     request.bInterfaceSubClass = kIOUSBFindInterfaceDontCare;
     request.bInterfaceProtocol = kIOUSBFindInterfaceDontCare;
     request.bAlternateSetting  = kIOUSBFindInterfaceDontCare;
@@ -216,13 +216,15 @@ void CPeripheralBusUSB::DeviceAttachCallback(CPeripheralBusUSB* refCon, io_itera
         continue;
       }
 
-      // finally we can get to bInterfaceClass/bInterfaceProtocol
+      // finally we can get to the bInterfaceClass
       // we should also check for kHIDKeyboardInterfaceProtocol but
       // some IR remotes that emulate an HID keyboard do not report this.
       UInt8 bInterfaceClass;
       result = (*interfaceInterface)->GetInterfaceClass(interfaceInterface, &bInterfaceClass);
-      if (bInterfaceClass == kUSBHIDInterfaceClass)
+      if (bInterfaceClass == kUSBHIDInterfaceClass || bInterfaceClass == kUSBCommunicationDataInterfaceClass)
       {
+        char ttlDeviceFilePath[MAXPATHLEN] = {0};
+        CFStringRef deviceFilePathAsCFString;
         USBDevicePrivateData *privateDataRef;
         privateDataRef = new USBDevicePrivateData;
         // save the device info to our private data.
@@ -230,7 +232,33 @@ void CPeripheralBusUSB::DeviceAttachCallback(CPeripheralBusUSB* refCon, io_itera
         privateDataRef->deviceName = deviceName;
         privateDataRef->result.m_iVendorId  = vendorId;
         privateDataRef->result.m_iProductId = productId;
-        privateDataRef->result.m_strLocation.Format("%d", locationId);
+
+        if (bInterfaceClass == kUSBCommunicationDataInterfaceClass)
+        {
+          // fetch the bds device path if this is USB serial device.
+          // to do this we have to switch from the kIOUSBPlane to
+          // kIOServicePlane, then we can search down for the path.
+          io_registry_entry_t parent;
+          kern_return_t kresult;
+          kresult = IORegistryEntryGetParentEntry(usbInterface, kIOServicePlane, &parent);
+          if (kresult == KERN_SUCCESS)
+          {
+            deviceFilePathAsCFString = (CFStringRef)IORegistryEntrySearchCFProperty(parent,
+              kIOServicePlane, CFSTR(kIOCalloutDeviceKey), kCFAllocatorDefault, kIORegistryIterateRecursively);
+            if (deviceFilePathAsCFString)
+            {
+              // Convert the path from a CFString to a NULL-terminated C string
+              CFStringGetCString((CFStringRef)deviceFilePathAsCFString,
+                ttlDeviceFilePath, MAXPATHLEN - 1, kCFStringEncodingASCII);
+              CFRelease(deviceFilePathAsCFString);
+            }
+            IOObjectRelease(parent);
+          }
+        }
+        if (strlen(ttlDeviceFilePath))
+          privateDataRef->result.m_strLocation.Format("%s", ttlDeviceFilePath);
+        else
+          privateDataRef->result.m_strLocation.Format("%d", locationId);
 
         if (bDeviceClass == kUSBCompositeClass)
           privateDataRef->result.m_type = refCon->GetType(bInterfaceClass);
@@ -250,7 +278,7 @@ void CPeripheralBusUSB::DeviceAttachCallback(CPeripheralBusUSB* refCon, io_itera
           if (result == kIOReturnSuccess)
           {
             refCon->m_scan_results.m_results.push_back(privateDataRef->result);
-            CLog::Log(LOGDEBUG, "HID Device Attach:%s, %s\n",
+            CLog::Log(LOGDEBUG, "USB Device Attach:%s, %s\n",
               deviceName, privateDataRef->result.m_strLocation.c_str());
           }
           else
index 183318a..b84ad7a 100644 (file)
@@ -129,7 +129,8 @@ bool CPeripheralBusUSB::PerformDeviceScan(const GUID *guid, const PeripheralType
       result.m_iVendorId    = PeripheralTypeTranslator::HexStringToInt(strVendorId.c_str());
       result.m_iProductId   = PeripheralTypeTranslator::HexStringToInt(strProductId.c_str());
 
-      results.m_results.push_back(result);
+      if (!results.ContainsResult(result))
+        results.m_results.push_back(result);
     }
   }
 
index e871c84..13f28cb 100644 (file)
@@ -12,5 +12,5 @@ endif
 
 LIB = peripheral-devices.a
 
-include ../../../Makefile.include
+include @abs_top_srcdir@/Makefile.include
 -include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))
index 291f679..559a561 100644 (file)
@@ -32,7 +32,7 @@ namespace PERIPHERALS
 
   class CPeripheral
   {
-    friend class CGUIDialogPeripheralSettings;;
+    friend class CGUIDialogPeripheralSettings;
 
   public:
     CPeripheral(const PeripheralType type, const PeripheralBusType busType, const CStdString &strLocation, const CStdString &strDeviceName, int iVendorId, int iProductId);
index bdc97a8..ce82318 100644 (file)
@@ -20,7 +20,7 @@
  */
 #include "system.h"
 
-#ifdef HAVE_LIBCEC
+#if defined(HAVE_LIBCEC)
 #include "PeripheralCecAdapter.h"
 #include "input/XBIRRemote.h"
 #include "Application.h"
@@ -37,27 +37,27 @@ using namespace PERIPHERALS;
 using namespace ANNOUNCEMENT;
 using namespace CEC;
 
-#define CEC_LIB_SUPPORTED_VERSION 2
+#define CEC_LIB_SUPPORTED_VERSION 6
 
 CPeripheralCecAdapter::CPeripheralCecAdapter(const PeripheralType type, const PeripheralBusType busType, const CStdString &strLocation, const CStdString &strDeviceName, int iVendorId, int iProductId) :
   CPeripheralHID(type, busType, strLocation, strDeviceName, iVendorId, iProductId),
-  CThread("CEC parser"),
+  CThread("CEC Adapter"),
   m_bStarted(false),
   m_bHasButton(false),
   m_bIsReady(false)
 {
-  m_cecParser = LoadLibCec("XBMC", CECDEVICE_PLAYBACKDEVICE1);
-  if (!m_cecParser || m_cecParser->GetMinVersion() > CEC_LIB_SUPPORTED_VERSION)
+  m_cecAdapter = LoadLibCec("XBMC", CECDEVICE_PLAYBACKDEVICE1);
+  if (!m_cecAdapter || m_cecAdapter->GetMinVersion() > CEC_LIB_SUPPORTED_VERSION)
   {
     /* unsupported libcec version */
-    CLog::Log(LOGERROR, g_localizeStrings.Get(36013).c_str(), CEC_LIB_SUPPORTED_VERSION, m_cecParser ? m_cecParser->GetMinVersion() : -1);
+    CLog::Log(LOGERROR, g_localizeStrings.Get(36013).c_str(), CEC_LIB_SUPPORTED_VERSION, m_cecAdapter ? m_cecAdapter->GetMinVersion() : -1);
 
     CStdString strMessage;
-    strMessage.Format(g_localizeStrings.Get(36013).c_str(), CEC_LIB_SUPPORTED_VERSION, m_cecParser ? m_cecParser->GetMinVersion() : -1);
+    strMessage.Format(g_localizeStrings.Get(36013).c_str(), CEC_LIB_SUPPORTED_VERSION, m_cecAdapter ? m_cecAdapter->GetMinVersion() : -1);
     CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Error, g_localizeStrings.Get(36000), strMessage);
     m_bError = true;
-    UnloadLibCec(m_cecParser);
-    m_cecParser = NULL;
+    UnloadLibCec(m_cecAdapter);
+    m_cecAdapter = NULL;
   }
   else
   {
@@ -68,53 +68,61 @@ CPeripheralCecAdapter::CPeripheralCecAdapter(const PeripheralType type, const Pe
 CPeripheralCecAdapter::~CPeripheralCecAdapter(void)
 {
   CAnnouncementManager::RemoveAnnouncer(this);
-  if (m_cecParser)
+
+  m_bStop = true;
+  StopThread(true);
+
+  if (m_cecAdapter)
   {
     FlushLog();
-    m_cecParser->Close(1000);
-    UnloadLibCec(m_cecParser);
+    UnloadLibCec(m_cecAdapter);
+    m_cecAdapter = NULL;
   }
-  StopThread(true);
 }
 
 void CPeripheralCecAdapter::Announce(EAnnouncementFlag flag, const char *sender, const char *message, const CVariant &data)
 {
-  if (flag == System && !strcmp(sender, "xbmc") && !strcmp(message, "ApplicationStop") && m_bIsReady)
+  if (flag == System && !strcmp(sender, "xbmc") && !strcmp(message, "OnQuit") && m_bIsReady)
   {
     if (GetSettingBool("cec_power_off_shutdown"))
-      m_cecParser->PowerOffDevices();
+      m_cecAdapter->StandbyDevices();
     else if (GetSettingBool("cec_mark_inactive_shutdown"))
-      m_cecParser->SetInactiveView();
+      m_cecAdapter->SetInactiveView();
   }
   else if (flag == GUI && !strcmp(sender, "xbmc") && !strcmp(message, "OnScreensaverDeactivated") && GetSettingBool("cec_standby_screensaver") && m_bIsReady)
   {
-    m_cecParser->PowerOnDevices();
+    m_cecAdapter->PowerOnDevices();
   }
   else if (flag == GUI && !strcmp(sender, "xbmc") && !strcmp(message, "OnScreensaverActivated") && GetSettingBool("cec_standby_screensaver"))
   {
-    m_cecParser->StandbyDevices();
+    m_cecAdapter->StandbyDevices();
   }
   else if (flag == System && !strcmp(sender, "xbmc") && !strcmp(message, "OnSleep"))
   {
     if (GetSettingBool("cec_power_off_shutdown") && m_bIsReady)
-      m_cecParser->PowerOffDevices();
+      m_cecAdapter->StandbyDevices();
+    CSingleLock lock(m_critSection);
+    m_bStop = true;
+    WaitForThreadExit(0);
   }
   else if (flag == System && !strcmp(sender, "xbmc") && !strcmp(message, "OnWake"))
   {
+    CSingleLock lock(m_critSection);
     CLog::Log(LOGDEBUG, "%s - reconnecting to the CEC adapter after standby mode", __FUNCTION__);
-    m_cecParser->Close();
+    m_cecAdapter->Close();
 
     CStdString strPort = GetSettingString("port");
-    if (!m_cecParser->Open(strPort.c_str(), 10000))
+    if (!m_cecAdapter->Open(strPort.c_str(), 10000))
     {
       CLog::Log(LOGERROR, "%s - failed to reconnect to the CEC adapter", __FUNCTION__);
+      FlushLog();
       m_bStop = true;
     }
     else
     {
       if (GetSettingBool("cec_power_on_startup"))
         PowerOnCecDevices();
-      m_cecParser->SetActiveView();
+      m_cecAdapter->SetActiveView();
     }
   }
 }
@@ -138,17 +146,14 @@ void CPeripheralCecAdapter::Process(void)
     m_bStarted = false;
     return;
   }
-
-  // the device needs a second to settle after it's plugged in
-  Sleep(CEC_SETTLE_DOWN_TIME);
-
+  
   CStdString strPort = GetSettingString("port");
   if (strPort.IsEmpty())
   {
-    std::vector<cec_device> deviceList;
     strPort = m_strFileLocation;
+    cec_adapter deviceList[10];
     TranslateComPort(strPort);
-    int iFound = m_cecParser->FindDevices(deviceList, strPort);
+    uint8_t iFound = m_cecAdapter->FindAdapters(deviceList, 10, strPort.c_str());
 
     if (iFound <= 0)
     {
@@ -159,14 +164,14 @@ void CPeripheralCecAdapter::Process(void)
     }
     else
     {
-      cec_device dev = deviceList[0];
+      cec_adapter *dev = &deviceList[0];
       if (iFound > 1)
         CLog::Log(LOGDEBUG, "%s - multiple com ports found for device. taking the first one", __FUNCTION__);
       else
-        CLog::Log(LOGDEBUG, "%s - autodetect com port '%s'", __FUNCTION__, dev.comm.c_str());
-      if (!strPort.Equals(dev.comm.c_str()))
+        CLog::Log(LOGDEBUG, "%s - autodetect com port '%s'", __FUNCTION__, dev->comm);
+      if (!strPort.Equals(dev->comm))
       {
-        strPort = dev.comm.c_str();
+        strPort = dev->comm;
         SetSetting("port", strPort);
       }
     }
@@ -175,7 +180,7 @@ void CPeripheralCecAdapter::Process(void)
   // open the CEC adapter
   CLog::Log(LOGDEBUG, "%s - opening a connection to the CEC adapter: %s", __FUNCTION__, strPort.c_str());
 
-  if (!m_cecParser->Open(strPort.c_str(), 10000))
+  if (!m_cecAdapter->Open(strPort.c_str(), 10000))
   {
     FlushLog();
     CLog::Log(LOGERROR, "%s - could not opening a connection to the CEC adapter", __FUNCTION__);
@@ -190,43 +195,32 @@ void CPeripheralCecAdapter::Process(void)
 
   if (GetSettingBool("cec_power_on_startup"))
     PowerOnCecDevices();
-  m_cecParser->SetActiveView();
+  m_cecAdapter->SetActiveView();
   FlushLog();
 
   while (!m_bStop)
   {
     FlushLog();
-    ProcessNextCommand();
-    Sleep(50);
+    if (!m_bStop)
+      ProcessNextCommand();
+    if (!m_bStop)
+      Sleep(50);
   }
 
-  m_cecParser->Close(500);
+  m_cecAdapter->Close();
 
   CLog::Log(LOGDEBUG, "%s - CEC adapter processor thread ended", __FUNCTION__);
   m_bStarted = false;
 }
 
-bool CPeripheralCecAdapter::PowerOffCecDevices(void)
-{
-  bool bReturn(false);
-
-  if (m_cecParser && m_bIsReady)
-  {
-    CLog::Log(LOGDEBUG, "%s - powering off CEC capable devices", __FUNCTION__);
-    bReturn = m_cecParser->PowerOffDevices();
-  }
-
-  return bReturn;
-}
-
 bool CPeripheralCecAdapter::PowerOnCecDevices(void)
 {
   bool bReturn(false);
 
-  if (m_cecParser && m_bIsReady)
+  if (m_cecAdapter && m_bIsReady)
   {
     CLog::Log(LOGDEBUG, "%s - powering on CEC capable devices", __FUNCTION__);
-    bReturn = m_cecParser->PowerOnDevices();
+    bReturn = m_cecAdapter->PowerOnDevices();
   }
 
   return bReturn;
@@ -236,10 +230,10 @@ bool CPeripheralCecAdapter::StandbyCecDevices(void)
 {
   bool bReturn(false);
 
-  if (m_cecParser && m_bIsReady)
+  if (m_cecAdapter && m_bIsReady)
   {
     CLog::Log(LOGDEBUG, "%s - putting CEC capable devices in standby mode", __FUNCTION__);
-    bReturn = m_cecParser->StandbyDevices();
+    bReturn = m_cecAdapter->StandbyDevices();
   }
 
   return bReturn;
@@ -248,10 +242,10 @@ bool CPeripheralCecAdapter::StandbyCecDevices(void)
 bool CPeripheralCecAdapter::SendPing(void)
 {
   bool bReturn(false);
-  if (m_cecParser && m_bIsReady)
+  if (m_cecAdapter && m_bIsReady)
   {
     CLog::Log(LOGDEBUG, "%s - sending ping to the CEC adapter", __FUNCTION__);
-    bReturn = m_cecParser->Ping();
+    bReturn = m_cecAdapter->PingAdapter();
   }
 
   return bReturn;
@@ -260,10 +254,10 @@ bool CPeripheralCecAdapter::SendPing(void)
 bool CPeripheralCecAdapter::StartBootloader(void)
 {
   bool bReturn(false);
-  if (m_cecParser && m_bIsReady)
+  if (m_cecAdapter && m_bIsReady)
   {
     CLog::Log(LOGDEBUG, "%s - starting the bootloader", __FUNCTION__);
-    bReturn = m_cecParser->StartBootloader();
+    bReturn = m_cecAdapter->StartBootloader();
   }
 
   return bReturn;
@@ -272,16 +266,16 @@ bool CPeripheralCecAdapter::StartBootloader(void)
 void CPeripheralCecAdapter::ProcessNextCommand(void)
 {
   cec_command command;
-  if (m_cecParser && m_bIsReady && m_cecParser->GetNextCommand(&command))
+  if (m_cecAdapter && m_bIsReady && m_cecAdapter->GetNextCommand(&command))
   {
-    CLog::Log(LOGDEBUG, "%s - processing command: initiator=%d destination=%d opcode=%d", __FUNCTION__, command.source, command.destination, command.opcode);
+    CLog::Log(LOGDEBUG, "%s - processing command: initiator=%d destination=%d opcode=%d", __FUNCTION__, command.initiator, command.destination, command.opcode);
 
     switch (command.opcode)
     {
     case CEC_OPCODE_STANDBY:
       /* a device was put in standby mode */
-      CLog::Log(LOGDEBUG, "%s - device %d was put in standby mode", __FUNCTION__, command.source);
-      if (command.source == CECDEVICE_TV && GetSettingBool("standby_pc_on_tv_standby"))
+      CLog::Log(LOGDEBUG, "%s - device %d was put in standby mode", __FUNCTION__, command.initiator);
+      if (command.initiator == CECDEVICE_TV && GetSettingBool("standby_pc_on_tv_standby"))
       {
         m_bStarted = false;
         g_application.getApplicationMessenger().Suspend();
@@ -300,7 +294,7 @@ bool CPeripheralCecAdapter::GetNextKey(void)
     return false;
 
   cec_keypress key;
-  if (!m_bIsReady || !(m_bHasButton = m_cecParser->GetNextKeypress(&key)))
+  if (!m_bIsReady || !(m_bHasButton = m_cecAdapter->GetNextKeypress(&key)))
     return false;
 
   CLog::Log(LOGDEBUG, "%s - received key %d", __FUNCTION__, key.keycode);
@@ -369,7 +363,7 @@ bool CPeripheralCecAdapter::GetNextKey(void)
     m_button.iButton = XINPUT_IR_REMOTE_STOP;
     break;
   case CEC_USER_CONTROL_CODE_PAUSE:
-    m_button.iButton = XINPUT_IR_REMOTE_STOP;
+    m_button.iButton = XINPUT_IR_REMOTE_PAUSE;
     break;
   case CEC_USER_CONTROL_CODE_REWIND:
     m_button.iButton = XINPUT_IR_REMOTE_REVERSE;
@@ -519,9 +513,9 @@ void CPeripheralCecAdapter::OnSettingChanged(const CStdString &strChangedSetting
   if (strChangedSetting.Equals("enabled"))
   {
     bool bEnabled(GetSettingBool("enabled"));
-    if (!bEnabled && m_cecParser && m_bStarted)
+    if (!bEnabled && m_cecAdapter && m_bStarted)
       StopThread(true);
-    else if (bEnabled && !m_cecParser && m_bStarted)
+    else if (bEnabled && !m_cecAdapter && m_bStarted)
       InitialiseFeature(FEATURE_CEC);
   }
 }
@@ -529,7 +523,7 @@ void CPeripheralCecAdapter::OnSettingChanged(const CStdString &strChangedSetting
 void CPeripheralCecAdapter::FlushLog(void)
 {
   cec_log_message message;
-  while (m_cecParser && m_cecParser->GetNextLogMessage(&message))
+  while (m_cecAdapter && m_cecAdapter->GetNextLogMessage(&message))
   {
     int iLevel = -1;
     switch (message.level)
@@ -550,7 +544,7 @@ void CPeripheralCecAdapter::FlushLog(void)
     }
 
     if (iLevel >= 0)
-      CLog::Log(iLevel, "%s - %s", __FUNCTION__, message.message.c_str());
+      CLog::Log(iLevel, "%s - %s", __FUNCTION__, message.message);
   }
 }
 
index ee566c0..9c5fb6d 100644 (file)
@@ -28,7 +28,7 @@
 
 namespace CEC
 {
-  class ICECDevice;
+  class ICECAdapter;
 };
 
 namespace PERIPHERALS
@@ -48,7 +48,6 @@ namespace PERIPHERALS
     virtual ~CPeripheralCecAdapter(void);
 
     virtual void Announce(ANNOUNCEMENT::EAnnouncementFlag flag, const char *sender, const char *message, const CVariant &data);
-    virtual bool PowerOffCecDevices(void);
     virtual bool PowerOnCecDevices(void);
     virtual bool StandbyCecDevices(void);
 
@@ -70,11 +69,11 @@ namespace PERIPHERALS
     static bool FindConfigLocation(CStdString &strString);
     static bool TranslateComPort(CStdString &strPort);
 
-    CEC::ICECDevice *m_cecParser;
-    bool             m_bStarted;
-    bool             m_bHasButton;
-    bool             m_bIsReady;
-    CecButtonPress   m_button;
-    CCriticalSection m_critSection;
+    CEC::ICECAdapter* m_cecAdapter;
+    bool              m_bStarted;
+    bool              m_bHasButton;
+    bool              m_bIsReady;
+    CecButtonPress    m_button;
+    CCriticalSection  m_critSection;
   };
 }
index 7b02cc4..9e4e156 100644 (file)
@@ -144,8 +144,8 @@ void CAdvancedSettings::Initialize()
   m_videoCleanStringRegExps.push_back("(\\[.*\\])");
 
   m_moviesExcludeFromScanRegExps.push_back("-trailer");
-  m_moviesExcludeFromScanRegExps.push_back("[-._ \\\\/]sample[-._ \\\\/]");
-  m_tvshowExcludeFromScanRegExps.push_back("[-._ \\\\/]sample[-._ \\\\/]");
+  m_moviesExcludeFromScanRegExps.push_back("[!-._ \\\\/]sample[-._ \\\\/]");
+  m_tvshowExcludeFromScanRegExps.push_back("[!-._ \\\\/]sample[-._ \\\\/]");
 
   m_folderStackRegExps.push_back("((cd|dvd|dis[ck])[0-9]+)$");
 
@@ -291,6 +291,8 @@ void CAdvancedSettings::Initialize()
   m_guiAlgorithmDirtyRegions = 0;
   m_guiDirtyRegionNoFlipTimeout = -1;
   m_logEnableAirtunes = false;
+  m_airTunesPort = 36666;
+  m_airPlayPort = 36667;
 }
 
 bool CAdvancedSettings::Load()
@@ -654,11 +656,15 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file)
     g_advancedSettings.m_logLevel = std::max(g_advancedSettings.m_logLevel, g_advancedSettings.m_logLevelHint);
     CLog::SetLogLevel(g_advancedSettings.m_logLevel);
   }
-  
-  XMLUtils::GetBoolean(pRootElement, "enableairtunesdebuglog", m_logEnableAirtunes);
-    
+     
   XMLUtils::GetString(pRootElement, "cddbaddress", m_cddbAddress);
 
+  //airtunes + airplay
+  XMLUtils::GetBoolean(pRootElement, "enableairtunesdebuglog", m_logEnableAirtunes);
+  XMLUtils::GetInt(pRootElement,     "airtunesport", m_airTunesPort);
+  XMLUtils::GetInt(pRootElement,     "airplayport", m_airPlayPort);  
+  
+
   XMLUtils::GetBoolean(pRootElement, "handlemounting", m_handleMounting);
 
   XMLUtils::GetBoolean(pRootElement, "nodvdrom", m_noDVDROM);
index 643e598..0c7b201 100644 (file)
@@ -154,8 +154,12 @@ class CAdvancedSettings
     int m_busyDialogDelay;
     int m_logLevel;
     int m_logLevelHint;
-    bool m_logEnableAirtunes;//airtunes spams alot - so make it an option
     CStdString m_cddbAddress;
+    
+    //airtunes + airplay
+    bool m_logEnableAirtunes;
+    int m_airTunesPort;
+    int m_airPlayPort;    
 
     bool m_handleMounting;
 
index 1b8a79d..0249ddd 100644 (file)
@@ -240,7 +240,7 @@ void CGUISettings::Initialize()
   AddBool(pic, "pictures.usetags", 14082, true);
   AddBool(pic,"pictures.generatethumbs",13360,true);
   AddBool(pic, "pictures.useexifrotation", 20184, true);
-  AddBool(pic, "pictures.showvideos", 22022, false);
+  AddBool(pic, "pictures.showvideos", 22022, true);
   // FIXME: hide this setting until it is properly respected. In the meanwhile, default to AUTO.
   AddInt(NULL, "pictures.displayresolution", 169, (int)RES_AUTORES, (int)RES_AUTORES, 1, (int)RES_AUTORES, SPIN_CONTROL_TEXT);
 
@@ -484,7 +484,7 @@ void CGUISettings::Initialize()
   AddSeparator(in, "input.sep1");
 #endif
   AddBool(in, "input.remoteaskeyboard", 21449, false);
-#if (defined(__APPLE__) && defined(__arm_))
+#if defined(TARGET_DARWIN_IOS)
   AddBool(NULL, "input.enablemouse", 21369, true);
 #else
   AddBool(in, "input.enablemouse", 21369, true);
@@ -705,7 +705,7 @@ void CGUISettings::Initialize()
 
   AddDefaultAddon(NULL, "scrapers.moviesdefault", 21413, "metadata.themoviedb.org", ADDON_SCRAPER_MOVIES);
   AddDefaultAddon(NULL, "scrapers.tvshowsdefault", 21414, "metadata.tvdb.com", ADDON_SCRAPER_TVSHOWS);
-  AddDefaultAddon(NULL, "scrapers.musicvideosdefault", 21415, "metadata.mtv.com", ADDON_SCRAPER_MUSICVIDEOS);
+  AddDefaultAddon(NULL, "scrapers.musicvideosdefault", 21415, "metadata.yahoomusic.com", ADDON_SCRAPER_MUSICVIDEOS);
   AddBool(NULL, "scrapers.langfallback", 21416, false);
 
   // network settings
index e977e0c..fc68c39 100644 (file)
@@ -1290,16 +1290,37 @@ void CGUIWindowSettingsCategory::OnSettingChanged(CBaseSettingControl *pSettingC
   {
 #ifdef HAS_ZEROCONF
     //ifdef zeroconf here because it's only found in guisettings if defined
-    CZeroconf::GetInstance()->Stop();
     if(g_guiSettings.GetBool("services.zeroconf"))
+    {
+      CZeroconf::GetInstance()->Stop();
       CZeroconf::GetInstance()->Start();
+    }
+#ifdef HAS_AIRPLAY
+    else
+    {
+      g_application.StopAirplayServer(true);
+      g_guiSettings.SetBool("services.airplay", false);
+      CZeroconf::GetInstance()->Stop();
+    }
+#endif
 #endif
   }
   else if (strSetting.Equals("services.airplay"))
   {  
 #ifdef HAS_AIRPLAY  
     if (g_guiSettings.GetBool("services.airplay"))
+    {
+#ifdef HAS_ZEROCONF
+      // AirPlay needs zeroconf
+      if(!g_guiSettings.GetBool("services.zeroconf"))
+      {
+        g_guiSettings.SetBool("services.zeroconf", true);
+        CZeroconf::GetInstance()->Stop();
+        CZeroconf::GetInstance()->Start();
+      }
+#endif //HAS_ZEROCONF
       g_application.StartAirplayServer();//will stop the server before internal
+    }
     else
       g_application.StopAirplayServer(true);//will stop the server before internal    
 #endif//HAS_AIRPLAY      
index 64472f3..c3c9844 100644 (file)
@@ -103,7 +103,7 @@ void CSettings::Initialize()
   m_bNonLinStretch = false;
 
   m_pictureExtensions = ".png|.jpg|.jpeg|.bmp|.gif|.ico|.tif|.tiff|.tga|.pcx|.cbz|.zip|.cbr|.rar|.m3u|.dng|.nef|.cr2|.crw|.orf|.arw|.erf|.3fr|.dcr|.x3f|.mef|.raf|.mrw|.pef|.sr2|.rss";
-  m_musicExtensions = ".nsv|.m4a|.flac|.aac|.strm|.pls|.rm|.rma|.mpa|.wav|.wma|.ogg|.mp3|.mp2|.m3u|.mod|.amf|.669|.dmf|.dsm|.far|.gdm|.imf|.it|.m15|.med|.okt|.s3m|.stm|.sfx|.ult|.uni|.xm|.sid|.ac3|.dts|.cue|.aif|.aiff|.wpl|.ape|.mac|.mpc|.mp+|.mpp|.shn|.zip|.rar|.wv|.nsf|.spc|.gym|.adx|.dsp|.adp|.ymf|.ast|.afc|.hps|.xsp|.xwav|.waa|.wvs|.wam|.gcm|.idsp|.mpdsp|.mss|.spt|.rsd|.mid|.kar|.sap|.cmc|.cmr|.dmc|.mpt|.mpd|.rmt|.tmc|.tm8|.tm2|.oga|.url|.pxml|.tta|.rss|.cm3|.cms|.dlt|.brstm|.wtv";
+  m_musicExtensions = ".nsv|.m4a|.flac|.aac|.strm|.pls|.rm|.rma|.mpa|.wav|.wma|.ogg|.mp3|.mp2|.m3u|.mod|.amf|.669|.dmf|.dsm|.far|.gdm|.imf|.it|.m15|.med|.okt|.s3m|.stm|.sfx|.ult|.uni|.xm|.sid|.ac3|.dts|.cue|.aif|.aiff|.wpl|.ape|.mac|.mpc|.mp+|.mpp|.shn|.zip|.rar|.wv|.nsf|.spc|.gym|.adx|.dsp|.adp|.ymf|.ast|.afc|.hps|.xsp|.xwav|.waa|.wvs|.wam|.gcm|.idsp|.mpdsp|.mss|.spt|.rsd|.mid|.kar|.sap|.cmc|.cmr|.dmc|.mpt|.mpd|.rmt|.tmc|.tm8|.tm2|.oga|.url|.pxml|.tta|.rss|.cm3|.cms|.dlt|.brstm|.wtv|.mka";
   m_videoExtensions = ".m4v|.3g2|.3gp|.nsv|.tp|.ts|.ty|.strm|.pls|.rm|.rmvb|.m3u|.ifo|.mov|.qt|.divx|.xvid|.bivx|.vob|.nrg|.img|.iso|.pva|.wmv|.asf|.asx|.ogm|.m2v|.avi|.bin|.dat|.mpg|.mpeg|.mp4|.mkv|.avc|.vp3|.svq3|.nuv|.viv|.dv|.fli|.flv|.rar|.001|.wpl|.zip|.vdr|.dvr-ms|.xsp|.mts|.m2t|.m2ts|.evo|.ogv|.sdp|.avs|.rec|.url|.pxml|.vc1|.h264|.rcv|.rss|.mpls|.webm|.bdmv|.wtv";
   m_discStubExtensions = ".disc";
   // internal music extensions
index e7c494d..3d9e97b 100644 (file)
@@ -23,7 +23,7 @@
 #define PRE_SKIN_VERSION_9_10_COMPATIBILITY 1
 #define PRE_SKIN_VERSION_11_COMPATIBILITY 1
 
-#if defined(TARGET_DARWIN_IOS) && !defined(TARGET_DARWIN_IOS_ATV2)
+#if defined(HAS_SKIN_TOUCHED) && defined(TARGET_DARWIN_IOS) && !defined(TARGET_DARWIN_IOS_ATV2)
 #define DEFAULT_SKIN          "skin.touched"
 #else
 #define DEFAULT_SKIN          "skin.confluence"
index 4dc5761..bead970 100644 (file)
@@ -24,6 +24,7 @@
 #include "guilib/LocalizeStrings.h"
 #include "utils/log.h"
 #include "utils/URIUtils.h"
+#include "PosixMountProvider.h"
 
 void CDeviceKitDiskDeviceOldAPI::Update()
 {
@@ -265,21 +266,8 @@ bool CDeviceKitDisksProvider::Eject(CStdString mountpath)
 
 std::vector<CStdString> CDeviceKitDisksProvider::GetDiskUsage()
 {
-  std::vector<CStdString> devices;
-  DeviceMap::iterator itr;
-
-  for(itr = m_AvailableDevices.begin(); itr != m_AvailableDevices.end(); ++itr)
-  {
-    CDeviceKitDiskDevice *device = itr->second;
-    if (device->m_isMounted)
-    {
-      CStdString str;
-      str.Format("%s %.1f GiB", device->m_MountPath.c_str(), device->m_PartitionSizeGiB);
-      devices.push_back(str);
-    }
-  }
-
-  return devices;
+  CPosixMountProvider legacy;
+  return legacy.GetDiskUsage();
 }
 
 bool CDeviceKitDisksProvider::PumpDriveChangeEvents(IStorageEventsCallback *callback)
index 0d87389..47c1649 100644 (file)
@@ -24,6 +24,7 @@
 #include "guilib/LocalizeStrings.h"
 #include "utils/log.h"
 #include "utils/URIUtils.h"
+#include "PosixMountProvider.h"
 
 CUDiskDevice::CUDiskDevice(const char *DeviceKitUDI)
 {
@@ -245,21 +246,8 @@ bool CUDisksProvider::Eject(CStdString mountpath)
 
 std::vector<CStdString> CUDisksProvider::GetDiskUsage()
 {
-  std::vector<CStdString> devices;
-  DeviceMap::iterator itr;
-
-  for(itr = m_AvailableDevices.begin(); itr != m_AvailableDevices.end(); ++itr)
-  {
-    CUDiskDevice *device = itr->second;
-    if (device->m_isMounted)
-    {
-      CStdString str;
-      str.Format("%s %.1f GiB", device->m_MountPath.c_str(), device->m_PartitionSizeGiB);
-      devices.push_back(str);
-    }
-  }
-
-  return devices;
+  CPosixMountProvider legacy;
+  return legacy.GetDiskUsage();
 }
 
 bool CUDisksProvider::PumpDriveChangeEvents(IStorageEventsCallback *callback)
index 7f6be61..0262fde 100644 (file)
 #define HAS_FILESYSTEM_NFS
 #define HAS_ZEROCONF
 #define HAS_AIRPLAY
+#define HAVE_LIBCEC
 #endif
 
 /*****************
index 6873a39..584e948 100644 (file)
@@ -228,6 +228,18 @@ void URIUtils::GetCommonPath(CStdString& strParent, const CStdString& strPath)
   }
 }
 
+bool URIUtils::ProtocolHasParentInHostname(const CStdString& prot)
+{
+  return prot.Equals("zip")
+      || prot.Equals("rar");
+}
+
+bool URIUtils::ProtocolHasEncodedHostname(const CStdString& prot)
+{
+  return ProtocolHasParentInHostname(prot)
+      || prot.Equals("musicsearch");
+}
+
 CStdString URIUtils::GetParentPath(const CStdString& strPath)
 {
   CStdString strReturn;
@@ -241,7 +253,7 @@ bool URIUtils::GetParentPath(const CStdString& strPath, CStdString& strParent)
 
   CURL url(strPath);
   CStdString strFile = url.GetFileName();
-  if ( ((url.GetProtocol() == "rar") || (url.GetProtocol() == "zip")) && strFile.IsEmpty())
+  if ( URIUtils::ProtocolHasParentInHostname(url.GetProtocol()) && strFile.IsEmpty())
   {
     strFile = url.GetHostName();
     return GetParentPath(strFile, strParent);
index 7e854b4..751f1f0 100644 (file)
@@ -108,5 +108,8 @@ public:
     AddFileToFolder(strFolder, strFile, result);
     return result;
   }
+
+  static bool ProtocolHasParentInHostname(const CStdString& prot);
+  static bool ProtocolHasEncodedHostname(const CStdString& prot);
 };
 
index 28224c0..0dfbbef 100644 (file)
@@ -211,7 +211,7 @@ namespace VIDEO
     if (CUtil::ExcludeFileOrFolder(strDirectory, regexps))
       return true;
 
-    bool ignoreFolder = !m_scanAll && settings.noupdate;
+    bool ignoreFolder = m_scanAll && settings.noupdate;
     if (content == CONTENT_NONE || ignoreFolder)
       return true;
 
index 724ac20..815a2c5 100644 (file)
@@ -115,6 +115,11 @@ bool CGUIWindowVideoNav::OnMessage(CGUIMessage& message)
       m_rootDir.AllowNonLocalSources(false);
 
       SetProperty("flattened", g_settings.m_bMyVideoNavFlatten);
+      if (message.GetNumStringParams() && message.GetStringParam(0).Equals("Files") &&
+          g_settings.GetSourcesFromType("video")->empty())
+      {
+        message.SetStringParam("");
+      }
       
       if (!CGUIWindowVideoBase::OnMessage(message))
         return false;
@@ -1069,7 +1074,11 @@ void CGUIWindowVideoNav::GetContextButtons(int itemNumber, CContextButtons &butt
           if (!pScanDlg || (pScanDlg && !pScanDlg->IsScanning()))
           {
             if (info && info->Content() != CONTENT_NONE)
+            {
               buttons.Add(CONTEXT_BUTTON_SET_CONTENT, 20442);
+              if (info && (!pScanDlg || (pScanDlg && !pScanDlg->IsScanning())))
+                buttons.Add(CONTEXT_BUTTON_SCAN, 13349);
+            }
             else
               buttons.Add(CONTEXT_BUTTON_SET_CONTENT, 20333);
           }
@@ -1315,7 +1324,7 @@ bool CGUIWindowVideoNav::OnContextButton(int itemNumber, CONTEXT_BUTTON button)
     }
   case CONTEXT_BUTTON_UPDATE_LIBRARY:
     {
-      OnScan("");
+      OnScan("",true);
       return true;
     }
   case CONTEXT_BUTTON_UNLINK_MOVIE:
diff --git a/xbmc/visualizations/Goom/goom2k4-0/Makefile.in b/xbmc/visualizations/Goom/goom2k4-0/Makefile.in
deleted file mode 100644 (file)
index 96d0793..0000000
+++ /dev/null
@@ -1,760 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-       $(srcdir)/Makefile.in $(srcdir)/libgoom2.pc.in \
-       $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-       config.guess config.sub depcomp install-sh ltmain.sh missing \
-       mkinstalldirs ylwrap
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-       $(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES = libgoom2.pc
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-       html-recursive info-recursive install-data-recursive \
-       install-dvi-recursive install-exec-recursive \
-       install-html-recursive install-info-recursive \
-       install-pdf-recursive install-ps-recursive install-recursive \
-       installcheck-recursive installdirs-recursive pdf-recursive \
-       ps-recursive uninstall-recursive
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
-DATA = $(pkgconfig_DATA)
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
-  distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-       $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-       distdir dist dist-all distcheck
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LEXLIB = @LEXLIB@
-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MACFOLDER = @MACFOLDER@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-YACC = @YACC@
-YFLAGS = @YFLAGS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-SUBDIRS = src xmms-goom sdl-goom @MACFOLDER@
-
-#.pc file
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgoom2.pc
-DISTCLEANFILES = libgoom2.pc
-all: all-recursive
-
-.SUFFIXES:
-am--refresh:
-       @:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-       @for dep in $?; do \
-         case '$(am__configure_deps)' in \
-           *$$dep*) \
-             echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
-             $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
-               && exit 0; \
-             exit 1;; \
-         esac; \
-       done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
-       $(am__cd) $(top_srcdir) && \
-         $(AUTOMAKE) --gnu Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-       @case '$?' in \
-         *config.status*) \
-           echo ' $(SHELL) ./config.status'; \
-           $(SHELL) ./config.status;; \
-         *) \
-           echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-           cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-       esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-       $(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-       $(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-       $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-$(am__aclocal_m4_deps):
-libgoom2.pc: $(top_builddir)/config.status $(srcdir)/libgoom2.pc.in
-       cd $(top_builddir) && $(SHELL) ./config.status $@
-
-mostlyclean-libtool:
-       -rm -f *.lo
-
-clean-libtool:
-       -rm -rf .libs _libs
-
-distclean-libtool:
-       -rm -f libtool config.lt
-install-pkgconfigDATA: $(pkgconfig_DATA)
-       @$(NORMAL_INSTALL)
-       test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
-       @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
-       done
-
-uninstall-pkgconfigDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       test -n "$$files" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-       @fail= failcom='exit 1'; \
-       for f in x $$MAKEFLAGS; do \
-         case $$f in \
-           *=* | --[!k]*);; \
-           *k*) failcom='fail=yes';; \
-         esac; \
-       done; \
-       dot_seen=no; \
-       target=`echo $@ | sed s/-recursive//`; \
-       list='$(SUBDIRS)'; for subdir in $$list; do \
-         echo "Making $$target in $$subdir"; \
-         if test "$$subdir" = "."; then \
-           dot_seen=yes; \
-           local_target="$$target-am"; \
-         else \
-           local_target="$$target"; \
-         fi; \
-         ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-         || eval $$failcom; \
-       done; \
-       if test "$$dot_seen" = "no"; then \
-         $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-       fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-       @fail= failcom='exit 1'; \
-       for f in x $$MAKEFLAGS; do \
-         case $$f in \
-           *=* | --[!k]*);; \
-           *k*) failcom='fail=yes';; \
-         esac; \
-       done; \
-       dot_seen=no; \
-       case "$@" in \
-         distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-         *) list='$(SUBDIRS)' ;; \
-       esac; \
-       rev=''; for subdir in $$list; do \
-         if test "$$subdir" = "."; then :; else \
-           rev="$$subdir $$rev"; \
-         fi; \
-       done; \
-       rev="$$rev ."; \
-       target=`echo $@ | sed s/-recursive//`; \
-       for subdir in $$rev; do \
-         echo "Making $$target in $$subdir"; \
-         if test "$$subdir" = "."; then \
-           local_target="$$target-am"; \
-         else \
-           local_target="$$target"; \
-         fi; \
-         ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-         || eval $$failcom; \
-       done && test -z "$$fail"
-tags-recursive:
-       list='$(SUBDIRS)'; for subdir in $$list; do \
-         test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-       done
-ctags-recursive:
-       list='$(SUBDIRS)'; for subdir in $$list; do \
-         test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-       done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
-       set x; \
-       here=`pwd`; \
-       if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-         include_option=--etags-include; \
-         empty_fix=.; \
-       else \
-         include_option=--include; \
-         empty_fix=; \
-       fi; \
-       list='$(SUBDIRS)'; for subdir in $$list; do \
-         if test "$$subdir" = .; then :; else \
-           test ! -f $$subdir/TAGS || \
-             set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-         fi; \
-       done; \
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       shift; \
-       if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-         test -n "$$unique" || unique=$$empty_fix; \
-         if test $$# -gt 0; then \
-           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             "$$@" $$unique; \
-         else \
-           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             $$unique; \
-         fi; \
-       fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       test -z "$(CTAGS_ARGS)$$unique" \
-         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-            $$unique
-
-GTAGS:
-       here=`$(am__cd) $(top_builddir) && pwd` \
-         && $(am__cd) $(top_srcdir) \
-         && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-       $(am__remove_distdir)
-       test -d "$(distdir)" || mkdir "$(distdir)"
-       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-       list='$(DISTFILES)'; \
-         dist_files=`for file in $$list; do echo $$file; done | \
-         sed -e "s|^$$srcdirstrip/||;t" \
-             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-       case $$dist_files in \
-         */*) $(MKDIR_P) `echo "$$dist_files" | \
-                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                          sort -u` ;; \
-       esac; \
-       for file in $$dist_files; do \
-         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-         if test -d $$d/$$file; then \
-           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-           if test -d "$(distdir)/$$file"; then \
-             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-           fi; \
-           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-           fi; \
-           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-         else \
-           test -f "$(distdir)/$$file" \
-           || cp -p $$d/$$file "$(distdir)/$$file" \
-           || exit 1; \
-         fi; \
-       done
-       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-         if test "$$subdir" = .; then :; else \
-           test -d "$(distdir)/$$subdir" \
-           || $(MKDIR_P) "$(distdir)/$$subdir" \
-           || exit 1; \
-         fi; \
-       done
-       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-         if test "$$subdir" = .; then :; else \
-           dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-           $(am__relativize); \
-           new_distdir=$$reldir; \
-           dir1=$$subdir; dir2="$(top_distdir)"; \
-           $(am__relativize); \
-           new_top_distdir=$$reldir; \
-           echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-           echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-           ($(am__cd) $$subdir && \
-             $(MAKE) $(AM_MAKEFLAGS) \
-               top_distdir="$$new_top_distdir" \
-               distdir="$$new_distdir" \
-               am__remove_distdir=: \
-               am__skip_length_check=: \
-               am__skip_mode_fix=: \
-               distdir) \
-             || exit 1; \
-         fi; \
-       done
-       -test -n "$(am__skip_mode_fix)" \
-       || find "$(distdir)" -type d ! -perm -755 \
-               -exec chmod u+rwx,go+rx {} \; -o \
-         ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-         ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-         ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-       || chmod -R a+r "$(distdir)"
-dist-gzip: distdir
-       tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-       $(am__remove_distdir)
-
-dist-bzip2: distdir
-       tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-       $(am__remove_distdir)
-
-dist-lzma: distdir
-       tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-       $(am__remove_distdir)
-
-dist-xz: distdir
-       tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
-       $(am__remove_distdir)
-
-dist-tarZ: distdir
-       tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-       $(am__remove_distdir)
-
-dist-shar: distdir
-       shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-       $(am__remove_distdir)
-
-dist-zip: distdir
-       -rm -f $(distdir).zip
-       zip -rq $(distdir).zip $(distdir)
-       $(am__remove_distdir)
-
-dist dist-all: distdir
-       tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-       $(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-       case '$(DIST_ARCHIVES)' in \
-       *.tar.gz*) \
-         GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
-       *.tar.bz2*) \
-         bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-       *.tar.lzma*) \
-         lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
-       *.tar.xz*) \
-         xz -dc $(distdir).tar.xz | $(am__untar) ;;\
-       *.tar.Z*) \
-         uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-       *.shar.gz*) \
-         GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
-       *.zip*) \
-         unzip $(distdir).zip ;;\
-       esac
-       chmod -R a-w $(distdir); chmod a+w $(distdir)
-       mkdir $(distdir)/_build
-       mkdir $(distdir)/_inst
-       chmod a-w $(distdir)
-       test -d $(distdir)/_build || exit 0; \
-       dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-         && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-         && am__cwd=`pwd` \
-         && $(am__cd) $(distdir)/_build \
-         && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-           $(DISTCHECK_CONFIGURE_FLAGS) \
-         && $(MAKE) $(AM_MAKEFLAGS) \
-         && $(MAKE) $(AM_MAKEFLAGS) dvi \
-         && $(MAKE) $(AM_MAKEFLAGS) check \
-         && $(MAKE) $(AM_MAKEFLAGS) install \
-         && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-         && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-         && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-               distuninstallcheck \
-         && chmod -R a-w "$$dc_install_base" \
-         && ({ \
-              (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-              && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-              && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-              && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-                   distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-             } || { rm -rf "$$dc_destdir"; exit 1; }) \
-         && rm -rf "$$dc_destdir" \
-         && $(MAKE) $(AM_MAKEFLAGS) dist \
-         && rm -rf $(DIST_ARCHIVES) \
-         && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
-         && cd "$$am__cwd" \
-         || exit 1
-       $(am__remove_distdir)
-       @(echo "$(distdir) archives ready for distribution: "; \
-         list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-         sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
-       @$(am__cd) '$(distuninstallcheck_dir)' \
-       && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-          || { echo "ERROR: files left after uninstall:" ; \
-               if test -n "$(DESTDIR)"; then \
-                 echo "  (check DESTDIR support)"; \
-               fi ; \
-               $(distuninstallcheck_listfiles) ; \
-               exit 1; } >&2
-distcleancheck: distclean
-       @if test '$(srcdir)' = . ; then \
-         echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-         exit 1 ; \
-       fi
-       @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-         || { echo "ERROR: files left in build directory after distclean:" ; \
-              $(distcleancheck_listfiles) ; \
-              exit 1; } >&2
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(DATA)
-installdirs: installdirs-recursive
-installdirs-am:
-       for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
-         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-       done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-         `test -z '$(STRIP)' || \
-           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-       -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-maintainer-clean-generic:
-       @echo "This command is intended for maintainers to use"
-       @echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-       -rm -f $(am__CONFIG_DISTCLEAN_FILES)
-       -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-       distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-pkgconfigDATA
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-       -rm -f $(am__CONFIG_DISTCLEAN_FILES)
-       -rm -rf $(top_srcdir)/autom4te.cache
-       -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-pkgconfigDATA
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-       install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-       all all-am am--refresh check check-am clean clean-generic \
-       clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-       dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
-       distcheck distclean distclean-generic distclean-libtool \
-       distclean-tags distcleancheck distdir distuninstallcheck dvi \
-       dvi-am html html-am info info-am install install-am \
-       install-data install-data-am install-dvi install-dvi-am \
-       install-exec install-exec-am install-html install-html-am \
-       install-info install-info-am install-man install-pdf \
-       install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
-       install-strip installcheck installcheck-am installdirs \
-       installdirs-am maintainer-clean maintainer-clean-generic \
-       mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-       ps ps-am tags tags-recursive uninstall uninstall-am \
-       uninstall-pkgconfigDATA
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/xbmc/visualizations/Goom/goom2k4-0/aclocal.m4 b/xbmc/visualizations/Goom/goom2k4-0/aclocal.m4
deleted file mode 100644 (file)
index 245cacf..0000000
+++ /dev/null
@@ -1,8938 +0,0 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  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(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-[m4_warning([this file was generated for autoconf 2.65.
-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'.])])
-
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-#
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-# 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.
-
-m4_define([_LT_COPYING], [dnl
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool 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.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-])
-
-# serial 56 LT_INIT
-
-
-# LT_PREREQ(VERSION)
-# ------------------
-# Complain and exit if this libtool version is less that VERSION.
-m4_defun([LT_PREREQ],
-[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
-       [m4_default([$3],
-                  [m4_fatal([Libtool version $1 or higher is required],
-                            63)])],
-       [$2])])
-
-
-# _LT_CHECK_BUILDDIR
-# ------------------
-# Complain if the absolute build directory name contains unusual characters
-m4_defun([_LT_CHECK_BUILDDIR],
-[case `pwd` in
-  *\ * | *\    *)
-    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
-esac
-])
-
-
-# LT_INIT([OPTIONS])
-# ------------------
-AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-AC_BEFORE([$0], [LT_LANG])dnl
-AC_BEFORE([$0], [LT_OUTPUT])dnl
-AC_BEFORE([$0], [LTDL_INIT])dnl
-m4_require([_LT_CHECK_BUILDDIR])dnl
-
-dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
-m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-dnl unless we require an AC_DEFUNed macro:
-AC_REQUIRE([LTOPTIONS_VERSION])dnl
-AC_REQUIRE([LTSUGAR_VERSION])dnl
-AC_REQUIRE([LTVERSION_VERSION])dnl
-AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-m4_require([_LT_PROG_LTMAIN])dnl
-
-dnl Parse OPTIONS
-_LT_SET_OPTIONS([$0], [$1])
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-_LT_SETUP
-
-# Only expand once:
-m4_define([LT_INIT])
-])# LT_INIT
-
-# Old names:
-AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
-AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
-dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-m4_defun([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-])
-
-
-# _LT_FILEUTILS_DEFAULTS
-# ----------------------
-# It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
-m4_defun([_LT_FILEUTILS_DEFAULTS],
-[: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-])# _LT_FILEUTILS_DEFAULTS
-
-
-# _LT_SETUP
-# ---------
-m4_defun([_LT_SETUP],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-_LT_DECL([], [host_alias], [0], [The host system])dnl
-_LT_DECL([], [host], [0])dnl
-_LT_DECL([], [host_os], [0])dnl
-dnl
-_LT_DECL([], [build_alias], [0], [The build system])dnl
-_LT_DECL([], [build], [0])dnl
-_LT_DECL([], [build_os], [0])dnl
-dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-test -z "$LN_S" && LN_S="ln -s"
-_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
-dnl
-AC_REQUIRE([LT_CMD_MAX_LEN])dnl
-_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
-_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
-dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-m4_require([_LT_CMD_RELOAD])dnl
-m4_require([_LT_CHECK_MAGIC_METHOD])dnl
-m4_require([_LT_CMD_OLD_ARCHIVE])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-
-_LT_CONFIG_LIBTOOL_INIT([
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-])
-if test -n "${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-_LT_CHECK_OBJDIR
-
-m4_require([_LT_TAG_COMPILER])dnl
-_LT_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.
-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 delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-_LT_CC_BASENAME([$compiler])
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    _LT_PATH_MAGIC
-  fi
-  ;;
-esac
-
-# Use C for the default configuration in the libtool script
-LT_SUPPORTED_TAG([CC])
-_LT_LANG_C_CONFIG
-_LT_LANG_DEFAULT_CONFIG
-_LT_CONFIG_COMMANDS
-])# _LT_SETUP
-
-
-# _LT_PROG_LTMAIN
-# ---------------
-# Note that this code is called both from `configure', and `config.status'
-# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
-# `config.status' has no value for ac_aux_dir unless we are using Automake,
-# so we pass a copy along to make sure it has a sensible value anyway.
-m4_defun([_LT_PROG_LTMAIN],
-[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
-_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-ltmain="$ac_aux_dir/ltmain.sh"
-])# _LT_PROG_LTMAIN
-
-
-
-# So that we can recreate a full libtool script including additional
-# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-# in macros and then make a single call at the end using the `libtool'
-# label.
-
-
-# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
-# ----------------------------------------
-# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL_INIT],
-[m4_ifval([$1],
-          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
-                     [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_INIT])
-
-
-# _LT_CONFIG_LIBTOOL([COMMANDS])
-# ------------------------------
-# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL],
-[m4_ifval([$1],
-          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
-                     [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
-
-
-# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
-# -----------------------------------------------------
-m4_defun([_LT_CONFIG_SAVE_COMMANDS],
-[_LT_CONFIG_LIBTOOL([$1])
-_LT_CONFIG_LIBTOOL_INIT([$2])
-])
-
-
-# _LT_FORMAT_COMMENT([COMMENT])
-# -----------------------------
-# Add leading comment marks to the start of each line, and a trailing
-# full-stop to the whole comment if one is not present already.
-m4_define([_LT_FORMAT_COMMENT],
-[m4_ifval([$1], [
-m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
-              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
-)])
-
-
-
-
-
-# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
-# -------------------------------------------------------------------
-# CONFIGNAME is the name given to the value in the libtool script.
-# VARNAME is the (base) name used in the configure script.
-# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
-# VARNAME.  Any other value will be used directly.
-m4_define([_LT_DECL],
-[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
-    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
-       [m4_ifval([$1], [$1], [$2])])
-    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
-    m4_ifval([$4],
-       [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
-    lt_dict_add_subkey([lt_decl_dict], [$2],
-       [tagged?], [m4_ifval([$5], [yes], [no])])])
-])
-
-
-# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
-# --------------------------------------------------------
-m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
-
-
-# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_tag_varnames],
-[_lt_decl_filter([tagged?], [yes], $@)])
-
-
-# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
-# ---------------------------------------------------------
-m4_define([_lt_decl_filter],
-[m4_case([$#],
-  [0], [m4_fatal([$0: too few arguments: $#])],
-  [1], [m4_fatal([$0: too few arguments: $#: $1])],
-  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
-  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
-  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
-])
-
-
-# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
-# --------------------------------------------------
-m4_define([lt_decl_quote_varnames],
-[_lt_decl_filter([value], [1], $@)])
-
-
-# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_dquote_varnames],
-[_lt_decl_filter([value], [2], $@)])
-
-
-# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_varnames_tagged],
-[m4_assert([$# <= 2])dnl
-_$0(m4_quote(m4_default([$1], [[, ]])),
-    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
-    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
-m4_define([_lt_decl_varnames_tagged],
-[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
-
-
-# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_all_varnames],
-[_$0(m4_quote(m4_default([$1], [[, ]])),
-     m4_if([$2], [],
-          m4_quote(lt_decl_varnames),
-       m4_quote(m4_shift($@))))[]dnl
-])
-m4_define([_lt_decl_all_varnames],
-[lt_join($@, lt_decl_varnames_tagged([$1],
-                       lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
-])
-
-
-# _LT_CONFIG_STATUS_DECLARE([VARNAME])
-# ------------------------------------
-# Quote a variable value, and forward it to `config.status' so that its
-# declaration there will have the same value as in `configure'.  VARNAME
-# must have a single quote delimited value for this to work.
-m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
-
-
-# _LT_CONFIG_STATUS_DECLARATIONS
-# ------------------------------
-# We delimit libtool config variables with single quotes, so when
-# we write them to config.status, we have to be sure to quote all
-# embedded single quotes properly.  In configure, this macro expands
-# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
-#
-#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
-m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
-    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAGS
-# ----------------
-# Output comment and list of tags supported by the script
-m4_defun([_LT_LIBTOOL_TAGS],
-[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-available_tags="_LT_TAGS"dnl
-])
-
-
-# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
-# -----------------------------------
-# Extract the dictionary values for VARNAME (optionally with TAG) and
-# expand to a commented shell variable setting:
-#
-#    # Some comment about what VAR is for.
-#    visible_name=$lt_internal_name
-m4_define([_LT_LIBTOOL_DECLARE],
-[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
-                                          [description])))[]dnl
-m4_pushdef([_libtool_name],
-    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
-m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
-    [0], [_libtool_name=[$]$1],
-    [1], [_libtool_name=$lt_[]$1],
-    [2], [_libtool_name=$lt_[]$1],
-    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
-m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
-])
-
-
-# _LT_LIBTOOL_CONFIG_VARS
-# -----------------------
-# Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
-# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
-# section) are produced by _LT_LIBTOOL_TAG_VARS.
-m4_defun([_LT_LIBTOOL_CONFIG_VARS],
-[m4_foreach([_lt_var],
-    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAG_VARS(TAG)
-# -------------------------
-m4_define([_LT_LIBTOOL_TAG_VARS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
-
-
-# _LT_TAGVAR(VARNAME, [TAGNAME])
-# ------------------------------
-m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
-
-
-# _LT_CONFIG_COMMANDS
-# -------------------
-# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
-# variables for single and double quote escaping we saved from calls
-# to _LT_DECL, we can put quote escaped variables declarations
-# into `config.status', and then the shell code to quote escape them in
-# for loops in `config.status'.  Finally, any additional code accumulated
-# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
-m4_defun([_LT_CONFIG_COMMANDS],
-[AC_PROVIDE_IFELSE([LT_OUTPUT],
-       dnl If the libtool generation code has been placed in $CONFIG_LT,
-       dnl instead of duplicating it all over again into config.status,
-       dnl then we will have config.status run $CONFIG_LT later, so it
-       dnl needs to know what name is stored there:
-        [AC_CONFIG_COMMANDS([libtool],
-            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
-    dnl If the libtool generation code is destined for config.status,
-    dnl expand the accumulated commands and init code now:
-    [AC_CONFIG_COMMANDS([libtool],
-        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
-])#_LT_CONFIG_COMMANDS
-
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
-[
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-_LT_CONFIG_STATUS_DECLARATIONS
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# Quote evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_quote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-    *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_dquote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-    *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\[$]0 --fallback-echo"')dnl "
-  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
-  ;;
-esac
-
-_LT_OUTPUT_LIBTOOL_INIT
-])
-
-
-# LT_OUTPUT
-# ---------
-# This macro allows early generation of the libtool script (before
-# AC_OUTPUT is called), incase it is used in configure for compilation
-# tests.
-AC_DEFUN([LT_OUTPUT],
-[: ${CONFIG_LT=./config.lt}
-AC_MSG_NOTICE([creating $CONFIG_LT])
-cat >"$CONFIG_LT" <<_LTEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate a libtool stub with the current configuration.
-
-lt_cl_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_LTEOF
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-AS_SHELL_SANITIZE
-_AS_PREPARE
-
-exec AS_MESSAGE_FD>&1
-exec AS_MESSAGE_LOG_FD>>config.log
-{
-  echo
-  AS_BOX([Running $as_me.])
-} >&AS_MESSAGE_LOG_FD
-
-lt_cl_help="\
-\`$as_me' creates a local libtool stub from the current configuration,
-for use in further configure time tests before the real libtool is
-generated.
-
-Usage: $[0] [[OPTIONS]]
-
-  -h, --help      print this help, then exit
-  -V, --version   print version number, then exit
-  -q, --quiet     do not print progress messages
-  -d, --debug     don't remove temporary files
-
-Report bugs to <bug-libtool@gnu.org>."
-
-lt_cl_version="\
-m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
-m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
-configured by $[0], generated by m4_PACKAGE_STRING.
-
-Copyright (C) 2008 Free Software Foundation, Inc.
-This config.lt script is free software; the Free Software Foundation
-gives unlimited permision to copy, distribute and modify it."
-
-while test $[#] != 0
-do
-  case $[1] in
-    --version | --v* | -V )
-      echo "$lt_cl_version"; exit 0 ;;
-    --help | --h* | -h )
-      echo "$lt_cl_help"; exit 0 ;;
-    --debug | --d* | -d )
-      debug=: ;;
-    --quiet | --q* | --silent | --s* | -q )
-      lt_cl_silent=: ;;
-
-    -*) AC_MSG_ERROR([unrecognized option: $[1]
-Try \`$[0] --help' for more information.]) ;;
-
-    *) AC_MSG_ERROR([unrecognized argument: $[1]
-Try \`$[0] --help' for more information.]) ;;
-  esac
-  shift
-done
-
-if $lt_cl_silent; then
-  exec AS_MESSAGE_FD>/dev/null
-fi
-_LTEOF
-
-cat >>"$CONFIG_LT" <<_LTEOF
-_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
-_LTEOF
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-AC_MSG_NOTICE([creating $ofile])
-_LT_OUTPUT_LIBTOOL_COMMANDS
-AS_EXIT(0)
-_LTEOF
-chmod +x "$CONFIG_LT"
-
-# configure is writing to config.log, but config.lt does its own redirection,
-# appending to config.log, which fails on DOS, as config.log is still kept
-# open by configure.  Here we exec the FD to /dev/null, effectively closing
-# config.log, so it can be properly (re)opened and appended to by config.lt.
-if test "$no_create" != yes; then
-  lt_cl_success=:
-  test "$silent" = yes &&
-    lt_config_lt_args="$lt_config_lt_args --quiet"
-  exec AS_MESSAGE_LOG_FD>/dev/null
-  $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-  exec AS_MESSAGE_LOG_FD>>config.log
-  $lt_cl_success || AS_EXIT(1)
-fi
-])# LT_OUTPUT
-
-
-# _LT_CONFIG(TAG)
-# ---------------
-# If TAG is the built-in tag, 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 TAG from the
-# matching tagged config vars.
-m4_defun([_LT_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_CONFIG_SAVE_COMMANDS([
-  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
-  m4_if(_LT_TAG, [C], [
-    # 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
-
-    cfgfile="${ofile}T"
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-_LT_COPYING
-_LT_LIBTOOL_TAGS
-
-# ### BEGIN LIBTOOL CONFIG
-_LT_LIBTOOL_CONFIG_VARS
-_LT_LIBTOOL_TAG_VARS
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_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
-_LT_EOF
-    ;;
-  esac
-
-  _LT_PROG_LTMAIN
-
-  # 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 '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  _LT_PROG_XSI_SHELLFNS
-
-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-],
-[cat <<_LT_EOF >> "$ofile"
-
-dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
-dnl in a comment (ie after a #).
-# ### BEGIN LIBTOOL TAG CONFIG: $1
-_LT_LIBTOOL_TAG_VARS(_LT_TAG)
-# ### END LIBTOOL TAG CONFIG: $1
-_LT_EOF
-])dnl /m4_if
-],
-[m4_if([$1], [], [
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
-    RM='$RM'
-    ofile='$ofile'], [])
-])dnl /_LT_CONFIG_SAVE_COMMANDS
-])# _LT_CONFIG
-
-
-# LT_SUPPORTED_TAG(TAG)
-# ---------------------
-# Trace this macro to discover what tags are supported by the libtool
-# --tag option, using:
-#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
-AC_DEFUN([LT_SUPPORTED_TAG], [])
-
-
-# C support is built-in for now
-m4_define([_LT_LANG_C_enabled], [])
-m4_define([_LT_TAGS], [])
-
-
-# LT_LANG(LANG)
-# -------------
-# Enable libtool support for the given language if not already enabled.
-AC_DEFUN([LT_LANG],
-[AC_BEFORE([$0], [LT_OUTPUT])dnl
-m4_case([$1],
-  [C],                 [_LT_LANG(C)],
-  [C++],               [_LT_LANG(CXX)],
-  [Java],              [_LT_LANG(GCJ)],
-  [Fortran 77],                [_LT_LANG(F77)],
-  [Fortran],           [_LT_LANG(FC)],
-  [Windows Resource],  [_LT_LANG(RC)],
-  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
-    [_LT_LANG($1)],
-    [m4_fatal([$0: unsupported language: "$1"])])])dnl
-])# LT_LANG
-
-
-# _LT_LANG(LANGNAME)
-# ------------------
-m4_defun([_LT_LANG],
-[m4_ifdef([_LT_LANG_]$1[_enabled], [],
-  [LT_SUPPORTED_TAG([$1])dnl
-  m4_append([_LT_TAGS], [$1 ])dnl
-  m4_define([_LT_LANG_]$1[_enabled], [])dnl
-  _LT_LANG_$1_CONFIG($1)])dnl
-])# _LT_LANG
-
-
-# _LT_LANG_DEFAULT_CONFIG
-# -----------------------
-m4_defun([_LT_LANG_DEFAULT_CONFIG],
-[AC_PROVIDE_IFELSE([AC_PROG_CXX],
-  [LT_LANG(CXX)],
-  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_F77],
-  [LT_LANG(F77)],
-  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_FC],
-  [LT_LANG(FC)],
-  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
-
-dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
-dnl pulling things in needlessly.
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-  [LT_LANG(GCJ)],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-    [LT_LANG(GCJ)],
-    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
-      [LT_LANG(GCJ)],
-      [m4_ifdef([AC_PROG_GCJ],
-       [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
-       m4_ifdef([A][M_PROG_GCJ],
-       [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
-       m4_ifdef([LT_PROG_GCJ],
-       [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
-
-AC_PROVIDE_IFELSE([LT_PROG_RC],
-  [LT_LANG(RC)],
-  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
-])# _LT_LANG_DEFAULT_CONFIG
-
-# Obsolete macros:
-AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
-AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
-AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
-AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
-dnl AC_DEFUN([AC_LIBTOOL_F77], [])
-dnl AC_DEFUN([AC_LIBTOOL_FC], [])
-dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
-
-
-# _LT_TAG_COMPILER
-# ----------------
-m4_defun([_LT_TAG_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
-_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
-_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
-_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_TAG_COMPILER
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-m4_defun([_LT_COMPILER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-])# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-m4_defun([_LT_LINKER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-])# _LT_LINKER_BOILERPLATE
-
-# _LT_REQUIRED_DARWIN_CHECKS
-# -------------------------
-m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
-  case $host_os in
-    rhapsody* | darwin*)
-    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-    AC_CHECK_TOOL([LIPO], [lipo], [:])
-    AC_CHECK_TOOL([OTOOL], [otool], [:])
-    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
-    _LT_DECL([], [DSYMUTIL], [1],
-      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
-    _LT_DECL([], [NMEDIT], [1],
-      [Tool to change global to local symbols on Mac OS X])
-    _LT_DECL([], [LIPO], [1],
-      [Tool to manipulate fat objects and archives on Mac OS X])
-    _LT_DECL([], [OTOOL], [1],
-      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
-    _LT_DECL([], [OTOOL64], [1],
-      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
-
-    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
-      [lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-       # By default we will add the -single_module flag. You can override
-       # by either setting the environment variable LT_MULTI_MODULE
-       # non-empty at configure time, or by adding -multi_module to the
-       # link flags.
-       rm -rf libconftest.dylib*
-       echo "int foo(void){return 1;}" > conftest.c
-       echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
-       $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-         -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-       if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
-         lt_cv_apple_cc_single_mod=yes
-       else
-         cat conftest.err >&AS_MESSAGE_LOG_FD
-       fi
-       rm -rf libconftest.dylib*
-       rm -f conftest.*
-      fi])
-    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-      [lt_cv_ld_exported_symbols_list],
-      [lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-       [lt_cv_ld_exported_symbols_list=yes],
-       [lt_cv_ld_exported_symbols_list=no])
-       LDFLAGS="$save_LDFLAGS"
-    ])
-    case $host_os in
-    rhapsody* | darwin1.[[012]])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-       10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-         _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-       10.[[012]]*)
-         _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-       10.*)
-         _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    if test "$DSYMUTIL" != ":"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-])
-
-
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
-# Checks for linker and compiler features on darwin
-m4_defun([_LT_DARWIN_LINKER_FEATURES],
-[
-  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_automatic, $1)=yes
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_TAGVAR(whole_archive_flag_spec, $1)=''
-  _LT_TAGVAR(link_all_deplibs, $1)=yes
-  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-  case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=echo
-    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-    m4_if([$1], [CXX],
-[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
-    fi
-],[])
-  else
-  _LT_TAGVAR(ld_shlibs, $1)=no
-  fi
-])
-
-# _LT_SYS_MODULE_PATH_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.
-m4_defun([_LT_SYS_MODULE_PATH_AIX],
-[m4_require([_LT_DECL_SED])dnl
-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-       /^0/ {
-           s/^0  *\(.*\)$/\1/
-           p
-       }
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# 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 "$lt_aix_libpath_sed"`
-fi],[])
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-])# _LT_SYS_MODULE_PATH_AIX
-
-
-# _LT_SHELL_INIT(ARG)
-# -------------------
-m4_define([_LT_SHELL_INIT],
-[ifdef([AC_DIVERSION_NOTICE],
-            [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-        [AC_DIVERT_PUSH(NOTICE)])
-$1
-AC_DIVERT_POP
-])# _LT_SHELL_INIT
-
-
-# _LT_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.
-m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[_LT_SHELL_INIT([
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$lt_ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-  ;;
-esac
-
-ECHO=${lt_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 <<_LT_EOF
-[$]*
-_LT_EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$lt_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 &&
-        { 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.
-lt_ECHO=$ECHO
-if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-   lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
-
-AC_SUBST(lt_ECHO)
-])
-_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-_LT_DECL([], [ECHO], [1],
-    [An echo program that does not interpret backslashes])
-])# _LT_PROG_ECHO_BACKSLASH
-
-
-# _LT_ENABLE_LOCK
-# ---------------
-m4_defun([_LT_ENABLE_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
-  [AS_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-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|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*)
-       case $host in
-         x86_64-*kfreebsd*-gnu)
-           LD="${LD-ld} -m elf_i386_fbsd"
-           ;;
-         x86_64-*linux*)
-           LD="${LD-ld} -m elf_i386"
-           ;;
-         ppc64-*linux*|powerpc64-*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*)
-       case $host in
-         x86_64-*kfreebsd*-gnu)
-           LD="${LD-ld} -m elf_x86_64_fbsd"
-           ;;
-         x86_64-*linux*)
-           LD="${LD-ld} -m elf_x86_64"
-           ;;
-         ppc*-*linux*|powerpc*-*linux*)
-           LD="${LD-ld} -m elf64ppc"
-           ;;
-         s390*-*linux*|s390*-*tpf*)
-           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_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[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
-  ;;
-sparc*-*solaris*)
-  # 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
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)
-       if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-         LD="${LD-ld} -64"
-       fi
-       ;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-esac
-
-need_locks="$enable_libtool_lock"
-])# _LT_ENABLE_LOCK
-
-
-# _LT_CMD_OLD_ARCHIVE
-# -------------------
-m4_defun([_LT_CMD_OLD_ARCHIVE],
-[AC_CHECK_TOOL(AR, ar, false)
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-_LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1])
-
-AC_CHECK_TOOL(STRIP, strip, :)
-test -z "$STRIP" && STRIP=:
-_LT_DECL([], [STRIP], [1], [A symbol stripping program])
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-test -z "$RANLIB" && RANLIB=:
-_LT_DECL([], [RANLIB], [1],
-    [Commands used to install an old-style archive])
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-_LT_DECL([], [old_postinstall_cmds], [2])
-_LT_DECL([], [old_postuninstall_cmds], [2])
-_LT_TAGDECL([], [old_archive_cmds], [2],
-    [Commands used to build an old-style archive])
-])# _LT_CMD_OLD_ARCHIVE
-
-
-# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#              [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([_LT_COMPILER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   echo "$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}\{0,1\} :&$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 other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       $2=yes
-     fi
-   fi
-   $RM conftest*
-])
-
-if test x"[$]$2" = xyes; then
-    m4_if([$5], , :, [$5])
-else
-    m4_if([$6], , :, [$6])
-fi
-])# _LT_COMPILER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
-
-
-# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#                  [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------
-# Check whether the given linker option works
-AC_DEFUN([_LT_LINKER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $3"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker 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
-       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         $2=yes
-       fi
-     else
-       $2=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-])
-
-if test x"[$]$2" = xyes; then
-    m4_if([$4], , :, [$4])
-else
-    m4_if([$5], , :, [$5])
-fi
-])# _LT_LINKER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
-
-
-# LT_CMD_MAX_LEN
-#---------------
-AC_DEFUN([LT_CMD_MAX_LEN],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-# 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
-  teststring="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* | cegcc*)
-    # 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;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536      # usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[        ]]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8 ; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # 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"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
-                = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
-             test $i != 17 # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # 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`
-    fi
-    ;;
-  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
-max_cmd_len=$lt_cv_sys_max_cmd_len
-_LT_DECL([], [max_cmd_len], [0],
-    [What is the maximum length of a command?])
-])# LT_CMD_MAX_LEN
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
-
-
-# _LT_HEADER_DLFCN
-# ----------------
-m4_defun([_LT_HEADER_DLFCN],
-[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
-])# _LT_HEADER_DLFCN
-
-
-# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ----------------------------------------------------------------
-m4_defun([_LT_TRY_DLOPEN_SELF],
-[m4_require([_LT_HEADER_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 <<_LT_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
-
-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); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}]
-_LT_EOF
-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) $1 ;;
-      x$lt_dlneed_uscore) $2 ;;
-      x$lt_dlunknown|x*) $3 ;;
-    esac
-  else :
-    # compilation failed
-    $3
-  fi
-fi
-rm -fr conftest*
-])# _LT_TRY_DLOPEN_SELF
-
-
-# LT_SYS_DLOPEN_SELF
-# ------------------
-AC_DEFUN([LT_SYS_DLOPEN_SELF],
-[m4_require([_LT_HEADER_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* | cegcc*)
-    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="-ldld"],
-       [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="-ldld"])
-             ])
-           ])
-         ])
-       ])
-      ])
-    ;;
-  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"
-    wl=$lt_prog_compiler_wl 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_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
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-         lt_cv_dlopen_self_static, [dnl
-         _LT_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
-_LT_DECL([dlopen_support], [enable_dlopen], [0],
-        [Whether dlopen is supported])
-_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
-        [Whether dlopen of programs is supported])
-_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
-        [Whether dlopen of statically linked programs is supported])
-])# LT_SYS_DLOPEN_SELF
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
-
-
-# _LT_COMPILER_C_O([TAGNAME])
-# ---------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler.
-# This macro does not hard code the compiler like AC_PROG_CC_C_O.
-m4_defun([_LT_COMPILER_C_O],
-[m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   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}\{0,1\} :&$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
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-     fi
-   fi
-   chmod u+w . 2>&AS_MESSAGE_LOG_FD
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-])
-_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
-       [Does compiler simultaneously support -c and -o options?])
-])# _LT_COMPILER_C_O
-
-
-# _LT_COMPILER_FILE_LOCKS([TAGNAME])
-# ----------------------------------
-# Check to see if we can do hard links to lock some files if needed
-m4_defun([_LT_COMPILER_FILE_LOCKS],
-[m4_require([_LT_ENABLE_LOCK])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_COMPILER_C_O([$1])
-
-hard_links="nottested"
-if test "$_LT_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
-_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
-])# _LT_COMPILER_FILE_LOCKS
-
-
-# _LT_CHECK_OBJDIR
-# ----------------
-m4_defun([_LT_CHECK_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
-_LT_DECL([], [objdir], [0],
-         [The name of the directory that contains temporary libtool files])dnl
-m4_pattern_allow([LT_OBJDIR])dnl
-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
-  [Define to the sub-directory in which libtool stores uninstalled libraries.])
-])# _LT_CHECK_OBJDIR
-
-
-# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
-# --------------------------------------
-# Check hardcoding attributes.
-m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
-[AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
-   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
-   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-
-  # We can hardcode non-existent directories.
-  if test "$_LT_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_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
-    # Linking always hardcodes the temporary library directory.
-    _LT_TAGVAR(hardcode_action, $1)=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    _LT_TAGVAR(hardcode_action, $1)=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  _LT_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
-
-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
-   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; 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
-_LT_TAGDECL([], [hardcode_action], [0],
-    [How to hardcode a shared library path into an executable])
-])# _LT_LINKER_HARDCODE_LIBPATH
-
-
-# _LT_CMD_STRIPLIB
-# ----------------
-m4_defun([_LT_CMD_STRIPLIB],
-[m4_require([_LT_DECL_EGREP])
-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"
-      old_striplib="$STRIP -S"
-      AC_MSG_RESULT([yes])
-    else
-      AC_MSG_RESULT([no])
-    fi
-    ;;
-  *)
-    AC_MSG_RESULT([no])
-    ;;
-  esac
-fi
-_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
-_LT_DECL([], [striplib], [1])
-])# _LT_CMD_STRIPLIB
-
-
-# _LT_SYS_DYNAMIC_LINKER([TAG])
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-m4_defun([_LT_SYS_DYNAMIC_LINKER],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_OBJDUMP])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_MSG_CHECKING([dynamic linker characteristics])
-m4_if([$1],
-       [], [
-if test "$GCC" = yes; then
-  case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
-      test -d "$lt_sys_path" && \
-       lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
-  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-}'`
-  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi])
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".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"
-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'
-  ;;
-
-aix[[4-9]]*)
-  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*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    ;;
-  m68k)
-    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'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[[45]]*)
-  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* | cegcc*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
-    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~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    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* | cegcc*)
-      # 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}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-m4_if([$1], [],[
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
-  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
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  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
-    ;;
-  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
-  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    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_cmds='.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_cmds='.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_cmds='.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'
-  ;;
-
-interix[[3-9]]*)
-  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'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-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* | k*bsd*-gnu | kopensolaris*-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'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # Some binutils ld are patched to set DT_RUNPATH
-  save_LDFLAGS=$LDFLAGS
-  save_libdir=$libdir
-  eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
-       LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-    [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
-       [shlibpath_overrides_runpath=yes])])
-  LDFLAGS=$save_LDFLAGS
-  libdir=$save_libdir
-
-  # 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
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[  ]*hwcap[        ]/d;s/[:,      ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # 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'
-  ;;
-
-netbsdelf*-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='NetBSD ld.elf_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}${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=qnx
-  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='ldqnx.so'
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
-  esac
-  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_cmds=".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"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-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.3*)
-  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
-      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
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-       ;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/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}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-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
-
-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
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-fi
-
-_LT_DECL([], [variables_saved_for_relink], [1],
-    [Variables whose values should be saved in libtool wrapper scripts and
-    restored at link time])
-_LT_DECL([], [need_lib_prefix], [0],
-    [Do we need the "lib" prefix for modules?])
-_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
-_LT_DECL([], [version_type], [0], [Library versioning type])
-_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
-_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
-_LT_DECL([], [shlibpath_overrides_runpath], [0],
-    [Is shlibpath searched before the hard-coded library search path?])
-_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
-_LT_DECL([], [library_names_spec], [1],
-    [[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]])
-_LT_DECL([], [soname_spec], [1],
-    [[The coded name of the library, if different from the real name]])
-_LT_DECL([], [postinstall_cmds], [2],
-    [Command to use after installation of a shared archive])
-_LT_DECL([], [postuninstall_cmds], [2],
-    [Command to use after uninstallation of a shared archive])
-_LT_DECL([], [finish_cmds], [2],
-    [Commands used to finish a libtool library installation in a directory])
-_LT_DECL([], [finish_eval], [1],
-    [[As "finish_cmds", except a single script fragment to be evaled but
-    not shown]])
-_LT_DECL([], [hardcode_into_libs], [0],
-    [Whether we should hardcode library paths into libraries])
-_LT_DECL([], [sys_lib_search_path_spec], [2],
-    [Compile-time system search path for libraries])
-_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
-    [Run-time system search path for libraries])
-])# _LT_SYS_DYNAMIC_LINKER
-
-
-# _LT_PATH_TOOL_PREFIX(TOOL)
-# --------------------------
-# find a file program which can recognize shared library
-AC_DEFUN([_LT_PATH_TOOL_PREFIX],
-[m4_require([_LT_DECL_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="m4_if([$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 <<_LT_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
-
-_LT_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
-_LT_DECL([], [MAGIC_CMD], [0],
-        [Used to examine libraries when file_magic_cmd begins with "file"])dnl
-])# _LT_PATH_TOOL_PREFIX
-
-# Old name:
-AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
-
-
-# _LT_PATH_MAGIC
-# --------------
-# find a file program which can recognize a shared library
-m4_defun([_LT_PATH_MAGIC],
-[_LT_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
-    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])# _LT_PATH_MAGIC
-
-
-# LT_PATH_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN([LT_PATH_LD],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-
-AC_ARG_WITH([gnu-ld],
-    [AS_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])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 variants of GNU ld 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])
-_LT_PATH_LD_GNU
-AC_SUBST([LD])
-
-_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
-])# LT_PATH_LD
-
-# Old names:
-AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
-AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_LD], [])
-dnl AC_DEFUN([AC_PROG_LD], [])
-
-
-# _LT_PATH_LD_GNU
-#- --------------
-m4_defun([_LT_PATH_LD_GNU],
-[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 lds 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
-])# _LT_PATH_LD_GNU
-
-
-# _LT_CMD_RELOAD
-# --------------
-# find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-m4_defun([_LT_CMD_RELOAD],
-[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'
-case $host_os in
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-_LT_DECL([], [reload_cmds], [2])dnl
-])# _LT_CMD_RELOAD
-
-
-# _LT_CHECK_MAGIC_METHOD
-# ----------------------
-# how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-m4_defun([_LT_CHECK_MAGIC_METHOD],
-[m4_require([_LT_DECL_EGREP])
-m4_require([_LT_DECL_OBJDUMP])
-AC_CACHE_CHECK([how to recognize 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
-aix[[4-9]]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[[45]]*)
-  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*)
-  # func_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='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  if ( file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-cegcc)
-  # use the weaker test based on 'objdump'. See mingw*.
-  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  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|DragonFly)/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
-  ;;
-
-interix[[3-9]]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd* | netbsdelf*-gnu)
-  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=pass_all
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  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
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-tpf*)
-  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
-
-_LT_DECL([], [deplibs_check_method], [1],
-    [Method to check whether dependent libraries are shared objects])
-_LT_DECL([], [file_magic_cmd], [1],
-    [Command to use when deplibs_check_method == "file_magic"])
-])# _LT_CHECK_MAGIC_METHOD
-
-
-# LT_PATH_NM
-# ----------
-# find the pathname to a BSD- or MS-compatible name lister
-AC_DEFUN([LT_PATH_NM],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_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"
-  done
-  : ${lt_cv_path_NM=no}
-fi])
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
-  AC_SUBST([DUMPBIN])
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
-  fi
-fi
-test -z "$NM" && NM=nm
-AC_SUBST([NM])
-_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
-
-AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
-  [lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
-  cat conftest.out >&AS_MESSAGE_LOG_FD
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*])
-])# LT_PATH_NM
-
-# Old names:
-AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
-AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_NM], [])
-dnl AC_DEFUN([AC_PROG_NM], [])
-
-
-# LT_LIB_M
-# --------
-# check for math library
-AC_DEFUN([LT_LIB_M],
-[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_SUBST([LIBM])
-])# LT_LIB_M
-
-# Old name:
-AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_CHECK_LIBM], [])
-
-
-# _LT_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------
-m4_defun([_LT_COMPILER_NO_RTTI],
-[m4_require([_LT_TAG_COMPILER])dnl
-
-_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test "$GCC" = yes; then
-  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-
-  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-    lt_cv_prog_compiler_rtti_exceptions,
-    [-fno-rtti -fno-exceptions], [],
-    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
-       [Compiler flag to turn off builtin functions])
-])# _LT_COMPILER_NO_RTTI
-
-
-# _LT_CMD_GLOBAL_SYMBOLS
-# ----------------------
-m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-
-# 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]]*\)'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[[BCDT]]'
-  ;;
-cygwin* | mingw* | pw32* | cegcc*)
-  symcode='[[ABCDGISTW]]'
-  ;;
-hpux*)
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDEGRST]]'
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[[BCDEGRST]]'
-  ;;
-osf*)
-  symcode='[[BCDEGQRST]]'
-  ;;
-solaris*)
-  symcode='[[BDRT]]'
-  ;;
-sco3.2v5*)
-  symcode='[[DT]]'
-  ;;
-sysv4.2uw2*)
-  symcode='[[DT]]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[[ABDT]]'
-  ;;
-sysv4)
-  symcode='[[DFNSTU]]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[[ABCDGIRSTW]]' ;;
-esac
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \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\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
-
-# 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
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function
-    # and D for any global variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
-    # which start with @ or ?.
-    lt_cv_sys_global_symbol_pipe="$AWK ['"\
-"     {last_section=section; section=\$ 3};"\
-"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-"     \$ 0!~/External *\|/{next};"\
-"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-"     {if(hide[section]) next};"\
-"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-"     ' prfx=^$ac_symprfx]"
-  else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[    ]]\($symcode$symcode*\)[[       ]][[    ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-  fi
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_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 <<_LT_EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-         # Now generate the symbol file.
-         eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-         cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols.  */
-const struct {
-  const char *name;
-  void       *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[[]] =
-{
-  { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-         $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-         cat <<\_LT_EOF >> conftest.$ac_ext
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_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_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 -rf 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
-
-_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
-    [Take the output of nm and produce a listing of raw symbols and C names])
-_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
-    [Transform the output of nm in a proper C declaration])
-_LT_DECL([global_symbol_to_c_name_address],
-    [lt_cv_sys_global_symbol_to_c_name_address], [1],
-    [Transform the output of nm in a C name address pair])
-_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
-    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
-    [Transform the output of nm in a C name address pair when lib prefix is needed])
-]) # _LT_CMD_GLOBAL_SYMBOLS
-
-
-# _LT_COMPILER_PIC([TAGNAME])
-# ---------------------------
-m4_defun([_LT_COMPILER_PIC],
-[m4_require([_LT_TAG_COMPILER])dnl
-_LT_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_TAGVAR(lt_prog_compiler_static, $1)=
-
-AC_MSG_CHECKING([for $compiler option to produce PIC])
-m4_if([$1], [CXX], [
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_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_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # 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_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | cygwin* | os2* | pw32* | cegcc*)
-      # 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).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-       [_LT_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_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-      ;;
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-       ;;
-      *)
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-       ;;
-      esac
-      ;;
-    *qnx* | *nto*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix[[4-9]]*)
-       # All AIX code is PIC.
-       if test "$host_cpu" = ia64; then
-         # AIX 5 now supports IA64 processor
-         _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-       else
-         _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-       fi
-       ;;
-      chorus*)
-       case $cc_basename in
-       cxch68*)
-         # Green Hills C++ Compiler
-         # _LT_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_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-           ;;
-         ghcx*)
-           # Green Hills C++ Compiler
-           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-           ;;
-         *)
-           ;;
-       esac
-       ;;
-      freebsd* | dragonfly*)
-       # FreeBSD uses GNU C++
-       ;;
-      hpux9* | hpux10* | hpux11*)
-       case $cc_basename in
-         CC*)
-           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-           if test "$host_cpu" != ia64; then
-             _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-           fi
-           ;;
-         aCC*)
-           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-           case $host_cpu in
-           hppa*64*|ia64*)
-             # +Z the default
-             ;;
-           *)
-             _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-             ;;
-           esac
-           ;;
-         *)
-           ;;
-       esac
-       ;;
-      interix*)
-       # This is c89, which is MS Visual C++ (no shared libs)
-       # Anyone wants to do a port?
-       ;;
-      irix5* | irix6* | nonstopux*)
-       case $cc_basename in
-         CC*)
-           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-           # CC pic flag -KPIC is the default.
-           ;;
-         *)
-           ;;
-       esac
-       ;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-       case $cc_basename in
-         KCC*)
-           # KAI C++ Compiler
-           _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-           ;;
-         ecpc* )
-           # old Intel C++ for x86_64 which still supported -KPIC.
-           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-           _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-           ;;
-         icpc* )
-           # Intel C++, used to be incompatible with GCC.
-           # ICC 10 doesn't accept -KPIC any more.
-           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-           _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-           ;;
-         pgCC* | pgcpp*)
-           # Portland Group C++ compiler
-           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-           _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-           ;;
-         cxx*)
-           # Compaq C++
-           # Make sure the PIC flag is empty.  It appears that all Alpha
-           # Linux and Compaq Tru64 Unix objects are PIC.
-           _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-           _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-           ;;
-         xlc* | xlC*)
-           # IBM XL 8.0 on PPC
-           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-           _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-           ;;
-         *)
-           case `$CC -V 2>&1 | sed 5q` in
-           *Sun\ C*)
-             # Sun C++ 5.9
-             _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-             _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-             _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-             ;;
-           esac
-           ;;
-       esac
-       ;;
-      lynxos*)
-       ;;
-      m88k*)
-       ;;
-      mvs*)
-       case $cc_basename in
-         cxx*)
-           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-           ;;
-         *)
-           ;;
-       esac
-       ;;
-      netbsd* | netbsdelf*-gnu)
-       ;;
-      *qnx* | *nto*)
-        # QNX uses GNU C++, but need to define -shared option too, otherwise
-        # it will coredump.
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-        ;;
-      osf3* | osf4* | osf5*)
-       case $cc_basename in
-         KCC*)
-           _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-           ;;
-         RCC*)
-           # Rational C++ 2.4.1
-           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-           ;;
-         cxx*)
-           # Digital/Compaq C++
-           _LT_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_TAGVAR(lt_prog_compiler_pic, $1)=
-           _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-           ;;
-         *)
-           ;;
-       esac
-       ;;
-      psos*)
-       ;;
-      solaris*)
-       case $cc_basename in
-         CC*)
-           # Sun C++ 4.2, 5.x and Centerline C++
-           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-           _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-           ;;
-         gcx*)
-           # Green Hills C++ Compiler
-           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-           ;;
-         *)
-           ;;
-       esac
-       ;;
-      sunos4*)
-       case $cc_basename in
-         CC*)
-           # Sun C++ 4.x
-           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-           _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-           ;;
-         lcc*)
-           # Lucid
-           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-           ;;
-         *)
-           ;;
-       esac
-       ;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-       case $cc_basename in
-         CC*)
-           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-           _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-           ;;
-       esac
-       ;;
-      tandem*)
-       case $cc_basename in
-         NCC*)
-           # NonStop-UX NCC 3.20
-           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-           ;;
-         *)
-           ;;
-       esac
-       ;;
-      vxworks*)
-       ;;
-      *)
-       _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-       ;;
-    esac
-  fi
-],
-[
-  if test "$GCC" = yes; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_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_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # 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_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # 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).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-       [_LT_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_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-       # +Z the default
-       ;;
-      *)
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-       ;;
-      esac
-      ;;
-
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      enable_shared=no
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      _LT_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_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      if test "$host_cpu" = ia64; then
-       # AIX 5 now supports IA64 processor
-       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      else
-       _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # 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).
-      m4_if([$1], [GCJ], [],
-       [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      _LT_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_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-       ;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC (with -KPIC) is the default.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-      case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
-      ecc*)
-       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-       _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-       _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
-       _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
-       ;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-       # which looks to be a dead project)
-       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-        ;;
-      ccc*)
-        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-        # All Alpha code is PIC.
-        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-        ;;
-      xl*)
-       # IBM XL C 8.0/Fortran 10.1 on PPC
-       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-       _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-       ;;
-      *)
-       case `$CC -V 2>&1 | sed 5q` in
-       *Sun\ C*)
-         # Sun C 5.9
-         _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-         _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-         _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-         ;;
-       *Sun\ F*)
-         # Sun Fortran 8.3 passes all unrecognized flags to the linker
-         _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-         _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-         _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
-         ;;
-       esac
-       ;;
-      esac
-      ;;
-
-    newsos6)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # All OSF/1 code is PIC.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    rdos*)
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    solaris*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-      *)
-       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    unicos*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-
-    uts4*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *)
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-    esac
-  fi
-])
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-    ;;
-  *)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
-    ;;
-esac
-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
-       [How to pass a linker flag through the compiler])
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
-    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
-    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
-    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
-     "" | " "*) ;;
-     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-     esac],
-    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-fi
-_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
-       [Additional compiler flags for building library objects])
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
-_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
-  $lt_tmp_static_flag,
-  [],
-  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
-_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
-       [Compiler flag to prevent dynamic linking])
-])# _LT_COMPILER_PIC
-
-
-# _LT_LINKER_SHLIBS([TAGNAME])
-# ----------------------------
-# See if the linker supports building shared libraries.
-m4_defun([_LT_LINKER_SHLIBS],
-[AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-m4_if([$1], [CXX], [
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  case $host_os in
-  aix[[4-9]]*)
-    # 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_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_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_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-  ;;
-  cygwin* | mingw* | cegcc*)
-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  linux* | k*bsd*-gnu)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-  ;;
-  *)
-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  esac
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-], [
-  runpath_var=
-  _LT_TAGVAR(allow_undefined_flag, $1)=
-  _LT_TAGVAR(always_export_symbols, $1)=no
-  _LT_TAGVAR(archive_cmds, $1)=
-  _LT_TAGVAR(archive_expsym_cmds, $1)=
-  _LT_TAGVAR(compiler_needs_object, $1)=no
-  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  _LT_TAGVAR(hardcode_automatic, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
-  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-  _LT_TAGVAR(hardcode_minus_L, $1)=no
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_TAGVAR(inherit_rpath, $1)=no
-  _LT_TAGVAR(link_all_deplibs, $1)=unknown
-  _LT_TAGVAR(module_cmds, $1)=
-  _LT_TAGVAR(module_expsym_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-  _LT_TAGVAR(thread_safe_flag_spec, $1)=
-  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  _LT_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_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-  # 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.
-  # Exclude shared library initialization/finalization symbols.
-dnl Note also adjust exclude_expsyms for C++ above.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    # 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
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  linux* | k*bsd*-gnu)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-    ;;
-  esac
-
-  _LT_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}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-    _LT_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_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
-      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[[3-9]]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-       _LT_TAGVAR(ld_shlibs, $1)=no
-       cat <<_LT_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.
-
-_LT_EOF
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_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_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-       # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-       # support --undefined.  This deserves some investigation.  FIXME
-       _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-       _LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-      # as there is no search path for DLLs.
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=no
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-       # If the export-symbols file already is a .def file (1st line
-       # is EXPORTS), use it as is; otherwise, prepend...
-       _LT_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 $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-       _LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    interix[[3-9]]*)
-      _LT_TAGVAR(hardcode_direct, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-      tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
-       case $cc_basename in
-         diet\ *) tmp_diet=yes;;       # linux-dietlibc with static linking (!diet-dyn)
-       esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-        && test "$tmp_diet" = no
-      then
-       tmp_addflag=
-       tmp_sharedflag='-shared'
-       case $cc_basename,$host_cpu in
-        pgcc*)                         # Portland Group C compiler
-         _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-         tmp_addflag=' $pic_flag'
-         ;;
-       pgf77* | pgf90* | pgf95*)       # Portland Group f77 and f90 compilers
-         _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-         tmp_addflag=' $pic_flag -Mnomain' ;;
-       ecc*,ia64* | icc*,ia64*)        # Intel C compiler on ia64
-         tmp_addflag=' -i_dynamic' ;;
-       efc*,ia64* | ifort*,ia64*)      # Intel Fortran compiler on ia64
-         tmp_addflag=' -i_dynamic -nofor_main' ;;
-       ifc* | ifort*)                  # Intel Fortran compiler
-         tmp_addflag=' -nofor_main' ;;
-       lf95*)                          # Lahey Fortran 8.1
-         _LT_TAGVAR(whole_archive_flag_spec, $1)=
-         tmp_sharedflag='--shared' ;;
-       xl[[cC]]*)                      # IBM XL C 8.0 on PPC (deal with xlf below)
-         tmp_sharedflag='-qmkshrobj'
-         tmp_addflag= ;;
-       esac
-       case `$CC -V 2>&1 | sed 5q` in
-       *Sun\ C*)                       # Sun C 5.9
-         _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-         _LT_TAGVAR(compiler_needs_object, $1)=yes
-         tmp_sharedflag='-G' ;;
-       *Sun\ F*)                       # Sun Fortran 8.3
-         tmp_sharedflag='-G' ;;
-       esac
-       _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-        if test "x$supports_anon_versioning" = xyes; then
-          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-           cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-           echo "local: *; };" >> $output_objdir/$libname.ver~
-           $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-        fi
-
-       case $cc_basename in
-       xlf*)
-         # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-         _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-         _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-         _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
-         if test "x$supports_anon_versioning" = xyes; then
-           _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-             cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-             echo "local: *; };" >> $output_objdir/$libname.ver~
-             $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-         fi
-         ;;
-       esac
-      else
-        _LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-       wlarc=
-      else
-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-       _LT_TAGVAR(ld_shlibs, $1)=no
-       cat <<_LT_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.
-
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-       _LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
-       _LT_TAGVAR(ld_shlibs, $1)=no
-       cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-       ;;
-       *)
-         # For security reasons, it is highly recommended that you always
-         # use absolute paths for naming shared libraries, and exclude the
-         # DT_RUNPATH tag from executables and libraries.  But doing so
-         # requires that you compile everything twice, which is a pain.
-         if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-           _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-           _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-         else
-           _LT_TAGVAR(ld_shlibs, $1)=no
-         fi
-       ;;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-       _LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-
-    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
-      runpath_var=
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      _LT_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_TAGVAR(hardcode_minus_L, $1)=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-       # Neither direct hardcoding nor static linking is supported with a
-       # broken collect2.
-       _LT_TAGVAR(hardcode_direct, $1)=unsupported
-      fi
-      ;;
-
-    aix[[4-9]]*)
-      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_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_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
-       aix_use_runtimelinking=no
-
-       # Test if we are trying to use run time linking or normal
-       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-       # need to do runtime linking.
-       case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-         for ld_flag in $LDFLAGS; do
-         if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-           aix_use_runtimelinking=yes
-           break
-         fi
-         done
-         ;;
-       esac
-
-       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_TAGVAR(archive_cmds, $1)=''
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
-      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
-         :
-         else
-         # We have old collect2
-         _LT_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_TAGVAR(hardcode_minus_L, $1)=yes
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-         _LT_TAGVAR(hardcode_libdir_separator, $1)=
-         fi
-         ;;
-       esac
-       shared_flag='-shared'
-       if test "$aix_use_runtimelinking" = yes; then
-         shared_flag="$shared_flag "'${wl}-G'
-       fi
-       _LT_TAGVAR(link_all_deplibs, $1)=no
-      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='${wl}-G'
-         else
-           shared_flag='${wl}-bM:SRE'
-         fi
-       fi
-      fi
-
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      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_TAGVAR(allow_undefined_flag, $1)='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        _LT_SYS_MODULE_PATH_AIX
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-      else
-       if test "$host_cpu" = ia64; then
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-         _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-         _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-       else
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        _LT_SYS_MODULE_PATH_AIX
-        _LT_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_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-         _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-         # Exported symbols can be pulled into shared objects from archives
-         _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-         _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-         # This is similar to how AIX traditionally builds its shared libraries.
-         _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-       fi
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_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_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
-
-    bsdi[[45]]*)
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # 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_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-      # FIXME: Should let the user specify the lib program.
-      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      ;;
-
-    darwin* | rhapsody*)
-      _LT_DARWIN_LINKER_FEATURES($1)
-      ;;
-
-    dgux*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    freebsd1*)
-      _LT_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_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-       _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-       _LT_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_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-       _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-       _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-       _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-       _LT_TAGVAR(hardcode_direct, $1)=yes
-       _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-       _LT_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_TAGVAR(hardcode_minus_L, $1)=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-       case $host_cpu in
-       hppa*64*)
-         _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       ia64*)
-         _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       *)
-         _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       esac
-      else
-       case $host_cpu in
-       hppa*64*)
-         _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       ia64*)
-         _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       *)
-         _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       esac
-      fi
-      if test "$with_gnu_ld" = no; then
-       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-       _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-       case $host_cpu in
-       hppa*64*|ia64*)
-         _LT_TAGVAR(hardcode_direct, $1)=no
-         _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-         ;;
-       *)
-         _LT_TAGVAR(hardcode_direct, $1)=yes
-         _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-         _LT_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_TAGVAR(hardcode_minus_L, $1)=yes
-         ;;
-       esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-       # Try to use the -exported_symbol ld option, if it does not
-       # work, assume that -exports_file does not work either and
-       # implicitly export all symbols.
-        save_LDFLAGS="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-        AC_LINK_IFELSE(int foo(void) {},
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-        )
-        LDFLAGS="$save_LDFLAGS"
-      else
-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-       _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(inherit_rpath, $1)=yes
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-       _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    newsos6)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-       _LT_TAGVAR(hardcode_direct, $1)=yes
-       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-       _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-       if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-         _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-         _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-       else
-         case $host_os in
-          openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-            _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-            ;;
-          *)
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-            ;;
-         esac
-       fi
-      else
-       _LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    os2*)
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_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 $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-       _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-       _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    osf4* | osf5*)     # as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-       _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      else
-       _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-       _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-       $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-
-       # Both c and cxx compiler support -rpath directly
-       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    solaris*)
-      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
-      if test "$GCC" = yes; then
-       wlarc='${wl}'
-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-       _LT_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}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-      else
-       case `$CC -V 2>&1` in
-       *"Compilers 5.0"*)
-         wlarc=''
-         _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-         _LT_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'
-         ;;
-       *)
-         wlarc='${wl}'
-         _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-         _LT_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} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-         ;;
-       esac
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      case $host_os in
-      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-      *)
-       # The compiler driver will combine and reorder linker options,
-       # but understands `-z linker_flag'.  GCC discards it without `$wl',
-       # but is careful enough not to reorder.
-       # Supported since Solaris 2.6 (maybe 2.5.1?)
-       if test "$GCC" = yes; then
-         _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-       else
-         _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-       fi
-       ;;
-      esac
-      _LT_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_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-       _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-       sni)
-         _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-         _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-       ;;
-       siemens)
-         ## LD is ld it makes a PLAMLIB
-         ## CC just makes a GrossModule.
-         _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-         _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-         _LT_TAGVAR(hardcode_direct, $1)=no
-        ;;
-       motorola)
-         _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-         _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-       ;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4.3*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-       _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-       runpath_var=LD_RUN_PATH
-       hardcode_runpath_var=yes
-       _LT_TAGVAR(ld_shlibs, $1)=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-       _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-       _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    esac
-
-    if test x$host_vendor = xsni; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-       _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
-       ;;
-      esac
-    fi
-  fi
-])
-AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
-
-_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
-_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
-_LT_DECL([], [extract_expsyms_cmds], [2],
-    [The commands to extract the exported symbol list from a shared archive])
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
-  # Assume -lc should be added
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $_LT_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*
-      echo "$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_TAGVAR(lt_prog_compiler_wl, $1)
-       pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
-        _LT_TAGVAR(allow_undefined_flag, $1)=
-        if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
-        then
-         _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-        else
-         _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-        fi
-        _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $RM conftest*
-      AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
-    [Whether or not to add -lc for building shared libraries])
-_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
-    [enable_shared_with_static_runtimes], [0],
-    [Whether or not to disallow shared libs when runtime libs are static])
-_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
-    [Compiler flag to allow reflexive dlopens])
-_LT_TAGDECL([], [whole_archive_flag_spec], [1],
-    [Compiler flag to generate shared objects directly from archives])
-_LT_TAGDECL([], [compiler_needs_object], [1],
-    [Whether the compiler copes with passing no objects directly])
-_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
-    [Create an old-style archive from a shared archive])
-_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
-    [Create a temporary old-style archive to link instead of a shared archive])
-_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
-_LT_TAGDECL([], [archive_expsym_cmds], [2])
-_LT_TAGDECL([], [module_cmds], [2],
-    [Commands used to build a loadable module if different from building
-    a shared archive.])
-_LT_TAGDECL([], [module_expsym_cmds], [2])
-_LT_TAGDECL([], [with_gnu_ld], [1],
-    [Whether we are building with GNU ld or not])
-_LT_TAGDECL([], [allow_undefined_flag], [1],
-    [Flag that allows shared libraries with undefined symbols to be built])
-_LT_TAGDECL([], [no_undefined_flag], [1],
-    [Flag that enforces no undefined symbols])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
-    [Flag to hardcode $libdir into a binary during linking.
-    This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [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]])
-_LT_TAGDECL([], [hardcode_libdir_separator], [1],
-    [Whether we need a single "-rpath" flag with a separated argument])
-_LT_TAGDECL([], [hardcode_direct], [0],
-    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-    DIR into the resulting binary])
-_LT_TAGDECL([], [hardcode_direct_absolute], [0],
-    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-    DIR into the resulting binary and the resulting library dependency is
-    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
-    library is relocated])
-_LT_TAGDECL([], [hardcode_minus_L], [0],
-    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-    into the resulting binary])
-_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
-    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-    into the resulting binary])
-_LT_TAGDECL([], [hardcode_automatic], [0],
-    [Set to "yes" if building a shared library automatically hardcodes DIR
-    into the library and all subsequent libraries and executables linked
-    against it])
-_LT_TAGDECL([], [inherit_rpath], [0],
-    [Set to yes if linker adds runtime paths of dependent libraries
-    to runtime path list])
-_LT_TAGDECL([], [link_all_deplibs], [0],
-    [Whether libtool must link a program against all its dependency libraries])
-_LT_TAGDECL([], [fix_srcfile_path], [1],
-    [Fix the shell variable $srcfile for the compiler])
-_LT_TAGDECL([], [always_export_symbols], [0],
-    [Set to "yes" if exported symbols are required])
-_LT_TAGDECL([], [export_symbols_cmds], [2],
-    [The commands to list exported symbols])
-_LT_TAGDECL([], [exclude_expsyms], [1],
-    [Symbols that should not be listed in the preloaded symbols])
-_LT_TAGDECL([], [include_expsyms], [1],
-    [Symbols that must always be exported])
-_LT_TAGDECL([], [prelink_cmds], [2],
-    [Commands necessary for linking programs (against libraries) with templates])
-_LT_TAGDECL([], [file_list_spec], [1],
-    [Specify filename containing input files])
-dnl FIXME: Not yet implemented
-dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
-dnl    [Compiler flag to generate thread safe objects])
-])# _LT_LINKER_SHLIBS
-
-
-# _LT_LANG_C_CONFIG([TAG])
-# ------------------------
-# Ensure that the configuration variables for a C compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_C_CONFIG],
-[m4_require([_LT_DECL_EGREP])dnl
-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_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-_LT_TAG_COMPILER
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_SYS_DYNAMIC_LINKER($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-  LT_SYS_DLOPEN_SELF
-  _LT_CMD_STRIPLIB
-
-  # Report which library types will 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
-    ;;
-
-  aix[[4-9]]*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=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])
-
-  _LT_CONFIG($1)
-fi
-AC_LANG_POP
-CC="$lt_save_CC"
-])# _LT_LANG_C_CONFIG
-
-
-# _LT_PROG_CXX
-# ------------
-# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
-# compiler, we have our own version here.
-m4_defun([_LT_PROG_CXX],
-[
-pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
-AC_PROG_CXX
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  AC_PROG_CXXCPP
-else
-  _lt_caught_CXX_error=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_CXX
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_CXX], [])
-
-
-# _LT_LANG_CXX_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a C++ compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_CXX_CONFIG],
-[AC_REQUIRE([_LT_PROG_CXX])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-
-AC_LANG_PUSH(C++)
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(compiler_needs_object, $1)=no
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the CXX compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="int some_variable = 0;"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # 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
-    $as_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
-    $as_unset lt_cv_path_LD
-  fi
-  test -z "${LDCXX+set}" || LD=$LDCXX
-  CC=${CXX-"c++"}
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-
-  if test -n "$compiler"; then
-    # We don't want -fno-exception when compiling C++ code, so set the
-    # no_builtin_flag separately
-    if test "$GXX" = yes; then
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-    else
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-    fi
-
-    if test "$GXX" = yes; then
-      # Set up default GNU C++ configuration
-
-      LT_PATH_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_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-        _LT_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_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-        else
-          _LT_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_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-      fi
-
-      # Commands to make compiler produce verbose output that lists
-      # 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_TAGVAR(ld_shlibs, $1)=yes
-    case $host_os in
-      aix3*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-      aix[[4-9]]*)
-        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
-          aix_use_runtimelinking=no
-
-          # Test if we are trying to use run time linking or normal
-          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-          # need to do runtime linking.
-          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-           for ld_flag in $LDFLAGS; do
-             case $ld_flag in
-             *-brtl*)
-               aix_use_runtimelinking=yes
-               break
-               ;;
-             esac
-           done
-           ;;
-          esac
-
-          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_TAGVAR(archive_cmds, $1)=''
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-        _LT_TAGVAR(link_all_deplibs, $1)=yes
-        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
-        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
-           :
-         else
-           # We have old collect2
-           _LT_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_TAGVAR(hardcode_minus_L, $1)=yes
-           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-           _LT_TAGVAR(hardcode_libdir_separator, $1)=
-         fi
-          esac
-          shared_flag='-shared'
-         if test "$aix_use_runtimelinking" = yes; then
-           shared_flag="$shared_flag "'${wl}-G'
-         fi
-        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='${wl}-G'
-           else
-             shared_flag='${wl}-bM:SRE'
-           fi
-          fi
-        fi
-
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-        # It seems that -bexpall does not export symbols beginning with
-        # underscore (_), so it is better to generate a list of symbols to
-       # export.
-        _LT_TAGVAR(always_export_symbols, $1)=yes
-        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_TAGVAR(allow_undefined_flag, $1)='-berok'
-          # Determine the default libpath from the value encoded in an empty
-          # executable.
-          _LT_SYS_MODULE_PATH_AIX
-          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-        else
-          if test "$host_cpu" = ia64; then
-           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-           _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-           _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-          else
-           # Determine the default libpath from the value encoded in an
-           # empty executable.
-           _LT_SYS_MODULE_PATH_AIX
-           _LT_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_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-           _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-           # Exported symbols can be pulled into shared objects from archives
-           _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-           _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-           # This is similar to how AIX traditionally builds its shared
-           # libraries.
-           _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-          fi
-        fi
-        ;;
-
-      beos*)
-       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-         _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-         # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-         # support --undefined.  This deserves some investigation.  FIXME
-         _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       else
-         _LT_TAGVAR(ld_shlibs, $1)=no
-       fi
-       ;;
-
-      chorus*)
-        case $cc_basename in
-          *)
-         # FIXME: insert proper C++ library support
-         _LT_TAGVAR(ld_shlibs, $1)=no
-         ;;
-        esac
-        ;;
-
-      cygwin* | mingw* | pw32* | cegcc*)
-        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-        # as there is no search path for DLLs.
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-        _LT_TAGVAR(always_export_symbols, $1)=no
-        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-          # If the export-symbols file already is a .def file (1st line
-          # is EXPORTS), use it as is; otherwise, prepend...
-          _LT_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 $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-        else
-          _LT_TAGVAR(ld_shlibs, $1)=no
-        fi
-        ;;
-      darwin* | rhapsody*)
-        _LT_DARWIN_LINKER_FEATURES($1)
-       ;;
-
-      dgux*)
-        case $cc_basename in
-          ec++*)
-           # FIXME: insert proper C++ library support
-           _LT_TAGVAR(ld_shlibs, $1)=no
-           ;;
-          ghcx*)
-           # Green Hills C++ Compiler
-           # FIXME: insert proper C++ library support
-           _LT_TAGVAR(ld_shlibs, $1)=no
-           ;;
-          *)
-           # FIXME: insert proper C++ library support
-           _LT_TAGVAR(ld_shlibs, $1)=no
-           ;;
-        esac
-        ;;
-
-      freebsd[[12]]*)
-        # C++ shared libraries reported to be fairly broken before
-       # switch to ELF
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      freebsd-elf*)
-        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-        ;;
-
-      freebsd* | dragonfly*)
-        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-        # conventions
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-        ;;
-
-      gnu*)
-        ;;
-
-      hpux9*)
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_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_TAGVAR(ld_shlibs, $1)=no
-            ;;
-          aCC*)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~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 "X$list" | $Xsed'
-            ;;
-          *)
-            if test "$GXX" = yes; then
-              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            else
-              # FIXME: insert proper C++ library support
-              _LT_TAGVAR(ld_shlibs, $1)=no
-            fi
-            ;;
-        esac
-        ;;
-
-      hpux10*|hpux11*)
-        if test $with_gnu_ld = no; then
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-         _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-          case $host_cpu in
-            hppa*64*|ia64*)
-              ;;
-            *)
-             _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-              ;;
-          esac
-        fi
-        case $host_cpu in
-          hppa*64*|ia64*)
-            _LT_TAGVAR(hardcode_direct, $1)=no
-            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-            ;;
-          *)
-            _LT_TAGVAR(hardcode_direct, $1)=yes
-            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-            _LT_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_TAGVAR(ld_shlibs, $1)=no
-           ;;
-          aCC*)
-           case $host_cpu in
-             hppa*64*)
-               _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-               ;;
-             ia64*)
-               _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-               ;;
-             *)
-               _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-               ;;
-           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 "X$list" | $Xsed'
-           ;;
-          *)
-           if test "$GXX" = yes; then
-             if test $with_gnu_ld = no; then
-               case $host_cpu in
-                 hppa*64*)
-                   _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-                   ;;
-                 ia64*)
-                   _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-                   ;;
-                 *)
-                   _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-                   ;;
-               esac
-             fi
-           else
-             # FIXME: insert proper C++ library support
-             _LT_TAGVAR(ld_shlibs, $1)=no
-           fi
-           ;;
-        esac
-        ;;
-
-      interix[[3-9]]*)
-       _LT_TAGVAR(hardcode_direct, $1)=no
-       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-       _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-       # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-       # Instead, shared libraries are loaded at an image base (0x10000000 by
-       # default) and relocated if they conflict, which is a slow very memory
-       # consuming and fragmenting process.  To avoid this, we pick a random,
-       # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-       # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-       _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-       ;;
-      irix5* | irix6*)
-        case $cc_basename in
-          CC*)
-           # SGI C++
-           _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_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_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_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-             else
-               _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
-             fi
-           fi
-           _LT_TAGVAR(link_all_deplibs, $1)=yes
-           ;;
-        esac
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(inherit_rpath, $1)=yes
-        ;;
-
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-        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_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 $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-           _LT_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 $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --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 "X$list" | $Xsed'
-
-           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-           _LT_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_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-           ;;
-         icpc* | ecpc* )
-           # Intel C++
-           with_gnu_ld=yes
-           # version 8.0 and above of icpc choke on multiply defined symbols
-           # if we add $predep_objects and $postdep_objects, however 7.1 and
-           # earlier do not add the objects themselves.
-           case `$CC -V 2>&1` in
-             *"Version 7."*)
-               _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-               _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-               ;;
-             *)  # Version 8.0 or newer
-               tmp_idyn=
-               case $host_cpu in
-                 ia64*) tmp_idyn=' -i_dynamic';;
-               esac
-               _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-               _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-               ;;
-           esac
-           _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-           _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-           _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-           ;;
-          pgCC* | pgcpp*)
-            # Portland Group C++ compiler
-           case `$CC -V` in
-           *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
-             _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
-               rm -rf $tpldir~
-               $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-               compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
-             _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
-               rm -rf $tpldir~
-               $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-               $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
-               $RANLIB $oldlib'
-             _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
-               rm -rf $tpldir~
-               $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-               $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-             _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
-               rm -rf $tpldir~
-               $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-               $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-             ;;
-           *) # Version 6 will use weak symbols
-             _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-             _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-             ;;
-           esac
-
-           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-           _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-           _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-            ;;
-         cxx*)
-           # Compaq C++
-           _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-           _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-           runpath_var=LD_RUN_PATH
-           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-           _LT_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 "X$templist" | $Xsed -e "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 "X$list" | $Xsed'
-           ;;
-         xl*)
-           # IBM XL 8.0 on PPC, with GNU ld
-           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-           _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-           _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-           if test "x$supports_anon_versioning" = xyes; then
-             _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-               cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-               echo "local: *; };" >> $output_objdir/$libname.ver~
-               $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-           fi
-           ;;
-         *)
-           case `$CC -V 2>&1 | sed 5q` in
-           *Sun\ C*)
-             # Sun C++ 5.9
-             _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-             _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-             _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-             _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-             _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-             _LT_TAGVAR(compiler_needs_object, $1)=yes
-
-             # Not sure whether something based on
-             # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-             # would be better.
-             output_verbose_link_cmd='echo'
-
-             # 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_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-             ;;
-           esac
-           ;;
-       esac
-       ;;
-
-      lynxos*)
-        # FIXME: insert proper C++ library support
-       _LT_TAGVAR(ld_shlibs, $1)=no
-       ;;
-
-      m88k*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-       ;;
-
-      mvs*)
-        case $cc_basename in
-          cxx*)
-           # FIXME: insert proper C++ library support
-           _LT_TAGVAR(ld_shlibs, $1)=no
-           ;;
-         *)
-           # FIXME: insert proper C++ library support
-           _LT_TAGVAR(ld_shlibs, $1)=no
-           ;;
-       esac
-       ;;
-
-      netbsd*)
-        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-         _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-         wlarc=
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-         _LT_TAGVAR(hardcode_direct, $1)=yes
-         _LT_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::"'
-       ;;
-
-      *nto* | *qnx*)
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-       ;;
-
-      openbsd2*)
-        # C++ shared libraries are fairly broken
-       _LT_TAGVAR(ld_shlibs, $1)=no
-       ;;
-
-      openbsd*)
-       if test -f /usr/libexec/ld.so; then
-         _LT_TAGVAR(hardcode_direct, $1)=yes
-         _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-         _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-         if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-           _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-           _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-           _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-         fi
-         output_verbose_link_cmd=echo
-       else
-         _LT_TAGVAR(ld_shlibs, $1)=no
-       fi
-       ;;
-
-      osf3* | 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_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 $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-           _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-           # Archives containing C++ object files must be created using
-           # the KAI C++ compiler.
-           case $host in
-             osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
-             *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
-           esac
-           ;;
-          RCC*)
-           # Rational C++ 2.4.1
-           # FIXME: insert proper C++ library support
-           _LT_TAGVAR(ld_shlibs, $1)=no
-           ;;
-          cxx*)
-           case $host in
-             osf3*)
-               _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-               _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-               _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-               ;;
-             *)
-               _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-               _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-               _LT_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 $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
-                 $RM $lib.exp'
-               _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-               ;;
-           esac
-
-           _LT_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 "X$templist" | $Xsed -e "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 "X$list" | $Xsed'
-           ;;
-         *)
-           if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-             _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-             case $host in
-               osf3*)
-                 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-                 ;;
-               *)
-                 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-                 ;;
-             esac
-
-             _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-             _LT_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_TAGVAR(ld_shlibs, $1)=no
-           fi
-           ;;
-        esac
-        ;;
-
-      psos*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      sunos4*)
-        case $cc_basename in
-          CC*)
-           # Sun C++ 4.x
-           # FIXME: insert proper C++ library support
-           _LT_TAGVAR(ld_shlibs, $1)=no
-           ;;
-          lcc*)
-           # Lucid
-           # FIXME: insert proper C++ library support
-           _LT_TAGVAR(ld_shlibs, $1)=no
-           ;;
-          *)
-           # FIXME: insert proper C++ library support
-           _LT_TAGVAR(ld_shlibs, $1)=no
-           ;;
-        esac
-        ;;
-
-      solaris*)
-        case $cc_basename in
-          CC*)
-           # Sun C++ 4.2, 5.x and Centerline C++
-            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
-           _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-           _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-           _LT_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} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-           _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-           case $host_os in
-             solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-             *)
-               # The compiler driver will combine and reorder linker options,
-               # but understands `-z linker_flag'.
-               # Supported since Solaris 2.6 (maybe 2.5.1?)
-               _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-               ;;
-           esac
-           _LT_TAGVAR(link_all_deplibs, $1)=yes
-
-           output_verbose_link_cmd='echo'
-
-           # 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_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-           ;;
-          gcx*)
-           # Green Hills C++ Compiler
-           _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-           # The C++ compiler must be used to create the archive.
-           _LT_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_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-             if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-               _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-               _LT_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 $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$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_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-               _LT_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 $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$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_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-             case $host_os in
-               solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-               *)
-                 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-                 ;;
-             esac
-           fi
-           ;;
-        esac
-        ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      case $cc_basename in
-        CC*)
-         _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-         _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       *)
-         _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-         _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-      esac
-      ;;
-
-      sysv5* | sco3.2v5* | sco5v6*)
-       # Note: We can NOT use -z defs as we might desire, because we do not
-       # link with -lc, and that would cause any symbols used from libc to
-       # always be unresolved, which means just about no library would
-       # ever link correctly.  If we're not using GNU ld we use -z text
-       # though, which does catch some bad symbols but isn't as heavy-handed
-       # as -z defs.
-       _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-       _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-       _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-       _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-       _LT_TAGVAR(link_all_deplibs, $1)=yes
-       _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-       runpath_var='LD_RUN_PATH'
-
-       case $cc_basename in
-          CC*)
-           _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-           _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-           ;;
-         *)
-           _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-           _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-           ;;
-       esac
-      ;;
-
-      tandem*)
-        case $cc_basename in
-          NCC*)
-           # NonStop-UX NCC 3.20
-           # FIXME: insert proper C++ library support
-           _LT_TAGVAR(ld_shlibs, $1)=no
-           ;;
-          *)
-           # FIXME: insert proper C++ library support
-           _LT_TAGVAR(ld_shlibs, $1)=no
-           ;;
-        esac
-        ;;
-
-      vxworks*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      *)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-    esac
-
-    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-    _LT_TAGVAR(GCC, $1)="$GXX"
-    _LT_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...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  CC=$lt_save_CC
-  LDCXX=$LD
-  LD=$lt_save_LD
-  GCC=$lt_save_GCC
-  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
-fi # test "$_lt_caught_CXX_error" != yes
-
-AC_LANG_POP
-])# _LT_LANG_CXX_CONFIG
-
-
-# _LT_SYS_HIDDEN_LIBDEPS([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.
-m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-# Dependencies to place before and after the object being linked:
-_LT_TAGVAR(predep_objects, $1)=
-_LT_TAGVAR(postdep_objects, $1)=
-_LT_TAGVAR(predeps, $1)=
-_LT_TAGVAR(postdeps, $1)=
-_LT_TAGVAR(compiler_lib_search_path, $1)=
-
-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...
-m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
-int a;
-void foo (void) { a = 0; }
-_LT_EOF
-], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-_LT_EOF
-], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer*4 a
-      a=0
-      return
-      end
-_LT_EOF
-], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer a
-      a=0
-      return
-      end
-_LT_EOF
-], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
-public class foo {
-  private int a;
-  public void bar (void) {
-    a = 0;
-  }
-};
-_LT_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
-
-  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_TAGVAR(compiler_lib_search_path, $1)"; then
-            _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-          else
-            _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_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_TAGVAR(postdeps, $1)"; then
-          _LT_TAGVAR(postdeps, $1)="${prev}${p}"
-        else
-          _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
-        fi
-       fi
-       ;;
-
-    *.$objext)
-       # 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_TAGVAR(predep_objects, $1)"; then
-          _LT_TAGVAR(predep_objects, $1)="$p"
-        else
-          _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
-        fi
-       else
-        if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
-          _LT_TAGVAR(postdep_objects, $1)="$p"
-        else
-          _LT_TAGVAR(postdep_objects, $1)="$_LT_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
-
-# PORTME: override above test on systems where it is broken
-m4_if([$1], [CXX],
-[case $host_os in
-interix[[3-9]]*)
-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-  # hack all around it, let's just trust "g++" to DTRT.
-  _LT_TAGVAR(predep_objects,$1)=
-  _LT_TAGVAR(postdep_objects,$1)=
-  _LT_TAGVAR(postdeps,$1)=
-  ;;
-
-linux*)
-  case `$CC -V 2>&1 | sed 5q` in
-  *Sun\ C*)
-    # Sun C++ 5.9
-
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-
-solaris*)
-  case $cc_basename in
-  CC*)
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-esac
-])
-
-case " $_LT_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=
-if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
-    [The directories searched by this compiler when creating a shared library])
-_LT_TAGDECL([], [predep_objects], [1],
-    [Dependencies to place before and after the objects being linked to
-    create a shared library])
-_LT_TAGDECL([], [postdep_objects], [1])
-_LT_TAGDECL([], [predeps], [1])
-_LT_TAGDECL([], [postdeps], [1])
-_LT_TAGDECL([], [compiler_lib_search_path], [1],
-    [The library search path used internally by the compiler when linking
-    a shared library])
-])# _LT_SYS_HIDDEN_LIBDEPS
-
-
-# _LT_PROG_F77
-# ------------
-# Since AC_PROG_F77 is broken, in that it returns the empty string
-# if there is no fortran compiler, we have our own version here.
-m4_defun([_LT_PROG_F77],
-[
-pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
-AC_PROG_F77
-if test -z "$F77" || test "X$F77" = "Xno"; then
-  _lt_disable_F77=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_F77
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_F77], [])
-
-
-# _LT_LANG_F77_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a Fortran 77 compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_F77_CONFIG],
-[AC_REQUIRE([_LT_PROG_F77])dnl
-AC_LANG_PUSH(Fortran 77)
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_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_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the F77 compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_F77" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
-  lt_save_GCC=$GCC
-  CC=${F77-"f77"}
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-  GCC=$G77
-  if test -n "$compiler"; then
-    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
-        ;;
-      aix[[4-9]]*)
-       if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-         test "$enable_shared" = yes && enable_static=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])
-
-    _LT_TAGVAR(GCC, $1)="$G77"
-    _LT_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...
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC="$lt_save_CC"
-fi # test "$_lt_disable_F77" != yes
-
-AC_LANG_POP
-])# _LT_LANG_F77_CONFIG
-
-
-# _LT_PROG_FC
-# -----------
-# Since AC_PROG_FC is broken, in that it returns the empty string
-# if there is no fortran compiler, we have our own version here.
-m4_defun([_LT_PROG_FC],
-[
-pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
-AC_PROG_FC
-if test -z "$FC" || test "X$FC" = "Xno"; then
-  _lt_disable_FC=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_FC
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_FC], [])
-
-
-# _LT_LANG_FC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for a Fortran compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_FC_CONFIG],
-[AC_REQUIRE([_LT_PROG_FC])dnl
-AC_LANG_PUSH(Fortran)
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for fc test sources.
-ac_ext=${ac_fc_srcext-f}
-
-# Object file extension for compiled fc test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the FC compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_FC" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
-  lt_save_GCC=$GCC
-  CC=${FC-"f95"}
-  compiler=$CC
-  GCC=$ac_cv_fc_compiler_gnu
-
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-
-  if test -n "$compiler"; then
-    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
-        ;;
-      aix[[4-9]]*)
-       if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-         test "$enable_shared" = yes && enable_static=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])
-
-    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
-    _LT_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...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC="$lt_save_CC"
-fi # test "$_lt_disable_FC" != yes
-
-AC_LANG_POP
-])# _LT_LANG_FC_CONFIG
-
-
-# _LT_LANG_GCJ_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for the GNU Java Compiler compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_GCJ_CONFIG],
-[AC_REQUIRE([LT_PROG_GCJ])dnl
-AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GCJ-"gcj"}
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
-_LT_CC_BASENAME([$compiler])
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-
-  _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC="$lt_save_CC"
-])# _LT_LANG_GCJ_CONFIG
-
-
-# _LT_LANG_RC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for the Windows resource compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_RC_CONFIG],
-[AC_REQUIRE([LT_PROG_RC])dnl
-AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
-# 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_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-lt_save_GCC=$GCC
-GCC=
-CC=${RC-"windres"}
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-if test -n "$compiler"; then
-  :
-  _LT_CONFIG($1)
-fi
-
-GCC=$lt_save_GCC
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# _LT_LANG_RC_CONFIG
-
-
-# LT_PROG_GCJ
-# -----------
-AC_DEFUN([LT_PROG_GCJ],
-[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
-  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
-    [AC_CHECK_TOOL(GCJ, gcj,)
-      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-      AC_SUBST(GCJFLAGS)])])[]dnl
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
-
-
-# LT_PROG_RC
-# ----------
-AC_DEFUN([LT_PROG_RC],
-[AC_CHECK_TOOL(RC, windres,)
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_RC], [])
-
-
-# _LT_DECL_EGREP
-# --------------
-# If we don't have a new enough Autoconf to choose the best grep
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_EGREP],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_REQUIRE([AC_PROG_FGREP])dnl
-test -z "$GREP" && GREP=grep
-_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
-_LT_DECL([], [EGREP], [1], [An ERE matcher])
-_LT_DECL([], [FGREP], [1], [A literal string matcher])
-dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
-AC_SUBST([GREP])
-])
-
-
-# _LT_DECL_OBJDUMP
-# --------------
-# If we don't have a new enough Autoconf to choose the best objdump
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_OBJDUMP],
-[AC_CHECK_TOOL(OBJDUMP, objdump, false)
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
-AC_SUBST([OBJDUMP])
-])
-
-
-# _LT_DECL_SED
-# ------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible.  Prefer GNU sed if found.
-m4_defun([_LT_DECL_SED],
-[AC_PROG_SED
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
-_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
-    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
-])# _LT_DECL_SED
-
-m4_ifndef([AC_PROG_SED], [
-# 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.                               #
-
-m4_defun([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
-IFS=$as_save_IFS
-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 && continue
-  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_SUBST([SED])
-AC_MSG_RESULT([$SED])
-])#AC_PROG_SED
-])#m4_ifndef
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_SED], [])
-
-
-# _LT_CHECK_SHELL_FEATURES
-# ------------------------
-# Find out whether the shell is Bourne or XSI compatible,
-# or has some other useful features.
-m4_defun([_LT_CHECK_SHELL_FEATURES],
-[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,, \
-    && eval 'test $(( 1 + 1 )) -eq 2 \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-AC_MSG_RESULT([$xsi_shell])
-_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
-
-AC_MSG_CHECKING([whether the shell understands "+="])
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-AC_MSG_RESULT([$lt_shell_append])
-_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
-  ;;
-esac
-_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
-_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
-])# _LT_CHECK_SHELL_FEATURES
-
-
-# _LT_PROG_XSI_SHELLFNS
-# ---------------------
-# Bourne and XSI compatible variants of some useful shell functions.
-m4_defun([_LT_PROG_XSI_SHELLFNS],
-[case $xsi_shell in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result="${1##*/}"
-}
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-  func_basename_result="${1##*/}"
-}
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-func_stripname ()
-{
-  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-  # positional parameters, so assign one to ordinary parameter first.
-  func_stripname_result=${3}
-  func_stripname_result=${func_stripname_result#"${1}"}
-  func_stripname_result=${func_stripname_result%"${2}"}
-}
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=${1%%=*}
-  func_opt_split_arg=${1#*=}
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  case ${1} in
-    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-    *)    func_lo2o_result=${1} ;;
-  esac
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=${1%.*}.lo
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=$(( $[*] ))
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=${#1}
-}
-
-_LT_EOF
-    ;;
-  *) # Bourne compatible functions.
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
-
-dnl func_dirname_and_basename
-dnl A portable version of this function is already defined in general.m4sh
-dnl so there is no need for it here.
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-  case ${2} in
-    .*) func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
-    *)  func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
-  esac
-}
-
-# sed scripts:
-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
-my_sed_long_arg='1s/^-[[^=]]*=//'
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
-  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=`expr "$[@]"`
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
-
-_LT_EOF
-esac
-
-case $lt_shell_append in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$[1]+=\$[2]"
-}
-_LT_EOF
-    ;;
-  *)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$[1]=\$$[1]\$[2]"
-}
-
-_LT_EOF
-    ;;
-  esac
-])
-
-# Helper functions for option handling.                    -*- Autoconf -*-
-#
-#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-#   Written by Gary V. Vaughan, 2004
-#
-# 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 6 ltoptions.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-
-
-# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
-# ------------------------------------------
-m4_define([_LT_MANGLE_OPTION],
-[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
-
-
-# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
-# ---------------------------------------
-# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
-# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
-# saved as a flag.
-m4_define([_LT_SET_OPTION],
-[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
-m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
-        _LT_MANGLE_DEFUN([$1], [$2]),
-    [m4_warning([Unknown $1 option `$2'])])[]dnl
-])
-
-
-# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
-# ------------------------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-m4_define([_LT_IF_OPTION],
-[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
-
-
-# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
-# -------------------------------------------------------
-# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
-# are set.
-m4_define([_LT_UNLESS_OPTIONS],
-[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-           [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
-                     [m4_define([$0_found])])])[]dnl
-m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
-])[]dnl
-])
-
-
-# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
-# ----------------------------------------
-# OPTION-LIST is a space-separated list of Libtool options associated
-# with MACRO-NAME.  If any OPTION has a matching handler declared with
-# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
-# the unknown option and exit.
-m4_defun([_LT_SET_OPTIONS],
-[# Set options
-m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-    [_LT_SET_OPTION([$1], _LT_Option)])
-
-m4_if([$1],[LT_INIT],[
-  dnl
-  dnl Simply set some default values (i.e off) if boolean options were not
-  dnl specified:
-  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
-  ])
-  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
-  ])
-  dnl
-  dnl If no reference was made to various pairs of opposing options, then
-  dnl we run the default mode handler for the pair.  For example, if neither
-  dnl `shared' nor `disable-shared' was passed, we enable building of shared
-  dnl archives by default:
-  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
-  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
-  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
-  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
-                  [_LT_ENABLE_FAST_INSTALL])
-  ])
-])# _LT_SET_OPTIONS
-
-
-
-# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
-# -----------------------------------------
-m4_define([_LT_MANGLE_DEFUN],
-[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
-
-
-# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
-# -----------------------------------------------
-m4_define([LT_OPTION_DEFINE],
-[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
-])# LT_OPTION_DEFINE
-
-
-# dlopen
-# ------
-LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
-])
-
-AU_DEFUN([AC_LIBTOOL_DLOPEN],
-[_LT_SET_OPTION([LT_INIT], [dlopen])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `dlopen' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
-
-
-# win32-dll
-# ---------
-# Declare package support for building win32 dll's.
-LT_OPTION_DEFINE([LT_INIT], [win32-dll],
-[enable_win32_dll=yes
-
-case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-  ;;
-esac
-
-test -z "$AS" && AS=as
-_LT_DECL([], [AS],      [0], [Assembler program])dnl
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
-])# win32-dll
-
-AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-_LT_SET_OPTION([LT_INIT], [win32-dll])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `win32-dll' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
-
-
-# _LT_ENABLE_SHARED([DEFAULT])
-# ----------------------------
-# implement the --enable-shared flag, and supports the `shared' and
-# `disable-shared' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_SHARED],
-[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([shared],
-    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-       [build shared libraries @<:@default=]_LT_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=]_LT_ENABLE_SHARED_DEFAULT)
-
-    _LT_DECL([build_libtool_libs], [enable_shared], [0],
-       [Whether or not to build shared libraries])
-])# _LT_ENABLE_SHARED
-
-LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
-])
-
-AC_DEFUN([AC_DISABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], [disable-shared])
-])
-
-AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_SHARED], [])
-dnl AC_DEFUN([AM_DISABLE_SHARED], [])
-
-
-
-# _LT_ENABLE_STATIC([DEFAULT])
-# ----------------------------
-# implement the --enable-static flag, and support the `static' and
-# `disable-static' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_STATIC],
-[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([static],
-    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-       [build static libraries @<:@default=]_LT_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=]_LT_ENABLE_STATIC_DEFAULT)
-
-    _LT_DECL([build_old_libs], [enable_static], [0],
-       [Whether or not to build static libraries])
-])# _LT_ENABLE_STATIC
-
-LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
-])
-
-AC_DEFUN([AC_DISABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], [disable-static])
-])
-
-AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_STATIC], [])
-dnl AC_DEFUN([AM_DISABLE_STATIC], [])
-
-
-
-# _LT_ENABLE_FAST_INSTALL([DEFAULT])
-# ----------------------------------
-# implement the --enable-fast-install flag, and support the `fast-install'
-# and `disable-fast-install' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_FAST_INSTALL],
-[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([fast-install],
-    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-    [optimize for fast installation @<:@default=]_LT_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=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
-
-_LT_DECL([fast_install], [enable_fast_install], [0],
-        [Whether or not to optimize for fast installation])dnl
-])# _LT_ENABLE_FAST_INSTALL
-
-LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
-
-# Old names:
-AU_DEFUN([AC_ENABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `fast-install' option into LT_INIT's first parameter.])
-])
-
-AU_DEFUN([AC_DISABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `disable-fast-install' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
-dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
-
-
-# _LT_WITH_PIC([MODE])
-# --------------------
-# implement the --with-pic flag, and support the `pic-only' and `no-pic'
-# LT_INIT options.
-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-m4_define([_LT_WITH_PIC],
-[AC_ARG_WITH([pic],
-    [AS_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=m4_default([$1], [default])
-
-_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
-])# _LT_WITH_PIC
-
-LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
-
-# Old name:
-AU_DEFUN([AC_LIBTOOL_PICMODE],
-[_LT_SET_OPTION([LT_INIT], [pic-only])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `pic-only' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
-
-
-m4_define([_LTDL_MODE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
-                [m4_define([_LTDL_MODE], [nonrecursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [recursive],
-                [m4_define([_LTDL_MODE], [recursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [subproject],
-                [m4_define([_LTDL_MODE], [subproject])])
-
-m4_define([_LTDL_TYPE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [installable],
-                [m4_define([_LTDL_TYPE], [installable])])
-LT_OPTION_DEFINE([LTDL_INIT], [convenience],
-                [m4_define([_LTDL_TYPE], [convenience])])
-
-# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
-#
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-# Written by Gary V. Vaughan, 2004
-#
-# 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 6 ltsugar.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
-
-
-# lt_join(SEP, ARG1, [ARG2...])
-# -----------------------------
-# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
-# associated separator.
-# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
-# versions in m4sugar had bugs.
-m4_define([lt_join],
-[m4_if([$#], [1], [],
-       [$#], [2], [[$2]],
-       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
-m4_define([_lt_join],
-[m4_if([$#$2], [2], [],
-       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
-
-
-# lt_car(LIST)
-# lt_cdr(LIST)
-# ------------
-# Manipulate m4 lists.
-# These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
-m4_define([lt_car], [[$1]])
-m4_define([lt_cdr],
-[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
-       [$#], 1, [],
-       [m4_dquote(m4_shift($@))])])
-m4_define([lt_unquote], $1)
-
-
-# lt_append(MACRO-NAME, STRING, [SEPARATOR])
-# ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
-# Note that neither SEPARATOR nor STRING are expanded; they are appended
-# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
-# No SEPARATOR is output if MACRO-NAME was previously undefined (different
-# than defined and empty).
-#
-# This macro is needed until we can rely on Autoconf 2.62, since earlier
-# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
-m4_define([lt_append],
-[m4_define([$1],
-          m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
-
-
-
-# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
-# ----------------------------------------------------------
-# Produce a SEP delimited list of all paired combinations of elements of
-# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
-# has the form PREFIXmINFIXSUFFIXn.
-# Needed until we can rely on m4_combine added in Autoconf 2.62.
-m4_define([lt_combine],
-[m4_if(m4_eval([$# > 3]), [1],
-       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
-[[m4_foreach([_Lt_prefix], [$2],
-            [m4_foreach([_Lt_suffix],
-               ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
-       [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
-
-
-# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
-# -----------------------------------------------------------------------
-# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
-# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
-m4_define([lt_if_append_uniq],
-[m4_ifdef([$1],
-         [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
-                [lt_append([$1], [$2], [$3])$4],
-                [$5])],
-         [lt_append([$1], [$2], [$3])$4])])
-
-
-# lt_dict_add(DICT, KEY, VALUE)
-# -----------------------------
-m4_define([lt_dict_add],
-[m4_define([$1($2)], [$3])])
-
-
-# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
-# --------------------------------------------
-m4_define([lt_dict_add_subkey],
-[m4_define([$1($2:$3)], [$4])])
-
-
-# lt_dict_fetch(DICT, KEY, [SUBKEY])
-# ----------------------------------
-m4_define([lt_dict_fetch],
-[m4_ifval([$3],
-       m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
-    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
-
-
-# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
-# -----------------------------------------------------------------
-m4_define([lt_if_dict_fetch],
-[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
-       [$5],
-    [$6])])
-
-
-# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
-# --------------------------------------------------------------
-m4_define([lt_dict_filter],
-[m4_if([$5], [], [],
-  [lt_join(m4_quote(m4_default([$4], [[, ]])),
-           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
-                     [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
-])
-
-# ltversion.m4 -- version numbers                      -*- Autoconf -*-
-#
-#   Copyright (C) 2004 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 2004
-#
-# 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.
-
-# Generated from ltversion.in.
-
-# serial 3017 ltversion.m4
-# This file is part of GNU Libtool
-
-m4_define([LT_PACKAGE_VERSION], [2.2.6b])
-m4_define([LT_PACKAGE_REVISION], [1.3017])
-
-AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6b'
-macro_revision='1.3017'
-_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-_LT_DECL(, macro_revision, 0)
-])
-
-# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
-#
-#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 2004.
-#
-# 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 lt~obsolete.m4
-
-# These exist entirely to fool aclocal when bootstrapping libtool.
-#
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
-# which have later been changed to m4_define as they aren't part of the
-# exported API, or moved to Autoconf or Automake where they belong.
-#
-# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
-# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
-# using a macro with the same name in our local m4/libtool.m4 it'll
-# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
-# and doesn't know about Autoconf macros at all.)
-#
-# So we provide this file, which has a silly filename so it's always
-# included after everything else.  This provides aclocal with the
-# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
-# because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
-#
-# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
-# Yes, that means every name once taken will need to remain here until
-# we give up compatibility with versions before 1.7, at which point
-# we need to keep only those names which we still refer to.
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
-
-m4_ifndef([AC_LIBTOOL_LINKER_OPTION],  [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
-m4_ifndef([AC_PROG_EGREP],             [AC_DEFUN([AC_PROG_EGREP])])
-m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],        [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_AC_SHELL_INIT],         [AC_DEFUN([_LT_AC_SHELL_INIT])])
-m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],    [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
-m4_ifndef([_LT_PROG_LTMAIN],           [AC_DEFUN([_LT_PROG_LTMAIN])])
-m4_ifndef([_LT_AC_TAGVAR],             [AC_DEFUN([_LT_AC_TAGVAR])])
-m4_ifndef([AC_LTDL_ENABLE_INSTALL],    [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
-m4_ifndef([AC_LTDL_PREOPEN],           [AC_DEFUN([AC_LTDL_PREOPEN])])
-m4_ifndef([_LT_AC_SYS_COMPILER],       [AC_DEFUN([_LT_AC_SYS_COMPILER])])
-m4_ifndef([_LT_AC_LOCK],               [AC_DEFUN([_LT_AC_LOCK])])
-m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],        [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
-m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],    [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
-m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],    [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
-m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
-m4_ifndef([AC_LIBTOOL_OBJDIR],         [AC_DEFUN([AC_LIBTOOL_OBJDIR])])
-m4_ifndef([AC_LTDL_OBJDIR],            [AC_DEFUN([AC_LTDL_OBJDIR])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
-m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],  [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
-m4_ifndef([AC_PATH_MAGIC],             [AC_DEFUN([AC_PATH_MAGIC])])
-m4_ifndef([AC_PROG_LD_GNU],            [AC_DEFUN([AC_PROG_LD_GNU])])
-m4_ifndef([AC_PROG_LD_RELOAD_FLAG],    [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
-m4_ifndef([AC_DEPLIBS_CHECK_METHOD],   [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
-m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
-m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
-m4_ifndef([LT_AC_PROG_EGREP],          [AC_DEFUN([LT_AC_PROG_EGREP])])
-m4_ifndef([LT_AC_PROG_SED],            [AC_DEFUN([LT_AC_PROG_SED])])
-m4_ifndef([_LT_CC_BASENAME],           [AC_DEFUN([_LT_CC_BASENAME])])
-m4_ifndef([_LT_COMPILER_BOILERPLATE],  [AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
-m4_ifndef([_LT_LINKER_BOILERPLATE],    [AC_DEFUN([_LT_LINKER_BOILERPLATE])])
-m4_ifndef([_AC_PROG_LIBTOOL],          [AC_DEFUN([_AC_PROG_LIBTOOL])])
-m4_ifndef([AC_LIBTOOL_SETUP],          [AC_DEFUN([AC_LIBTOOL_SETUP])])
-m4_ifndef([_LT_AC_CHECK_DLFCN],                [AC_DEFUN([_LT_AC_CHECK_DLFCN])])
-m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],     [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
-m4_ifndef([_LT_AC_TAGCONFIG],          [AC_DEFUN([_LT_AC_TAGCONFIG])])
-m4_ifndef([AC_DISABLE_FAST_INSTALL],   [AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
-m4_ifndef([_LT_AC_LANG_CXX],           [AC_DEFUN([_LT_AC_LANG_CXX])])
-m4_ifndef([_LT_AC_LANG_F77],           [AC_DEFUN([_LT_AC_LANG_F77])])
-m4_ifndef([_LT_AC_LANG_GCJ],           [AC_DEFUN([_LT_AC_LANG_GCJ])])
-m4_ifndef([AC_LIBTOOL_RC],             [AC_DEFUN([AC_LIBTOOL_RC])])
-m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],  [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
-m4_ifndef([_LT_AC_LANG_C_CONFIG],      [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],        [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
-m4_ifndef([_LT_AC_LANG_CXX_CONFIG],    [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],        [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
-m4_ifndef([_LT_AC_LANG_F77_CONFIG],    [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],        [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
-m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],    [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
-m4_ifndef([_LT_AC_LANG_RC_CONFIG],     [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
-m4_ifndef([AC_LIBTOOL_CONFIG],         [AC_DEFUN([AC_LIBTOOL_CONFIG])])
-m4_ifndef([_LT_AC_FILE_LTDLL_C],       [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-
-# Copyright (C) 2002, 2003, 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.
-
-# 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.11'
-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.11.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 AM_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.1])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(m4_defn([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, 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 9
-
-# 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
-m4_define([_AM_COND_VALUE_$1], [$2])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, 2009
-# 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 10
-
-# 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
-  am__universal=false
-  m4_case([$1], [CC],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac],
-    [CXX],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac])
-
-  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
-
-    # 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.  Also, some Intel
-    # versions had trouble with output in subdirs
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    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
-      ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj 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 $am__obj 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, 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 5
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[{
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
-  shift
-  for mf
-  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"])
-])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 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 16
-
-# 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.62])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)
-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-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
-])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
-AC_CONFIG_COMMANDS_PRE(dnl
-[m4_provide_if([_AM_COMPILER_EXEEXT],
-  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-])
-
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-dnl mangled by Autoconf and run in a shell conditional statement.
-m4_define([_AC_COMPILER_EXEEXT],
-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-
-
-# 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, 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.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\    *)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-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])])
-
-# Copyright (C) 1998, 1999, 2000, 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 5
-
-# 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_PREREQ(2.50)dnl
-AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
-AC_REQUIRE([AC_PROG_LEX])dnl
-if test "$LEX" = :; then
-  LEX=${am_missing_run}flex
-fi])
-
-# Check to see how 'make' treats includes.                 -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005, 2009  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_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-       @echo this is the am__doit target
-.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
-# Ignore all kinds of additional output from `make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-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, 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 6
-
-# 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
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\    *)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# 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, 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 4
-
-# _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],
-[m4_foreach_w([_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, 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 5
-
-# 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
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[[\\\"\#\$\&\'\`$am_lf]]*)
-    AC_MSG_ERROR([unsafe absolute working directory name]);;
-esac
-case $srcdir in
-  *[[\\\"\#\$\&\'\`$am_lf\ \   ]]*)
-    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
-esac
-
-# 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, 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 2
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-# AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Public sister of _AM_SUBST_NOTMAKE.
-AC_DEFUN([AM_SUBST_NOTMAKE], [_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
-
diff --git a/xbmc/visualizations/Goom/goom2k4-0/config.guess b/xbmc/visualizations/Goom/goom2k4-0/config.guess
deleted file mode 100755 (executable)
index c2246a4..0000000
+++ /dev/null
@@ -1,1502 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-#   Free Software Foundation, Inc.
-
-timestamp='2009-12-30'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# 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.
-
-
-# Originally written by Per Bothner.  Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )        # Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-       for c in cc gcc c89 c99 ; do
-         if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-            CC_FOR_BUILD="$c"; break ;
-         fi ;
-       done ;
-       if test x"$CC_FOR_BUILD" = x ; then
-         CC_FOR_BUILD=no_compiler_found ;
-       fi
-       ;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-       PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-       # NetBSD (nbsd) targets should (where applicable) match one or
-       # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-       # *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-       # switched to ELF, *-*-netbsd* would select the old
-       # object file format.  This provides both forward
-       # compatibility and a consistent mechanism for selecting the
-       # object file format.
-       #
-       # Note: NetBSD doesn't particularly care about the vendor
-       # portion of the name.  We always set it to "unknown".
-       sysctl="sysctl -n hw.machine_arch"
-       UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-           /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-       case "${UNAME_MACHINE_ARCH}" in
-           armeb) machine=armeb-unknown ;;
-           arm*) machine=arm-unknown ;;
-           sh3el) machine=shl-unknown ;;
-           sh3eb) machine=sh-unknown ;;
-           sh5el) machine=sh5le-unknown ;;
-           *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-       esac
-       # The Operating System including object format, if it has switched
-       # to ELF recently, or will in the future.
-       case "${UNAME_MACHINE_ARCH}" in
-           arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-               eval $set_cc_for_build
-               if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-                       | grep -q __ELF__
-               then
-                   # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-                   # Return netbsd for either.  FIX?
-                   os=netbsd
-               else
-                   os=netbsdelf
-               fi
-               ;;
-           *)
-               os=netbsd
-               ;;
-       esac
-       # The OS release
-       # Debian GNU/NetBSD machines have a different userland, and
-       # thus, need a distinct triplet. However, they do not need
-       # kernel version information, so it can be replaced with a
-       # suitable tag, in the style of linux-gnu.
-       case "${UNAME_VERSION}" in
-           Debian*)
-               release='-gnu'
-               ;;
-           *)
-               release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-               ;;
-       esac
-       # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-       # contains redundant information, the shorter form:
-       # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-       echo "${machine}-${os}${release}"
-       exit ;;
-    *:OpenBSD:*:*)
-       UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-       echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-       exit ;;
-    *:ekkoBSD:*:*)
-       echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-       exit ;;
-    *:SolidBSD:*:*)
-       echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-       exit ;;
-    macppc:MirBSD:*:*)
-       echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-       exit ;;
-    *:MirBSD:*:*)
-       echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-       exit ;;
-    alpha:OSF1:*:*)
-       case $UNAME_RELEASE in
-       *4.0)
-               UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-               ;;
-       *5.*)
-               UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-               ;;
-       esac
-       # According to Compaq, /usr/sbin/psrinfo has been available on
-       # OSF/1 and Tru64 systems produced since 1995.  I hope that
-       # covers most systems running today.  This code pipes the CPU
-       # types through head -n 1, so we only detect the type of CPU 0.
-       ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-       case "$ALPHA_CPU_TYPE" in
-           "EV4 (21064)")
-               UNAME_MACHINE="alpha" ;;
-           "EV4.5 (21064)")
-               UNAME_MACHINE="alpha" ;;
-           "LCA4 (21066/21068)")
-               UNAME_MACHINE="alpha" ;;
-           "EV5 (21164)")
-               UNAME_MACHINE="alphaev5" ;;
-           "EV5.6 (21164A)")
-               UNAME_MACHINE="alphaev56" ;;
-           "EV5.6 (21164PC)")
-               UNAME_MACHINE="alphapca56" ;;
-           "EV5.7 (21164PC)")
-               UNAME_MACHINE="alphapca57" ;;
-           "EV6 (21264)")
-               UNAME_MACHINE="alphaev6" ;;
-           "EV6.7 (21264A)")
-               UNAME_MACHINE="alphaev67" ;;
-           "EV6.8CB (21264C)")
-               UNAME_MACHINE="alphaev68" ;;
-           "EV6.8AL (21264B)")
-               UNAME_MACHINE="alphaev68" ;;
-           "EV6.8CX (21264D)")
-               UNAME_MACHINE="alphaev68" ;;
-           "EV6.9A (21264/EV69A)")
-               UNAME_MACHINE="alphaev69" ;;
-           "EV7 (21364)")
-               UNAME_MACHINE="alphaev7" ;;
-           "EV7.9 (21364A)")
-               UNAME_MACHINE="alphaev79" ;;
-       esac
-       # A Pn.n version is a patched version.
-       # A Vn.n version is a released version.
-       # A Tn.n version is a released field test version.
-       # A Xn.n version is an unreleased experimental baselevel.
-       # 1.2 uses "1.2" for uname -r.
-       echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-       exit ;;
-    Alpha\ *:Windows_NT*:*)
-       # How do we know it's Interix rather than the generic POSIX subsystem?
-       # Should we change UNAME_MACHINE based on the output of uname instead
-       # of the specific Alpha model?
-       echo alpha-pc-interix
-       exit ;;
-    21064:Windows_NT:50:3)
-       echo alpha-dec-winnt3.5
-       exit ;;
-    Amiga*:UNIX_System_V:4.0:*)
-       echo m68k-unknown-sysv4
-       exit ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-       echo ${UNAME_MACHINE}-unknown-amigaos
-       exit ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-       echo ${UNAME_MACHINE}-unknown-morphos
-       exit ;;
-    *:OS/390:*:*)
-       echo i370-ibm-openedition
-       exit ;;
-    *:z/VM:*:*)
-       echo s390-ibm-zvmoe
-       exit ;;
-    *:OS400:*:*)
-        echo powerpc-ibm-os400
-       exit ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-       echo arm-acorn-riscix${UNAME_RELEASE}
-       exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
-       echo arm-unknown-riscos
-       exit ;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-       echo hppa1.1-hitachi-hiuxmpp
-       exit ;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-       # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-       if test "`(/bin/universe) 2>/dev/null`" = att ; then
-               echo pyramid-pyramid-sysv3
-       else
-               echo pyramid-pyramid-bsd
-       fi
-       exit ;;
-    NILE*:*:*:dcosx)
-       echo pyramid-pyramid-svr4
-       exit ;;
-    DRS?6000:unix:4.0:6*)
-       echo sparc-icl-nx6
-       exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-       case `/usr/bin/uname -p` in
-           sparc) echo sparc-icl-nx7; exit ;;
-       esac ;;
-    s390x:SunOS:*:*)
-       echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-       exit ;;
-    sun4H:SunOS:5.*:*)
-       echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-       exit ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-       echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-       exit ;;
-    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-       echo i386-pc-auroraux${UNAME_RELEASE}
-       exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-       eval $set_cc_for_build
-       SUN_ARCH="i386"
-       # If there is a compiler, see if it is configured for 64-bit objects.
-       # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-       # This test works for both compilers.
-       if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-           if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-               (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-               grep IS_64BIT_ARCH >/dev/null
-           then
-               SUN_ARCH="x86_64"
-           fi
-       fi
-       echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-       exit ;;
-    sun4*:SunOS:6*:*)
-       # According to config.sub, this is the proper way to canonicalize
-       # SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-       # it's likely to be more like Solaris than SunOS4.
-       echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-       exit ;;
-    sun4*:SunOS:*:*)
-       case "`/usr/bin/arch -k`" in
-           Series*|S4*)
-               UNAME_RELEASE=`uname -v`
-               ;;
-       esac
-       # Japanese Language versions have a version number like `4.1.3-JL'.
-       echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-       exit ;;
-    sun3*:SunOS:*:*)
-       echo m68k-sun-sunos${UNAME_RELEASE}
-       exit ;;
-    sun*:*:4.2BSD:*)
-       UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-       test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-       case "`/bin/arch`" in
-           sun3)
-               echo m68k-sun-sunos${UNAME_RELEASE}
-               ;;
-           sun4)
-               echo sparc-sun-sunos${UNAME_RELEASE}
-               ;;
-       esac
-       exit ;;
-    aushp:SunOS:*:*)
-       echo sparc-auspex-sunos${UNAME_RELEASE}
-       exit ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-       exit ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-       echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-       exit ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
-    m68k:machten:*:*)
-       echo m68k-apple-machten${UNAME_RELEASE}
-       exit ;;
-    powerpc:machten:*:*)
-       echo powerpc-apple-machten${UNAME_RELEASE}
-       exit ;;
-    RISC*:Mach:*:*)
-       echo mips-dec-mach_bsd4.3
-       exit ;;
-    RISC*:ULTRIX:*:*)
-       echo mips-dec-ultrix${UNAME_RELEASE}
-       exit ;;
-    VAX*:ULTRIX*:*:*)
-       echo vax-dec-ultrix${UNAME_RELEASE}
-       exit ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-       echo clipper-intergraph-clix${UNAME_RELEASE}
-       exit ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-       eval $set_cc_for_build
-       sed 's/^        //' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-       int main (int argc, char *argv[]) {
-#else
-       int main (argc, argv) int argc; char *argv[]; {
-#endif
-       #if defined (host_mips) && defined (MIPSEB)
-       #if defined (SYSTYPE_SYSV)
-         printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-       #endif
-       #if defined (SYSTYPE_SVR4)
-         printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-       #endif
-       #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-         printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-       #endif
-       #endif
-         exit (-1);
-       }
-EOF
-       $CC_FOR_BUILD -o $dummy $dummy.c &&
-         dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-         SYSTEM_NAME=`$dummy $dummyarg` &&
-           { echo "$SYSTEM_NAME"; exit; }
-       echo mips-mips-riscos${UNAME_RELEASE}
-       exit ;;
-    Motorola:PowerMAX_OS:*:*)
-       echo powerpc-motorola-powermax
-       exit ;;
-    Motorola:*:4.3:PL8-*)
-       echo powerpc-harris-powermax
-       exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-       echo powerpc-harris-powermax
-       exit ;;
-    Night_Hawk:Power_UNIX:*:*)
-       echo powerpc-harris-powerunix
-       exit ;;
-    m88k:CX/UX:7*:*)
-       echo m88k-harris-cxux7
-       exit ;;
-    m88k:*:4*:R4*)
-       echo m88k-motorola-sysv4
-       exit ;;
-    m88k:*:3*:R3*)
-       echo m88k-motorola-sysv3
-       exit ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-       if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-       then
-           if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-              [ ${TARGET_BINARY_INTERFACE}x = x ]
-           then
-               echo m88k-dg-dgux${UNAME_RELEASE}
-           else
-               echo m88k-dg-dguxbcs${UNAME_RELEASE}
-           fi
-       else
-           echo i586-dg-dgux${UNAME_RELEASE}
-       fi
-       exit ;;
-    M88*:DolphinOS:*:*)        # DolphinOS (SVR3)
-       echo m88k-dolphin-sysv3
-       exit ;;
-    M88*:*:R3*:*)
-       # Delta 88k system running SVR3
-       echo m88k-motorola-sysv3
-       exit ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-       echo m88k-tektronix-sysv3
-       exit ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-       echo m68k-tektronix-bsd
-       exit ;;
-    *:IRIX*:*:*)
-       echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-       exit ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-       echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-       exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-       echo i386-ibm-aix
-       exit ;;
-    ia64:AIX:*:*)
-       if [ -x /usr/bin/oslevel ] ; then
-               IBM_REV=`/usr/bin/oslevel`
-       else
-               IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-       fi
-       echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-       exit ;;
-    *:AIX:2:3)
-       if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-               eval $set_cc_for_build
-               sed 's/^                //' << EOF >$dummy.c
-               #include <sys/systemcfg.h>
-
-               main()
-                       {
-                       if (!__power_pc())
-                               exit(1);
-                       puts("powerpc-ibm-aix3.2.5");
-                       exit(0);
-                       }
-EOF
-               if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-               then
-                       echo "$SYSTEM_NAME"
-               else
-                       echo rs6000-ibm-aix3.2.5
-               fi
-       elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-               echo rs6000-ibm-aix3.2.4
-       else
-               echo rs6000-ibm-aix3.2
-       fi
-       exit ;;
-    *:AIX:*:[456])
-       IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-       if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-               IBM_ARCH=rs6000
-       else
-               IBM_ARCH=powerpc
-       fi
-       if [ -x /usr/bin/oslevel ] ; then
-               IBM_REV=`/usr/bin/oslevel`
-       else
-               IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-       fi
-       echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-       exit ;;
-    *:AIX:*:*)
-       echo rs6000-ibm-aix
-       exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-       echo romp-ibm-bsd4.4
-       exit ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-       echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-       exit ;;                             # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-       echo rs6000-bull-bosx
-       exit ;;
-    DPX/2?00:B.O.S.:*:*)
-       echo m68k-bull-sysv3
-       exit ;;
-    9000/[34]??:4.3bsd:1.*:*)
-       echo m68k-hp-bsd
-       exit ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-       echo m68k-hp-bsd4.4
-       exit ;;
-    9000/[34678]??:HP-UX:*:*)
-       HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-       case "${UNAME_MACHINE}" in
-           9000/31? )            HP_ARCH=m68000 ;;
-           9000/[34]?? )         HP_ARCH=m68k ;;
-           9000/[678][0-9][0-9])
-               if [ -x /usr/bin/getconf ]; then
-                   sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-                         '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
-               fi
-               if [ "${HP_ARCH}" = "" ]; then
-                   eval $set_cc_for_build
-                   sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-               {
-               case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-               case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-               case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-                   switch (bits)
-                       {
-                       case 64: puts ("hppa2.0w"); break;
-                       case 32: puts ("hppa2.0n"); break;
-                       default: puts ("hppa2.0"); break;
-                       } break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-                   puts ("hppa2.0"); break;
-              #endif
-               default: puts ("hppa1.0"); break;
-               }
-                  exit (0);
-              }
-EOF
-                   (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-                   test -z "$HP_ARCH" && HP_ARCH=hppa
-               fi ;;
-       esac
-       if [ ${HP_ARCH} = "hppa2.0w" ]
-       then
-           eval $set_cc_for_build
-
-           # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-           # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-           # generating 64-bit code.  GNU and HP use different nomenclature:
-           #
-           # $ CC_FOR_BUILD=cc ./config.guess
-           # => hppa2.0w-hp-hpux11.23
-           # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-           # => hppa64-hp-hpux11.23
-
-           if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-               grep -q __LP64__
-           then
-               HP_ARCH="hppa2.0w"
-           else
-               HP_ARCH="hppa64"
-           fi
-       fi
-       echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-       exit ;;
-    ia64:HP-UX:*:*)
-       HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-       echo ia64-hp-hpux${HPUX_REV}
-       exit ;;
-    3050*:HI-UX:*:*)
-       eval $set_cc_for_build
-       sed 's/^        //' << EOF >$dummy.c
-       #include <unistd.h>
-       int
-       main ()
-       {
-         long cpu = sysconf (_SC_CPU_VERSION);
-         /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-            true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-            results, however.  */
-         if (CPU_IS_PA_RISC (cpu))
-           {
-             switch (cpu)
-               {
-                 case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-                 case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-                 case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-                 default: puts ("hppa-hitachi-hiuxwe2"); break;
-               }
-           }
-         else if (CPU_IS_HP_MC68K (cpu))
-           puts ("m68k-hitachi-hiuxwe2");
-         else puts ("unknown-hitachi-hiuxwe2");
-         exit (0);
-       }
-EOF
-       $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-               { echo "$SYSTEM_NAME"; exit; }
-       echo unknown-hitachi-hiuxwe2
-       exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-       echo hppa1.1-hp-bsd
-       exit ;;
-    9000/8??:4.3bsd:*:*)
-       echo hppa1.0-hp-bsd
-       exit ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-       echo hppa1.0-hp-mpeix
-       exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-       echo hppa1.1-hp-osf
-       exit ;;
-    hp8??:OSF1:*:*)
-       echo hppa1.0-hp-osf
-       exit ;;
-    i*86:OSF1:*:*)
-       if [ -x /usr/sbin/sysversion ] ; then
-           echo ${UNAME_MACHINE}-unknown-osf1mk
-       else
-           echo ${UNAME_MACHINE}-unknown-osf1
-       fi
-       exit ;;
-    parisc*:Lites*:*:*)
-       echo hppa1.1-hp-lites
-       exit ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-       echo c1-convex-bsd
-        exit ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-       if getsysinfo -f scalar_acc
-       then echo c32-convex-bsd
-       else echo c2-convex-bsd
-       fi
-        exit ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-       echo c34-convex-bsd
-        exit ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-       echo c38-convex-bsd
-        exit ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-       echo c4-convex-bsd
-        exit ;;
-    CRAY*Y-MP:*:*:*)
-       echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-       exit ;;
-    CRAY*[A-Z]90:*:*:*)
-       echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-       | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-             -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-             -e 's/\.[^.]*$/.X/'
-       exit ;;
-    CRAY*TS:*:*:*)
-       echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-       exit ;;
-    CRAY*T3E:*:*:*)
-       echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-       exit ;;
-    CRAY*SV1:*:*:*)
-       echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-       exit ;;
-    *:UNICOS/mp:*:*)
-       echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-       exit ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-       FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
-    5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-       exit ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-       echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-       exit ;;
-    sparc*:BSD/OS:*:*)
-       echo sparc-unknown-bsdi${UNAME_RELEASE}
-       exit ;;
-    *:BSD/OS:*:*)
-       echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-       exit ;;
-    *:FreeBSD:*:*)
-       case ${UNAME_MACHINE} in
-           pc98)
-               echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-           amd64)
-               echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-           *)
-               echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-       esac
-       exit ;;
-    i*:CYGWIN*:*)
-       echo ${UNAME_MACHINE}-pc-cygwin
-       exit ;;
-    *:MINGW*:*)
-       echo ${UNAME_MACHINE}-pc-mingw32
-       exit ;;
-    i*:windows32*:*)
-       # uname -m includes "-pc" on this system.
-       echo ${UNAME_MACHINE}-mingw32
-       exit ;;
-    i*:PW*:*)
-       echo ${UNAME_MACHINE}-pc-pw32
-       exit ;;
-    *:Interix*:*)
-       case ${UNAME_MACHINE} in
-           x86)
-               echo i586-pc-interix${UNAME_RELEASE}
-               exit ;;
-           authenticamd | genuineintel | EM64T)
-               echo x86_64-unknown-interix${UNAME_RELEASE}
-               exit ;;
-           IA64)
-               echo ia64-unknown-interix${UNAME_RELEASE}
-               exit ;;
-       esac ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-       echo i${UNAME_MACHINE}-pc-mks
-       exit ;;
-    8664:Windows_NT:*)
-       echo x86_64-pc-mks
-       exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-       # How do we know it's Interix rather than the generic POSIX subsystem?
-       # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-       # UNAME_MACHINE based on the output of uname instead of i386?
-       echo i586-pc-interix
-       exit ;;
-    i*:UWIN*:*)
-       echo ${UNAME_MACHINE}-pc-uwin
-       exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-       echo x86_64-unknown-cygwin
-       exit ;;
-    p*:CYGWIN*:*)
-       echo powerpcle-unknown-cygwin
-       exit ;;
-    prep*:SunOS:5.*:*)
-       echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-       exit ;;
-    *:GNU:*:*)
-       # the GNU system
-       echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-       exit ;;
-    *:GNU/*:*:*)
-       # other systems with GNU libc and userland
-       echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-       exit ;;
-    i*86:Minix:*:*)
-       echo ${UNAME_MACHINE}-pc-minix
-       exit ;;
-    alpha:Linux:*:*)
-       case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-         EV5)   UNAME_MACHINE=alphaev5 ;;
-         EV56)  UNAME_MACHINE=alphaev56 ;;
-         PCA56) UNAME_MACHINE=alphapca56 ;;
-         PCA57) UNAME_MACHINE=alphapca56 ;;
-         EV6)   UNAME_MACHINE=alphaev6 ;;
-         EV67)  UNAME_MACHINE=alphaev67 ;;
-         EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-       objdump --private-headers /bin/sh | grep -q ld.so.1
-       if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-       echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-       exit ;;
-    arm*:Linux:*:*)
-       eval $set_cc_for_build
-       if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-           | grep -q __ARM_EABI__
-       then
-           echo ${UNAME_MACHINE}-unknown-linux-gnu
-       else
-           echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-       fi
-       exit ;;
-    avr32*:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
-    cris:Linux:*:*)
-       echo cris-axis-linux-gnu
-       exit ;;
-    crisv32:Linux:*:*)
-       echo crisv32-axis-linux-gnu
-       exit ;;
-    frv:Linux:*:*)
-       echo frv-unknown-linux-gnu
-       exit ;;
-    i*86:Linux:*:*)
-       LIBC=gnu
-       eval $set_cc_for_build
-       sed 's/^        //' << EOF >$dummy.c
-       #ifdef __dietlibc__
-       LIBC=dietlibc
-       #endif
-EOF
-       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-       echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-       exit ;;
-    ia64:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
-    m32r*:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
-    m68*:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
-    mips:Linux:*:* | mips64:Linux:*:*)
-       eval $set_cc_for_build
-       sed 's/^        //' << EOF >$dummy.c
-       #undef CPU
-       #undef ${UNAME_MACHINE}
-       #undef ${UNAME_MACHINE}el
-       #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-       CPU=${UNAME_MACHINE}el
-       #else
-       #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-       CPU=${UNAME_MACHINE}
-       #else
-       CPU=
-       #endif
-       #endif
-EOF
-       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-       test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-       ;;
-    or32:Linux:*:*)
-       echo or32-unknown-linux-gnu
-       exit ;;
-    padre:Linux:*:*)
-       echo sparc-unknown-linux-gnu
-       exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-       echo hppa64-unknown-linux-gnu
-       exit ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-       # Look for CPU level
-       case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-         PA7*) echo hppa1.1-unknown-linux-gnu ;;
-         PA8*) echo hppa2.0-unknown-linux-gnu ;;
-         *)    echo hppa-unknown-linux-gnu ;;
-       esac
-       exit ;;
-    ppc64:Linux:*:*)
-       echo powerpc64-unknown-linux-gnu
-       exit ;;
-    ppc:Linux:*:*)
-       echo powerpc-unknown-linux-gnu
-       exit ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-       echo ${UNAME_MACHINE}-ibm-linux
-       exit ;;
-    sh64*:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
-    sh*:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
-    vax:Linux:*:*)
-       echo ${UNAME_MACHINE}-dec-linux-gnu
-       exit ;;
-    x86_64:Linux:*:*)
-       echo x86_64-unknown-linux-gnu
-       exit ;;
-    xtensa*:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
-    i*86:DYNIX/ptx:4*:*)
-       # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-       # earlier versions are messed up and put the nodename in both
-       # sysname and nodename.
-       echo i386-sequent-sysv4
-       exit ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-       # I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-       echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-       exit ;;
-    i*86:OS/2:*:*)
-       # If we were able to find `uname', then EMX Unix compatibility
-       # is probably installed.
-       echo ${UNAME_MACHINE}-pc-os2-emx
-       exit ;;
-    i*86:XTS-300:*:STOP)
-       echo ${UNAME_MACHINE}-unknown-stop
-       exit ;;
-    i*86:atheos:*:*)
-       echo ${UNAME_MACHINE}-unknown-atheos
-       exit ;;
-    i*86:syllable:*:*)
-       echo ${UNAME_MACHINE}-pc-syllable
-       exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-       echo i386-unknown-lynxos${UNAME_RELEASE}
-       exit ;;
-    i*86:*DOS:*:*)
-       echo ${UNAME_MACHINE}-pc-msdosdjgpp
-       exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-       UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-       if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-               echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-       else
-               echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-       fi
-       exit ;;
-    i*86:*:5:[678]*)
-       # UnixWare 7.x, OpenUNIX and OpenServer 6.
-       case `/bin/uname -X | grep "^Machine"` in
-           *486*)           UNAME_MACHINE=i486 ;;
-           *Pentium)        UNAME_MACHINE=i586 ;;
-           *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-       esac
-       echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-       exit ;;
-    i*86:*:3.2:*)
-       if test -f /usr/options/cb.name; then
-               UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-               echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-       elif /bin/uname -X 2>/dev/null >/dev/null ; then
-               UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-               (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-               (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-                       && UNAME_MACHINE=i586
-               (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-                       && UNAME_MACHINE=i686
-               (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-                       && UNAME_MACHINE=i686
-               echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-       else
-               echo ${UNAME_MACHINE}-pc-sysv32
-       fi
-       exit ;;
-    pc:*:*:*)
-       # Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i586.
-       # Note: whatever this is, it MUST be the same as what config.sub
-       # prints for the "djgpp" host, or else GDB configury will decide that
-       # this is a cross-build.
-       echo i586-pc-msdosdjgpp
-        exit ;;
-    Intel:Mach:3*:*)
-       echo i386-pc-mach3
-       exit ;;
-    paragon:*:*:*)
-       echo i860-intel-osf1
-       exit ;;
-    i860:*:4.*:*) # i860-SVR4
-       if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-         echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-       else # Add other i860-SVR4 vendors below as they are discovered.
-         echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-       fi
-       exit ;;
-    mini*:CTIX:SYS*5:*)
-       # "miniframe"
-       echo m68010-convergent-sysv
-       exit ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-       echo m68k-convergent-sysv
-       exit ;;
-    M680?0:D-NIX:5.3:*)
-       echo m68k-diab-dnix
-       exit ;;
-    M68*:*:R3V[5678]*:*)
-       test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-       OS_REL=''
-       test -r /etc/.relid \
-       && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-       /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-         && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-       /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-         && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
-    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-       OS_REL='.3'
-       test -r /etc/.relid \
-           && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-       /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-           && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-       /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-           && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-       /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-           && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-       echo m68k-unknown-lynxos${UNAME_RELEASE}
-       exit ;;
-    mc68030:UNIX_System_V:4.*:*)
-       echo m68k-atari-sysv4
-       exit ;;
-    TSUNAMI:LynxOS:2.*:*)
-       echo sparc-unknown-lynxos${UNAME_RELEASE}
-       exit ;;
-    rs6000:LynxOS:2.*:*)
-       echo rs6000-unknown-lynxos${UNAME_RELEASE}
-       exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-       echo powerpc-unknown-lynxos${UNAME_RELEASE}
-       exit ;;
-    SM[BE]S:UNIX_SV:*:*)
-       echo mips-dde-sysv${UNAME_RELEASE}
-       exit ;;
-    RM*:ReliantUNIX-*:*:*)
-       echo mips-sni-sysv4
-       exit ;;
-    RM*:SINIX-*:*:*)
-       echo mips-sni-sysv4
-       exit ;;
-    *:SINIX-*:*:*)
-       if uname -p 2>/dev/null >/dev/null ; then
-               UNAME_MACHINE=`(uname -p) 2>/dev/null`
-               echo ${UNAME_MACHINE}-sni-sysv4
-       else
-               echo ns32k-sni-sysv
-       fi
-       exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
-    *:UNIX_System_V:4*:FTX*)
-       # From Gerald Hewes <hewes@openmarket.com>.
-       # How about differentiating between stratus architectures? -djm
-       echo hppa1.1-stratus-sysv4
-       exit ;;
-    *:*:*:FTX*)
-       # From seanf@swdc.stratus.com.
-       echo i860-stratus-sysv4
-       exit ;;
-    i*86:VOS:*:*)
-       # From Paul.Green@stratus.com.
-       echo ${UNAME_MACHINE}-stratus-vos
-       exit ;;
-    *:VOS:*:*)
-       # From Paul.Green@stratus.com.
-       echo hppa1.1-stratus-vos
-       exit ;;
-    mc68*:A/UX:*:*)
-       echo m68k-apple-aux${UNAME_RELEASE}
-       exit ;;
-    news*:NEWS-OS:6*:*)
-       echo mips-sony-newsos6
-       exit ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-       if [ -d /usr/nec ]; then
-               echo mips-nec-sysv${UNAME_RELEASE}
-       else
-               echo mips-unknown-sysv${UNAME_RELEASE}
-       fi
-        exit ;;
-    BeBox:BeOS:*:*)    # BeOS running on hardware made by Be, PPC only.
-       echo powerpc-be-beos
-       exit ;;
-    BeMac:BeOS:*:*)    # BeOS running on Mac or Mac clone, PPC only.
-       echo powerpc-apple-beos
-       exit ;;
-    BePC:BeOS:*:*)     # BeOS running on Intel PC compatible.
-       echo i586-pc-beos
-       exit ;;
-    BePC:Haiku:*:*)    # Haiku running on Intel PC compatible.
-       echo i586-pc-haiku
-       exit ;;
-    SX-4:SUPER-UX:*:*)
-       echo sx4-nec-superux${UNAME_RELEASE}
-       exit ;;
-    SX-5:SUPER-UX:*:*)
-       echo sx5-nec-superux${UNAME_RELEASE}
-       exit ;;
-    SX-6:SUPER-UX:*:*)
-       echo sx6-nec-superux${UNAME_RELEASE}
-       exit ;;
-    SX-7:SUPER-UX:*:*)
-       echo sx7-nec-superux${UNAME_RELEASE}
-       exit ;;
-    SX-8:SUPER-UX:*:*)
-       echo sx8-nec-superux${UNAME_RELEASE}
-       exit ;;
-    SX-8R:SUPER-UX:*:*)
-       echo sx8r-nec-superux${UNAME_RELEASE}
-       exit ;;
-    Power*:Rhapsody:*:*)
-       echo powerpc-apple-rhapsody${UNAME_RELEASE}
-       exit ;;
-    *:Rhapsody:*:*)
-       echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-       exit ;;
-    *:Darwin:*:*)
-       UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-       case $UNAME_PROCESSOR in
-           i386)
-               eval $set_cc_for_build
-               if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-                 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-                     (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-                     grep IS_64BIT_ARCH >/dev/null
-                 then
-                     UNAME_PROCESSOR="x86_64"
-                 fi
-               fi ;;
-           unknown) UNAME_PROCESSOR=powerpc ;;
-       esac
-       echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-       exit ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-       UNAME_PROCESSOR=`uname -p`
-       if test "$UNAME_PROCESSOR" = "x86"; then
-               UNAME_PROCESSOR=i386
-               UNAME_MACHINE=pc
-       fi
-       echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-       exit ;;
-    *:QNX:*:4*)
-       echo i386-pc-qnx
-       exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
-       echo nse-tandem-nsk${UNAME_RELEASE}
-       exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-       echo nsr-tandem-nsk${UNAME_RELEASE}
-       exit ;;
-    *:NonStop-UX:*:*)
-       echo mips-compaq-nonstopux
-       exit ;;
-    BS2000:POSIX*:*:*)
-       echo bs2000-siemens-sysv
-       exit ;;
-    DS/*:UNIX_System_V:*:*)
-       echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-       exit ;;
-    *:Plan9:*:*)
-       # "uname -m" is not consistent, so use $cputype instead. 386
-       # is converted to i386 for consistency with other x86
-       # operating systems.
-       if test "$cputype" = "386"; then
-           UNAME_MACHINE=i386
-       else
-           UNAME_MACHINE="$cputype"
-       fi
-       echo ${UNAME_MACHINE}-unknown-plan9
-       exit ;;
-    *:TOPS-10:*:*)
-       echo pdp10-unknown-tops10
-       exit ;;
-    *:TENEX:*:*)
-       echo pdp10-unknown-tenex
-       exit ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-       echo pdp10-dec-tops20
-       exit ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-       echo pdp10-xkl-tops20
-       exit ;;
-    *:TOPS-20:*:*)
-       echo pdp10-unknown-tops20
-       exit ;;
-    *:ITS:*:*)
-       echo pdp10-unknown-its
-       exit ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
-       exit ;;
-    *:DragonFly:*:*)
-       echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-       exit ;;
-    *:*VMS:*:*)
-       UNAME_MACHINE=`(uname -p) 2>/dev/null`
-       case "${UNAME_MACHINE}" in
-           A*) echo alpha-dec-vms ; exit ;;
-           I*) echo ia64-dec-vms ; exit ;;
-           V*) echo vax-dec-vms ; exit ;;
-       esac ;;
-    *:XENIX:*:SysV)
-       echo i386-pc-xenix
-       exit ;;
-    i*86:skyos:*:*)
-       echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-       exit ;;
-    i*86:rdos:*:*)
-       echo ${UNAME_MACHINE}-pc-rdos
-       exit ;;
-    i*86:AROS:*:*)
-       echo ${UNAME_MACHINE}-pc-aros
-       exit ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-         ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-       printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-       printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-       { echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-       echo c1-convex-bsd
-       exit ;;
-    c2*)
-       if getsysinfo -f scalar_acc
-       then echo c32-convex-bsd
-       else echo c2-convex-bsd
-       fi
-       exit ;;
-    c34*)
-       echo c34-convex-bsd
-       exit ;;
-    c38*)
-       echo c38-convex-bsd
-       exit ;;
-    c4*)
-       echo c4-convex-bsd
-       exit ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/xbmc/visualizations/Goom/goom2k4-0/config.sub b/xbmc/visualizations/Goom/goom2k4-0/config.sub
deleted file mode 100755 (executable)
index c2d1257..0000000
+++ /dev/null
@@ -1,1714 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-#   Free Software Foundation, Inc.
-
-timestamp='2010-01-22'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# 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.
-
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#      CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#      CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )        # Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit ;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-  kopensolaris*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-       -sun*os*)
-               # Prevent following clause from handling this invalid input.
-               ;;
-       -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-       -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-       -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-       -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-       -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-       -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-       -apple | -axis | -knuth | -cray | -microblaze)
-               os=
-               basic_machine=$1
-               ;;
-        -bluegene*)
-               os=-cnk
-               ;;
-       -sim | -cisco | -oki | -wec | -winbond)
-               os=
-               basic_machine=$1
-               ;;
-       -scout)
-               ;;
-       -wrs)
-               os=-vxworks
-               basic_machine=$1
-               ;;
-       -chorusos*)
-               os=-chorusos
-               basic_machine=$1
-               ;;
-       -chorusrdb)
-               os=-chorusrdb
-               basic_machine=$1
-               ;;
-       -hiux*)
-               os=-hiuxwe2
-               ;;
-       -sco6)
-               os=-sco5v6
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -sco5)
-               os=-sco3.2v5
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -sco4)
-               os=-sco3.2v4
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -sco3.2.[4-9]*)
-               os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -sco3.2v[4-9]*)
-               # Don't forget version if it is 3.2v4 or newer.
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -sco5v6*)
-               # Don't forget version if it is 3.2v4 or newer.
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -sco*)
-               os=-sco3.2v2
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -udk*)
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -isc)
-               os=-isc2.2
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -clix*)
-               basic_machine=clipper-intergraph
-               ;;
-       -isc*)
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -lynx*)
-               os=-lynxos
-               ;;
-       -ptx*)
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-               ;;
-       -windowsnt*)
-               os=`echo $os | sed -e 's/windowsnt/winnt/'`
-               ;;
-       -psos*)
-               os=-psos
-               ;;
-       -mint | -mint[0-9]*)
-               basic_machine=m68k-atari
-               os=-mint
-               ;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-       # Recognize the basic CPU types without company name.
-       # Some are omitted here because they have special meanings below.
-       1750a | 580 \
-       | a29k \
-       | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-       | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-       | am33_2.0 \
-       | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-       | bfin \
-       | c4x | clipper \
-       | d10v | d30v | dlx | dsp16xx \
-       | fido | fr30 | frv \
-       | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-       | i370 | i860 | i960 | ia64 \
-       | ip2k | iq2000 \
-       | lm32 \
-       | m32c | m32r | m32rle | m68000 | m68k | m88k \
-       | maxq | mb | microblaze | mcore | mep | metag \
-       | mips | mipsbe | mipseb | mipsel | mipsle \
-       | mips16 \
-       | mips64 | mips64el \
-       | mips64octeon | mips64octeonel \
-       | mips64orion | mips64orionel \
-       | mips64r5900 | mips64r5900el \
-       | mips64vr | mips64vrel \
-       | mips64vr4100 | mips64vr4100el \
-       | mips64vr4300 | mips64vr4300el \
-       | mips64vr5000 | mips64vr5000el \
-       | mips64vr5900 | mips64vr5900el \
-       | mipsisa32 | mipsisa32el \
-       | mipsisa32r2 | mipsisa32r2el \
-       | mipsisa64 | mipsisa64el \
-       | mipsisa64r2 | mipsisa64r2el \
-       | mipsisa64sb1 | mipsisa64sb1el \
-       | mipsisa64sr71k | mipsisa64sr71kel \
-       | mipstx39 | mipstx39el \
-       | mn10200 | mn10300 \
-       | moxie \
-       | mt \
-       | msp430 \
-       | nios | nios2 \
-       | ns16k | ns32k \
-       | or32 \
-       | pdp10 | pdp11 | pj | pjl \
-       | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-       | pyramid \
-       | rx \
-       | score \
-       | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-       | sh64 | sh64le \
-       | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-       | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-       | spu | strongarm \
-       | tahoe | thumb | tic4x | tic80 | tron \
-       | ubicom32 \
-       | v850 | v850e \
-       | we32k \
-       | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-       | z8k | z80)
-               basic_machine=$basic_machine-unknown
-               ;;
-       m6811 | m68hc11 | m6812 | m68hc12 | picochip)
-               # Motorola 68HC11/12.
-               basic_machine=$basic_machine-unknown
-               os=-none
-               ;;
-       m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-               ;;
-       ms1)
-               basic_machine=mt-unknown
-               ;;
-
-       # We use `pc' rather than `unknown'
-       # because (1) that's what they normally are, and
-       # (2) the word "unknown" tends to confuse beginning users.
-       i*86 | x86_64)
-         basic_machine=$basic_machine-pc
-         ;;
-       # Object if more than one company name word.
-       *-*-*)
-               echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-               exit 1
-               ;;
-       # Recognize the basic CPU types with company name.
-       580-* \
-       | a29k-* \
-       | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-       | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-       | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-       | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-       | avr-* | avr32-* \
-       | bfin-* | bs2000-* \
-       | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-       | clipper-* | craynv-* | cydra-* \
-       | d10v-* | d30v-* | dlx-* \
-       | elxsi-* \
-       | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-       | h8300-* | h8500-* \
-       | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-       | i*86-* | i860-* | i960-* | ia64-* \
-       | ip2k-* | iq2000-* \
-       | lm32-* \
-       | m32c-* | m32r-* | m32rle-* \
-       | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-       | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
-       | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-       | mips16-* \
-       | mips64-* | mips64el-* \
-       | mips64octeon-* | mips64octeonel-* \
-       | mips64orion-* | mips64orionel-* \
-       | mips64r5900-* | mips64r5900el-* \
-       | mips64vr-* | mips64vrel-* \
-       | mips64vr4100-* | mips64vr4100el-* \
-       | mips64vr4300-* | mips64vr4300el-* \
-       | mips64vr5000-* | mips64vr5000el-* \
-       | mips64vr5900-* | mips64vr5900el-* \
-       | mipsisa32-* | mipsisa32el-* \
-       | mipsisa32r2-* | mipsisa32r2el-* \
-       | mipsisa64-* | mipsisa64el-* \
-       | mipsisa64r2-* | mipsisa64r2el-* \
-       | mipsisa64sb1-* | mipsisa64sb1el-* \
-       | mipsisa64sr71k-* | mipsisa64sr71kel-* \
-       | mipstx39-* | mipstx39el-* \
-       | mmix-* \
-       | mt-* \
-       | msp430-* \
-       | nios-* | nios2-* \
-       | none-* | np1-* | ns16k-* | ns32k-* \
-       | orion-* \
-       | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-       | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-       | pyramid-* \
-       | romp-* | rs6000-* | rx-* \
-       | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-       | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-       | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-       | sparclite-* \
-       | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-       | tahoe-* | thumb-* \
-       | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-       | tile-* | tilegx-* \
-       | tron-* \
-       | ubicom32-* \
-       | v850-* | v850e-* | vax-* \
-       | we32k-* \
-       | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-       | xstormy16-* | xtensa*-* \
-       | ymp-* \
-       | z8k-* | z80-*)
-               ;;
-       # Recognize the basic CPU types without company name, with glob match.
-       xtensa*)
-               basic_machine=$basic_machine-unknown
-               ;;
-       # Recognize the various machine names and aliases which stand
-       # for a CPU type and a company and sometimes even an OS.
-       386bsd)
-               basic_machine=i386-unknown
-               os=-bsd
-               ;;
-       3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-               basic_machine=m68000-att
-               ;;
-       3b*)
-               basic_machine=we32k-att
-               ;;
-       a29khif)
-               basic_machine=a29k-amd
-               os=-udi
-               ;;
-       abacus)
-               basic_machine=abacus-unknown
-               ;;
-       adobe68k)
-               basic_machine=m68010-adobe
-               os=-scout
-               ;;
-       alliant | fx80)
-               basic_machine=fx80-alliant
-               ;;
-       altos | altos3068)
-               basic_machine=m68k-altos
-               ;;
-       am29k)
-               basic_machine=a29k-none
-               os=-bsd
-               ;;
-       amd64)
-               basic_machine=x86_64-pc
-               ;;
-       amd64-*)
-               basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       amdahl)
-               basic_machine=580-amdahl
-               os=-sysv
-               ;;
-       amiga | amiga-*)
-               basic_machine=m68k-unknown
-               ;;
-       amigaos | amigados)
-               basic_machine=m68k-unknown
-               os=-amigaos
-               ;;
-       amigaunix | amix)
-               basic_machine=m68k-unknown
-               os=-sysv4
-               ;;
-       apollo68)
-               basic_machine=m68k-apollo
-               os=-sysv
-               ;;
-       apollo68bsd)
-               basic_machine=m68k-apollo
-               os=-bsd
-               ;;
-       aros)
-               basic_machine=i386-pc
-               os=-aros
-               ;;
-       aux)
-               basic_machine=m68k-apple
-               os=-aux
-               ;;
-       balance)
-               basic_machine=ns32k-sequent
-               os=-dynix
-               ;;
-       blackfin)
-               basic_machine=bfin-unknown
-               os=-linux
-               ;;
-       blackfin-*)
-               basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-               os=-linux
-               ;;
-       bluegene*)
-               basic_machine=powerpc-ibm
-               os=-cnk
-               ;;
-       c90)
-               basic_machine=c90-cray
-               os=-unicos
-               ;;
-        cegcc)
-               basic_machine=arm-unknown
-               os=-cegcc
-               ;;
-       convex-c1)
-               basic_machine=c1-convex
-               os=-bsd
-               ;;
-       convex-c2)
-               basic_machine=c2-convex
-               os=-bsd
-               ;;
-       convex-c32)
-               basic_machine=c32-convex
-               os=-bsd
-               ;;
-       convex-c34)
-               basic_machine=c34-convex
-               os=-bsd
-               ;;
-       convex-c38)
-               basic_machine=c38-convex
-               os=-bsd
-               ;;
-       cray | j90)
-               basic_machine=j90-cray
-               os=-unicos
-               ;;
-       craynv)
-               basic_machine=craynv-cray
-               os=-unicosmp
-               ;;
-       cr16)
-               basic_machine=cr16-unknown
-               os=-elf
-               ;;
-       crds | unos)
-               basic_machine=m68k-crds
-               ;;
-       crisv32 | crisv32-* | etraxfs*)
-               basic_machine=crisv32-axis
-               ;;
-       cris | cris-* | etrax*)
-               basic_machine=cris-axis
-               ;;
-       crx)
-               basic_machine=crx-unknown
-               os=-elf
-               ;;
-       da30 | da30-*)
-               basic_machine=m68k-da30
-               ;;
-       decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-               basic_machine=mips-dec
-               ;;
-       decsystem10* | dec10*)
-               basic_machine=pdp10-dec
-               os=-tops10
-               ;;
-       decsystem20* | dec20*)
-               basic_machine=pdp10-dec
-               os=-tops20
-               ;;
-       delta | 3300 | motorola-3300 | motorola-delta \
-             | 3300-motorola | delta-motorola)
-               basic_machine=m68k-motorola
-               ;;
-       delta88)
-               basic_machine=m88k-motorola
-               os=-sysv3
-               ;;
-       dicos)
-               basic_machine=i686-pc
-               os=-dicos
-               ;;
-       djgpp)
-               basic_machine=i586-pc
-               os=-msdosdjgpp
-               ;;
-       dpx20 | dpx20-*)
-               basic_machine=rs6000-bull
-               os=-bosx
-               ;;
-       dpx2* | dpx2*-bull)
-               basic_machine=m68k-bull
-               os=-sysv3
-               ;;
-       ebmon29k)
-               basic_machine=a29k-amd
-               os=-ebmon
-               ;;
-       elxsi)
-               basic_machine=elxsi-elxsi
-               os=-bsd
-               ;;
-       encore | umax | mmax)
-               basic_machine=ns32k-encore
-               ;;
-       es1800 | OSE68k | ose68k | ose | OSE)
-               basic_machine=m68k-ericsson
-               os=-ose
-               ;;
-       fx2800)
-               basic_machine=i860-alliant
-               ;;
-       genix)
-               basic_machine=ns32k-ns
-               ;;
-       gmicro)
-               basic_machine=tron-gmicro
-               os=-sysv
-               ;;
-       go32)
-               basic_machine=i386-pc
-               os=-go32
-               ;;
-       h3050r* | hiux*)
-               basic_machine=hppa1.1-hitachi
-               os=-hiuxwe2
-               ;;
-       h8300hms)
-               basic_machine=h8300-hitachi
-               os=-hms
-               ;;
-       h8300xray)
-               basic_machine=h8300-hitachi
-               os=-xray
-               ;;
-       h8500hms)
-               basic_machine=h8500-hitachi
-               os=-hms
-               ;;
-       harris)
-               basic_machine=m88k-harris
-               os=-sysv3
-               ;;
-       hp300-*)
-               basic_machine=m68k-hp
-               ;;
-       hp300bsd)
-               basic_machine=m68k-hp
-               os=-bsd
-               ;;
-       hp300hpux)
-               basic_machine=m68k-hp
-               os=-hpux
-               ;;
-       hp3k9[0-9][0-9] | hp9[0-9][0-9])
-               basic_machine=hppa1.0-hp
-               ;;
-       hp9k2[0-9][0-9] | hp9k31[0-9])
-               basic_machine=m68000-hp
-               ;;
-       hp9k3[2-9][0-9])
-               basic_machine=m68k-hp
-               ;;
-       hp9k6[0-9][0-9] | hp6[0-9][0-9])
-               basic_machine=hppa1.0-hp
-               ;;
-       hp9k7[0-79][0-9] | hp7[0-79][0-9])
-               basic_machine=hppa1.1-hp
-               ;;
-       hp9k78[0-9] | hp78[0-9])
-               # FIXME: really hppa2.0-hp
-               basic_machine=hppa1.1-hp
-               ;;
-       hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-               # FIXME: really hppa2.0-hp
-               basic_machine=hppa1.1-hp
-               ;;
-       hp9k8[0-9][13679] | hp8[0-9][13679])
-               basic_machine=hppa1.1-hp
-               ;;
-       hp9k8[0-9][0-9] | hp8[0-9][0-9])
-               basic_machine=hppa1.0-hp
-               ;;
-       hppa-next)
-               os=-nextstep3
-               ;;
-       hppaosf)
-               basic_machine=hppa1.1-hp
-               os=-osf
-               ;;
-       hppro)
-               basic_machine=hppa1.1-hp
-               os=-proelf
-               ;;
-       i370-ibm* | ibm*)
-               basic_machine=i370-ibm
-               ;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-       i*86v32)
-               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-               os=-sysv32
-               ;;
-       i*86v4*)
-               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-               os=-sysv4
-               ;;
-       i*86v)
-               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-               os=-sysv
-               ;;
-       i*86sol2)
-               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-               os=-solaris2
-               ;;
-       i386mach)
-               basic_machine=i386-mach
-               os=-mach
-               ;;
-       i386-vsta | vsta)
-               basic_machine=i386-unknown
-               os=-vsta
-               ;;
-       iris | iris4d)
-               basic_machine=mips-sgi
-               case $os in
-                   -irix*)
-                       ;;
-                   *)
-                       os=-irix4
-                       ;;
-               esac
-               ;;
-       isi68 | isi)
-               basic_machine=m68k-isi
-               os=-sysv
-               ;;
-       m68knommu)
-               basic_machine=m68k-unknown
-               os=-linux
-               ;;
-       m68knommu-*)
-               basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-               os=-linux
-               ;;
-       m88k-omron*)
-               basic_machine=m88k-omron
-               ;;
-       magnum | m3230)
-               basic_machine=mips-mips
-               os=-sysv
-               ;;
-       merlin)
-               basic_machine=ns32k-utek
-               os=-sysv
-               ;;
-        microblaze)
-               basic_machine=microblaze-xilinx
-               ;;
-       mingw32)
-               basic_machine=i386-pc
-               os=-mingw32
-               ;;
-       mingw32ce)
-               basic_machine=arm-unknown
-               os=-mingw32ce
-               ;;
-       miniframe)
-               basic_machine=m68000-convergent
-               ;;
-       *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-               basic_machine=m68k-atari
-               os=-mint
-               ;;
-       mips3*-*)
-               basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-               ;;
-       mips3*)
-               basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-               ;;
-       monitor)
-               basic_machine=m68k-rom68k
-               os=-coff
-               ;;
-       morphos)
-               basic_machine=powerpc-unknown
-               os=-morphos
-               ;;
-       msdos)
-               basic_machine=i386-pc
-               os=-msdos
-               ;;
-       ms1-*)
-               basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-               ;;
-       mvs)
-               basic_machine=i370-ibm
-               os=-mvs
-               ;;
-       ncr3000)
-               basic_machine=i486-ncr
-               os=-sysv4
-               ;;
-       netbsd386)
-               basic_machine=i386-unknown
-               os=-netbsd
-               ;;
-       netwinder)
-               basic_machine=armv4l-rebel
-               os=-linux
-               ;;
-       news | news700 | news800 | news900)
-               basic_machine=m68k-sony
-               os=-newsos
-               ;;
-       news1000)
-               basic_machine=m68030-sony
-               os=-newsos
-               ;;
-       news-3600 | risc-news)
-               basic_machine=mips-sony
-               os=-newsos
-               ;;
-       necv70)
-               basic_machine=v70-nec
-               os=-sysv
-               ;;
-       next | m*-next )
-               basic_machine=m68k-next
-               case $os in
-                   -nextstep* )
-                       ;;
-                   -ns2*)
-                     os=-nextstep2
-                       ;;
-                   *)
-                     os=-nextstep3
-                       ;;
-               esac
-               ;;
-       nh3000)
-               basic_machine=m68k-harris
-               os=-cxux
-               ;;
-       nh[45]000)
-               basic_machine=m88k-harris
-               os=-cxux
-               ;;
-       nindy960)
-               basic_machine=i960-intel
-               os=-nindy
-               ;;
-       mon960)
-               basic_machine=i960-intel
-               os=-mon960
-               ;;
-       nonstopux)
-               basic_machine=mips-compaq
-               os=-nonstopux
-               ;;
-       np1)
-               basic_machine=np1-gould
-               ;;
-       nsr-tandem)
-               basic_machine=nsr-tandem
-               ;;
-       op50n-* | op60c-*)
-               basic_machine=hppa1.1-oki
-               os=-proelf
-               ;;
-       openrisc | openrisc-*)
-               basic_machine=or32-unknown
-               ;;
-       os400)
-               basic_machine=powerpc-ibm
-               os=-os400
-               ;;
-       OSE68000 | ose68000)
-               basic_machine=m68000-ericsson
-               os=-ose
-               ;;
-       os68k)
-               basic_machine=m68k-none
-               os=-os68k
-               ;;
-       pa-hitachi)
-               basic_machine=hppa1.1-hitachi
-               os=-hiuxwe2
-               ;;
-       paragon)
-               basic_machine=i860-intel
-               os=-osf
-               ;;
-       parisc)
-               basic_machine=hppa-unknown
-               os=-linux
-               ;;
-       parisc-*)
-               basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-               os=-linux
-               ;;
-       pbd)
-               basic_machine=sparc-tti
-               ;;
-       pbb)
-               basic_machine=m68k-tti
-               ;;
-       pc532 | pc532-*)
-               basic_machine=ns32k-pc532
-               ;;
-       pc98)
-               basic_machine=i386-pc
-               ;;
-       pc98-*)
-               basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       pentium | p5 | k5 | k6 | nexgen | viac3)
-               basic_machine=i586-pc
-               ;;
-       pentiumpro | p6 | 6x86 | athlon | athlon_*)
-               basic_machine=i686-pc
-               ;;
-       pentiumii | pentium2 | pentiumiii | pentium3)
-               basic_machine=i686-pc
-               ;;
-       pentium4)
-               basic_machine=i786-pc
-               ;;
-       pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-               basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       pentiumpro-* | p6-* | 6x86-* | athlon-*)
-               basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-               basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       pentium4-*)
-               basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       pn)
-               basic_machine=pn-gould
-               ;;
-       power)  basic_machine=power-ibm
-               ;;
-       ppc)    basic_machine=powerpc-unknown
-               ;;
-       ppc-*)  basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       ppcle | powerpclittle | ppc-le | powerpc-little)
-               basic_machine=powerpcle-unknown
-               ;;
-       ppcle-* | powerpclittle-*)
-               basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       ppc64)  basic_machine=powerpc64-unknown
-               ;;
-       ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-               basic_machine=powerpc64le-unknown
-               ;;
-       ppc64le-* | powerpc64little-*)
-               basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       ps2)
-               basic_machine=i386-ibm
-               ;;
-       pw32)
-               basic_machine=i586-unknown
-               os=-pw32
-               ;;
-       rdos)
-               basic_machine=i386-pc
-               os=-rdos
-               ;;
-       rom68k)
-               basic_machine=m68k-rom68k
-               os=-coff
-               ;;
-       rm[46]00)
-               basic_machine=mips-siemens
-               ;;
-       rtpc | rtpc-*)
-               basic_machine=romp-ibm
-               ;;
-       s390 | s390-*)
-               basic_machine=s390-ibm
-               ;;
-       s390x | s390x-*)
-               basic_machine=s390x-ibm
-               ;;
-       sa29200)
-               basic_machine=a29k-amd
-               os=-udi
-               ;;
-       sb1)
-               basic_machine=mipsisa64sb1-unknown
-               ;;
-       sb1el)
-               basic_machine=mipsisa64sb1el-unknown
-               ;;
-       sde)
-               basic_machine=mipsisa32-sde
-               os=-elf
-               ;;
-       sei)
-               basic_machine=mips-sei
-               os=-seiux
-               ;;
-       sequent)
-               basic_machine=i386-sequent
-               ;;
-       sh)
-               basic_machine=sh-hitachi
-               os=-hms
-               ;;
-       sh5el)
-               basic_machine=sh5le-unknown
-               ;;
-       sh64)
-               basic_machine=sh64-unknown
-               ;;
-       sparclite-wrs | simso-wrs)
-               basic_machine=sparclite-wrs
-               os=-vxworks
-               ;;
-       sps7)
-               basic_machine=m68k-bull
-               os=-sysv2
-               ;;
-       spur)
-               basic_machine=spur-unknown
-               ;;
-       st2000)
-               basic_machine=m68k-tandem
-               ;;
-       stratus)
-               basic_machine=i860-stratus
-               os=-sysv4
-               ;;
-       sun2)
-               basic_machine=m68000-sun
-               ;;
-       sun2os3)
-               basic_machine=m68000-sun
-               os=-sunos3
-               ;;
-       sun2os4)
-               basic_machine=m68000-sun
-               os=-sunos4
-               ;;
-       sun3os3)
-               basic_machine=m68k-sun
-               os=-sunos3
-               ;;
-       sun3os4)
-               basic_machine=m68k-sun
-               os=-sunos4
-               ;;
-       sun4os3)
-               basic_machine=sparc-sun
-               os=-sunos3
-               ;;
-       sun4os4)
-               basic_machine=sparc-sun
-               os=-sunos4
-               ;;
-       sun4sol2)
-               basic_machine=sparc-sun
-               os=-solaris2
-               ;;
-       sun3 | sun3-*)
-               basic_machine=m68k-sun
-               ;;
-       sun4)
-               basic_machine=sparc-sun
-               ;;
-       sun386 | sun386i | roadrunner)
-               basic_machine=i386-sun
-               ;;
-       sv1)
-               basic_machine=sv1-cray
-               os=-unicos
-               ;;
-       symmetry)
-               basic_machine=i386-sequent
-               os=-dynix
-               ;;
-       t3e)
-               basic_machine=alphaev5-cray
-               os=-unicos
-               ;;
-       t90)
-               basic_machine=t90-cray
-               os=-unicos
-               ;;
-       tic54x | c54x*)
-               basic_machine=tic54x-unknown
-               os=-coff
-               ;;
-       tic55x | c55x*)
-               basic_machine=tic55x-unknown
-               os=-coff
-               ;;
-       tic6x | c6x*)
-               basic_machine=tic6x-unknown
-               os=-coff
-               ;;
-        # This must be matched before tile*.
-        tilegx*)
-               basic_machine=tilegx-unknown
-               os=-linux-gnu
-               ;;
-       tile*)
-               basic_machine=tile-unknown
-               os=-linux-gnu
-               ;;
-       tx39)
-               basic_machine=mipstx39-unknown
-               ;;
-       tx39el)
-               basic_machine=mipstx39el-unknown
-               ;;
-       toad1)
-               basic_machine=pdp10-xkl
-               os=-tops20
-               ;;
-       tower | tower-32)
-               basic_machine=m68k-ncr
-               ;;
-       tpf)
-               basic_machine=s390x-ibm
-               os=-tpf
-               ;;
-       udi29k)
-               basic_machine=a29k-amd
-               os=-udi
-               ;;
-       ultra3)
-               basic_machine=a29k-nyu
-               os=-sym1
-               ;;
-       v810 | necv810)
-               basic_machine=v810-nec
-               os=-none
-               ;;
-       vaxv)
-               basic_machine=vax-dec
-               os=-sysv
-               ;;
-       vms)
-               basic_machine=vax-dec
-               os=-vms
-               ;;
-       vpp*|vx|vx-*)
-               basic_machine=f301-fujitsu
-               ;;
-       vxworks960)
-               basic_machine=i960-wrs
-               os=-vxworks
-               ;;
-       vxworks68)
-               basic_machine=m68k-wrs
-               os=-vxworks
-               ;;
-       vxworks29k)
-               basic_machine=a29k-wrs
-               os=-vxworks
-               ;;
-       w65*)
-               basic_machine=w65-wdc
-               os=-none
-               ;;
-       w89k-*)
-               basic_machine=hppa1.1-winbond
-               os=-proelf
-               ;;
-       xbox)
-               basic_machine=i686-pc
-               os=-mingw32
-               ;;
-       xps | xps100)
-               basic_machine=xps100-honeywell
-               ;;
-       ymp)
-               basic_machine=ymp-cray
-               os=-unicos
-               ;;
-       z8k-*-coff)
-               basic_machine=z8k-unknown
-               os=-sim
-               ;;
-       z80-*-coff)
-               basic_machine=z80-unknown
-               os=-sim
-               ;;
-       none)
-               basic_machine=none-none
-               os=-none
-               ;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-       w89k)
-               basic_machine=hppa1.1-winbond
-               ;;
-       op50n)
-               basic_machine=hppa1.1-oki
-               ;;
-       op60c)
-               basic_machine=hppa1.1-oki
-               ;;
-       romp)
-               basic_machine=romp-ibm
-               ;;
-       mmix)
-               basic_machine=mmix-knuth
-               ;;
-       rs6000)
-               basic_machine=rs6000-ibm
-               ;;
-       vax)
-               basic_machine=vax-dec
-               ;;
-       pdp10)
-               # there are many clones, so DEC is not a safe bet
-               basic_machine=pdp10-unknown
-               ;;
-       pdp11)
-               basic_machine=pdp11-dec
-               ;;
-       we32k)
-               basic_machine=we32k-att
-               ;;
-       sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
-               basic_machine=sh-unknown
-               ;;
-       sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-               basic_machine=sparc-sun
-               ;;
-       cydra)
-               basic_machine=cydra-cydrome
-               ;;
-       orion)
-               basic_machine=orion-highlevel
-               ;;
-       orion105)
-               basic_machine=clipper-highlevel
-               ;;
-       mac | mpw | mac-mpw)
-               basic_machine=m68k-apple
-               ;;
-       pmac | pmac-mpw)
-               basic_machine=powerpc-apple
-               ;;
-       *-unknown)
-               # Make sure to match an already-canonicalized machine name.
-               ;;
-       *)
-               echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-               exit 1
-               ;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-       *-digital*)
-               basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-               ;;
-       *-commodore*)
-               basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-               ;;
-       *)
-               ;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-       # -solaris* is a basic system type, with this one exception.
-        -auroraux)
-               os=-auroraux
-               ;;
-       -solaris1 | -solaris1.*)
-               os=`echo $os | sed -e 's|solaris1|sunos4|'`
-               ;;
-       -solaris)
-               os=-solaris2
-               ;;
-       -svr4*)
-               os=-sysv4
-               ;;
-       -unixware*)
-               os=-sysv4.2uw
-               ;;
-       -gnu/linux*)
-               os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-               ;;
-       # First accept the basic system types.
-       # The portable systems comes first.
-       # Each alternative MUST END IN A *, to match a version number.
-       # -sysv* is not here because it comes later, after sysvr4.
-       -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-             | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-             | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-             | -sym* | -kopensolaris* \
-             | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-             | -aos* | -aros* \
-             | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-             | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-             | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-             | -openbsd* | -solidbsd* \
-             | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-             | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-             | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-             | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-             | -chorusos* | -chorusrdb* | -cegcc* \
-             | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-             | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-             | -uxpv* | -beos* | -mpeix* | -udk* \
-             | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-             | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-             | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-             | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-             | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-             | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-             | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
-       # Remember, each alternative MUST END IN *, to match a version number.
-               ;;
-       -qnx*)
-               case $basic_machine in
-                   x86-* | i*86-*)
-                       ;;
-                   *)
-                       os=-nto$os
-                       ;;
-               esac
-               ;;
-       -nto-qnx*)
-               ;;
-       -nto*)
-               os=`echo $os | sed -e 's|nto|nto-qnx|'`
-               ;;
-       -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-             | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-             | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-               ;;
-       -mac*)
-               os=`echo $os | sed -e 's|mac|macos|'`
-               ;;
-       -linux-dietlibc)
-               os=-linux-dietlibc
-               ;;
-       -linux*)
-               os=`echo $os | sed -e 's|linux|linux-gnu|'`
-               ;;
-       -sunos5*)
-               os=`echo $os | sed -e 's|sunos5|solaris2|'`
-               ;;
-       -sunos6*)
-               os=`echo $os | sed -e 's|sunos6|solaris3|'`
-               ;;
-       -opened*)
-               os=-openedition
-               ;;
-        -os400*)
-               os=-os400
-               ;;
-       -wince*)
-               os=-wince
-               ;;
-       -osfrose*)
-               os=-osfrose
-               ;;
-       -osf*)
-               os=-osf
-               ;;
-       -utek*)
-               os=-bsd
-               ;;
-       -dynix*)
-               os=-bsd
-               ;;
-       -acis*)
-               os=-aos
-               ;;
-       -atheos*)
-               os=-atheos
-               ;;
-       -syllable*)
-               os=-syllable
-               ;;
-       -386bsd)
-               os=-bsd
-               ;;
-       -ctix* | -uts*)
-               os=-sysv
-               ;;
-       -nova*)
-               os=-rtmk-nova
-               ;;
-       -ns2 )
-               os=-nextstep2
-               ;;
-       -nsk*)
-               os=-nsk
-               ;;
-       # Preserve the version number of sinix5.
-       -sinix5.*)
-               os=`echo $os | sed -e 's|sinix|sysv|'`
-               ;;
-       -sinix*)
-               os=-sysv4
-               ;;
-        -tpf*)
-               os=-tpf
-               ;;
-       -triton*)
-               os=-sysv3
-               ;;
-       -oss*)
-               os=-sysv3
-               ;;
-       -svr4)
-               os=-sysv4
-               ;;
-       -svr3)
-               os=-sysv3
-               ;;
-       -sysvr4)
-               os=-sysv4
-               ;;
-       # This must come after -sysvr4.
-       -sysv*)
-               ;;
-       -ose*)
-               os=-ose
-               ;;
-       -es1800*)
-               os=-ose
-               ;;
-       -xenix)
-               os=-xenix
-               ;;
-       -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-               os=-mint
-               ;;
-       -aros*)
-               os=-aros
-               ;;
-       -kaos*)
-               os=-kaos
-               ;;
-       -zvmoe)
-               os=-zvmoe
-               ;;
-       -dicos*)
-               os=-dicos
-               ;;
-        -nacl*)
-               ;;
-       -none)
-               ;;
-       *)
-               # Get rid of the `-' at the beginning of $os.
-               os=`echo $os | sed 's/[^-]*-//'`
-               echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-               exit 1
-               ;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-        score-*)
-               os=-elf
-               ;;
-        spu-*)
-               os=-elf
-               ;;
-       *-acorn)
-               os=-riscix1.2
-               ;;
-       arm*-rebel)
-               os=-linux
-               ;;
-       arm*-semi)
-               os=-aout
-               ;;
-        c4x-* | tic4x-*)
-               os=-coff
-               ;;
-       # This must come before the *-dec entry.
-       pdp10-*)
-               os=-tops20
-               ;;
-       pdp11-*)
-               os=-none
-               ;;
-       *-dec | vax-*)
-               os=-ultrix4.2
-               ;;
-       m68*-apollo)
-               os=-domain
-               ;;
-       i386-sun)
-               os=-sunos4.0.2
-               ;;
-       m68000-sun)
-               os=-sunos3
-               # This also exists in the configure program, but was not the
-               # default.
-               # os=-sunos4
-               ;;
-       m68*-cisco)
-               os=-aout
-               ;;
-        mep-*)
-               os=-elf
-               ;;
-       mips*-cisco)
-               os=-elf
-               ;;
-       mips*-*)
-               os=-elf
-               ;;
-       or32-*)
-               os=-coff
-               ;;
-       *-tti)  # must be before sparc entry or we get the wrong os.
-               os=-sysv3
-               ;;
-       sparc-* | *-sun)
-               os=-sunos4.1.1
-               ;;
-       *-be)
-               os=-beos
-               ;;
-       *-haiku)
-               os=-haiku
-               ;;
-       *-ibm)
-               os=-aix
-               ;;
-       *-knuth)
-               os=-mmixware
-               ;;
-       *-wec)
-               os=-proelf
-               ;;
-       *-winbond)
-               os=-proelf
-               ;;
-       *-oki)
-               os=-proelf
-               ;;
-       *-hp)
-               os=-hpux
-               ;;
-       *-hitachi)
-               os=-hiux
-               ;;
-       i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-               os=-sysv
-               ;;
-       *-cbm)
-               os=-amigaos
-               ;;
-       *-dg)
-               os=-dgux
-               ;;
-       *-dolphin)
-               os=-sysv3
-               ;;
-       m68k-ccur)
-               os=-rtu
-               ;;
-       m88k-omron*)
-               os=-luna
-               ;;
-       *-next )
-               os=-nextstep
-               ;;
-       *-sequent)
-               os=-ptx
-               ;;
-       *-crds)
-               os=-unos
-               ;;
-       *-ns)
-               os=-genix
-               ;;
-       i370-*)
-               os=-mvs
-               ;;
-       *-next)
-               os=-nextstep3
-               ;;
-       *-gould)
-               os=-sysv
-               ;;
-       *-highlevel)
-               os=-bsd
-               ;;
-       *-encore)
-               os=-bsd
-               ;;
-       *-sgi)
-               os=-irix
-               ;;
-       *-siemens)
-               os=-sysv4
-               ;;
-       *-masscomp)
-               os=-rtu
-               ;;
-       f30[01]-fujitsu | f700-fujitsu)
-               os=-uxpv
-               ;;
-       *-rom68k)
-               os=-coff
-               ;;
-       *-*bug)
-               os=-coff
-               ;;
-       *-apple)
-               os=-macos
-               ;;
-       *-atari*)
-               os=-mint
-               ;;
-       *)
-               os=-none
-               ;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-       *-unknown)
-               case $os in
-                       -riscix*)
-                               vendor=acorn
-                               ;;
-                       -sunos*)
-                               vendor=sun
-                               ;;
-                       -cnk*|-aix*)
-                               vendor=ibm
-                               ;;
-                       -beos*)
-                               vendor=be
-                               ;;
-                       -hpux*)
-                               vendor=hp
-                               ;;
-                       -mpeix*)
-                               vendor=hp
-                               ;;
-                       -hiux*)
-                               vendor=hitachi
-                               ;;
-                       -unos*)
-                               vendor=crds
-                               ;;
-                       -dgux*)
-                               vendor=dg
-                               ;;
-                       -luna*)
-                               vendor=omron
-                               ;;
-                       -genix*)
-                               vendor=ns
-                               ;;
-                       -mvs* | -opened*)
-                               vendor=ibm
-                               ;;
-                       -os400*)
-                               vendor=ibm
-                               ;;
-                       -ptx*)
-                               vendor=sequent
-                               ;;
-                       -tpf*)
-                               vendor=ibm
-                               ;;
-                       -vxsim* | -vxworks* | -windiss*)
-                               vendor=wrs
-                               ;;
-                       -aux*)
-                               vendor=apple
-                               ;;
-                       -hms*)
-                               vendor=hitachi
-                               ;;
-                       -mpw* | -macos*)
-                               vendor=apple
-                               ;;
-                       -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-                               vendor=atari
-                               ;;
-                       -vos*)
-                               vendor=stratus
-                               ;;
-               esac
-               basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-               ;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/xbmc/visualizations/Goom/goom2k4-0/configure b/xbmc/visualizations/Goom/goom2k4-0/configure
deleted file mode 100755 (executable)
index 556f460..0000000
+++ /dev/null
@@ -1,14022 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65.
-#
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-#
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-       expr "X$arg" : "X\\(.*\\)$as_nl";
-       arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""       $as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-"
-  as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
-
-exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-
-else
-  exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1"
-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  as_found=:
-  case $as_dir in #(
-        /*)
-          for as_base in sh bash ksh sh5; do
-            # Try only shells that exist, to save several forks.
-            as_shell=$as_dir/$as_base
-            if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-                   { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  CONFIG_SHELL=$as_shell as_have_required=yes
-                  if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  break 2
-fi
-fi
-          done;;
-       esac
-  as_found=false
-done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-             { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
-IFS=$as_save_IFS
-
-
-      if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-       # neutralization value for shells without unset; and this also
-       # works around shells that cannot unset nonexistent variables.
-       BASH_ENV=/dev/null
-       ENV=/dev/null
-       (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-       export CONFIG_SHELL
-       exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-  else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
-$0: including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
-  fi
-  exit 1
-fi
-fi
-fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-        X"$as_dir" : 'X\(//\)[^/]' \| \
-        X"$as_dir" : 'X\(//\)$' \| \
-        X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)[^/].*/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-  fi
-  $as_echo "$as_me: error: $1" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-        X"$0" : 'X\(//\)$' \| \
-        X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-           s//\1/
-           q
-         }
-         /^X\/\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\/\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='        ';;     # ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='        ';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -p'
-  fi
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-       test -d "$1/.";
-      else
-       case $1 in #(
-       -*)set "./$1";;
-       esac;
-       case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-       ???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$lt_ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
-  ;;
-esac
-
-ECHO=${lt_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 <<_LT_EOF
-$*
-_LT_EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$lt_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 &&
-        { 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.
-lt_ECHO=$ECHO
-if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-   lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
-fi
-
-
-
-
-test -n "$DJDIR" || exec 7<&0 </dev/null
-exec 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-PACKAGE_URL=
-
-ac_unique_file="README"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='am__EXEEXT_FALSE
-am__EXEEXT_TRUE
-LTLIBOBJS
-LIBOBJS
-PTHREAD_LIBS
-MACTARGET_FALSE
-MACTARGET_TRUE
-HAVE_PPC_FALSE
-HAVE_PPC_TRUE
-HAVE_MMX_FALSE
-HAVE_MMX_TRUE
-CCASFLAGS
-CCAS
-MACFOLDER
-HAVE_SDL_FALSE
-HAVE_SDL_TRUE
-HAVE_XMMS_FALSE
-HAVE_XMMS_TRUE
-YFLAGS
-YACC
-LEXLIB
-LEX_OUTPUT_ROOT
-LEX
-CPP
-OTOOL64
-OTOOL
-LIPO
-NMEDIT
-DSYMUTIL
-lt_ECHO
-RANLIB
-AR
-OBJDUMP
-LN_S
-NM
-ac_ct_DUMPBIN
-DUMPBIN
-LD
-FGREP
-EGREP
-GREP
-SED
-am__fastdepCC_FALSE
-am__fastdepCC_TRUE
-CCDEPMODE
-AMDEPBACKSLASH
-AMDEP_FALSE
-AMDEP_TRUE
-am__quote
-am__include
-DEPDIR
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-LIBTOOL
-am__untar
-am__tar
-AMTAR
-am__leading_dot
-SET_MAKE
-AWK
-mkdir_p
-MKDIR_P
-INSTALL_STRIP_PROGRAM
-STRIP
-install_sh
-MAKEINFO
-AUTOHEADER
-AUTOMAKE
-AUTOCONF
-ACLOCAL
-VERSION
-PACKAGE
-CYGPATH_W
-am__isrc
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_URL
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL'
-ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-enable_static
-enable_shared
-with_pic
-enable_fast_install
-enable_dependency_tracking
-with_gnu_ld
-enable_libtool_lock
-'
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP
-YACC
-YFLAGS'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)   ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-        ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-        ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-        ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-        ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    case $ac_envvar in #(
-      '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
-    esac
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error "missing argument to $ac_option"
-fi
-
-if test -n "$ac_unrecognized_opts"; then
-  case $enable_option_checking in
-    no) ;;
-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-  esac
-fi
-
-# Check all directory arguments for consistency.
-for ac_var in  exec_prefix prefix bindir sbindir libexecdir datarootdir \
-               datadir sysconfdir sharedstatedir localstatedir includedir \
-               oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-               libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  # Remove trailing slashes.
-  case $ac_val in
-    */ )
-      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-      eval $ac_var=\$ac_val;;
-  esac
-  # Be sure to have absolute directory names.
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error "working directory cannot be determined"
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error "pwd does not report name of working directory"
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-        X"$as_myself" : 'X\(//\)[^/]' \| \
-        X"$as_myself" : 'X\(//\)$' \| \
-        X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)[^/].*/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-       cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
-       pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR            user executables [EPREFIX/bin]
-  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR        program executables [EPREFIX/libexec]
-  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --libdir=DIR            object code libraries [EPREFIX/lib]
-  --includedir=DIR        C header files [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR           info documentation [DATAROOTDIR/info]
-  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
-  --htmldir=DIR           html documentation [DOCDIR]
-  --dvidir=DIR            dvi documentation [DOCDIR]
-  --pdfdir=DIR            pdf documentation [DOCDIR]
-  --psdir=DIR             ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-option-checking  ignore unrecognized --enable/--with options
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-static[=PKGS]  build static libraries [default=no]
-  --enable-shared[=PKGS]  build shared libraries [default=yes]
-  --enable-fast-install[=PKGS]
-                          optimize for fast installation [default=yes]
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
-  --disable-libtool-lock  avoid locking (might break parallel builds)
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic              try to use only PIC/non-PIC objects [default=use
-                          both]
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
-  YACC        The `Yet Another C Compiler' implementation to use. Defaults to
-              the first program found out of: `bison -y', `byacc', `yacc'.
-  YFLAGS      The list of arguments that will be passed by default to $YACC.
-              This script will default YFLAGS to the empty string to avoid a
-              default value of `-d' given by some make applications.
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-Report bugs to the package provider.
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" ||
-      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-      continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-configure
-generated by GNU Autoconf 2.65
-
-Copyright (C) 2009 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
-
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=1
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_compile
-
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
-
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_header_compile
-
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } >/dev/null && {
-        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_func
-
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_header_mongrel
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
-  done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
-    2)
-      as_fn_append ac_configure_args1 " '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-       ac_must_keep_next=false # Got value, back to normal.
-      else
-       case $ac_arg in
-         *=* | --config-cache | -C | -disable-* | --disable-* \
-         | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-         | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-         | -with-* | --with-* | -without-* | --without-* | --x)
-           case "$ac_configure_args0 " in
-             "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-           esac
-           ;;
-         -* ) ac_must_keep_next=true ;;
-       esac
-      fi
-      as_fn_append ac_configure_args " '$ac_arg'"
-      ;;
-    esac
-  done
-done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-       "s/'\''/'\''\\\\'\'''\''/g;
-         s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      $as_echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-       eval ac_val=\$$ac_var
-       case $ac_val in
-       *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-       esac
-       $as_echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-$as_echo "/* confdefs.h */" > confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
-elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
-else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
-fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-do
-  test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special files
-  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-       # differences in whitespace do not lead to failure.
-       ac_old_val_w=`echo x $ac_old_val`
-       ac_new_val_w=`echo x $ac_new_val`
-       if test "$ac_old_val_w" != "$ac_new_val_w"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-         ac_cache_corrupted=:
-       else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-         eval $ac_var=\$ac_old_val
-       fi
-       { $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-       { $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-# Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then :
-  enableval=$enable_static; 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
-else
-  enable_static=no
-fi
-
-
-
-
-
-
-
-
-
-am__api_version='1.11'
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  for ac_t in install-sh install.sh shtool; do
-    if test -f "$ac_dir/$ac_t"; then
-      ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
-      break 2
-    fi
-  done
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
-  ./ | .// | /[cC]/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-       if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-         if test $ac_prog = install &&
-           grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-           # AIX install.  It has an incompatible calling convention.
-           :
-         elif test $ac_prog = install &&
-           grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-           # program-specific install script used by HP pwplus--don't use.
-           :
-         else
-           rm -rf conftest.one conftest.two conftest.dir
-           echo one > conftest.one
-           echo two > conftest.two
-           mkdir conftest.dir
-           if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-             test -s conftest.one && test -s conftest.two &&
-             test -s conftest.dir/conftest.one &&
-             test -s conftest.dir/conftest.two
-           then
-             ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-             break 3
-           fi
-         fi
-       fi
-      done
-    done
-    ;;
-esac
-
-  done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
-$as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
-esac
-case $srcdir in
-  *[\\\"\#\$\&\'\`$am_lf\ \    ]*)
-    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
-esac
-
-# 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".
-      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" "$LINENO" 5
-   fi
-
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   as_fn_error "newly created file is older than distributed files!
-Check your system clock" "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-test "$program_prefix" != NONE &&
-  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.
-# By default was `s,x,x', remove it if useless.
-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\    *)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-
-if test x"${install_sh}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\    *)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-
-# 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.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in mkdir gmkdir; do
-        for ac_exec_ext in '' $ac_executable_extensions; do
-          { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-          case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-            'mkdir (GNU coreutils) '* | \
-            'mkdir (coreutils) '* | \
-            'mkdir (fileutils) '4.1*)
-              ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-              break 3;;
-          esac
-        done
-       done
-  done
-IFS=$as_save_IFS
-
-fi
-
-  test -d ./--version && rmdir ./--version
-  if test "${ac_cv_path_mkdir+set}" = set; then
-    MKDIR_P="$ac_cv_path_mkdir -p"
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    MKDIR_P="$ac_install_sh -d"
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
-
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-       @echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  SET_MAKE=
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-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
-
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  am__isrc=' -I$(srcdir)'
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
-  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
-
-
-# Define the identity of the package.
- PACKAGE=SDL_Goom
- VERSION=2k4
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-
-
-
-
-
-
-ACLOCAL="$ACLOCAL -I m4"
-
-case `pwd` in
-  *\ * | *\    *)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
-esac
-
-
-
-macro_version='2.2.6b'
-macro_revision='1.3017'
-
-
-
-
-
-
-
-
-
-
-
-
-
-ltmain="$ac_aux_dir/ltmain.sh"
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-       @echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then :
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
- if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { { ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-       ;;
-    [ab].out )
-       # We found the default executable, but exeext='' is most
-       # certainly right.
-       break;;
-    *.* )
-       if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-       then :; else
-          ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-       fi
-       # We set ac_cv_exeext here because the later test for it is not
-       # safe: cross compilers may not add the suffix if given an `-o'
-       # argument, so we may need to know it at that point already.
-       # Even if this section looks crufty: it has the advantage of
-       # actually working.
-       break;;
-    * )
-       break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "C compiler cannot create executables
-See \`config.log' for more details." "$LINENO" 5; }; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-ac_exeext=$ac_cv_exeext
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-         break;;
-    * ) break;;
-  esac
-done
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "$LINENO" 5; }
-fi
-rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-if test "$cross_compiling" != yes; then
-  { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-  if { ac_try='./conftest$ac_cv_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-       cross_compiling=yes
-    else
-       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." "$LINENO" 5; }
-fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-        CFLAGS="-g"
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-       -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-depcc="$CC"   am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  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_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
-
-  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
-
-    # 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.  Also, some Intel
-    # versions had trouble with output in subdirs
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    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
-      ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj 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 $am__obj 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_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if test "${ac_cv_path_SED+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-     for ac_i in 1 2 3 4 5 6 7; do
-       ac_script="$ac_script$as_nl$ac_script"
-     done
-     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     { ac_script=; unset ac_script;}
-     if test -z "$SED"; then
-  ac_path_SED_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-# Check for GNU ac_path_SED and select it if it is found.
-  # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
-*GNU*)
-  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo '' >> "conftest.nl"
-    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_SED_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_SED="$ac_path_SED"
-      ac_path_SED_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_SED_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_SED"; then
-    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
-  fi
-else
-  ac_cv_path_SED=$SED
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
- SED="$ac_cv_path_SED"
-  rm -f conftest.sed
-
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
-$as_echo_n "checking for fgrep... " >&6; }
-if test "${ac_cv_path_FGREP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-   then ac_cv_path_FGREP="$GREP -F"
-   else
-     if test -z "$FGREP"; then
-  ac_path_FGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in fgrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-# Check for GNU ac_path_FGREP and select it if it is found.
-  # Check for GNU $ac_path_FGREP
-case `"$ac_path_FGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'FGREP' >> "conftest.nl"
-    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_FGREP="$ac_path_FGREP"
-      ac_path_FGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_FGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_FGREP"; then
-    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_FGREP=$FGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-$as_echo "$ac_cv_path_FGREP" >&6; }
- FGREP="$ac_cv_path_FGREP"
-
-
-test -z "$GREP" && GREP=grep
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
-  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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
-fi
-if test "${lt_cv_path_LD+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  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 variants of GNU ld 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
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  # I'd rather use --version here, but apparently some GNU lds 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
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
-$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if test "${lt_cv_path_NM+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_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"
-  done
-  : ${lt_cv_path_NM=no}
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-$as_echo "$lt_cv_path_NM" >&6; }
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DUMPBIN"; then
-  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DUMPBIN=$ac_cv_prog_DUMPBIN
-if test -n "$DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-$as_echo "$DUMPBIN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$DUMPBIN" && break
-  done
-fi
-if test -z "$DUMPBIN"; then
-  ac_ct_DUMPBIN=$DUMPBIN
-  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DUMPBIN"; then
-  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
-if test -n "$ac_ct_DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-$as_echo "$ac_ct_DUMPBIN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_DUMPBIN" && break
-done
-
-  if test "x$ac_ct_DUMPBIN" = x; then
-    DUMPBIN=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DUMPBIN=$ac_ct_DUMPBIN
-  fi
-fi
-
-
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
-  fi
-fi
-test -z "$NM" && NM=nm
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
-$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if test "${lt_cv_nm_interface+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4514: $ac_compile\"" >&5)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:4517: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:4520: output\"" >&5)
-  cat conftest.out >&5
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-$as_echo "$lt_cv_nm_interface" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
-fi
-
-# find the maximum length of command line arguments
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
-$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-    i=0
-  teststring="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* | cegcc*)
-    # 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;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536      # usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[         ]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8 ; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # 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"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
-                = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
-             test $i != 17 # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # 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`
-    fi
-    ;;
-  esac
-
-fi
-
-if test -n $lt_cv_sys_max_cmd_len ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-
-
-
-
-
-: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
-$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,, \
-    && eval 'test $(( 1 + 1 )) -eq 2 \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
-$as_echo "$xsi_shell" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
-$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
-$as_echo "$lt_shell_append" >&6; }
-
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-
-
-
-
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
-$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if test "${lt_cv_ld_reload_flag+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-$as_echo "$lt_cv_ld_reload_flag" >&6; }
-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'
-case $host_os in
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OBJDUMP=$ac_cv_prog_OBJDUMP
-if test -n "$OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-$as_echo "$OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OBJDUMP"; then
-  ac_ct_OBJDUMP=$OBJDUMP
-  # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OBJDUMP"; then
-  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-if test -n "$ac_ct_OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-$as_echo "$ac_ct_OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OBJDUMP" = x; then
-    OBJDUMP="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OBJDUMP=$ac_ct_OBJDUMP
-  fi
-else
-  OBJDUMP="$ac_cv_prog_OBJDUMP"
-fi
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
-$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if test "${lt_cv_deplibs_check_method+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  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
-aix[4-9]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[45]*)
-  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*)
-  # func_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='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  if ( file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-cegcc)
-  # use the weaker test based on 'objdump'. See mingw*.
-  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  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|DragonFly)/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
-  ;;
-
-interix[3-9]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd* | netbsdelf*-gnu)
-  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=pass_all
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  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
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-tpf*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-$as_echo "$lt_cv_deplibs_check_method" >&6; }
-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
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AR="${ac_tool_prefix}ar"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_AR"; then
-  ac_ct_AR=$AR
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_AR="ar"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_AR" = x; then
-    AR="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AR=$ac_ct_AR
-  fi
-else
-  AR="$ac_cv_prog_AR"
-fi
-
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-
-
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-test -z "$STRIP" && STRIP=:
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-test -z "$RANLIB" && RANLIB=:
-
-
-
-
-
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
-$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-
-# 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]*\)'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[BCDT]'
-  ;;
-cygwin* | mingw* | pw32* | cegcc*)
-  symcode='[ABCDGISTW]'
-  ;;
-hpux*)
-  if test "$host_cpu" = ia64; then
-    symcode='[ABCDEGRST]'
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[BCDEGRST]'
-  ;;
-osf*)
-  symcode='[BCDEGQRST]'
-  ;;
-solaris*)
-  symcode='[BDRT]'
-  ;;
-sco3.2v5*)
-  symcode='[DT]'
-  ;;
-sysv4.2uw2*)
-  symcode='[DT]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[ABDT]'
-  ;;
-sysv4)
-  symcode='[DFNSTU]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[ABCDGIRSTW]' ;;
-esac
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \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\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
-
-# 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
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function
-    # and D for any global variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
-    # which start with @ or ?.
-    lt_cv_sys_global_symbol_pipe="$AWK '"\
-"     {last_section=section; section=\$ 3};"\
-"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-"     \$ 0!~/External *\|/{next};"\
-"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-"     {if(hide[section]) next};"\
-"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-"     ' prfx=^$ac_symprfx"
-  else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[     ]\($symcode$symcode*\)[         ][      ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-  fi
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
-  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && 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 <<_LT_EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-         # Now generate the symbol file.
-         eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-         cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols.  */
-const struct {
-  const char *name;
-  void       *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[] =
-{
-  { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-         $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-         cat <<\_LT_EOF >> conftest.$ac_ext
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_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_prog_compiler_no_builtin_flag"
-         if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && 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" >&5
-       fi
-      else
-       echo "cannot find nm_test_var in $nlist" >&5
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-    fi
-  else
-    echo "$progname: failed program was:" >&5
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf 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
-
-fi
-
-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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-$as_echo "failed" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then :
-  enableval=$enable_libtool_lock;
-fi
-
-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 { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; 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 5726 "configure"' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; 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-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
-      *32-bit*)
-       case $host in
-         x86_64-*kfreebsd*-gnu)
-           LD="${LD-ld} -m elf_i386_fbsd"
-           ;;
-         x86_64-*linux*)
-           LD="${LD-ld} -m elf_i386"
-           ;;
-         ppc64-*linux*|powerpc64-*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*)
-       case $host in
-         x86_64-*kfreebsd*-gnu)
-           LD="${LD-ld} -m elf_x86_64_fbsd"
-           ;;
-         x86_64-*linux*)
-           LD="${LD-ld} -m elf_x86_64"
-           ;;
-         ppc*-*linux*|powerpc*-*linux*)
-           LD="${LD-ld} -m elf64ppc"
-           ;;
-         s390*-*linux*|s390*-*tpf*)
-           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"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
-$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if test "${lt_cv_cc_needs_belf+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_cc_needs_belf=yes
-else
-  lt_cv_cc_needs_belf=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-     ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-$as_echo "$lt_cv_cc_needs_belf" >&6; }
-  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
-  ;;
-sparc*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)
-       if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-         LD="${LD-ld} -64"
-       fi
-       ;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-esac
-
-need_locks="$enable_libtool_lock"
-
-
-  case $host_os in
-    rhapsody* | darwin*)
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DSYMUTIL"; then
-  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DSYMUTIL=$ac_cv_prog_DSYMUTIL
-if test -n "$DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-$as_echo "$DSYMUTIL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DSYMUTIL"; then
-  ac_ct_DSYMUTIL=$DSYMUTIL
-  # Extract the first word of "dsymutil", so it can be a program name with args.
-set dummy dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DSYMUTIL"; then
-  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-if test -n "$ac_ct_DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-$as_echo "$ac_ct_DSYMUTIL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_DSYMUTIL" = x; then
-    DSYMUTIL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DSYMUTIL=$ac_ct_DSYMUTIL
-  fi
-else
-  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
-set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_NMEDIT+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NMEDIT"; then
-  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-NMEDIT=$ac_cv_prog_NMEDIT
-if test -n "$NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-$as_echo "$NMEDIT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_NMEDIT"; then
-  ac_ct_NMEDIT=$NMEDIT
-  # Extract the first word of "nmedit", so it can be a program name with args.
-set dummy nmedit; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_NMEDIT"; then
-  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-if test -n "$ac_ct_NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-$as_echo "$ac_ct_NMEDIT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_NMEDIT" = x; then
-    NMEDIT=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    NMEDIT=$ac_ct_NMEDIT
-  fi
-else
-  NMEDIT="$ac_cv_prog_NMEDIT"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
-set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LIPO+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$LIPO"; then
-  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-LIPO=$ac_cv_prog_LIPO
-if test -n "$LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-$as_echo "$LIPO" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_LIPO"; then
-  ac_ct_LIPO=$LIPO
-  # Extract the first word of "lipo", so it can be a program name with args.
-set dummy lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_LIPO"; then
-  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_LIPO="lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
-if test -n "$ac_ct_LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-$as_echo "$ac_ct_LIPO" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_LIPO" = x; then
-    LIPO=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    LIPO=$ac_ct_LIPO
-  fi
-else
-  LIPO="$ac_cv_prog_LIPO"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL"; then
-  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL=$ac_cv_prog_OTOOL
-if test -n "$OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-$as_echo "$OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OTOOL"; then
-  ac_ct_OTOOL=$OTOOL
-  # Extract the first word of "otool", so it can be a program name with args.
-set dummy otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OTOOL"; then
-  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_OTOOL="otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
-if test -n "$ac_ct_OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-$as_echo "$ac_ct_OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OTOOL" = x; then
-    OTOOL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL=$ac_ct_OTOOL
-  fi
-else
-  OTOOL="$ac_cv_prog_OTOOL"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL64+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL64"; then
-  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL64=$ac_cv_prog_OTOOL64
-if test -n "$OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-$as_echo "$OTOOL64" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OTOOL64"; then
-  ac_ct_OTOOL64=$OTOOL64
-  # Extract the first word of "otool64", so it can be a program name with args.
-set dummy otool64; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OTOOL64"; then
-  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_OTOOL64="otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
-if test -n "$ac_ct_OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-$as_echo "$ac_ct_OTOOL64" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OTOOL64" = x; then
-    OTOOL64=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL64=$ac_ct_OTOOL64
-  fi
-else
-  OTOOL64="$ac_cv_prog_OTOOL64"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
-$as_echo_n "checking for -single_module linker flag... " >&6; }
-if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-       # By default we will add the -single_module flag. You can override
-       # by either setting the environment variable LT_MULTI_MODULE
-       # non-empty at configure time, or by adding -multi_module to the
-       # link flags.
-       rm -rf libconftest.dylib*
-       echo "int foo(void){return 1;}" > conftest.c
-       echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&5
-       $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-         -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-       if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
-         lt_cv_apple_cc_single_mod=yes
-       else
-         cat conftest.err >&5
-       fi
-       rm -rf libconftest.dylib*
-       rm -f conftest.*
-      fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
-$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_ld_exported_symbols_list=yes
-else
-  lt_cv_ld_exported_symbols_list=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-       LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-    case $host_os in
-    rhapsody* | darwin1.[012])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-       10.0,*86*-darwin8*|10.0,*-darwin[91]*)
-         _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-       10.[012]*)
-         _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-       10.*)
-         _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    if test "$DSYMUTIL" != ":"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-                    Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-                    Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-                  (('a' <= (c) && (c) <= 'i') \
-                    || ('j' <= (c) && (c) <= 'r') \
-                    || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-       || toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-                 inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_header in dlfcn.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-"
-if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DLFCN_H 1
-_ACEOF
-
-fi
-
-done
-
-
-
-# Set options
-
-
-
-        enable_dlopen=no
-
-
-  enable_win32_dll=no
-
-
-            # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
-  enableval=$enable_shared; 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
-else
-  enable_shared=yes
-fi
-
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then :
-  withval=$with_pic; pic_mode="$withval"
-else
-  pic_mode=default
-fi
-
-
-test -z "$pic_mode" && pic_mode=default
-
-
-
-
-
-
-
-  # Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then :
-  enableval=$enable_fast_install; 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
-else
-  enable_fast_install=yes
-fi
-
-
-
-
-
-
-
-
-
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-test -z "$LN_S" && LN_S="ln -s"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
-$as_echo_n "checking for objdir... " >&6; }
-if test "${lt_cv_objdir+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  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
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-$as_echo "$lt_cv_objdir" >&6; }
-objdir=$lt_cv_objdir
-
-
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define LT_OBJDIR "$lt_cv_objdir/"
-_ACEOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-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.
-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 delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
-$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  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
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      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 <<_LT_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
-
-_LT_EOF
-         fi ;;
-       esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
-$as_echo_n "checking for file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  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
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      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 <<_LT_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
-
-_LT_EOF
-         fi ;;
-       esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-# Use C for the default configuration in the libtool script
-
-lt_save_CC="$CC"
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-objext=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-
-
-if test -n "$compiler"; then
-
-lt_prog_compiler_no_builtin_flag=
-
-if test "$GCC" = yes; then
-  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_rtti_exceptions=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"
-   # 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}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7222: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:7226: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_rtti_exceptions=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-else
-    :
-fi
-
-fi
-
-
-
-
-
-
-  lt_prog_compiler_wl=
-lt_prog_compiler_pic=
-lt_prog_compiler_static=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl='-Wl,'
-    lt_prog_compiler_static='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-       # AIX 5 now supports IA64 processor
-       lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            lt_prog_compiler_pic='-fPIC'
-        ;;
-      m68k)
-            # 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_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # 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).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic='-fno-common'
-      ;;
-
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-       # +Z the default
-       ;;
-      *)
-       lt_prog_compiler_pic='-fPIC'
-       ;;
-      esac
-      ;;
-
-    interix[3-9]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared=no
-      enable_shared=no
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic='-fPIC -shared'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-       lt_prog_compiler_pic=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      lt_prog_compiler_pic='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl='-Wl,'
-      if test "$host_cpu" = ia64; then
-       # AIX 5 now supports IA64 processor
-       lt_prog_compiler_static='-Bstatic'
-      else
-       lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # 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_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl='-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_prog_compiler_pic='+Z'
-       ;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-      case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
-      ecc*)
-       lt_prog_compiler_wl='-Wl,'
-       lt_prog_compiler_pic='-KPIC'
-       lt_prog_compiler_static='-static'
-        ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-       lt_prog_compiler_wl='-Wl,'
-       lt_prog_compiler_pic='-fPIC'
-       lt_prog_compiler_static='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-       lt_prog_compiler_wl='-Wl,'
-       lt_prog_compiler_pic='--shared'
-       lt_prog_compiler_static='--static'
-       ;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-       # which looks to be a dead project)
-       lt_prog_compiler_wl='-Wl,'
-       lt_prog_compiler_pic='-fpic'
-       lt_prog_compiler_static='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static='-non_shared'
-        ;;
-      xl*)
-       # IBM XL C 8.0/Fortran 10.1 on PPC
-       lt_prog_compiler_wl='-Wl,'
-       lt_prog_compiler_pic='-qpic'
-       lt_prog_compiler_static='-qstaticlink'
-       ;;
-      *)
-       case `$CC -V 2>&1 | sed 5q` in
-       *Sun\ C*)
-         # Sun C 5.9
-         lt_prog_compiler_pic='-KPIC'
-         lt_prog_compiler_static='-Bstatic'
-         lt_prog_compiler_wl='-Wl,'
-         ;;
-       *Sun\ F*)
-         # Sun Fortran 8.3 passes all unrecognized flags to the linker
-         lt_prog_compiler_pic='-KPIC'
-         lt_prog_compiler_static='-Bstatic'
-         lt_prog_compiler_wl=''
-         ;;
-       esac
-       ;;
-      esac
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    rdos*)
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-       lt_prog_compiler_wl='-Qoption ld ';;
-      *)
-       lt_prog_compiler_wl='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl='-Qoption ld '
-      lt_prog_compiler_pic='-PIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-       lt_prog_compiler_pic='-Kconform_pic'
-       lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    unicos*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_can_build_shared=no
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic='-pic'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared=no
-      ;;
-    esac
-  fi
-
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic=
-    ;;
-  *)
-    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-    ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
-$as_echo "$lt_prog_compiler_pic" >&6; }
-
-
-
-
-
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_works=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
-   # 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}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7561: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:7565: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_pic_works=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
-
-if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-    case $lt_prog_compiler_pic in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-     esac
-else
-    lt_prog_compiler_pic=
-     lt_prog_compiler_can_build_shared=no
-fi
-
-fi
-
-
-
-
-
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_static_works=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker 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>&5
-       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
-
-if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-    :
-else
-    lt_prog_compiler_static=
-fi
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   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}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7666: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:7670: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   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}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7721: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:7725: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
-  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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-
-  runpath_var=
-  allow_undefined_flag=
-  always_export_symbols=no
-  archive_cmds=
-  archive_expsym_cmds=
-  compiler_needs_object=no
-  enable_shared_with_static_runtimes=no
-  export_dynamic_flag_spec=
-  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  hardcode_automatic=no
-  hardcode_direct=no
-  hardcode_direct_absolute=no
-  hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
-  hardcode_libdir_separator=
-  hardcode_minus_L=no
-  hardcode_shlibpath_var=unsupported
-  inherit_rpath=no
-  link_all_deplibs=unknown
-  module_cmds=
-  module_expsym_cmds=
-  old_archive_from_new_cmds=
-  old_archive_from_expsyms_cmds=
-  thread_safe_flag_spec=
-  whole_archive_flag_spec=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms=
-  # 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'.
-  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-  # 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.
-  # Exclude shared library initialization/finalization symbols.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    # 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
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  linux* | k*bsd*-gnu)
-    link_all_deplibs=no
-    ;;
-  esac
-
-  ld_shlibs=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    export_dynamic_flag_spec='${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
-      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      whole_archive_flag_spec=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
-      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[3-9]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-       ld_shlibs=no
-       cat <<_LT_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.
-
-_LT_EOF
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            archive_expsym_cmds=''
-        ;;
-      m68k)
-            archive_cmds='$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)'
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_minus_L=yes
-        ;;
-      esac
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-       allow_undefined_flag=unsupported
-       # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-       # support --undefined.  This deserves some investigation.  FIXME
-       archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-       ld_shlibs=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec='-L$libdir'
-      allow_undefined_flag=unsupported
-      always_export_symbols=no
-      enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-       # If the export-symbols file already is a .def file (1st line
-       # is EXPORTS), use it as is; otherwise, prepend...
-       archive_expsym_cmds='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 $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-       ld_shlibs=no
-      fi
-      ;;
-
-    interix[3-9]*)
-      hardcode_direct=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-      tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
-       case $cc_basename in
-         diet\ *) tmp_diet=yes;;       # linux-dietlibc with static linking (!diet-dyn)
-       esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-        && test "$tmp_diet" = no
-      then
-       tmp_addflag=
-       tmp_sharedflag='-shared'
-       case $cc_basename,$host_cpu in
-        pgcc*)                         # Portland Group C compiler
-         whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-         tmp_addflag=' $pic_flag'
-         ;;
-       pgf77* | pgf90* | pgf95*)       # Portland Group f77 and f90 compilers
-         whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-         tmp_addflag=' $pic_flag -Mnomain' ;;
-       ecc*,ia64* | icc*,ia64*)        # Intel C compiler on ia64
-         tmp_addflag=' -i_dynamic' ;;
-       efc*,ia64* | ifort*,ia64*)      # Intel Fortran compiler on ia64
-         tmp_addflag=' -i_dynamic -nofor_main' ;;
-       ifc* | ifort*)                  # Intel Fortran compiler
-         tmp_addflag=' -nofor_main' ;;
-       lf95*)                          # Lahey Fortran 8.1
-         whole_archive_flag_spec=
-         tmp_sharedflag='--shared' ;;
-       xl[cC]*)                        # IBM XL C 8.0 on PPC (deal with xlf below)
-         tmp_sharedflag='-qmkshrobj'
-         tmp_addflag= ;;
-       esac
-       case `$CC -V 2>&1 | sed 5q` in
-       *Sun\ C*)                       # Sun C 5.9
-         whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-         compiler_needs_object=yes
-         tmp_sharedflag='-G' ;;
-       *Sun\ F*)                       # Sun Fortran 8.3
-         tmp_sharedflag='-G' ;;
-       esac
-       archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-        if test "x$supports_anon_versioning" = xyes; then
-          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-           cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-           echo "local: *; };" >> $output_objdir/$libname.ver~
-           $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-        fi
-
-       case $cc_basename in
-       xlf*)
-         # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-         whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-         hardcode_libdir_flag_spec=
-         hardcode_libdir_flag_spec_ld='-rpath $libdir'
-         archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
-         if test "x$supports_anon_versioning" = xyes; then
-           archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-             cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-             echo "local: *; };" >> $output_objdir/$libname.ver~
-             $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-         fi
-         ;;
-       esac
-      else
-        ld_shlibs=no
-      fi
-      ;;
-
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-       archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-       wlarc=
-      else
-       archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-       ld_shlibs=no
-       cat <<_LT_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.
-
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-       archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-       ld_shlibs=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-       ld_shlibs=no
-       cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-       ;;
-       *)
-         # For security reasons, it is highly recommended that you always
-         # use absolute paths for naming shared libraries, and exclude the
-         # DT_RUNPATH tag from executables and libraries.  But doing so
-         # requires that you compile everything twice, which is a pain.
-         if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-           hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-           archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-           archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-         else
-           ld_shlibs=no
-         fi
-       ;;
-      esac
-      ;;
-
-    sunos4*)
-      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-       archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-       ld_shlibs=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs" = no; then
-      runpath_var=
-      hardcode_libdir_flag_spec=
-      export_dynamic_flag_spec=
-      whole_archive_flag_spec=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag=unsupported
-      always_export_symbols=yes
-      archive_expsym_cmds='$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.
-      hardcode_minus_L=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-       # Neither direct hardcoding nor static linking is supported with a
-       # broken collect2.
-       hardcode_direct=unsupported
-      fi
-      ;;
-
-    aix[4-9]*)
-      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
-         export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-       else
-         export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-       fi
-       aix_use_runtimelinking=no
-
-       # Test if we are trying to use run time linking or normal
-       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-       # need to do runtime linking.
-       case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-         for ld_flag in $LDFLAGS; do
-         if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-           aix_use_runtimelinking=yes
-           break
-         fi
-         done
-         ;;
-       esac
-
-       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.
-
-      archive_cmds=''
-      hardcode_direct=yes
-      hardcode_direct_absolute=yes
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      file_list_spec='${wl}-f,'
-
-      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
-         :
-         else
-         # We have old collect2
-         hardcode_direct=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
-         hardcode_minus_L=yes
-         hardcode_libdir_flag_spec='-L$libdir'
-         hardcode_libdir_separator=
-         fi
-         ;;
-       esac
-       shared_flag='-shared'
-       if test "$aix_use_runtimelinking" = yes; then
-         shared_flag="$shared_flag "'${wl}-G'
-       fi
-       link_all_deplibs=no
-      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='${wl}-G'
-         else
-           shared_flag='${wl}-bM:SRE'
-         fi
-       fi
-      fi
-
-      export_dynamic_flag_spec='${wl}-bexpall'
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols=yes
-      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.
-       allow_undefined_flag='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-       /^0/ {
-           s/^0  *\(.*\)$/\1/
-           p
-       }
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# 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 "$lt_aix_libpath_sed"`
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-      else
-       if test "$host_cpu" = ia64; then
-         hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-         allow_undefined_flag="-z nodefs"
-         archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-       else
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-       /^0/ {
-           s/^0  *\(.*\)$/\1/
-           p
-       }
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# 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 "$lt_aix_libpath_sed"`
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-         # Warning - without using the other run time loading flags,
-         # -berok will link without error, but may produce a broken library.
-         no_undefined_flag=' ${wl}-bernotok'
-         allow_undefined_flag=' ${wl}-berok'
-         # Exported symbols can be pulled into shared objects from archives
-         whole_archive_flag_spec='$convenience'
-         archive_cmds_need_lc=yes
-         # This is similar to how AIX traditionally builds its shared libraries.
-         archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-       fi
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            archive_expsym_cmds=''
-        ;;
-      m68k)
-            archive_cmds='$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)'
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_minus_L=yes
-        ;;
-      esac
-      ;;
-
-    bsdi[45]*)
-      export_dynamic_flag_spec=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # 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.
-      hardcode_libdir_flag_spec=' '
-      allow_undefined_flag=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_from_new_cmds='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes=yes
-      ;;
-
-    darwin* | rhapsody*)
-
-
-  archive_cmds_need_lc=no
-  hardcode_direct=no
-  hardcode_automatic=yes
-  hardcode_shlibpath_var=unsupported
-  whole_archive_flag_spec=''
-  link_all_deplibs=yes
-  allow_undefined_flag="$_lt_dar_allow_undefined"
-  case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=echo
-    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-
-  else
-  ld_shlibs=no
-  fi
-
-      ;;
-
-    dgux*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    freebsd1*)
-      ld_shlibs=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*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-       archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-       archive_cmds='$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
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-       archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-       archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-       hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-       hardcode_libdir_flag_spec_ld='+b $libdir'
-       hardcode_libdir_separator=:
-       hardcode_direct=yes
-       hardcode_direct_absolute=yes
-       export_dynamic_flag_spec='${wl}-E'
-       # hardcode_minus_L: Not really in the search PATH,
-       # but as the default location of the library.
-       hardcode_minus_L=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-       case $host_cpu in
-       hppa*64*)
-         archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       ia64*)
-         archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       *)
-         archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       esac
-      else
-       case $host_cpu in
-       hppa*64*)
-         archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       ia64*)
-         archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       *)
-         archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       esac
-      fi
-      if test "$with_gnu_ld" = no; then
-       hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-       hardcode_libdir_separator=:
-
-       case $host_cpu in
-       hppa*64*|ia64*)
-         hardcode_direct=no
-         hardcode_shlibpath_var=no
-         ;;
-       *)
-         hardcode_direct=yes
-         hardcode_direct_absolute=yes
-         export_dynamic_flag_spec='${wl}-E'
-
-         # hardcode_minus_L: Not really in the search PATH,
-         # but as the default location of the library.
-         hardcode_minus_L=yes
-         ;;
-       esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-       archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-       # Try to use the -exported_symbol ld option, if it does not
-       # work, assume that -exports_file does not work either and
-       # implicitly export all symbols.
-        save_LDFLAGS="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int foo(void) {}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-        LDFLAGS="$save_LDFLAGS"
-      else
-       archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-       archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      inherit_rpath=yes
-      link_all_deplibs=yes
-      ;;
-
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-       archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    newsos6)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_shlibpath_var=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-       hardcode_direct=yes
-       hardcode_shlibpath_var=no
-       hardcode_direct_absolute=yes
-       if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-         archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-         archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-         hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-         export_dynamic_flag_spec='${wl}-E'
-       else
-         case $host_os in
-          openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-            archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-            hardcode_libdir_flag_spec='-R$libdir'
-            ;;
-          *)
-            archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-            hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-            ;;
-         esac
-       fi
-      else
-       ld_shlibs=no
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      allow_undefined_flag=unsupported
-      archive_cmds='$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 $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-       allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-       archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-       allow_undefined_flag=' -expect_unresolved \*'
-       archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      ;;
-
-    osf4* | osf5*)     # as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-       allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-       archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      else
-       allow_undefined_flag=' -expect_unresolved \*'
-       archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-       archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-       $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-
-       # Both c and cxx compiler support -rpath directly
-       hardcode_libdir_flag_spec='-rpath $libdir'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_separator=:
-      ;;
-
-    solaris*)
-      no_undefined_flag=' -z defs'
-      if test "$GCC" = yes; then
-       wlarc='${wl}'
-       archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-       archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-         $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-      else
-       case `$CC -V 2>&1` in
-       *"Compilers 5.0"*)
-         wlarc=''
-         archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-         archive_expsym_cmds='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'
-         ;;
-       *)
-         wlarc='${wl}'
-         archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-         archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-         $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-         ;;
-       esac
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_shlibpath_var=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *)
-       # The compiler driver will combine and reorder linker options,
-       # but understands `-z linker_flag'.  GCC discards it without `$wl',
-       # but is careful enough not to reorder.
-       # Supported since Solaris 2.6 (maybe 2.5.1?)
-       if test "$GCC" = yes; then
-         whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-       else
-         whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
-       fi
-       ;;
-      esac
-      link_all_deplibs=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.
-       archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-       archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-       sni)
-         archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-         hardcode_direct=yes # is this really true???
-       ;;
-       siemens)
-         ## LD is ld it makes a PLAMLIB
-         ## CC just makes a GrossModule.
-         archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-         reload_cmds='$CC -r -o $output$reload_objs'
-         hardcode_direct=no
-        ;;
-       motorola)
-         archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-         hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-       ;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var=no
-      export_dynamic_flag_spec='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-       archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-       hardcode_shlibpath_var=no
-       runpath_var=LD_RUN_PATH
-       hardcode_runpath_var=yes
-       ld_shlibs=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag='${wl}-z,text'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-       archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-       archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      no_undefined_flag='${wl}-z,text'
-      allow_undefined_flag='${wl}-z,nodefs'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-R,$libdir'
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      export_dynamic_flag_spec='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-       archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-       archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      ld_shlibs=no
-      ;;
-    esac
-
-    if test x$host_vendor = xsni; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-       export_dynamic_flag_spec='${wl}-Blargedynsym'
-       ;;
-      esac
-    fi
-  fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-$as_echo "$ld_shlibs" >&6; }
-test "$ld_shlibs" = no && can_build_shared=no
-
-with_gnu_ld=$with_gnu_ld
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds 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.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-      $RM conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl
-       pic_flag=$lt_prog_compiler_pic
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag
-        allow_undefined_flag=
-        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-        then
-         archive_cmds_need_lc=no
-        else
-         archive_cmds_need_lc=yes
-        fi
-        allow_undefined_flag=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $RM conftest*
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
-$as_echo "$archive_cmds_need_lc" >&6; }
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
-
-if test "$GCC" = yes; then
-  case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
-      test -d "$lt_sys_path" && \
-       lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[lt_foo]++; }
-  if (lt_freq[lt_foo] == 1) { print lt_foo; }
-}'`
-  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".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"
-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'
-  ;;
-
-aix[4-9]*)
-  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*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    ;;
-  m68k)
-    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'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  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* | cegcc*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
-    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~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    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* | cegcc*)
-      # 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}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
-  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
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[123]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  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
-    ;;
-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    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_cmds='.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_cmds='.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_cmds='.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'
-  ;;
-
-interix[3-9]*)
-  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'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-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* | k*bsd*-gnu | kopensolaris*-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'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # Some binutils ld are patched to set DT_RUNPATH
-  save_LDFLAGS=$LDFLAGS
-  save_libdir=$libdir
-  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  shlibpath_overrides_runpath=yes
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  LDFLAGS=$save_LDFLAGS
-  libdir=$save_libdir
-
-  # 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
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[      ]*hwcap[        ]/d;s/[:,      ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # 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'
-  ;;
-
-netbsdelf*-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='NetBSD ld.elf_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}${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=qnx
-  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='ldqnx.so'
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
-  esac
-  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_cmds=".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"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-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.3*)
-  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
-      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
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-       ;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/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}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = 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
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" ||
-   test -n "$runpath_var" ||
-   test "X$hardcode_automatic" = "Xyes" ; then
-
-  # We can hardcode non-existent directories.
-  if test "$hardcode_direct" != 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_TAGVAR(hardcode_shlibpath_var, )" != no &&
-     test "$hardcode_minus_L" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action=unsupported
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-$as_echo "$hardcode_action" >&6; }
-
-if test "$hardcode_action" = relink ||
-   test "$inherit_rpath" = yes; 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
-
-
-
-
-
-
-  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* | cegcc*)
-    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
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-
-fi
-
-    ;;
-
-  *)
-    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = x""yes; then :
-  lt_cv_dlopen="shl_load"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-int
-main ()
-{
-return shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_shl_load=yes
-else
-  ac_cv_lib_dld_shl_load=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-else
-  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = x""yes; then :
-  lt_cv_dlopen="dlopen"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
-$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_svld_dlopen=yes
-else
-  ac_cv_lib_svld_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
-$as_echo_n "checking for dld_link in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dld_link ();
-int
-main ()
-{
-return dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_dld_link=yes
-else
-  ac_cv_lib_dld_dld_link=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-    ;;
-  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"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
-$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-         if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-#line 10105 "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
-
-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); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}
-_LT_EOF
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-$as_echo "$lt_cv_dlopen_self" >&6; }
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
-$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self_static+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-         if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self_static=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-#line 10201 "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
-
-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); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}
-_LT_EOF
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-$as_echo "$lt_cv_dlopen_self_static" >&6; }
-    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
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-striplib=
-old_striplib=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
-$as_echo_n "checking whether stripping libraries is possible... " >&6; }
-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"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-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"
-      old_striplib="$STRIP -S"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    fi
-    ;;
-  *)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    ;;
-  esac
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-  # Report which library types will actually be built
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-$as_echo "$can_build_shared" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
-$as_echo_n "checking whether to build shared libraries... " >&6; }
-  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
-    ;;
-
-  aix[4-9]*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
-    fi
-    ;;
-  esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
-  # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
-
-
-
-
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-
-
-
-
-
-
-
-
-
-
-
-
-        ac_config_commands="$ac_config_commands libtool"
-
-
-
-
-# Only expand once:
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-        CFLAGS="-g"
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-       -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-depcc="$CC"   am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  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_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
-
-  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
-
-    # 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.  Also, some Intel
-    # versions had trouble with output in subdirs
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    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
-      ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj 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 $am__obj 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_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
-fi
-
-for ac_prog in flex lex
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LEX+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$LEX"; then
-  ac_cv_prog_LEX="$LEX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_LEX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-LEX=$ac_cv_prog_LEX
-if test -n "$LEX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5
-$as_echo "$LEX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$LEX" && break
-done
-test -n "$LEX" || LEX=":"
-
-if test "x$LEX" != "x:"; then
-  cat >conftest.l <<_ACEOF
-%%
-a { ECHO; }
-b { REJECT; }
-c { yymore (); }
-d { yyless (1); }
-e { yyless (input () != 0); }
-f { unput (yytext[0]); }
-. { BEGIN INITIAL; }
-%%
-#ifdef YYTEXT_POINTER
-extern char *yytext;
-#endif
-int
-main (void)
-{
-  return ! yylex () + ! yywrap ();
-}
-_ACEOF
-{ { ac_try="$LEX conftest.l"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$LEX conftest.l") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5
-$as_echo_n "checking lex output file root... " >&6; }
-if test "${ac_cv_prog_lex_root+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-
-if test -f lex.yy.c; then
-  ac_cv_prog_lex_root=lex.yy
-elif test -f lexyy.c; then
-  ac_cv_prog_lex_root=lexyy
-else
-  as_fn_error "cannot find output from $LEX; giving up" "$LINENO" 5
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
-$as_echo "$ac_cv_prog_lex_root" >&6; }
-LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
-
-if test -z "${LEXLIB+set}"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5
-$as_echo_n "checking lex library... " >&6; }
-if test "${ac_cv_lib_lex+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    ac_save_LIBS=$LIBS
-    ac_cv_lib_lex='none needed'
-    for ac_lib in '' -lfl -ll; do
-      LIBS="$ac_lib $ac_save_LIBS"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-`cat $LEX_OUTPUT_ROOT.c`
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_lex=$ac_lib
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-      test "$ac_cv_lib_lex" != 'none needed' && break
-    done
-    LIBS=$ac_save_LIBS
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5
-$as_echo "$ac_cv_lib_lex" >&6; }
-  test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5
-$as_echo_n "checking whether yytext is a pointer... " >&6; }
-if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  # POSIX says lex can declare yytext either as a pointer or an array; the
-# default is implementation-dependent.  Figure out which it is, since
-# not all implementations provide the %pointer and %array declarations.
-ac_cv_prog_lex_yytext_pointer=no
-ac_save_LIBS=$LIBS
-LIBS="$LEXLIB $ac_save_LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#define YYTEXT_POINTER 1
-`cat $LEX_OUTPUT_ROOT.c`
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_prog_lex_yytext_pointer=yes
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_save_LIBS
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5
-$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
-if test $ac_cv_prog_lex_yytext_pointer = yes; then
-
-$as_echo "#define YYTEXT_POINTER 1" >>confdefs.h
-
-fi
-rm -f conftest.l $LEX_OUTPUT_ROOT.c
-
-fi
-if test "$LEX" = :; then
-  LEX=${am_missing_run}flex
-fi
-for ac_prog in 'bison -y' byacc
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_YACC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$YACC"; then
-  ac_cv_prog_YACC="$YACC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_YACC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-YACC=$ac_cv_prog_YACC
-if test -n "$YACC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
-$as_echo "$YACC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$YACC" && break
-done
-test -n "$YACC" || YACC="yacc"
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if test "${ac_cv_c_bigendian+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_c_bigendian=unknown
-    # See if we're dealing with a universal compiler.
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifndef __APPLE_CC__
-              not a universal capable compiler
-            #endif
-            typedef int dummy;
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-       # Check for potential -arch flags.  It is not universal unless
-       # there are at least two -arch flags with different values.
-       ac_arch=
-       ac_prev=
-       for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
-        if test -n "$ac_prev"; then
-          case $ac_word in
-            i?86 | x86_64 | ppc | ppc64)
-              if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
-                ac_arch=$ac_word
-              else
-                ac_cv_c_bigendian=universal
-                break
-              fi
-              ;;
-          esac
-          ac_prev=
-        elif test "x$ac_word" = "x-arch"; then
-          ac_prev=arch
-        fi
-       done
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    if test $ac_cv_c_bigendian = unknown; then
-      # See if sys/param.h defines the BYTE_ORDER macro.
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-            #include <sys/param.h>
-
-int
-main ()
-{
-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-                    && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
-                    && LITTLE_ENDIAN)
-             bogus endian macros
-            #endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  # It does; now see whether it defined to BIG_ENDIAN or not.
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-               #include <sys/param.h>
-
-int
-main ()
-{
-#if BYTE_ORDER != BIG_ENDIAN
-                not big endian
-               #endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_bigendian=yes
-else
-  ac_cv_c_bigendian=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-    if test $ac_cv_c_bigendian = unknown; then
-      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <limits.h>
-
-int
-main ()
-{
-#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
-             bogus endian macros
-            #endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  # It does; now see whether it defined to _BIG_ENDIAN or not.
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <limits.h>
-
-int
-main ()
-{
-#ifndef _BIG_ENDIAN
-                not big endian
-               #endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_bigendian=yes
-else
-  ac_cv_c_bigendian=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-    if test $ac_cv_c_bigendian = unknown; then
-      # Compile a test program.
-      if test "$cross_compiling" = yes; then :
-  # Try to guess by grepping values from an object file.
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-short int ascii_mm[] =
-                 { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-               short int ascii_ii[] =
-                 { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-               int use_ascii (int i) {
-                 return ascii_mm[i] + ascii_ii[i];
-               }
-               short int ebcdic_ii[] =
-                 { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-               short int ebcdic_mm[] =
-                 { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-               int use_ebcdic (int i) {
-                 return ebcdic_mm[i] + ebcdic_ii[i];
-               }
-               extern int foo;
-
-int
-main ()
-{
-return use_ascii (foo) == use_ebcdic (foo);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
-             ac_cv_c_bigendian=yes
-           fi
-           if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-             if test "$ac_cv_c_bigendian" = unknown; then
-               ac_cv_c_bigendian=no
-             else
-               # finding both strings is unlikely to happen, but who knows?
-               ac_cv_c_bigendian=unknown
-             fi
-           fi
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-
-            /* Are we little or big endian?  From Harbison&Steele.  */
-            union
-            {
-              long int l;
-              char c[sizeof (long int)];
-            } u;
-            u.l = 1;
-            return u.c[sizeof (long int) - 1] == 1;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_c_bigendian=no
-else
-  ac_cv_c_bigendian=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-    fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
-$as_echo "$ac_cv_c_bigendian" >&6; }
- case $ac_cv_c_bigendian in #(
-   yes)
-     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
-;; #(
-   no)
-      ;; #(
-   universal)
-
-$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
-
-     ;; #(
-   *)
-     as_fn_error "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
- esac
-
-
-CFLAGS="${CFLAGS}"
-LDFLAGS="${LDFLAGS}"
-
-
-HAVE_XMMS="no"
- if test "x$HAVE_XMMS" = "xyes"; then
-  HAVE_XMMS_TRUE=
-  HAVE_XMMS_FALSE='#'
-else
-  HAVE_XMMS_TRUE='#'
-  HAVE_XMMS_FALSE=
-fi
-
-
-
-
-HAVE_SDL="no"
- if test "x$HAVE_SDL" = "xyes"; then
-  HAVE_SDL_TRUE=
-  HAVE_SDL_FALSE='#'
-else
-  HAVE_SDL_TRUE='#'
-  HAVE_SDL_FALSE=
-fi
-
-
-
-
-HAVE_MMX="no"
-HAVE_PPC="no"
-MACTARGET="no"
-
-case "$host" in
-*-apple-darwin*)
-       MACTARGET="no"
-       MACFOLDER=""
-
-       CCAS='$(CC)'
-
-       ;;
-*-*-cygwin*)
-       CFLAGS="$CFLAGS -mno-cygwin -mwindows"
-       LDFLAGS="$LDFLAGS -lmingw32"
-       ;;
-esac
-
-case "$host" in
-i*86-*-*)
-       $as_echo "#define HAVE_MMX 1" >>confdefs.h
-
-       $as_echo "#define CPU_X86 1" >>confdefs.h
-
-       HAVE_MMX="yes"
-       ;;
-
-powerpc-*-*)
-       CCASFLAGS=-force_cpusubtype_ALL
-
-       $as_echo "#define CPU_POWERPC 1" >>confdefs.h
-
-       HAVE_PPC="yes"
-       ;;
-
-esac
- if test "x$HAVE_MMX" = "xyes"; then
-  HAVE_MMX_TRUE=
-  HAVE_MMX_FALSE='#'
-else
-  HAVE_MMX_TRUE='#'
-  HAVE_MMX_FALSE=
-fi
-
- if test "x$HAVE_PPC" = "xyes"; then
-  HAVE_PPC_TRUE=
-  HAVE_PPC_FALSE='#'
-else
-  HAVE_PPC_TRUE='#'
-  HAVE_PPC_FALSE=
-fi
-
- if test "x$MACTARGET" = "xyes"; then
-  MACTARGET_TRUE=
-  MACTARGET_FALSE='#'
-else
-  MACTARGET_TRUE='#'
-  MACTARGET_FALSE=
-fi
-
-
-
-ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
-if test "x$ac_cv_header_pthread_h" = x""yes; then :
-
-else
-  as_fn_error "*** POSIX thread support not installed - please install first ***" "$LINENO" 5
-fi
-
-
-
-PTHREAD_LIBS=error
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_attr_init in -lpthread" >&5
-$as_echo_n "checking for pthread_attr_init in -lpthread... " >&6; }
-if test "${ac_cv_lib_pthread_pthread_attr_init+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pthread_attr_init ();
-int
-main ()
-{
-return pthread_attr_init ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_pthread_pthread_attr_init=yes
-else
-  ac_cv_lib_pthread_pthread_attr_init=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_attr_init" >&5
-$as_echo "$ac_cv_lib_pthread_pthread_attr_init" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_attr_init" = x""yes; then :
-  PTHREAD_LIBS="-lpthread"
-fi
-
-
-if test "x$PTHREAD_LIBS" = xerror; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_attr_init in -lpthreads" >&5
-$as_echo_n "checking for pthread_attr_init in -lpthreads... " >&6; }
-if test "${ac_cv_lib_pthreads_pthread_attr_init+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthreads  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pthread_attr_init ();
-int
-main ()
-{
-return pthread_attr_init ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_pthreads_pthread_attr_init=yes
-else
-  ac_cv_lib_pthreads_pthread_attr_init=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthreads_pthread_attr_init" >&5
-$as_echo "$ac_cv_lib_pthreads_pthread_attr_init" >&6; }
-if test "x$ac_cv_lib_pthreads_pthread_attr_init" = x""yes; then :
-  PTHREAD_LIBS="-lpthreads"
-fi
-
-fi
-
-if test "x$PTHREAD_LIBS" = xerror; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_attr_init in -lc_r" >&5
-$as_echo_n "checking for pthread_attr_init in -lc_r... " >&6; }
-if test "${ac_cv_lib_c_r_pthread_attr_init+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lc_r  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pthread_attr_init ();
-int
-main ()
-{
-return pthread_attr_init ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_c_r_pthread_attr_init=yes
-else
-  ac_cv_lib_c_r_pthread_attr_init=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_attr_init" >&5
-$as_echo "$ac_cv_lib_c_r_pthread_attr_init" >&6; }
-if test "x$ac_cv_lib_c_r_pthread_attr_init" = x""yes; then :
-  PTHREAD_LIBS="-lc_r"
-fi
-
-fi
-
-if test "x$PTHREAD_LIBS" = xerror; then
-    ac_fn_c_check_func "$LINENO" "pthread_attr_init" "ac_cv_func_pthread_attr_init"
-if test "x$ac_cv_func_pthread_attr_init" = x""yes; then :
-  PTHREAD_LIBS=""
-fi
-
-fi
-
-
-
-
-
-
-
-
-ac_config_files="$ac_config_files Makefile src/Makefile xmms-goom/Makefile sdl-goom/Makefile libgoom2.pc"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-       "s/'/'\\\\''/g;
-         s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then branch to the quote section.  Otherwise,
-# look for a macro that doesn't take arguments.
-ac_script='
-:mline
-/\\$/{
- N
- s,\\\n,,
- b mline
-}
-t clear
-:clear
-s/^[    ]*#[    ]*define[       ][      ]*\([^  (][^    (]*([^)]*)\)[   ]*\(.*\)/-D\1=\2/g
-t quote
-s/^[    ]*#[    ]*define[       ][      ]*\([^  ][^     ]*\)[   ]*\(.*\)/-D\1=\2/g
-t quote
-b any
-:quote
-s/[     `~#$^&*(){}\\|;'\''"<>?]/\\&/g
-s/\[/\\&/g
-s/\]/\\&/g
-s/\$/$$/g
-H
-:any
-${
-       g
-       s/^\n//
-       s/\n/ /g
-       p
-}
-'
-DEFS=`sed -n "$ac_script" confdefs.h`
-
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
- if test -n "$EXEEXT"; then
-  am__EXEEXT_TRUE=
-  am__EXEEXT_FALSE='#'
-else
-  am__EXEEXT_TRUE='#'
-  am__EXEEXT_FALSE=
-fi
-
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error "conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-
-if test -z "${HAVE_XMMS_TRUE}" && test -z "${HAVE_XMMS_FALSE}"; then
-  as_fn_error "conditional \"HAVE_XMMS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_SDL_TRUE}" && test -z "${HAVE_SDL_FALSE}"; then
-  as_fn_error "conditional \"HAVE_SDL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_MMX_TRUE}" && test -z "${HAVE_MMX_FALSE}"; then
-  as_fn_error "conditional \"HAVE_MMX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_PPC_TRUE}" && test -z "${HAVE_PPC_FALSE}"; then
-  as_fn_error "conditional \"HAVE_PPC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${MACTARGET_TRUE}" && test -z "${MACTARGET_FALSE}"; then
-  as_fn_error "conditional \"MACTARGET\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-
-: ${CONFIG_STATUS=./config.status}
-ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-       expr "X$arg" : "X\\(.*\\)$as_nl";
-       arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""       $as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-  fi
-  $as_echo "$as_me: error: $1" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-        X"$0" : 'X\(//\)$' \| \
-        X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-           s//\1/
-           q
-         }
-         /^X\/\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\/\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='        ';;     # ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='        ';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -p'
-  fi
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-        X"$as_dir" : 'X\(//\)[^/]' \| \
-        X"$as_dir" : 'X\(//\)$' \| \
-        X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)[^/].*/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-       test -d "$1/.";
-      else
-       case $1 in #(
-       -*)set "./$1";;
-       esac;
-       case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-       ???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_commands="$ac_config_commands"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration.  Unless the files
-and actions are specified as TAGs, all are instantiated by default.
-
-Usage: $0 [OPTION]... [TAG]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-      --config     print configuration, then exit
-  -q, --quiet, --silent
-                   do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-      --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-
-Configuration files:
-$config_files
-
-Configuration commands:
-$config_commands
-
-Report bugs to the package provider."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.65,
-  with options \\"\$ac_cs_config\\"
-
-Copyright (C) 2009 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-MKDIR_P='$MKDIR_P'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
-  --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    as_fn_append CONFIG_FILES " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --he | --h |  --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) as_fn_error "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
-
-  *) as_fn_append ac_config_targets " $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
-  export CONFIG_SHELL
-  exec "\$@"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  $as_echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-#
-# INIT-COMMANDS
-#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
-macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
-host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
-host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
-host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
-build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
-build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
-build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
-SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
-Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
-GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
-EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
-FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
-LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
-NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
-LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
-exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
-AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
-GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
-SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
-ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
-need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
-LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
-libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
-fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
-version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
-striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
-
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# Quote evaled strings.
-for var in SED \
-GREP \
-EGREP \
-FGREP \
-LD \
-NM \
-LN_S \
-lt_SP2NL \
-lt_NL2SP \
-reload_flag \
-OBJDUMP \
-deplibs_check_method \
-file_magic_cmd \
-AR \
-AR_FLAGS \
-STRIP \
-RANLIB \
-CC \
-CFLAGS \
-compiler \
-lt_cv_sys_global_symbol_pipe \
-lt_cv_sys_global_symbol_to_cdecl \
-lt_cv_sys_global_symbol_to_c_name_address \
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-SHELL \
-ECHO \
-lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_wl \
-lt_prog_compiler_pic \
-lt_prog_compiler_static \
-lt_cv_prog_compiler_c_o \
-need_locks \
-DSYMUTIL \
-NMEDIT \
-LIPO \
-OTOOL \
-OTOOL64 \
-shrext_cmds \
-export_dynamic_flag_spec \
-whole_archive_flag_spec \
-compiler_needs_object \
-with_gnu_ld \
-allow_undefined_flag \
-no_undefined_flag \
-hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
-hardcode_libdir_separator \
-fix_srcfile_path \
-exclude_expsyms \
-include_expsyms \
-file_list_spec \
-variables_saved_for_relink \
-libname_spec \
-library_names_spec \
-soname_spec \
-finish_eval \
-old_striplib \
-striplib; do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-    *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in reload_cmds \
-old_postinstall_cmds \
-old_postuninstall_cmds \
-old_archive_cmds \
-extract_expsyms_cmds \
-old_archive_from_new_cmds \
-old_archive_from_expsyms_cmds \
-archive_cmds \
-archive_expsym_cmds \
-module_cmds \
-module_expsym_cmds \
-export_symbols_cmds \
-prelink_cmds \
-postinstall_cmds \
-postuninstall_cmds \
-finish_cmds \
-sys_lib_search_path_spec \
-sys_lib_dlsearch_path_spec; do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-    *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\$0 --fallback-echo"')  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
-  ;;
-esac
-
-ac_aux_dir='$ac_aux_dir'
-xsi_shell='$xsi_shell'
-lt_shell_append='$lt_shell_append'
-
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
-    RM='$RM'
-    ofile='$ofile'
-
-
-
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-    "xmms-goom/Makefile") CONFIG_FILES="$CONFIG_FILES xmms-goom/Makefile" ;;
-    "sdl-goom/Makefile") CONFIG_FILES="$CONFIG_FILES sdl-goom/Makefile" ;;
-    "libgoom2.pc") CONFIG_FILES="$CONFIG_FILES libgoom2.pc" ;;
-
-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp=
-  trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-' 0
-  trap 'as_fn_exit 1' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
-  eval ac_cr=\$\'\\r\'
-fi
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\r'
-else
-  ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
-_ACEOF
-
-
-{
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-  if test $ac_delim_n = $ac_delim_num; then
-    break
-  elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-rm -f conf$$subs.sh
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\)..*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\)..*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
-  N
-  s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = "\a"
-
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
-_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[         ]*VPATH[        ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[    ]*\):*/\1/
-s/:*$//
-s/^[^=]*=[      ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
-
-
-eval set X "  :F $CONFIG_FILES      :C $CONFIG_COMMANDS"
-shift
-for ac_tag
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-        # (if the path is not absolute).  The absolute path cannot be DOS-style,
-        # because $ac_f cannot contain `:'.
-        test -f "$ac_f" ||
-          case $ac_f in
-          [\\/$]*) false;;
-          *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-          esac ||
-          as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-      esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      as_fn_append ac_file_inputs " '$ac_f'"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-         $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-       `' by configure.'
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
-    fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-        X"$ac_file" : 'X\(//\)[^/]' \| \
-        X"$ac_file" : 'X\(//\)$' \| \
-        X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)[^/].*/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`
-  as_dir="$ac_dir"; as_fn_mkdir_p
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-  ac_MKDIR_P=$MKDIR_P
-  case $MKDIR_P in
-  [\\/$]* | ?:[\\/]* ) ;;
-  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-  esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-ac_sed_dataroot='
-/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-  s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-s&@MKDIR_P@&$ac_MKDIR_P&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[         ]*datarootdir[  ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
-
-  rm -f "$tmp/stdin"
-  case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-  esac \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
- ;;
-
-
-  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
-  shift
-  for mf
-  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" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-        X"$mf" : 'X\(//\)[^/]' \| \
-        X"$mf" : 'X\(//\)$' \| \
-        X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)[^/].*/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`
-    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_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-        X"$file" : 'X\(//\)[^/]' \| \
-        X"$file" : 'X\(//\)$' \| \
-        X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)[^/].*/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`
-      as_dir=$dirpart/$fdir; as_fn_mkdir_p
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
-  done
-}
- ;;
-    "libtool":C)
-
-    # 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
-
-    cfgfile="${ofile}T"
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool 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.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-# The names of the tagged configurations supported by this script.
-available_tags=""
-
-# ### BEGIN LIBTOOL CONFIG
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Which release of libtool.m4 was used?
-macro_version=$macro_version
-macro_revision=$macro_revision
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# What type of objects to build.
-pic_mode=$pic_mode
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# 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 1s/^X//"
-
-# A grep program that handles long lines.
-GREP=$lt_GREP
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# A literal string matcher.
-FGREP=$lt_FGREP
-
-# A BSD- or MS-compatible name lister.
-NM=$lt_NM
-
-# Whether we need soft or hard links.
-LN_S=$lt_LN_S
-
-# What is the maximum length of a command?
-max_cmd_len=$max_cmd_len
-
-# Object file suffix (normally "o").
-objext=$ac_objext
-
-# Executable file suffix (normally "").
-exeext=$exeext
-
-# whether the shell understands "unset".
-lt_unset=$lt_unset
-
-# turn spaces into newlines.
-SP2NL=$lt_lt_SP2NL
-
-# turn newlines into spaces.
-NL2SP=$lt_lt_NL2SP
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# An object symbol dumper.
-OBJDUMP=$lt_OBJDUMP
-
-# 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
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A symbol stripping program.
-STRIP=$lt_STRIP
-
-# Commands used to install an old-style archive.
-RANLIB=$lt_RANLIB
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# A C compiler.
-LTCC=$lt_CC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_CFLAGS
-
-# 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
-
-# Transform the output of nm in a C name address pair when lib prefix is needed.
-global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# An echo program that does not interpret backslashes.
-ECHO=$lt_ECHO
-
-# Used to examine libraries when file_magic_cmd begins with "file".
-MAGIC_CMD=$MAGIC_CMD
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
-DSYMUTIL=$lt_DSYMUTIL
-
-# Tool to change global to local symbols on Mac OS X.
-NMEDIT=$lt_NMEDIT
-
-# Tool to manipulate fat objects and archives on Mac OS X.
-LIPO=$lt_LIPO
-
-# ldd/readelf like tool for Mach-O binaries on Mac OS X.
-OTOOL=$lt_OTOOL
-
-# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
-OTOOL64=$lt_OTOOL64
-
-# Old archive suffix (normally "a").
-libext=$libext
-
-# Shared library suffix (normally ".so").
-shrext_cmds=$lt_shrext_cmds
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at link time.
-variables_saved_for_relink=$lt_variables_saved_for_relink
-
-# 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
-
-# Library versioning type.
-version_type=$version_type
-
-# Shared library runtime path variable.
-runpath_var=$runpath_var
-
-# Shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# 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
-
-# Command to use after installation of a shared archive.
-postinstall_cmds=$lt_postinstall_cmds
-
-# Command to use after uninstallation of a shared archive.
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# As "finish_cmds", except a single script fragment to be evaled but
-# not shown.
-finish_eval=$lt_finish_eval
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# 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
-
-# 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
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-
-# The linker used to build libraries.
-LD=$lt_LD
-
-# Commands used to build an old-style archive.
-old_archive_cmds=$lt_old_archive_cmds
-
-# A language specific compiler.
-CC=$lt_compiler
-
-# Is the compiler the GNU compiler?
-with_gcc=$GCC
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc
-
-# Whether or not to disallow shared libs when runtime libs are static.
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec
-
-# Whether the compiler copes with passing no objects directly.
-compiler_needs_object=$lt_compiler_needs_object
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-
-# Commands used to build a shared archive.
-archive_cmds=$lt_archive_cmds
-archive_expsym_cmds=$lt_archive_expsym_cmds
-
-# Commands used to build a loadable module if different from building
-# a shared archive.
-module_cmds=$lt_module_cmds
-module_expsym_cmds=$lt_module_expsym_cmds
-
-# Whether we are building with GNU ld or not.
-with_gnu_ld=$lt_with_gnu_ld
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag
-
-# Flag that enforces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-
-# 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_hardcode_libdir_flag_spec_ld
-
-# Whether we need a single "-rpath" flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary.
-hardcode_direct=$hardcode_direct
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
-# library is relocated.
-hardcode_direct_absolute=$hardcode_direct_absolute
-
-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-# into the resulting binary.
-hardcode_minus_L=$hardcode_minus_L
-
-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-# into the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
-
-# 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=$hardcode_automatic
-
-# Set to yes if linker adds runtime paths of dependent libraries
-# to runtime path list.
-inherit_rpath=$inherit_rpath
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
-
-# Set to "yes" if exported symbols are required.
-always_export_symbols=$always_export_symbols
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms
-
-# Commands necessary for linking programs (against libraries) with templates.
-prelink_cmds=$lt_prelink_cmds
-
-# Specify filename containing input files.
-file_list_spec=$lt_file_list_spec
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
-
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_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
-_LT_EOF
-    ;;
-  esac
-
-
-ltmain="$ac_aux_dir/ltmain.sh"
-
-
-  # 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 '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  case $xsi_shell in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result="${1##*/}"
-}
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-  func_basename_result="${1##*/}"
-}
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-func_stripname ()
-{
-  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-  # positional parameters, so assign one to ordinary parameter first.
-  func_stripname_result=${3}
-  func_stripname_result=${func_stripname_result#"${1}"}
-  func_stripname_result=${func_stripname_result%"${2}"}
-}
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=${1%%=*}
-  func_opt_split_arg=${1#*=}
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  case ${1} in
-    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-    *)    func_lo2o_result=${1} ;;
-  esac
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=${1%.*}.lo
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=$(( $* ))
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=${#1}
-}
-
-_LT_EOF
-    ;;
-  *) # Bourne compatible functions.
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
-
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-  case ${2} in
-    .*) func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
-    *)  func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
-  esac
-}
-
-# sed scripts:
-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
-my_sed_long_arg='1s/^-[^=]*=//'
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
-  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=`expr "$@"`
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
-
-_LT_EOF
-esac
-
-case $lt_shell_append in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$1+=\$2"
-}
-_LT_EOF
-    ;;
-  *)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$1=\$$1\$2"
-}
-
-_LT_EOF
-    ;;
-  esac
-
-
-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-
- ;;
-
-  esac
-done # for ac_tag
-
-
-as_fn_exit 0
-_ACEOF
-ac_clean_files=$ac_clean_files_save
-
-test $ac_write_fail = 0 ||
-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit $?
-fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: goom2k4 was configured with the following options:" >&5
-$as_echo "$as_me: goom2k4 was configured with the following options:" >&6;}
-if test "x$HAVE_PPC" = "xyes"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}:  ** PPC support enabled" >&5
-$as_echo "$as_me:  ** PPC support enabled" >&6;}
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}:     PPC support disabled" >&5
-$as_echo "$as_me:     PPC support disabled" >&6;}
-fi
-if test "x$HAVE_MMX" = "xyes"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}:  ** MMX support enabled" >&5
-$as_echo "$as_me:  ** MMX support enabled" >&6;}
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}:     MMX support disabled" >&5
-$as_echo "$as_me:     MMX support disabled" >&6;}
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}:  ** goom lib will be built" >&5
-$as_echo "$as_me:  ** goom lib will be built" >&6;}
-if test "x$HAVE_XMMS" = "xyes"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}:  ** XMMS plugin will be built" >&5
-$as_echo "$as_me:  ** XMMS plugin will be built" >&6;}
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}:     XMMS plugin will not be built" >&5
-$as_echo "$as_me:     XMMS plugin will not be built" >&6;}
-fi
-if test "x$MACTARGET" = "xyes"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}:  ** goom mac application will be built" >&5
-$as_echo "$as_me:  ** goom mac application will be built" >&6;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}:  ** goom mac iTunes plugin will be built" >&5
-$as_echo "$as_me:  ** goom mac iTunes plugin will be built" >&6;}
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}:     goom mac application will not be built" >&5
-$as_echo "$as_me:     goom mac application will not be built" >&6;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}:     goom mac iTunes plugin will not be built" >&5
-$as_echo "$as_me:     goom mac iTunes plugin will not be built" >&6;}
-fi
-if test "x$HAVE_SDL" = "xyes"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}:  ** goom sdl application will be built" >&5
-$as_echo "$as_me:  ** goom sdl application will be built" >&6;}
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}:     goom sdl application will not be built" >&5
-$as_echo "$as_me:     goom sdl application will not be built" >&6;}
-fi
diff --git a/xbmc/visualizations/Goom/goom2k4-0/sdl-goom/Makefile.in b/xbmc/visualizations/Goom/goom2k4-0/sdl-goom/Makefile.in
deleted file mode 100644 (file)
index d92dff0..0000000
+++ /dev/null
@@ -1,535 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# the goom2 stand alone program
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-@HAVE_SDL_TRUE@bin_PROGRAMS = goom2$(EXEEXT)
-subdir = sdl-goom
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-       $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
-PROGRAMS = $(bin_PROGRAMS)
-am__goom2_SOURCES_DIST = frame_rate_tester.c gmtimer.c gtk-callbacks.c \
-       gtk-interface.c gtk-support.c pixeldoubler.c readme.c \
-       sdl_goom.c sdl_pixeldoubler.c surface.c
-@HAVE_SDL_TRUE@am_goom2_OBJECTS = frame_rate_tester.$(OBJEXT) \
-@HAVE_SDL_TRUE@        gmtimer.$(OBJEXT) gtk-callbacks.$(OBJEXT) \
-@HAVE_SDL_TRUE@        gtk-interface.$(OBJEXT) gtk-support.$(OBJEXT) \
-@HAVE_SDL_TRUE@        pixeldoubler.$(OBJEXT) readme.$(OBJEXT) \
-@HAVE_SDL_TRUE@        sdl_goom.$(OBJEXT) sdl_pixeldoubler.$(OBJEXT) \
-@HAVE_SDL_TRUE@        surface.$(OBJEXT)
-goom2_OBJECTS = $(am_goom2_OBJECTS)
-@HAVE_SDL_TRUE@goom2_DEPENDENCIES = $(top_builddir)/src/libgoom2.la
-goom2_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-       --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(goom2_LDFLAGS) \
-       $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-       --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-       --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-       $(LDFLAGS) -o $@
-SOURCES = $(goom2_SOURCES)
-DIST_SOURCES = $(am__goom2_SOURCES_DIST)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LEXLIB = @LEXLIB@
-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MACFOLDER = @MACFOLDER@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-YACC = @YACC@
-YFLAGS = @YFLAGS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-@HAVE_SDL_TRUE@goom2_LDADD = $(top_builddir)/src/libgoom2.la
-@HAVE_SDL_TRUE@goom2_LDFLAGS = $(SDL_LIBS) `gtk-config --libs`
-@HAVE_SDL_TRUE@goom2_SOURCES = frame_rate_tester.c gmtimer.c gtk-callbacks.c gtk-interface.c gtk-support.c pixeldoubler.c readme.c sdl_goom.c sdl_pixeldoubler.c surface.c
-@HAVE_SDL_TRUE@INCLUDES = $(SDL_CFLAGS) `gtk-config --cflags` -I../src/
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-       @for dep in $?; do \
-         case '$(am__configure_deps)' in \
-           *$$dep*) \
-             ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-               && { if test -f $@; then exit 0; else break; fi; }; \
-             exit 1;; \
-         esac; \
-       done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sdl-goom/Makefile'; \
-       $(am__cd) $(top_srcdir) && \
-         $(AUTOMAKE) --gnu sdl-goom/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-       @case '$?' in \
-         *config.status*) \
-           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-         *) \
-           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-       esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-binPROGRAMS: $(bin_PROGRAMS)
-       @$(NORMAL_INSTALL)
-       test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-       @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-       for p in $$list; do echo "$$p $$p"; done | \
-       sed 's/$(EXEEXT)$$//' | \
-       while read p p1; do if test -f $$p || test -f $$p1; \
-         then echo "$$p"; echo "$$p"; else :; fi; \
-       done | \
-       sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-           -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-       sed 'N;N;N;s,\n, ,g' | \
-       $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-         { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-           if ($$2 == $$4) files[d] = files[d] " " $$1; \
-           else { print "f", $$3 "/" $$4, $$1; } } \
-         END { for (d in files) print "f", d, files[d] }' | \
-       while read type dir files; do \
-           if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-           test -z "$$files" || { \
-           echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-           $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-           } \
-       ; done
-
-uninstall-binPROGRAMS:
-       @$(NORMAL_UNINSTALL)
-       @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-       files=`for p in $$list; do echo "$$p"; done | \
-         sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-             -e 's/$$/$(EXEEXT)/' `; \
-       test -n "$$list" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(bindir)" && rm -f $$files
-
-clean-binPROGRAMS:
-       @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
-       echo " rm -f" $$list; \
-       rm -f $$list || exit $$?; \
-       test -n "$(EXEEXT)" || exit 0; \
-       list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-       echo " rm -f" $$list; \
-       rm -f $$list
-goom2$(EXEEXT): $(goom2_OBJECTS) $(goom2_DEPENDENCIES) 
-       @rm -f goom2$(EXEEXT)
-       $(goom2_LINK) $(goom2_OBJECTS) $(goom2_LDADD) $(LIBS)
-
-mostlyclean-compile:
-       -rm -f *.$(OBJEXT)
-
-distclean-compile:
-       -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/frame_rate_tester.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmtimer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk-callbacks.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk-interface.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk-support.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixeldoubler.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readme.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sdl_goom.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sdl_pixeldoubler.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/surface.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@   $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-       -rm -f *.lo
-
-clean-libtool:
-       -rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
-       set x; \
-       here=`pwd`; \
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       shift; \
-       if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-         test -n "$$unique" || unique=$$empty_fix; \
-         if test $$# -gt 0; then \
-           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             "$$@" $$unique; \
-         else \
-           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             $$unique; \
-         fi; \
-       fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       test -z "$(CTAGS_ARGS)$$unique" \
-         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-            $$unique
-
-GTAGS:
-       here=`$(am__cd) $(top_builddir) && pwd` \
-         && $(am__cd) $(top_srcdir) \
-         && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-       list='$(DISTFILES)'; \
-         dist_files=`for file in $$list; do echo $$file; done | \
-         sed -e "s|^$$srcdirstrip/||;t" \
-             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-       case $$dist_files in \
-         */*) $(MKDIR_P) `echo "$$dist_files" | \
-                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                          sort -u` ;; \
-       esac; \
-       for file in $$dist_files; do \
-         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-         if test -d $$d/$$file; then \
-           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-           if test -d "$(distdir)/$$file"; then \
-             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-           fi; \
-           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-           fi; \
-           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-         else \
-           test -f "$(distdir)/$$file" \
-           || cp -p $$d/$$file "$(distdir)/$$file" \
-           || exit 1; \
-         fi; \
-       done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS)
-installdirs:
-       for dir in "$(DESTDIR)$(bindir)"; do \
-         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-       done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-         `test -z '$(STRIP)' || \
-           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-       @echo "This command is intended for maintainers to use"
-       @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-       -rm -rf ./$(DEPDIR)
-       -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-       distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-binPROGRAMS
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-       -rm -rf ./$(DEPDIR)
-       -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-       mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-       clean-generic clean-libtool ctags distclean distclean-compile \
-       distclean-generic distclean-libtool distclean-tags distdir dvi \
-       dvi-am html html-am info info-am install install-am \
-       install-binPROGRAMS install-data install-data-am install-dvi \
-       install-dvi-am install-exec install-exec-am install-html \
-       install-html-am install-info install-info-am install-man \
-       install-pdf install-pdf-am install-ps install-ps-am \
-       install-strip installcheck installcheck-am installdirs \
-       maintainer-clean maintainer-clean-generic mostlyclean \
-       mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-       pdf pdf-am ps ps-am tags uninstall uninstall-am \
-       uninstall-binPROGRAMS
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/xbmc/visualizations/Goom/goom2k4-0/src/Makefile.in b/xbmc/visualizations/Goom/goom2k4-0/src/Makefile.in
deleted file mode 100644 (file)
index bed507f..0000000
+++ /dev/null
@@ -1,647 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# libgoom2
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src
-DIST_COMMON = $(goom2_library_include_HEADERS) $(noinst_HEADERS) \
-       $(srcdir)/Makefile.am $(srcdir)/Makefile.in TODO goomsl_lex.c \
-       goomsl_yacc.c goomsl_yacc.h
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-       $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(goom2_libdir)" \
-       "$(DESTDIR)$(goom2_library_includedir)"
-LTLIBRARIES = $(goom2_lib_LTLIBRARIES)
-libgoom2_la_LIBADD =
-am__libgoom2_la_SOURCES_DIST = goomsl_yacc.y goomsl_lex.l goomsl.c \
-       goomsl_hash.c goomsl_heap.c goom_tools.c mmx.c xmmx.c \
-       ppc_zoom_ultimate.s ppc_drawings.s config_param.c \
-       convolve_fx.c filters.c flying_stars_fx.c gfontlib.c \
-       gfontrle.c goom_core.c graphic.c ifs.c lines.c mathtools.c \
-       sound_tester.c surf3d.c tentacle3d.c plugin_info.c v3d.c \
-       drawmethods.c cpu_info.c
-@HAVE_MMX_TRUE@am__objects_1 = mmx.lo xmmx.lo
-@HAVE_PPC_TRUE@am__objects_2 = ppc_zoom_ultimate.lo ppc_drawings.lo
-am_libgoom2_la_OBJECTS = goomsl_yacc.lo goomsl_lex.lo goomsl.lo \
-       goomsl_hash.lo goomsl_heap.lo goom_tools.lo $(am__objects_1) \
-       $(am__objects_2) config_param.lo convolve_fx.lo filters.lo \
-       flying_stars_fx.lo gfontlib.lo gfontrle.lo goom_core.lo \
-       graphic.lo ifs.lo lines.lo mathtools.lo sound_tester.lo \
-       surf3d.lo tentacle3d.lo plugin_info.lo v3d.lo drawmethods.lo \
-       cpu_info.lo
-libgoom2_la_OBJECTS = $(am_libgoom2_la_OBJECTS)
-libgoom2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-       $(libgoom2_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-       --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-       --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-       $(LDFLAGS) -o $@
-LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
-LTLEXCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-       --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
-YLWRAP = $(top_srcdir)/ylwrap
-CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
-LTCCASCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-       --mode=compile $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
-YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
-LTYACCCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-       --mode=compile $(YACC) $(YFLAGS) $(AM_YFLAGS)
-SOURCES = $(libgoom2_la_SOURCES)
-DIST_SOURCES = $(am__libgoom2_la_SOURCES_DIST)
-HEADERS = $(goom2_library_include_HEADERS) $(noinst_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LEXLIB = @LEXLIB@
-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MACFOLDER = @MACFOLDER@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-YACC = @YACC@
-YFLAGS = @YFLAGS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-@HAVE_MMX_FALSE@MMX_FILES = 
-@HAVE_MMX_TRUE@MMX_FILES = mmx.c xmmx.c 
-@HAVE_PPC_FALSE@PPC_FILES = 
-@HAVE_PPC_TRUE@PPC_FILES = ppc_zoom_ultimate.s ppc_drawings.s
-goom2_lib_LTLIBRARIES = libgoom2.la
-goom2_libdir = $(libdir)
-goom2_library_includedir = $(includedir)/goom
-goom2_library_include_HEADERS = goom.h goom_plugin_info.h goom_typedefs.h goom_graphic.h goom_config_param.h goom_visual_fx.h goom_filters.h goom_tools.h goomsl.h goomsl_hash.h goomsl_heap.h goom_tools.h goom_config.h
-libgoom2_la_LDFLAGS = -export-dynamic -export-symbols-regex "goom.*" 
-libgoom2_la_SOURCES = \
-       goomsl_yacc.y goomsl_lex.l goomsl.c goomsl_hash.c goomsl_heap.c \
-       goom_tools.c $(MMX_FILES) $(PPC_FILES) \
-       config_param.c convolve_fx.c filters.c \
-       flying_stars_fx.c gfontlib.c gfontrle.c \
-       goom_core.c graphic.c ifs.c lines.c \
-       mathtools.c sound_tester.c surf3d.c \
-       tentacle3d.c plugin_info.c \
-       v3d.c drawmethods.c \
-       cpu_info.c
-
-AM_YFLAGS = -d
-noinst_HEADERS = mmx.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .l .lo .o .obj .s .y
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-       @for dep in $?; do \
-         case '$(am__configure_deps)' in \
-           *$$dep*) \
-             ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-               && { if test -f $@; then exit 0; else break; fi; }; \
-             exit 1;; \
-         esac; \
-       done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
-       $(am__cd) $(top_srcdir) && \
-         $(AUTOMAKE) --gnu src/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-       @case '$?' in \
-         *config.status*) \
-           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-         *) \
-           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-       esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-goom2_libLTLIBRARIES: $(goom2_lib_LTLIBRARIES)
-       @$(NORMAL_INSTALL)
-       test -z "$(goom2_libdir)" || $(MKDIR_P) "$(DESTDIR)$(goom2_libdir)"
-       @list='$(goom2_lib_LTLIBRARIES)'; test -n "$(goom2_libdir)" || list=; \
-       list2=; for p in $$list; do \
-         if test -f $$p; then \
-           list2="$$list2 $$p"; \
-         else :; fi; \
-       done; \
-       test -z "$$list2" || { \
-         echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(goom2_libdir)'"; \
-         $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(goom2_libdir)"; \
-       }
-
-uninstall-goom2_libLTLIBRARIES:
-       @$(NORMAL_UNINSTALL)
-       @list='$(goom2_lib_LTLIBRARIES)'; test -n "$(goom2_libdir)" || list=; \
-       for p in $$list; do \
-         $(am__strip_dir) \
-         echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(goom2_libdir)/$$f'"; \
-         $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(goom2_libdir)/$$f"; \
-       done
-
-clean-goom2_libLTLIBRARIES:
-       -test -z "$(goom2_lib_LTLIBRARIES)" || rm -f $(goom2_lib_LTLIBRARIES)
-       @list='$(goom2_lib_LTLIBRARIES)'; for p in $$list; do \
-         dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-         test "$$dir" != "$$p" || dir=.; \
-         echo "rm -f \"$${dir}/so_locations\""; \
-         rm -f "$${dir}/so_locations"; \
-       done
-goomsl_yacc.h: goomsl_yacc.c
-       @if test ! -f $@; then \
-         rm -f goomsl_yacc.c; \
-         $(MAKE) $(AM_MAKEFLAGS) goomsl_yacc.c; \
-       else :; fi
-libgoom2.la: $(libgoom2_la_OBJECTS) $(libgoom2_la_DEPENDENCIES) 
-       $(libgoom2_la_LINK) -rpath $(goom2_libdir) $(libgoom2_la_OBJECTS) $(libgoom2_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-       -rm -f *.$(OBJEXT)
-
-distclean-compile:
-       -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/config_param.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/convolve_fx.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu_info.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drawmethods.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filters.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flying_stars_fx.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gfontlib.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gfontrle.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goom_core.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goom_tools.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goomsl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goomsl_hash.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goomsl_heap.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goomsl_lex.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goomsl_yacc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graphic.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ifs.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lines.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mathtools.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mmx.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin_info.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sound_tester.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/surf3d.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tentacle3d.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/v3d.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmmx.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@   $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LTCOMPILE) -c -o $@ $<
-
-.l.c:
-       $(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE)
-
-.s.o:
-       $(CCASCOMPILE) -c -o $@ $<
-
-.s.obj:
-       $(CCASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.s.lo:
-       $(LTCCASCOMPILE) -c -o $@ $<
-
-.y.c:
-       $(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE)
-
-mostlyclean-libtool:
-       -rm -f *.lo
-
-clean-libtool:
-       -rm -rf .libs _libs
-install-goom2_library_includeHEADERS: $(goom2_library_include_HEADERS)
-       @$(NORMAL_INSTALL)
-       test -z "$(goom2_library_includedir)" || $(MKDIR_P) "$(DESTDIR)$(goom2_library_includedir)"
-       @list='$(goom2_library_include_HEADERS)'; test -n "$(goom2_library_includedir)" || list=; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(goom2_library_includedir)'"; \
-         $(INSTALL_HEADER) $$files "$(DESTDIR)$(goom2_library_includedir)" || exit $$?; \
-       done
-
-uninstall-goom2_library_includeHEADERS:
-       @$(NORMAL_UNINSTALL)
-       @list='$(goom2_library_include_HEADERS)'; test -n "$(goom2_library_includedir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       test -n "$$files" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(goom2_library_includedir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(goom2_library_includedir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
-       set x; \
-       here=`pwd`; \
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       shift; \
-       if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-         test -n "$$unique" || unique=$$empty_fix; \
-         if test $$# -gt 0; then \
-           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             "$$@" $$unique; \
-         else \
-           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             $$unique; \
-         fi; \
-       fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       test -z "$(CTAGS_ARGS)$$unique" \
-         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-            $$unique
-
-GTAGS:
-       here=`$(am__cd) $(top_builddir) && pwd` \
-         && $(am__cd) $(top_srcdir) \
-         && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-       list='$(DISTFILES)'; \
-         dist_files=`for file in $$list; do echo $$file; done | \
-         sed -e "s|^$$srcdirstrip/||;t" \
-             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-       case $$dist_files in \
-         */*) $(MKDIR_P) `echo "$$dist_files" | \
-                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                          sort -u` ;; \
-       esac; \
-       for file in $$dist_files; do \
-         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-         if test -d $$d/$$file; then \
-           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-           if test -d "$(distdir)/$$file"; then \
-             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-           fi; \
-           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-           fi; \
-           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-         else \
-           test -f "$(distdir)/$$file" \
-           || cp -p $$d/$$file "$(distdir)/$$file" \
-           || exit 1; \
-         fi; \
-       done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-       for dir in "$(DESTDIR)$(goom2_libdir)" "$(DESTDIR)$(goom2_library_includedir)"; do \
-         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-       done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-         `test -z '$(STRIP)' || \
-           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-       @echo "This command is intended for maintainers to use"
-       @echo "it deletes files that may require special tools to rebuild."
-       -rm -f goomsl_lex.c
-       -rm -f goomsl_yacc.c
-       -rm -f goomsl_yacc.h
-clean: clean-am
-
-clean-am: clean-generic clean-goom2_libLTLIBRARIES clean-libtool \
-       mostlyclean-am
-
-distclean: distclean-am
-       -rm -rf ./$(DEPDIR)
-       -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-       distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-goom2_libLTLIBRARIES \
-       install-goom2_library_includeHEADERS
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-       -rm -rf ./$(DEPDIR)
-       -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-       mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-goom2_libLTLIBRARIES \
-       uninstall-goom2_library_includeHEADERS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-       clean-goom2_libLTLIBRARIES clean-libtool ctags distclean \
-       distclean-compile distclean-generic distclean-libtool \
-       distclean-tags distdir dvi dvi-am html html-am info info-am \
-       install install-am install-data install-data-am install-dvi \
-       install-dvi-am install-exec install-exec-am \
-       install-goom2_libLTLIBRARIES \
-       install-goom2_library_includeHEADERS install-html \
-       install-html-am install-info install-info-am install-man \
-       install-pdf install-pdf-am install-ps install-ps-am \
-       install-strip installcheck installcheck-am installdirs \
-       maintainer-clean maintainer-clean-generic mostlyclean \
-       mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-       pdf pdf-am ps ps-am tags uninstall uninstall-am \
-       uninstall-goom2_libLTLIBRARIES \
-       uninstall-goom2_library_includeHEADERS
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/xbmc/visualizations/Goom/goom2k4-0/xmms-goom/Makefile.in b/xbmc/visualizations/Goom/goom2k4-0/xmms-goom/Makefile.in
deleted file mode 100644 (file)
index 702845d..0000000
+++ /dev/null
@@ -1,531 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# the xmms plugin
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = xmms-goom
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-       $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(xmms_libdir)"
-LTLIBRARIES = $(xmms_lib_LTLIBRARIES)
-@HAVE_XMMS_TRUE@libxmmsgoom2_la_DEPENDENCIES =  \
-@HAVE_XMMS_TRUE@       $(top_builddir)/src/libgoom2.la
-am__libxmmsgoom2_la_SOURCES_DIST = xmms_goom.c
-@HAVE_XMMS_TRUE@am_libxmmsgoom2_la_OBJECTS = xmms_goom.lo
-libxmmsgoom2_la_OBJECTS = $(am_libxmmsgoom2_la_OBJECTS)
-libxmmsgoom2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-       $(libxmmsgoom2_la_LDFLAGS) $(LDFLAGS) -o $@
-@HAVE_XMMS_TRUE@am_libxmmsgoom2_la_rpath = -rpath $(xmms_libdir)
-DEFAULT_INCLUDES = -I.@am__isrc@
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-       --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-       --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-       $(LDFLAGS) -o $@
-SOURCES = $(libxmmsgoom2_la_SOURCES)
-DIST_SOURCES = $(am__libxmmsgoom2_la_SOURCES_DIST)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LEXLIB = @LEXLIB@
-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MACFOLDER = @MACFOLDER@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-YACC = @YACC@
-YFLAGS = @YFLAGS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-@HAVE_XMMS_TRUE@xmms_lib_LTLIBRARIES = libxmmsgoom2.la
-@HAVE_XMMS_TRUE@xmms_libdir = $(XMMS_VISUALIZATION_PLUGIN_DIR)
-@HAVE_XMMS_TRUE@libxmmsgoom2_la_LIBADD = $(top_builddir)/src/libgoom2.la $(XMMS_LIBS)
-@HAVE_XMMS_TRUE@libxmmsgoom2_la_SOURCES = xmms_goom.c
-@HAVE_XMMS_TRUE@INCLUDES = -DDATADIR=\"@XMMS_DATA_DIR@\" @XMMS_CFLAGS@ -Wall -I../src/
-libxmmsgoom2_la_LDFLAGS = -module -avoid-version
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-       @for dep in $?; do \
-         case '$(am__configure_deps)' in \
-           *$$dep*) \
-             ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-               && { if test -f $@; then exit 0; else break; fi; }; \
-             exit 1;; \
-         esac; \
-       done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu xmms-goom/Makefile'; \
-       $(am__cd) $(top_srcdir) && \
-         $(AUTOMAKE) --gnu xmms-goom/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-       @case '$?' in \
-         *config.status*) \
-           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-         *) \
-           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-       esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-xmms_libLTLIBRARIES: $(xmms_lib_LTLIBRARIES)
-       @$(NORMAL_INSTALL)
-       test -z "$(xmms_libdir)" || $(MKDIR_P) "$(DESTDIR)$(xmms_libdir)"
-       @list='$(xmms_lib_LTLIBRARIES)'; test -n "$(xmms_libdir)" || list=; \
-       list2=; for p in $$list; do \
-         if test -f $$p; then \
-           list2="$$list2 $$p"; \
-         else :; fi; \
-       done; \
-       test -z "$$list2" || { \
-         echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(xmms_libdir)'"; \
-         $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(xmms_libdir)"; \
-       }
-
-uninstall-xmms_libLTLIBRARIES:
-       @$(NORMAL_UNINSTALL)
-       @list='$(xmms_lib_LTLIBRARIES)'; test -n "$(xmms_libdir)" || list=; \
-       for p in $$list; do \
-         $(am__strip_dir) \
-         echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(xmms_libdir)/$$f'"; \
-         $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(xmms_libdir)/$$f"; \
-       done
-
-clean-xmms_libLTLIBRARIES:
-       -test -z "$(xmms_lib_LTLIBRARIES)" || rm -f $(xmms_lib_LTLIBRARIES)
-       @list='$(xmms_lib_LTLIBRARIES)'; for p in $$list; do \
-         dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-         test "$$dir" != "$$p" || dir=.; \
-         echo "rm -f \"$${dir}/so_locations\""; \
-         rm -f "$${dir}/so_locations"; \
-       done
-libxmmsgoom2.la: $(libxmmsgoom2_la_OBJECTS) $(libxmmsgoom2_la_DEPENDENCIES) 
-       $(libxmmsgoom2_la_LINK) $(am_libxmmsgoom2_la_rpath) $(libxmmsgoom2_la_OBJECTS) $(libxmmsgoom2_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-       -rm -f *.$(OBJEXT)
-
-distclean-compile:
-       -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmms_goom.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@   $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-       -rm -f *.lo
-
-clean-libtool:
-       -rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
-       set x; \
-       here=`pwd`; \
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       shift; \
-       if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-         test -n "$$unique" || unique=$$empty_fix; \
-         if test $$# -gt 0; then \
-           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             "$$@" $$unique; \
-         else \
-           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             $$unique; \
-         fi; \
-       fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       test -z "$(CTAGS_ARGS)$$unique" \
-         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-            $$unique
-
-GTAGS:
-       here=`$(am__cd) $(top_builddir) && pwd` \
-         && $(am__cd) $(top_srcdir) \
-         && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-       list='$(DISTFILES)'; \
-         dist_files=`for file in $$list; do echo $$file; done | \
-         sed -e "s|^$$srcdirstrip/||;t" \
-             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-       case $$dist_files in \
-         */*) $(MKDIR_P) `echo "$$dist_files" | \
-                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                          sort -u` ;; \
-       esac; \
-       for file in $$dist_files; do \
-         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-         if test -d $$d/$$file; then \
-           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-           if test -d "$(distdir)/$$file"; then \
-             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-           fi; \
-           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-           fi; \
-           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-         else \
-           test -f "$(distdir)/$$file" \
-           || cp -p $$d/$$file "$(distdir)/$$file" \
-           || exit 1; \
-         fi; \
-       done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-       for dir in "$(DESTDIR)$(xmms_libdir)"; do \
-         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-       done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-         `test -z '$(STRIP)' || \
-           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-       @echo "This command is intended for maintainers to use"
-       @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-xmms_libLTLIBRARIES \
-       mostlyclean-am
-
-distclean: distclean-am
-       -rm -rf ./$(DEPDIR)
-       -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-       distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-xmms_libLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-       -rm -rf ./$(DEPDIR)
-       -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-       mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-xmms_libLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-       clean-libtool clean-xmms_libLTLIBRARIES ctags distclean \
-       distclean-compile distclean-generic distclean-libtool \
-       distclean-tags distdir dvi dvi-am html html-am info info-am \
-       install install-am install-data install-data-am install-dvi \
-       install-dvi-am install-exec install-exec-am install-html \
-       install-html-am install-info install-info-am install-man \
-       install-pdf install-pdf-am install-ps install-ps-am \
-       install-strip install-xmms_libLTLIBRARIES installcheck \
-       installcheck-am installdirs maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-compile \
-       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-       tags uninstall uninstall-am uninstall-xmms_libLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/xbmc/visualizations/Goom/goom2k4-0/ylwrap b/xbmc/visualizations/Goom/goom2k4-0/ylwrap
deleted file mode 100755 (executable)
index 84d5634..0000000
+++ /dev/null
@@ -1,222 +0,0 @@
-#! /bin/sh
-# ylwrap - wrapper for lex/yacc invocations.
-
-scriptversion=2009-04-28.21; # UTC
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
-# 2007, 2009 Free Software Foundation, Inc.
-#
-# Written by Tom Tromey <tromey@cygnus.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, 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, see <http://www.gnu.org/licenses/>.
-
-# 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.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-case "$1" in
-  '')
-    echo "$0: No files given.  Try \`$0 --help' for more information." 1>&2
-    exit 1
-    ;;
-  --basedir)
-    basedir=$2
-    shift 2
-    ;;
-  -h|--h*)
-    cat <<\EOF
-Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
-
-Wrapper for lex/yacc invocations, renaming files as desired.
-
-  INPUT is the input file
-  OUTPUT is one file PROG generates
-  DESIRED is the file we actually want instead of OUTPUT
-  PROGRAM is program to run
-  ARGS are passed to PROG
-
-Any number of OUTPUT,DESIRED pairs may be used.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v|--v*)
-    echo "ylwrap $scriptversion"
-    exit $?
-    ;;
-esac
-
-
-# The input.
-input="$1"
-shift
-case "$input" in
-  [\\/]* | ?:[\\/]*)
-    # Absolute path; do nothing.
-    ;;
-  *)
-    # Relative path.  Make it absolute.
-    input="`pwd`/$input"
-    ;;
-esac
-
-pairlist=
-while test "$#" -ne 0; do
-  if test "$1" = "--"; then
-    shift
-    break
-  fi
-  pairlist="$pairlist $1"
-  shift
-done
-
-# The program to run.
-prog="$1"
-shift
-# Make any relative path in $prog absolute.
-case "$prog" in
-  [\\/]* | ?:[\\/]*) ;;
-  *[\\/]*) prog="`pwd`/$prog" ;;
-esac
-
-# FIXME: add hostname here for parallel makes that run commands on
-# other machines.  But that might take us over the 14-char limit.
-dirname=ylwrap$$
-trap "cd '`pwd`'; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
-mkdir $dirname || exit 1
-
-cd $dirname
-
-case $# in
-  0) "$prog" "$input" ;;
-  *) "$prog" "$@" "$input" ;;
-esac
-ret=$?
-
-if test $ret -eq 0; then
-  set X $pairlist
-  shift
-  first=yes
-  # Since DOS filename conventions don't allow two dots,
-  # the DOS version of Bison writes out y_tab.c instead of y.tab.c
-  # and y_tab.h instead of y.tab.h. Test to see if this is the case.
-  y_tab_nodot="no"
-  if test -f y_tab.c || test -f y_tab.h; then
-    y_tab_nodot="yes"
-  fi
-
-  # The directory holding the input.
-  input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
-  # Quote $INPUT_DIR so we can use it in a regexp.
-  # FIXME: really we should care about more than `.' and `\'.
-  input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'`
-
-  while test "$#" -ne 0; do
-    from="$1"
-    # Handle y_tab.c and y_tab.h output by DOS
-    if test $y_tab_nodot = "yes"; then
-      if test $from = "y.tab.c"; then
-       from="y_tab.c"
-      else
-       if test $from = "y.tab.h"; then
-         from="y_tab.h"
-       fi
-      fi
-    fi
-    if test -f "$from"; then
-      # If $2 is an absolute path name, then just use that,
-      # otherwise prepend `../'.
-      case "$2" in
-       [\\/]* | ?:[\\/]*) target="$2";;
-       *) target="../$2";;
-      esac
-
-      # We do not want to overwrite a header file if it hasn't
-      # changed.  This avoid useless recompilations.  However the
-      # parser itself (the first file) should always be updated,
-      # because it is the destination of the .y.c rule in the
-      # Makefile.  Divert the output of all other files to a temporary
-      # file so we can compare them to existing versions.
-      if test $first = no; then
-       realtarget="$target"
-       target="tmp-`echo $target | sed s/.*[\\/]//g`"
-      fi
-      # Edit out `#line' or `#' directives.
-      #
-      # We don't want the resulting debug information to point at
-      # an absolute srcdir; it is better for it to just mention the
-      # .y file with no path.
-      #
-      # We want to use the real output file name, not yy.lex.c for
-      # instance.
-      #
-      # We want the include guards to be adjusted too.
-      FROM=`echo "$from" | sed \
-            -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
-            -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
-      TARGET=`echo "$2" | sed \
-            -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
-            -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
-
-      sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \
-          -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$?
-
-      # Check whether header files must be updated.
-      if test $first = no; then
-       if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
-         echo "$2" is unchanged
-         rm -f "$target"
-       else
-          echo updating "$2"
-          mv -f "$target" "$realtarget"
-        fi
-      fi
-    else
-      # A missing file is only an error for the first file.  This
-      # is a blatant hack to let us support using "yacc -d".  If -d
-      # is not specified, we don't want an error when the header
-      # file is "missing".
-      if test $first = yes; then
-        ret=1
-      fi
-    fi
-    shift
-    shift
-    first=no
-  done
-else
-  ret=$?
-fi
-
-# Remove the directory.
-cd ..
-rm -rf $dirname
-
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
index b715b3c..4e6d20a 100644 (file)
@@ -7,4 +7,9 @@
   <extension
     point="xbmc.player.musicviz"
     library_linux="Goom.vis" />
+  <extension point="xbmc.addon.metadata">
+    <summary lang="en">Goom 2k4 Visualization</summary>
+    <description lang="en">The Goom 2k4 visualization supports effects like Tentacles, Flash, Stars, Fireworks, Waves, Blurs and Glows and includes a large number of trippy hypnotic effects that dance, swirl and pop with the music</description>
+  <platform>linux</platform>
+  </extension>
 </addon>
diff --git a/xbmc/visualizations/Goom/visualization.goom/default.tbn b/xbmc/visualizations/Goom/visualization.goom/default.tbn
deleted file mode 100644 (file)
index e4e4fa1..0000000
Binary files a/xbmc/visualizations/Goom/visualization.goom/default.tbn and /dev/null differ
diff --git a/xbmc/visualizations/Goom/visualization.goom/description.xml b/xbmc/visualizations/Goom/visualization.goom/description.xml
deleted file mode 100644 (file)
index 8a51d68..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addoninfo>
-  <id>visualization.goom</id>
-  <type>visualization</type>
-  <title>Goom</title>
-  <library>Goom.vis</library>
-  <librarywin32>Goom_win32.vis</librarywin32>
-  <version>1.0.0</version>
-  <platforms>
-    <platform>windows</platform>
-    <platform>linux</platform>
-  </platforms>
-  <minversion>
-    <xbmc>28344</xbmc>
-  </minversion>
-  <summary>Visualization</summary>
-  <description>Goom visual effects generator</description>
-  <author>TEAMXBMC</author>
-</addoninfo>
diff --git a/xbmc/visualizations/Goom/visualization.goom/icon.png b/xbmc/visualizations/Goom/visualization.goom/icon.png
new file mode 100644 (file)
index 0000000..f535698
Binary files /dev/null and b/xbmc/visualizations/Goom/visualization.goom/icon.png differ
index 57f9a78..d0a54a0 100644 (file)
@@ -652,7 +652,7 @@ bool CGUIMediaWindow::GetDirectory(const CStdString &strDirectory, CFileItemList
       m_history.RemoveParentPath();
   }
 
-  if (m_guiState.get() && !m_guiState->HideParentDirItems() && !items.GetPath().IsEmpty())
+  if (m_guiState.get() && !m_guiState->HideParentDirItems() && items.GetPath() != m_startDirectory)
   {
     CFileItemPtr pItem(new CFileItem(".."));
     pItem->SetPath(strParentPath);
index 1840016..dcd1fef 100644 (file)
@@ -116,7 +116,7 @@ void CGUIWindowSystemInfo::FrameMove()
     SetControlLabel(i++, "%s: %s", 149, NETWORK_MAC_ADDRESS);
 #endif
     SetControlLabel(i++, "%s: %s", 150, NETWORK_IP_ADDRESS);
-    SetControlLabel(i++, "%s: %s", 13159, NETWORK_SUBNET_ADDRESS);
+    SetControlLabel(i++, "%s: %s", 13159, NETWORK_SUBNET_MASK);
     SetControlLabel(i++, "%s: %s", 13160, NETWORK_GATEWAY_ADDRESS);
     SetControlLabel(i++, "%s: %s", 13161, NETWORK_DNS1_ADDRESS);
     SetControlLabel(i++, "%s: %s", 20307, NETWORK_DNS2_ADDRESS);