X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=vlc-config.in.in;h=bfe8c9505335206020996b3caab232c4a40b35a6;hb=c87ad54056043b0b94d78847bd6e311e6e20aa6a;hp=0585089602f35aec3f2956fb058a90c940714b11;hpb=fbf4c8060d35617e39b50ae739307152d02ed951;p=vlc

diff --git a/vlc-config.in.in b/vlc-config.in.in
index 0585089602..bfe8c95053 100644
--- a/vlc-config.in.in
+++ b/vlc-config.in.in
@@ -19,9 +19,11 @@ cflags=""
 cxxflags=""
 objcflags=""
 ldflags=""
+libs=""
 
 cflags_tuning="@CFLAGS_TUNING@"
-cflags_optim="@CFLAGS_OPTIM@"
+cflags_optim_size="@CFLAGS_OPTIM_SIZE@"
+cflags_optim_speed="@CFLAGS_OPTIM_SPEED@"
 cflags_optim_nodebug="@CFLAGS_OPTIM_NODEBUG@"
 cflags_nooptim="@CFLAGS_NOOPTIM@"
 
@@ -101,7 +103,6 @@ cppflags="${cppflags} -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURC
 #  Gettext, data and plugin location
 #
 cppflags="${cppflags} -DLOCALEDIR=\"@datadir@/locale\""
-cppflags="${cppflags} -DDATA_PATH=\"@datadir@/vlc\""
 cppflags="${cppflags} -DPLUGIN_PATH=\"@libdir@/vlc\""
 
 #
@@ -130,13 +131,28 @@ fi
 if [ "${release}" = yes ]; then
   cppflags="${cppflags} -DHAVE_RELEASE"
 fi
-if [ "${optim}" = yes ]; then
-  cppflags="${cppflags} ${cflags_optim} ${cflags_tuning}"
+if [ "${optim}" = size ]; then
+  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
+  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
+    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
 
 #
@@ -181,13 +197,19 @@ while test $# -gt 0; do
     --cflags)
       echo_cflags=yes
       ;;
+    --cppflags)
+      echo_cppflags=yes
+      ;;
     --cxxflags)
       echo_cxxflags=yes
       ;;
     --objcflags)
       echo_objcflags=yes
       ;;
-    --libs)
+    --ldflags)
+      echo_ldflags=yes
+      ;;
+    --libs|-libs)
       echo_libs=yes
       ;;
     -*)
@@ -210,7 +232,7 @@ while test $# -gt 0; do
       ;;
     external)
       echo_external=yes
-      ldflags="${ldflags} -lvlc -lvlc-control"
+      libs="${libs} -lvlc -lvlc-control"
       ;;      
     *)
       module="$1"
@@ -226,8 +248,6 @@ while test $# -gt 0; do
   shift
 done
 
-libs="-L@libdir@"
-
 #
 #  If a module was requested, use its name
 #
@@ -301,6 +321,9 @@ fi
 if test "${echo_objcflags}" = yes; then
   echo "${cppflags} ${objcflags}"
 fi
+if test "${echo_ldflags}" = yes; then
+  echo "${ldflags}"
+fi
 
 # Libs
 # There are 4 possibilities
@@ -322,12 +345,12 @@ if test "${echo_libs}" = yes; then
   fi
   if test "${echo_external}" = yes; then
     for module in `echo "${builtins}"`; do
-      ldflags="${ldflags} @libdir@/vlc/lib${module}.a"
+      libs="${libs} @libdir@/vlc/lib${module}.a"
     done
     for module in `echo "${builtins}"`; do
       register_flags "${module}"
     done
     register_flags "vlc"
   fi
-  echo "${libs} ${ldflags}"
+  echo "${libs}"
 fi