X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=vlc-config.in.in;h=55211fb5ce3f64286c297cd6bda83dac741b1e5c;hb=d6abd400bfadd7c0bfe4bfe2cf1547d72e153508;hp=5245222c506ec710d43ea6cb3cf5ce0ded52401c;hpb=66b5536ec1d6b3e85f9d27feda188c4351463c86;p=vlc

diff --git a/vlc-config.in.in b/vlc-config.in.in
index 5245222c50..55211fb5ce 100644
--- a/vlc-config.in.in
+++ b/vlc-config.in.in
@@ -151,9 +151,10 @@ while test $# -gt 0; do
   # Mangle plugin name, if applicable
   # This is just a convenience hack for modules/common.am
   tgt="$1"
+  tgt="${tgt##*/}"
   case "$tgt" in
     lib*_plugin_la-*.lo)
-      tgt="${tgt#lib}"
+      tgt="${tgt#*lib}"
       tgt="${tgt%_plugin_la-*.lo}"
       ;;
     lib*_plugin.la)
@@ -227,10 +228,6 @@ while test $# -gt 0; do
       ;;
     mozilla)
       ;;
-    external)
-      echo_external=yes
-      libs="${libs} -lvlc -lvlc-control"
-      ;;
     *)
       module="$tgt"
       ;;
@@ -246,23 +243,13 @@ done
 #  If a module was requested, use its name
 #
 if test -n "${module}"; then
-  cppflags="${cppflags} -DMODULE_NAME=${module} -DMODULE_NAME_IS_${module}"
+  cppflags="${cppflags} -DMODULE_NAME=${module} -DMODULE_NAME_IS_${module} -DMODULE_STRING=\"${module}\""
 fi
 
 #
 #  Output what we were asked
 #
 if test "${echo_linkage}" = yes; then
-  if test "${echo_plugin}" = yes; then
-    for module in `echo "${plugins}"`; do
-      register_flags "${module}"
-    done
-  fi
-  if test "${echo_builtin}" = yes; then
-    for module in `echo "${builtins}"`; do
-      register_flags "${module}"
-    done
-  fi
   echo "${linkage}"
   exit 0
 fi
@@ -304,22 +291,10 @@ fi
 # Libs
 # There are 4 possibilities
 #  - We are a plugin or a builtin
-#  - We are building from the outside (external):
-#	- Give full libvlc linkflags + -lvlc (in libdir)
-# 	- Link with builtins in libdir
 #  - We are building something from the inside (builtin)
 #       - Link with builtins in place
 #  If you want something shared from the inside (binding),
 #  you need "builtin vlc"
 if test "${echo_libs}" = yes; then
-  if test "${echo_external}" = yes; then
-    for module in `echo "${builtins}"`; do
-      libs="${libs} @libdir@/vlc/lib${module}.a"
-    done
-    for module in `echo "${builtins}"`; do
-      register_flags "${module}"
-    done
-    register_flags "vlc"
-  fi
   echo "${libs}"
 fi