-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)]