OpenCV: more cosmetics.

[vlc] / vlc-config.in.in

diff --git a/vlc-config.in.in b/vlc-config.in.in
index 79e3e7ec4d64e5eec3cb247415360e88fac80adf..e7253236f7689a23dcc47dee79ad4f7d47700508 100644 (file)
--- a/vlc-config.in.in
+++ b/vlc-config.in.in
@@ -1,11 +1,10 @@
-#!/bin/sh
+#!@SHELL@
 
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 exec_prefix_set=no
 datarootdir="@datarootdir@"
 
-release="@release@"
 debug="@debug@"
 gprof="@gprof@"
 cprof="@cprof@"
@@ -27,6 +26,8 @@ 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
 #
@@ -50,6 +51,7 @@ 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
         exit $1
 }
@@ -67,13 +69,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
@@ -93,28 +88,22 @@ cppflags="${cppflags} -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURC
 #  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}"
@@ -213,7 +202,7 @@ while test $# -gt 0; do
     -*)
       usage 1 1>&1
       ;;
-    libvlc)
+    libvlccore)
       cppflags="${cppflags} -D__LIBVLC__ -I${top_builddir}src/misc"
       ;;
     plugin)
@@ -224,14 +213,14 @@ 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)
       ;;
-    external)
-      echo_external=yes
-      libs="${libs} -lvlc -lvlc-control"
-      ;;
     *)
       module="$tgt"
       ;;
@@ -250,6 +239,12 @@ 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
 #
@@ -295,22 +290,10 @@ fi
 # Libs
 # There are 4 possibilities
 #  - We are a plugin or a builtin
-#  - We are building from the outside (external):
-#      - Give full libvlc linkflags + -lvlc (in libdir)
-#      - Link with builtins in libdir
 #  - We are building something from the inside (builtin)
 #       - Link with builtins in place
 #  If you want something shared from the inside (binding),
 #  you need "builtin vlc"
 if test "${echo_libs}" = yes; then
-  if test "${echo_external}" = yes; then
-    for module in `echo "${builtins}"`; do
-      libs="${libs} @libdir@/vlc/lib${module}.a"
-    done
-    for module in `echo "${builtins}"`; do
-      register_flags "${module}"
-    done
-    register_flags "vlc"
-  fi
   echo "${libs}"
 fi