X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=vlc-config.in.in;h=502b61f4b4a2b2ae5a4a303388ff60ef384fbffe;hb=a27faa4c9474b66883cfef0cbf9453b895525b87;hp=c1fd3d26c183a371e18b3e40ab47ffe286e7a44f;hpb=c89257fa93e05298f9b1e9a861f17a58d638ab60;p=vlc

diff --git a/vlc-config.in.in b/vlc-config.in.in
index c1fd3d26c1..502b61f4b4 100644
--- a/vlc-config.in.in
+++ b/vlc-config.in.in
@@ -5,13 +5,9 @@ exec_prefix="@exec_prefix@"
 exec_prefix_set=no
 datarootdir="@datarootdir@"
 
-debug="@debug@"
-gprof="@gprof@"
-cprof="@cprof@"
 optim="@optim@"
 
 plugins="@PLUGINS@ "
-builtins="@BUILTINS@ "
 
 cppflags=""
 cflags=""
@@ -21,9 +17,6 @@ ldflags=""
 libs=""
 
 cflags_tuning="@CFLAGS_TUNING@"
-cflags_optim_speed="@CFLAGS_OPTIM_SPEED@"
-cflags_optim_nodebug="@CFLAGS_OPTIM_NODEBUG@"
-cflags_nooptim="@CFLAGS_NOOPTIM@"
 
 #
 #  Do not touch below this place unless you really know what you are doing
@@ -36,7 +29,6 @@ Options:
         [--prefix[=DIR]]          set prefix
         [--exec-prefix[=DIR]]     set exec prefix
         [--version]               print version and exit
-        [--linkage]               print linkage mode (c, c++, objc)
         [--list]                  print modules names and exit
         [--libs]                  output linking flags
         [--cflags]                output C compilation flags
@@ -44,9 +36,6 @@ Options:
         [--objcflags]             output Objective C compilation flags
 Modules:
         vlc                       the main VLC object
-        plugin                    flags for plugin modules
-        builtin                   flags for built-in modules
-        pic                       flags for PIC code
         MODULE                    any available module (dummy, gtk, avi, etc.)
         libs                      flags for external libs
 BLAH
@@ -74,29 +63,14 @@ fi
 includes="${includes}"
 cppflags="${includes}"
 module=""
-linkage="c"
-
-#
-#  On Linux and Solaris, activate 64-bit off_t (by default under BSD)
-#
-cppflags="${cppflags} -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE"
 
 #
 #  Various additional defines
 #
 if [ "${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
-  cflags="${cflags} ${cflags_nooptim}"
-  cxxflags="${cxxflags} ${cflags_nooptim}"
-  objcflags="${objcflags} ${cflags_nooptim}"
+  cflags="${cflags} ${cflags_tuning}"
+  cxxflags="${cxxflags} ${cflags_tuning}"
+  objcflags="${objcflags} ${cflags_tuning}"
 fi
 
 #
@@ -146,9 +120,6 @@ while test $# -gt 0; do
       echo "@VERSION@"
       exit 0
       ;;
-    --linkage)
-      echo_linkage=yes
-      ;;
     --list)
       echo_list=yes
       ;;
@@ -174,17 +145,9 @@ while test $# -gt 0; do
       usage 1 1>&1
       ;;
     libvlccore)
-      cppflags="${cppflags} -D__LIBVLC__ -I${top_builddir}src/misc"
       ;;
     plugin)
       echo_plugin=yes
-      cppflags="${cppflags} -D__LIBVLC__ -D__PLUGIN__"
-      ;;
-    builtin)
-      echo_builtin=yes
-      cppflags="${cppflags} -D__LIBVLC__ -D__BUILTIN__"
-      ;;
-    pic)
       ;;
     *)
       module="$tgt"
@@ -207,20 +170,11 @@ fi
 #
 #  Output what we were asked
 #
-if test "${echo_linkage}" = yes; then
-  echo "${linkage}"
-  exit 0
-fi
-
 if test "${echo_list}" = yes; then
   if test "${echo_plugin}" = yes; then
     echo "${plugins}"
     printf '\n'
   fi
-  if test "${echo_builtin}" = yes; then
-    echo "${builtins}"
-    printf '\n'
-  fi
   exit 0
 fi