X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=m4%2Fwith_pkg.m4;h=39439b792ff8924620edf7722f380c68014dada9;hb=b318bfb3d71139b337cd61f4b9e146b59545a3c9;hp=73854e2b69ef5cd1c0f03c8658541fad70eddab7;hpb=30f9eb499bf5e47a05e6652126fc9c4cbec34e11;p=vlc

diff --git a/m4/with_pkg.m4 b/m4/with_pkg.m4
index 73854e2b69..39439b792f 100644
--- a/m4/with_pkg.m4
+++ b/m4/with_pkg.m4
@@ -75,24 +75,29 @@ AM_CONDITIONAL([HAVE_][$1],
                [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"])
 ])
 
-dnl PKG_ENABLE_MODULES_VLC(VARIABLE-PREFIX, MODULES,
+dnl PKG_ENABLE_MODULES_VLC(VARIABLE-PREFIX,
+dnl                         VLC_MODULE_NAME  dnl (if empty, same as VARIABLE-PREFIX)
+dnl                         PKG MODULES,
 dnl                         [DESCRIPTION], [DEFAULT],
-dnl                         [EXTRA_CFLAGS], [EXTRA_LIBS])
+dnl                         [EXTRA_CFLAGS], [EXTRA_LIBS], [EXTRA_CPPFLAGS]
 AC_DEFUN([PKG_ENABLE_MODULES_VLC],
 [
-PKG_WITH_MODULES([$1],[$2],
-    VLC_ADD_PLUGIN(m4_tolower([$1]))
-    VLC_ADD_CFLAGS(m4_tolower([$1]),[$$1_CFLAGS] [$5])
-    VLC_ADD_LIBS(m4_tolower([$1]),[$$1_LIBS] [$6]),
-    AS_IF([test x"$AS_TR_SH([enable_]m4_tolower([$1]))" = "xyes"],
-        [AC_MSG_ERROR(Library [$2] needed for [m4_tolower([$1]) was not found])],
-        [AC_MSG_WARN(Library [$2] needed for [m4_tolower([$1]) was not found])]
+m4_pushdef([module_names], m4_default(m4_tolower([$2]),m4_tolower([$1])))
+m4_pushdef([enable_arg], m4_tolower([$1]))
+
+PKG_WITH_MODULES([$1],[$3],
+    VLC_ADD_PLUGIN(module_names)
+    m4_ifval( m4_normalize([$8]), VLC_ADD_CPPFLAGS(module_names, [$8]))
+    VLC_ADD_CFLAGS(module_names,[$$1_CFLAGS] [$6])
+    VLC_ADD_LIBS(module_names,[$$1_LIBS] [$7]),
+    AS_IF([test x"$AS_TR_SH([enable_]enable_arg)" = "xyes"],
+        [AC_MSG_ERROR(Library [$3] needed for [m4_tolower([$1])] was not found)],
+        [AC_MSG_WARN(Library [$3] needed for [m4_tolower([$1])] was not found)]
          ),
-    [$3],[$4])
+    [$4],[$5])
 
-
-AM_CONDITIONAL([HAVE_][$1],
-               [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"])
+m4_popdef([module_names])
+m4_popdef([enable_arg])
 
 ])