Merge commit 'origin/master' into tmbinc/FixTimingBugs

[enigma2.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b94272d94e674b3c0d9175e980e952cac4c6ba9a..cb0ace7fa809c9c83cb09373fb125b06bc7c650b 100755 (executable)
--- 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)
 
@@ -120,6 +125,7 @@ lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/Makefile
 lib/python/Plugins/SystemPlugins/Videomode/Makefile
 lib/python/Plugins/SystemPlugins/VideoTune/Makefile
 lib/python/Plugins/SystemPlugins/DiseqcTester/Makefile
+lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/Makefile
 lib/python/Plugins/DemoPlugins/Makefile
 lib/python/Plugins/DemoPlugins/TestPlugin/Makefile
 lib/python/Plugins/Extensions/Makefile