videolan/vlc
1
Fork 0
mirror of https://code.videolan.org/videolan/vlc synced 2024-09-16 16:02:54 +02:00
Code Releases Activity

configure: simplify libdsm check

Browse Source
This commit is contained in:
Alexandre Janniaux 2022-02-08 16:51:49 +01:00 committed by Hugo Beauzée-Luyssen
parent e1ebf07d6e
commit 4d73c1ea47
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@ -2048,14 +2048,7 @@ PKG_ENABLE_MODULES_VLC([SMBCLIENT], [smbc], [smbclient], (SMB/CIFS support), [au
dnl
dnl liBDSM access module
dnl
AM_CONDITIONAL([HAVE_DSM], [test "$AS_TR_SH(with_dsm)" = "yes"])
PKG_WITH_MODULES([DSM], [libdsm >= 0.2.0], [
VLC_ADD_PLUGIN([dsm])
VLC_ADD_CFLAGS([dsm], [$DSM_CFLAGS])
VLC_ADD_LIBS([dsm], [$DSM_LIBS])
have_dsm="yes"
],,[libdsm SMB/CIFS access/sd module], [auto])
AM_CONDITIONAL([HAVE_DSM], [test "${have_dsm}" = "yes"])
PKG_HAVE_WITH_MODULES([DSM], [libdsm >= 0.2.0], [libdsm SMB/CIFS access/sd module], [auto])
dnl
dnl sftp access support

6
modules/access/Makefile.am
View File

@ -370,9 +370,9 @@ EXTRA_LTLIBRARIES += libsmbc_plugin.la
libdsm_plugin_la_SOURCES = access/dsm/access.c access/dsm/sd.c access/smb_common.h
libdsm_plugin_la_CFLAGS = $(AM_CFLAGS) $(DSM_CFLAGS)
libdsm_plugin_la_LIBADD = $(DSM_LIBS)
libdsm_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
access_LTLIBRARIES += $(LTLIBdsm)
EXTRA_LTLIBRARIES += libdsm_plugin.la
if HAVE_DSM
access_LTLIBRARIES += libdsm_plugin.la
endif
libsmb2_plugin_la_SOURCES = access/smb2.c
libsmb2_plugin_la_CFLAGS = $(AM_CFLAGS) $(SMB2_CFLAGS)