Set SOCKET_LIBS on Windows too

[vlc] / vlc-config.in.in

diff --git a/vlc-config.in.in b/vlc-config.in.in
index e7253236f7689a23dcc47dee79ad4f7d47700508..32876560474f31eb1e762776e0b20d9ac55d07e5 100644 (file)
--- a/vlc-config.in.in
+++ b/vlc-config.in.in
@@ -1,18 +1,7 @@
 #!@SHELL@
 
 #!@SHELL@
 

-prefix="@prefix@"
-exec_prefix="@exec_prefix@"
-exec_prefix_set=no
-datarootdir="@datarootdir@"
-
-debug="@debug@"
-gprof="@gprof@"
-cprof="@cprof@"

 optim="@optim@"
 
 optim="@optim@"
 

-plugins="@PLUGINS@ "
-builtins="@BUILTINS@ "
-

 cppflags=""
 cflags=""
 cxxflags=""
 cppflags=""
 cflags=""
 cxxflags=""


@@ -21,12 +10,6 @@ ldflags=""
 libs=""
 
 cflags_tuning="@CFLAGS_TUNING@"
 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
 
 #
 #  Do not touch below this place unless you really know what you are doing


@@ -36,20 +19,13 @@ usage()
         cat << BLAH
 Usage: vlc-config OPTIONS MODULES
 Options:
         cat << BLAH
 Usage: vlc-config OPTIONS MODULES
 Options:

-        [--prefix[=DIR]]          set prefix
-        [--exec-prefix[=DIR]]     set exec prefix

         [--version]               print version and exit
         [--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
         [--cxxflags]              output C++ compilation flags
         [--objcflags]             output Objective C compilation flags
 Modules:
         vlc                       the main VLC object
         [--libs]                  output linking flags
         [--cflags]                output C compilation flags
         [--cxxflags]              output C++ compilation flags
         [--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
         MODULE                    any available module (dummy, gtk, avi, etc.)
         libs                      flags for external libs
 BLAH


@@ -77,55 +53,14 @@ fi
 includes="${includes}"
 cppflags="${includes}"
 module=""
 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
 #
 
 #
 #  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
 
 #
 fi
 
 #


@@ -155,32 +90,10 @@ while test $# -gt 0; do
   esac
 
   case "$tgt" in
   esac
 
   case "$tgt" in

-    --prefix=*)
-      prefix="${optarg}"
-      if test "${exec_prefix_set}" = no ; then
-        exec_prefix="${optarg}"
-      fi
-      ;;
-    --prefix)
-      echo_prefix=yes
-      ;;
-    --exec-prefix=*)
-      exec_prefix="${optarg}"
-      exec_prefix_set=yes
-      ;;
-    --exec-prefix)
-      echo_exec_prefix=yes
-      ;;

     --version)
       echo "@VERSION@"
       exit 0
       ;;
     --version)
       echo "@VERSION@"
       exit 0
       ;;

-    --linkage)
-      echo_linkage=yes
-      ;;
-    --list)
-      echo_list=yes
-      ;;

     --cflags)
       echo_cflags=yes
       ;;
     --cflags)
       echo_cflags=yes
       ;;


@@ -203,23 +116,6 @@ while test $# -gt 0; do
       usage 1 1>&1
       ;;
     libvlccore)
       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"
       ;;
     *)
       module="$tgt"


@@ -232,45 +128,9 @@ while test $# -gt 0; do
   shift
 done
 
   shift
 done
 

-#
-#  If a module was requested, use its name
-#
-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
 #
 #
 #  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
-
-if test "${echo_prefix}" = yes; then
-  echo "${prefix}"
-fi
-if test "${echo_exec_prefix}" = yes; then
-  echo "${exec_prefix}"
-fi

 if test "${echo_cppflags}" = yes; then
   echo "${cppflags}"
 fi
 if test "${echo_cppflags}" = yes; then
   echo "${cppflags}"
 fi