소스 검색

fluxbox: fix build against xlib_libXpm

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>
James Knight 10 년 전
부모
커밋
3f1ddefda1
1개의 변경된 파일7개의 추가작업 그리고 0개의 파일을 삭제
  1. 7 0
      package/fluxbox/fluxbox.mk

+ 7 - 0
package/fluxbox/fluxbox.mk

@@ -22,6 +22,13 @@ else
 FLUXBOX_CONF_OPTS += --disable-imlib2
 FLUXBOX_CONF_OPTS += --disable-imlib2
 endif
 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
 define FLUXBOX_INSTALL_XSESSION_FILE
 	$(INSTALL) -m 0755 -D package/fluxbox/xsession \
 	$(INSTALL) -m 0755 -D package/fluxbox/xsession \
 		$(TARGET_DIR)/root/.xsession
 		$(TARGET_DIR)/root/.xsession