Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 4 Mar 2009 23:12:49 +0000 (00:12 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 4 Mar 2009 23:12:49 +0000 (00:12 +0100)
configure.ac
lib/python/Components/config.py

index b94272d..49bf6d2 100755 (executable)
@@ -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)
 
index 79e99b0..4cc4063 100755 (executable)
@@ -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):