diff options
| author | Samuel Martin <s.martin49@gmail.com> | 2014-01-18 20:23:46 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-01-19 21:31:02 +0100 |
| commit | d0433603e3c7de5a0d7d6a434b4cb45ef5e5b533 (patch) | |
| tree | c8b56faeaff596f6dde62e57e6091f41150ab0d9 | |
| parent | 171fc468dc0dc2a2011d105357c91fdaf4af463a (diff) | |
| download | buildroot-d0433603e3c7de5a0d7d6a434b4cb45ef5e5b533.tar.gz buildroot-d0433603e3c7de5a0d7d6a434b4cb45ef5e5b533.zip | |
urg: make sdl support optional
Only enable SDL support if SDL and SDL_net are already enabled in the
configuration.
[Peter: drop SDL comment]
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
| -rw-r--r-- | package/urg/Config.in | 3 | ||||
| -rw-r--r-- | package/urg/urg.mk | 10 |
2 files changed, 7 insertions, 6 deletions
diff --git a/package/urg/Config.in b/package/urg/Config.in index ded8204406..9d57645d62 100644 --- a/package/urg/Config.in +++ b/package/urg/Config.in @@ -1,11 +1,8 @@ config BR2_PACKAGE_URG bool "urg" depends on BR2_INSTALL_LIBSTDCPP - select BR2_PACKAGE_SDL - select BR2_PACKAGE_SDL_NET help Library to control Hokuyo's URG series sensors. - Requires SDL & SDL_net. http://www.hokuyo-aut.jp/02sensor/07scanner/download/urg_programs_en/ diff --git a/package/urg/urg.mk b/package/urg/urg.mk index e16393a5f9..075a0b3676 100644 --- a/package/urg/urg.mk +++ b/package/urg/urg.mk @@ -12,10 +12,14 @@ URG_LICENSE_FILES = COPYING URG_INSTALL_STAGING = YES -URG_DEPENDENCIES = sdl sdl_net - -URG_CONF_OPT = --with-sdl-prefix=$(STAGING_DIR)/usr \ +ifeq ($(BR2_PACKAGE_SDL)$(BR2_PACKAGE_SDL_NET),yy) +URG_DEPENDENCIES += sdl sdl_net +URG_CONF_OPT += --with-sdl-prefix=$(STAGING_DIR)/usr \ --with-sdl-exec-prefix=$(STAGING_DIR)/usr +else +URG_CONF_OPT = --without-sdl +URG_CONF_ENV += ac_cv_path_SDL_CONFIG="" +endif URG_CONFIG_SCRIPTS = c_urg-config urg-config |
