backport [13095]

diff --git a/bootstrap b/bootstrap
index 75574281ea67849bd046716d24ab4dfcd3c73677..4a9e423b6b3e676ba86eac4f317a9e965d038daa 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -127,8 +127,8 @@ dnl  Private VLC macros - generated by bootstrap
 EOF
 
 if [ "${PKGCONFIG}" = "no" ]; then cat >> m4/private.m4 << EOF
-dnl  User does not have pkg-config, so this is a no-op
-AC_DEFUN([PKG_CHECK_MODULES], [:], [], [], [])
+dnl  User does not have pkg-config, so assume package was not found
+AC_DEFUN([PKG_CHECK_MODULES],[ifelse([\$4], , :, [\$4])])
 
 EOF
 fi

diff --git a/vlc-config.in.in b/vlc-config.in.in
index 34945deb0d948f8f423f7bbda7b2342a3eacf837..c1946a65efd92a73fa360901651959a51e1c8ef9 100644 (file)
--- a/vlc-config.in.in
+++ b/vlc-config.in.in
@@ -10,8 +10,8 @@ gprof="@gprof@"
 cprof="@cprof@"
 optim="@optim@"
 
-plugins="@PLUGINS@"
-builtins="@BUILTINS@"
+plugins="@PLUGINS@ "
+builtins="@BUILTINS@ "
 
 cppflags=""
 cflags=""