X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=vlc-config.in.in;h=502b61f4b4a2b2ae5a4a303388ff60ef384fbffe;hb=930a832a97f813d6cc82a160b39d8425885ea2bb;hp=134cd59d0d3dc5482ce5ed84419d41ef2b0a7f45;hpb=b8d77ded5185dd3221f5fa4df15ce34b9b06f696;p=vlc

diff --git a/vlc-config.in.in b/vlc-config.in.in
index 134cd59d0d..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,12 +17,6 @@ ldflags=""
 libs=""
 
 cflags_tuning="@CFLAGS_TUNING@"
-cflags_optim_size="@CFLAGS_OPTIM_SIZE@"
-cflags_optim_speed="@CFLAGS_OPTIM_SPEED@"
-cflags_optim_nodebug="@CFLAGS_OPTIM_NODEBUG@"
-cflags_nooptim="@CFLAGS_NOOPTIM@"
-
-cflags_werror="@CFLAGS_WERROR@"
 
 #
 #  Do not touch below this place unless you really know what you are doing
@@ -39,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
@@ -47,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
@@ -69,13 +55,6 @@ if test $# -eq 0; then
         usage 1 1>&2
 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
-  includes="-I@includedir@"
-fi
 if test "${top_builddir}" != ""; then
   top_builddir="${top_builddir}/"
 elif test "${TOP_BUILDDIR}" != ""; then
@@ -84,55 +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_LARGEFILE64_SOURCE -D_REENTRANT -D_THREAD_SAFE"
 
 #
 #  Various additional defines
 #
-if [ "${debug}" = yes ]; then
-  cflags="${cflags} -g"
-  cxxflags="${cxxflags} -g"
-  objcflags="${objcflags} -g"
-  ldflags="${ldflags} -g"
-fi
-if [ "${cprof}" = yes ]; then
-  cflags="${cflags} -finstrument-functions"
-  cxxflags="${cxxflags} -finstrument-functions"
-  objcflags="${objcflags} -finstrument-functions"
-fi
-if [ "${gprof}" = yes ]; then
-  cflags="${cflags} -pg"
-  cxxflags="${cxxflags} -pg"
-  objcflags="${objcflags} -pg"
-  ldflags="${ldflags} -pg"
-fi
-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
-    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
-  cflags="${cflags} ${cflags_nooptim}"
-  cxxflags="${cxxflags} ${cflags_nooptim}"
-  objcflags="${objcflags} ${cflags_nooptim}"
+if [ "${optim}" = speed ]; then
+  cflags="${cflags} ${cflags_tuning}"
+  cxxflags="${cxxflags} ${cflags_tuning}"
+  objcflags="${objcflags} ${cflags_tuning}"
 fi
 
 #
@@ -182,9 +120,6 @@ while test $# -gt 0; do
       echo "@VERSION@"
       exit 0
       ;;
-    --linkage)
-      echo_linkage=yes
-      ;;
     --list)
       echo_list=yes
       ;;
@@ -210,23 +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__"
-      ;;
-    libs)
-      # Avoid to use werror on what is not vlc's code.
-      cflags_werror=""
-      ;;
-    pic)
-      ;;
-    mozilla)
       ;;
     *)
       module="$tgt"
@@ -246,29 +167,14 @@ if test -n "${module}"; then
   cppflags="${cppflags} -DMODULE_NAME=${module} -DMODULE_NAME_IS_${module} -DMODULE_STRING=\"${module}\""
 fi
 
-#
-# Set the Werror flags.
-#
-
-cflags="${cflags} ${cflags_werror}"
-
 #
 #  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