X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=vlc-config.in.in;h=6f6d7e32338f21c9532b423d52b9822e0d5dae09;hb=ea869b5e77f87ffb5999b3b367366686837e999c;hp=3532bc8f58d8294f1163905bd91b6f805dbe3bf9;hpb=22861410d6d76dd5ecd05f0bfa0f070892a3d8e5;p=vlc

diff --git a/vlc-config.in.in b/vlc-config.in.in
index 3532bc8f58..6f6d7e3233 100644
--- a/vlc-config.in.in
+++ b/vlc-config.in.in
@@ -19,7 +19,7 @@ cflags=""
 cxxflags=""
 objcflags=""
 ldflags=""
-libs="-L@libdir@"
+libs=""
 
 cflags_tuning="@CFLAGS_TUNING@"
 cflags_optim_size="@CFLAGS_OPTIM_SIZE@"
@@ -133,17 +133,27 @@ if [ "${release}" = yes ]; then
   cppflags="${cppflags} -DHAVE_RELEASE"
 fi
 if [ "${optim}" = size ]; then
-  cppflags="${cppflags} ${cflags_optim_size} ${cflags_tuning}"
+  cflags="${cflags} ${cflags_optim_size} ${cflags_tuning}"
+  cxxflags="${cxxflags} ${cflags_optim_size} ${cflags_tuning}"
+  objcflags="${objcflags} ${cflags_optim_size} ${cflags_tuning}"
   if [ "${debug}" != yes -a "${gprof}" != yes -a "${cprof}" != yes ]; then
-    cppflags="${cppflags} ${cflags_optim_nodebug}"
+    cflags="${cflags} ${cflags_optim_nodebug}"
+    cxxflags="${cxxflags} ${cflags_optim_nodebug}"
+    objcflags="${objcflags} ${cflags_optim_nodebug}"
   fi
 elif [ "${optim}" = speed ]; then
-  cppflags="${cppflags} ${cflags_optim_speed} ${cflags_tuning}"
+  cflags="${cflags} ${cflags_optim_speed} ${cflags_tuning}"
+  cxxflags="${cxxflags} ${cflags_optim_speed} ${cflags_tuning}"
+  objcflags="${objcflags} ${cflags_optim_speed} ${cflags_tuning}"
   if [ "${debug}" != yes -a "${gprof}" != yes -a "${cprof}" != yes ]; then
-    cppflags="${cppflags} ${cflags_optim_nodebug}"
+    cflags="${cflags} ${cflags_optim_nodebug}"
+    cxxflags="${cxxflags} ${cflags_optim_nodebug}"
+    objcflags="${objcflags} ${cflags_optim_nodebug}"
   fi
 else
-  cppflags="${cppflags} ${cflags_nooptim}"
+  cflags="${cflags} ${cflags_nooptim}"
+  cxxflags="${cxxflags} ${cflags_nooptim}"
+  objcflags="${objcflags} ${cflags_nooptim}"
 fi
 
 #
@@ -188,6 +198,9 @@ while test $# -gt 0; do
     --cflags)
       echo_cflags=yes
       ;;
+    --cppflags)
+      echo_cppflags=yes
+      ;;
     --cxxflags)
       echo_cxxflags=yes
       ;;