fluxbox: fix build against xlib_libXpm
authorJames Knight <james.knight@rockwellcollins.com>
Thu, 18 Jun 2015 17:42:56 +0000 (13:42 -0400)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thu, 18 Jun 2015 20:40:04 +0000 (22:40 +0200)
Explicitly configure XPM support based on the library selection provided
(BR2_PACKAGE_XLIB_LIBXPM). It has been observed on different hosts that
XPM support may or may not be included based off the state of the host's
system. One can validate XPM support is included in Fluxbox by using the
command `fluxbox -info`.

Signed-off-by: James Knight <james.knight@rockwellcollins.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
package/fluxbox/fluxbox.mk

index c8e4289bf58403e0c0a7246f8b5f94c2e5dcae24..d2e8c89f53e7a5b69ea6e8c3cc4c8206dbe37d9a 100644 (file)
@@ -22,6 +22,13 @@ else
 FLUXBOX_CONF_OPTS += --disable-imlib2
 endif
 
+ifeq ($(BR2_PACKAGE_XLIB_LIBXPM),y)
+FLUXBOX_CONF_OPTS += --enable-xpm --with-xpm-prefix=$(STAGING_DIR)/usr
+FLUXBOX_DEPENDENCIES += xlib_libXpm
+else
+FLUXBOX_CONF_OPTS += --disable-xpm
+endif
+
 define FLUXBOX_INSTALL_XSESSION_FILE
        $(INSTALL) -m 0755 -D package/fluxbox/xsession \
                $(TARGET_DIR)/root/.xsession