[vlc-commits] [Git][videolan/vlc][master] configure: simplify libdsm check

[Hugo Beauzée-Luyssen (@chouquette)]

Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC


Commits:
4d73c1ea by Alexandre Janniaux at 2022-02-11T10:32:47+00:00
configure: simplify libdsm check

- - - - -


2 changed files:

- configure.ac
- modules/access/Makefile.am


Changes:

=====================================
configure.ac
=====================================
@@ -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


=====================================
modules/access/Makefile.am
=====================================
@@ -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)



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/4d73c1ea474a9cb159367d67be61f3b4ddee49c4

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/4d73c1ea474a9cb159367d67be61f3b4ddee49c4
You're receiving this email because of your account on code.videolan.org.