Merge branch 'next'

[coffee/buildroot.git] / package / fltk / fltk.mk

diff --git a/package/fltk/fltk.mk b/package/fltk/fltk.mk
index d1acb8651489f93d1e36a31826475726693e1c0f..9b67bd32aeb49ac920772b0a9659579be845d664 100644 (file)
--- a/package/fltk/fltk.mk
+++ b/package/fltk/fltk.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FLTK_VERSION = 1.3.2
+FLTK_VERSION = 1.3.3
 FLTK_SOURCE = fltk-$(FLTK_VERSION)-source.tar.gz
 FLTK_SITE = http://fltk.org/pub/fltk/$(FLTK_VERSION)
 FLTK_INSTALL_STAGING = YES
@@ -27,6 +27,20 @@ FLTK_CONF_OPTS += --enable-cairo
 FLTK_DEPENDENCIES += cairo
 endif
 
+ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y)
+FLTK_DEPENDENCIES += xlib_libXcursor
+FLTK_CONF_OPTS += --enable-xcursor
+else
+FLTK_CONF_OPTS += --disable-xcursor
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXFIXES),y)
+FLTK_DEPENDENCIES += xlib_libXfixes
+FLTK_CONF_OPTS += --enable-xfixes
+else
+FLTK_CONF_OPTS += --disable-xfixes
+endif
+
 ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y)
 FLTK_CONF_ENV += ac_cv_path_FTCONFIG=$(STAGING_DIR)/usr/bin/freetype-config
 FLTK_DEPENDENCIES += xlib_libXft