[vlc-commits] m4: with_pkg: fix PKG_HAVE_WITH_MODULES macro

[Alexandre Janniaux]

vlc | branch: master | Alexandre Janniaux <ajanni at videolabs.io> | Thu Feb 25 12:51:18 2021 +0100| [d0dd9745762b05d97a869cf7d911324a8d72bbba] | committer: Alexandre Janniaux

m4: with_pkg: fix PKG_HAVE_WITH_MODULES macro

The macro was checking for $with_foo to be set but only $enabled_foo was
set correctly by the PKG_WITH_MODULES macro. In addition, this patch
adds an intermediate macro for the name to be readable.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d0dd9745762b05d97a869cf7d911324a8d72bbba
---

 m4/with_pkg.m4 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/m4/with_pkg.m4 b/m4/with_pkg.m4
index 39439b792f..b6c51756e4 100644
--- a/m4/with_pkg.m4
+++ b/m4/with_pkg.m4
@@ -71,8 +71,10 @@ AC_DEFUN([PKG_HAVE_WITH_MODULES],
 [
 PKG_WITH_MODULES([$1],[$2],,,[$3],[$4])
 
+m4_pushdef([with_arg], m4_tolower([$1]))
 AM_CONDITIONAL([HAVE_][$1],
-               [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"])
+               [test "$AS_TR_SH([enable_]with_arg)" = "yes"])
+m4_popdef([with_arg])
 ])
 
 dnl PKG_ENABLE_MODULES_VLC(VARIABLE-PREFIX,