X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=vlc-config.in.in;h=88decc0f94909e466ec1b8fad56e9f0567b4f8d7;hb=4e14fb80198b09975dc5d067421e21b5253db119;hp=63c3f6600589ecb5c168e94693466df0e2754fb8;hpb=103061a648dd9585db719da94b6b41daf3408cf4;p=vlc

diff --git a/vlc-config.in.in b/vlc-config.in.in
index 63c3f66005..88decc0f94 100644
--- a/vlc-config.in.in
+++ b/vlc-config.in.in
@@ -213,7 +213,7 @@ while test $# -gt 0; do
     -*)
       usage 1 1>&1
       ;;
-    libvlc)
+    libvlccore)
       cppflags="${cppflags} -D__LIBVLC__ -I${top_builddir}src/misc"
       ;;
     plugin)
@@ -228,10 +228,6 @@ while test $# -gt 0; do
       ;;
     mozilla)
       ;;
-    external)
-      echo_external=yes
-      libs="${libs} -lvlc -lvlc-control"
-      ;;
     *)
       module="$tgt"
       ;;
@@ -247,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
@@ -305,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