From: ghost <andreas.monzner@multimedia-labs.de>
Date: Wed, 4 Mar 2009 23:12:49 +0000 (+0100)
Subject: Merge branch 'master' of git.opendreambox.org:/git/enigma2
X-Git-Tag: 2.6.0~384
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/55526774d926e19f8e34e94262a9fc939ddf91fc?hp=690b1b1a235752794a92e99bf513a6db01f42748

Merge branch 'master' of git.opendreambox.org:/git/enigma2
---

diff --git a/configure.ac b/configure.ac
index b94272d9..49bf6d2d 100755
--- a/configure.ac
+++ b/configure.ac
@@ -45,9 +45,14 @@ AC_CHECK_LIB(jpeg, jpeg_set_defaults, HAVE_JPEG="yes", HAVE_JPEG="no")
 JPEG_LIBS="-ljpeg"
 AC_SUBST(JPEG_LIBS)
 
-AC_CHECK_LIB(ungif, DGifOpenFileName, HAVE_LIBUNGIF="yes", HAVE_LIBUNGIF="no")
-LIBUNGIF_LIBS="-lungif"
-AC_SUBST(LIBUNGIF_LIBS)
+AC_SUBST(LIBUNGIF_LIBS,"")
+AC_CHECK_HEADERS(gif_lib.h,
+	AC_CHECK_LIB(ungif,DGifOpen,
+	[AC_DEFINE(HAVE_LIBUNGIF,1,[Define if you have libgif/libungif including devel headers])
+		LIBUNGIF_LIBS="-lungif"],
+		[AC_CHECK_LIB(gif,DGifOpen,
+			[AC_DEFINE(HAVE_LIUNBGIF,1)
+			LIBUNGIF_LIBS="-lgif"])]))
 
 TUXBOX_APPS_LIB_PKGCONFIG(XML2,libxml-2.0)
 
diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 79e99b03..4cc40633 100755
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -1614,8 +1614,9 @@ class Config(ConfigSubsection):
 			self.setSavedValue(tree["config"])
 
 	def saveToFile(self, filename):
+		text = self.pickle()
 		f = open(filename, "w")
-		f.write(self.pickle())
+		f.write(text)
 		f.close()
 
 	def loadFromFile(self, filename):