shoutcast genres fix by Jonas A. Larsen

[vlc] / vlc-config.in.in

diff --git a/vlc-config.in.in b/vlc-config.in.in
index c437224300e1676a43c9071095091c13e0791cf1..0c90def5a84140f37baeeed36b486292e6da275e 100644 (file)
--- a/vlc-config.in.in
+++ b/vlc-config.in.in
@@ -80,9 +80,10 @@ fi
 if test "@includedir@" != "/usr/include"; then
   includes="-I@includedir@"
 fi
-if test "${top_srcdir}" != ""; then
-  top_srcdir="${top_srcdir}/"
+if test "${top_builddir}" != ""; then
+  top_builddir="${top_builddir}/"
 fi
+includes="${includes} -I${top_builddir}include"
 cppflags="${includes}"
 libs="-L@libdir@"
 module=""
@@ -187,7 +188,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
@@ -202,6 +203,10 @@ while test $# -gt 0; do
       ;;
     mozilla)
       ;;
+    external)
+      echo_external=yes
+      ldflags="${ldflags} -lvlc"
+      ;;      
     *)
       module="$1"
       ;;
@@ -246,7 +251,7 @@ if test "${echo_target}" = yes; then
     for module in `echo "${plugins}"`; do
       register_targets "${module}"
     done
-    for target in `echo "${list}"`; do printf "${top_srcdir}modules/${target}_plugin "; done
+    for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}_plugin "; done
     printf '\n'
   fi
   if test "${echo_builtin}" = yes; then
@@ -254,9 +259,9 @@ if test "${echo_target}" = yes; then
       register_targets "${module}"
     done
     if test "${echo_pic}" = yes; then
-      for target in `echo "${list}"`; do printf "${top_srcdir}modules/${target}_pic.a "; done
+      for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}_pic.a "; done
     else
-      for target in `echo "${list}"`; do printf "${top_srcdir}modules/${target}.a "; done
+      for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}.a "; done
     fi
     printf '\n'
   fi
@@ -288,11 +293,25 @@ if test "${echo_libs}" = yes; then
       register_flags "${module}"
     done
     if test "${echo_pic}" = yes; then
-      for target in `echo "${list}"`; do printf "${top_srcdir}modules/${target}_pic.a "; done
+      for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}_pic.a "; done
     else
-      for target in `echo "${list}"`; do printf "${top_srcdir}modules/${target}.a "; done
+      for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}.a "; done
     fi
   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
-