* configure.ac vlc-config.in.in: Oops, vlc-config needs top_builddir, not

[vlc] / vlc-config.in.in

diff --git a/vlc-config.in.in b/vlc-config.in.in
index 358e037989587a0aa540dd6df20ea9365edebd47..9353452392974230f44f7ce7330a8dc59f52cf00 100644 (file)
--- a/vlc-config.in.in
+++ b/vlc-config.in.in
@@ -13,6 +13,12 @@ optim="@optim@"
 plugins="@PLUGINS@"
 builtins="@BUILTINS@"
 
+cppflags=""
+cflags=""
+cxxflags=""
+objcflags=""
+ldflags=""
+
 cflags_tuning="@CFLAGS_TUNING@"
 cflags_optim="@CFLAGS_OPTIM@"
 cflags_optim_nodebug="@CFLAGS_OPTIM_NODEBUG@"
@@ -71,9 +77,12 @@ 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}/"
+fi
 cppflags="${includes}"
 libs="-L@libdir@"
 module=""
@@ -99,7 +108,7 @@ if [ "${debug}" = yes ]; then
   cflags="${cflags} -g"
   cxxflags="${cxxflags} -g"
   objcflags="${objcflags} -g"
-  ldflags="${objcflags} -g"
+  ldflags="${ldflags} -g"
 fi
 if [ "${cprof}" = yes ]; then
   cppflags="${cppflags} -DCPROF"
@@ -210,7 +219,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
 
@@ -218,12 +227,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
@@ -233,21 +242,23 @@ 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
-    echo "${list}" | sed -e 's/[^ ][^ ]*/&_plugin/g'
+    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
-      echo "${list}" | sed -e 's/[^ ][^ ]*/&_pic.a/g'
+    if test "${echo_pic}" = yes; then
+      for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}_pic.a "; done
     else
-      echo "${list}" | sed -e 's/[^ ][^ ]*/&.a/g'
+      for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}.a "; done
     fi
+    printf '\n'
   fi
   exit 0
 fi
@@ -271,15 +282,15 @@ 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
-      libs="`echo "${list}" | sed -e 's/[^ ][^ ]*/&_pic.a/g'` ${libs}"
+    if test "${echo_pic}" = yes; then
+      for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}_pic.a "; done
     else
-      libs="`echo "${list}" | sed -e 's/[^ ][^ ]*/&.a/g'` ${libs}"
+      for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}.a "; done
     fi
   fi
   echo "${libs} ${ldflags}"