3 files changed, 37 insertions, 9 deletions
diff --git a/package/links/Config.in b/package/links/Config.in
index 5a0ce9c66..fddf3d260 100644
--- a/package/links/Config.in
+++ b/package/links/Config.in
@@ -3,4 +3,13 @@ config BR2_PACKAGE_LINKS
 	help
 	  Graphics and text mode WWW browser (kind of like lynx).
 
-	  http://atrey.karlin.mff.cuni.cz/~clock/twibright/links
+	  http://links.twibright.com/
+
+config BR2_PACKAGE_LINKS_GRAPHICS
+	bool "use graphics (directfb)"
+	depends on BR2_PACKAGE_LINKS
+	select BR2_PACKAGE_DIRECTFB
+	select BR2_PACKAGE_LIBPNG
+	help
+	  Enable graphics output.
+	  Otherwise links will be text-mode only.
diff --git a/package/links/links-1.01pre1-no-ssl-largefile.patch b/package/links/links-no-largefile.patch
index f3143cba0..f3143cba0 100644
--- a/package/links/links-1.01pre1-no-ssl-largefile.patch
+++ b/package/links/links-no-largefile.patch
diff --git a/package/links/links.mk b/package/links/links.mk
index 2e17066f2..b8520d4a0 100644
--- a/package/links/links.mk
+++ b/package/links/links.mk
@@ -1,16 +1,35 @@
 #############################################################
 #
-# links (text based web browser)
+# links
 #
 #############################################################
-LINKS_VERSION:=1.01pre1-no-ssl
-LINKS_SITE:=http://artax.karlin.mff.cuni.cz/~mikulas/vyplody/links/download/no-ssl
-LINKS_SOURCE:=links-$(LINKS_VERSION).tar.gz
 
-LINKS_CONF_OPT = --localstatedir=/tmp
+LINKS_VERSION = 2.3pre1
+LINKS_SITE = http://links.twibright.com/download
+LINKS_CONF_OPT = --without-x
 
-define LINKS_INSTALL_TARGET_CMDS
-	install -c $(@D)/links $(TARGET_DIR)/usr/bin/links
-endef
+ifeq ($(BR2_PACKAGE_LINKS_GRAPHICS),y)
+LINKS_CONF_OPT += --enable-graphics
+LINKS_CONF_ENV = ac_cv_path_DIRECTFB_CONFIG=$(STAGING_DIR)/usr/bin/directfb-config
+LINKS_DEPENDENCIES += directfb libpng
+ifeq ($(BR2_PACKAGE_JPEG),y)
+LINKS_DEPENDENCIES += jpeg
+endif
+ifeq ($(BR2_PACKAGE_TIFF),y)
+LINKS_DEPENDENCIES += tiff
+endif
+endif
+
+ifeq ($(BR2_PACKAGE_BZIP2),y)
+LINKS_DEPENDENCIES += bzip2
+endif
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+LINKS_DEPENDENCIES += openssl
+endif
+
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+LINKS_DEPENDENCIES += zlib
+endif
 
 $(eval $(call AUTOTARGETS,package,links))