Merge branch 'master' into lpcm_encoder

[vlc] / vlc-config.in.in

diff --git a/vlc-config.in.in b/vlc-config.in.in
index 16065459bbb86f17e2d1eef8fbcdac0d7d4338e1..e457e226a5a5a3c4acb518d17640f68b9d1efab1 100644 (file)
--- a/vlc-config.in.in
+++ b/vlc-config.in.in
@@ -5,7 +5,6 @@ exec_prefix="@exec_prefix@"
 exec_prefix_set=no
 datarootdir="@datarootdir@"
 
-release="@release@"
 debug="@debug@"
 gprof="@gprof@"
 cprof="@cprof@"
@@ -27,8 +26,6 @@ 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
 #
@@ -70,13 +67,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
@@ -90,34 +80,28 @@ 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"
+cppflags="${cppflags} -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE"
 
 #
 #  Various additional defines
 #
 if [ "${debug}" = yes ]; then
-  cppflags="${cppflags} -DDEBUG"
   cflags="${cflags} -g"
   cxxflags="${cxxflags} -g"
   objcflags="${objcflags} -g"
   ldflags="${ldflags} -g"
 fi
 if [ "${cprof}" = yes ]; then
-  cppflags="${cppflags} -DCPROF"
   cflags="${cflags} -finstrument-functions"
   cxxflags="${cxxflags} -finstrument-functions"
   objcflags="${objcflags} -finstrument-functions"
 fi
 if [ "${gprof}" = yes ]; then
-  cppflags="${cppflags} -DGPROF"
   cflags="${cflags} -pg"
   cxxflags="${cxxflags} -pg"
   objcflags="${objcflags} -pg"
   ldflags="${ldflags} -pg"
 fi
-if [ "${release}" = yes ]; then
-  cppflags="${cppflags} -DHAVE_RELEASE"
-fi
 if [ "${optim}" = size ]; then
   cflags="${cflags} ${cflags_optim_size} ${cflags_tuning}"
   cxxflags="${cxxflags} ${cflags_optim_size} ${cflags_tuning}"
@@ -227,10 +211,6 @@ while test $# -gt 0; do
       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)
@@ -253,12 +233,6 @@ 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
 #