diff options
| -rw-r--r-- | package/dvdauthor/Config.in | 5 | ||||
| -rw-r--r-- | package/dvdauthor/dvdauthor.mk | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/package/dvdauthor/Config.in b/package/dvdauthor/Config.in index 6f8e2e4380..8b2bcb3d6f 100644 --- a/package/dvdauthor/Config.in +++ b/package/dvdauthor/Config.in @@ -17,13 +17,8 @@ if BR2_PACKAGE_DVDAUTHOR config BR2_PACKAGE_DVDAUTHOR_DVDUNAUTHOR bool "dvdunauthor" select BR2_PACKAGE_LIBDVDREAD - depends on !BR2_STATIC_LIBS # libdvdread help This option enables the dvdunauthor program, which requires libdvdread. -comment "dvdunauthor needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - endif - diff --git a/package/dvdauthor/dvdauthor.mk b/package/dvdauthor/dvdauthor.mk index 6b90c43c3e..e982a40e40 100644 --- a/package/dvdauthor/dvdauthor.mk +++ b/package/dvdauthor/dvdauthor.mk @@ -40,6 +40,10 @@ endif ifeq ($(BR2_PACKAGE_DVDAUTHOR_DVDUNAUTHOR),y) DVDAUTHOR_DEPENDENCIES += libdvdread +# dvdauthor configure does not use pkg-config to detect libdvdread +ifeq ($(BR2_PACKAGE_LIBDVDCSS)$(BR2_STATIC_LIBS),yy) +DVDAUTHOR_CONF_ENV += LIBS="-ldvdcss" +endif DVDAUTHOR_CONF_OPTS += --enable-dvdunauthor else DVDAUTHOR_CONF_OPTS += --disable-dvdunauthor |
