X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=vlc-config.in.in;h=658c893c6a7dbd792fc66c9006a89aa76cc25c3f;hb=da4dc63b33a3cbffa38513107882a05f2043d17c;hp=4a9c3b3c3ab7e63836e46735c6aef12c2b1e3295;hpb=1fb282c6adb52ffca47ed766233cac12d6a85ff4;p=vlc

diff --git a/vlc-config.in.in b/vlc-config.in.in
index 4a9c3b3c3a..658c893c6a 100644
--- a/vlc-config.in.in
+++ b/vlc-config.in.in
@@ -77,9 +77,15 @@ fi
 #  No need to include the default @*FLAGS@ values here because they are
 #  automatically added when using $(COMPILE), $(CXXCOMPILE) or $(OBJCCOMPILE)
 #
-if test "@includedir@" != /usr/include ; then
+if test "@includedir@" != "/usr/include"; then
   includes="-I@includedir@"
 fi
+if test "${top_builddir}" != ""; then
+  top_builddir="${top_builddir}/"
+elif test "${TOP_BUILDDIR}" != ""; then
+  top_builddir="${TOP_BUILDDIR}/"
+fi
+includes="${includes}"
 cppflags="${includes}"
 libs="-L@libdir@"
 module=""
@@ -184,7 +190,7 @@ while test $# -gt 0; do
       usage 1 1>&1
       ;;
     vlc)
-      cppflags="${cppflags} -D__VLC__"
+      cppflags="${cppflags} -D__VLC__ -I${top_builddir}src/misc"
       ;;
     plugin)
       echo_plugin=yes
@@ -199,6 +205,10 @@ while test $# -gt 0; do
       ;;
     mozilla)
       ;;
+    external)
+      echo_external=yes
+      ldflags="${ldflags} -lvlc"
+      ;;      
     *)
       module="$1"
       ;;
@@ -216,7 +226,7 @@ done
 #
 #  If a module was requested, use its name
 #
-if test "${module}" != ""; then
+if test -n "${module}"; then
   cppflags="${cppflags} -DMODULE_NAME=${module} -DMODULE_NAME_IS_${module}"
 fi
 
@@ -224,12 +234,12 @@ fi
 #  Output what we were asked
 #
 if test "${echo_linkage}" = yes; then
-  if test "${echo_plugin}"; then
+  if test "${echo_plugin}" = yes; then
     for module in `echo "${plugins}"`; do
       register_flags "${module}"
     done
   fi
-  if test "${echo_builtin}"; then
+  if test "${echo_builtin}" = yes; then
     for module in `echo "${builtins}"`; do
       register_flags "${module}"
     done
@@ -239,21 +249,21 @@ if test "${echo_linkage}" = yes; then
 fi
 
 if test "${echo_target}" = yes; then
-  if test "${echo_plugin}"; then
+  if test "${echo_plugin}" = yes; then
     for module in `echo "${plugins}"`; do
       register_targets "${module}"
     done
-    for target in `echo ${list}`; do printf "${target}_plugin "; done
+    for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}_plugin "; done
     printf '\n'
   fi
-  if test "${echo_builtin}"; then
+  if test "${echo_builtin}" = yes; then
     for module in `echo "${builtins}"`; do
       register_targets "${module}"
     done
-    if test "${echo_pic}"; then
-      for target in `echo ${list}`; do printf "${target}_pic.a "; done
+    if test "${echo_pic}" = yes; then
+      for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}_pic.a "; done
     else
-      for target in `echo ${list}`; do printf "${target}.a "; done
+      for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}.a "; done
     fi
     printf '\n'
   fi
@@ -279,18 +289,31 @@ if test "${echo_objcflags}" = yes; then
   echo "${cppflags} ${objcflags}"
 fi
 if test "${echo_libs}" = yes; then
-  if test "${echo_builtin}"; then
+  if test "${echo_builtin}" = yes; then
     for module in `echo "${builtins}"`; do
       register_targets "${module}"
       register_flags "${module}"
     done
-    if test "${echo_pic}"; then
-      for target in `echo ${list}`; do printf "${target}_pic.a "; done
+    if test "${echo_pic}" = yes; then
+      for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}_pic.a "; done
     else
-      for target in `echo ${list}`; do printf "${target}.a "; done
+      for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}.a "; done
     fi
-    printf '\n'
+  fi
+  if test "${echo_external}" = yes; then
+    if test "${echo_pic}" = yes; then
+      for module in `echo "${builtins}"`; do
+        ldflags="${ldflags} @libdir@/vlc/lib${module}_pic.a"
+      done
+    else
+      for module in `echo "${builtins}"`; do
+        ldflags="${ldflags} @libdir@/vlc/lib${module}.a"
+      done
+    fi
+    for module in `echo "${builtins}"`; do
+      register_flags "${module}"
+    done
+    register_flags "vlc"
   fi
   echo "${libs} ${ldflags}"
 fi
-