X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=vlc-config.in.in;h=bfe8c9505335206020996b3caab232c4a40b35a6;hb=28a41153e77335041ff45992e92e49f354b6f780;hp=4e5d1b3f0328ee2ebd9e5e1081aead9f2cccc183;hpb=ad9ca44d5979a242ef0781dbe793c3c7ae8d8caa;p=vlc

diff --git a/vlc-config.in.in b/vlc-config.in.in
index 4e5d1b3f03..bfe8c95053 100644
--- a/vlc-config.in.in
+++ b/vlc-config.in.in
@@ -103,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\""
 
 #
@@ -133,17 +132,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 +197,9 @@ while test $# -gt 0; do
     --cflags)
       echo_cflags=yes
       ;;
+    --cppflags)
+      echo_cppflags=yes
+      ;;
     --cxxflags)
       echo_cxxflags=yes
       ;;