xscreensaver: use the new gettext logic

This commit switches to use the new gettext logic, which involves:

 - using TARGET_NLS_DEPENDENCIES instead of hand-encoded dependencies
   on gettext/host-gettext

 - dropping BR2_PACKAGE_GETTEXT selection

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2017-07-03 23:25:22 +02:00
parent e398ec92e9
commit 5ceabb945d
2 changed files with 1 additions and 2 deletions

View File

@ -11,7 +11,6 @@ config BR2_PACKAGE_XSCREENSAVER
select BR2_PACKAGE_JPEG select BR2_PACKAGE_JPEG
select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXT select BR2_PACKAGE_XLIB_LIBXT
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
help help
XScreenSaver is the standard screen saver collection shipped on most XScreenSaver is the standard screen saver collection shipped on most
Linux and Unix systems running the X11 Window System. Linux and Unix systems running the X11 Window System.

View File

@ -12,7 +12,7 @@ XSCREENSAVER_LICENSE = MIT-like, GPL-2.0+
XSCREENSAVER_LICENSE_FILES = hacks/screenhack.h hacks/glx/chessmodels.h XSCREENSAVER_LICENSE_FILES = hacks/screenhack.h hacks/glx/chessmodels.h
XSCREENSAVER_DEPENDENCIES = jpeg libglade libgtk2 xlib_libX11 xlib_libXt \ XSCREENSAVER_DEPENDENCIES = jpeg libglade libgtk2 xlib_libX11 xlib_libXt \
$(if $(BR2_PACKAGE_GETTEXT),gettext) host-intltool $(TARGET_NLS_DEPENDENCIES) host-intltool
# otherwise we end up with host include/library dirs passed to the # otherwise we end up with host include/library dirs passed to the
# compiler/linker # compiler/linker