From: Rémi Denis-Courmont <remi@remlab.net>
Date: Mon, 2 May 2011 07:59:16 +0000 (+0300)
Subject: vlc-config: remove unused linkage command
X-Git-Tag: 1.2.0-pre1~2819
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=8b5b0cfa909f14f521a2905132a67c06dfa59954;p=vlc

vlc-config: remove unused linkage command
---

diff --git a/m4/vlc.m4 b/m4/vlc.m4
index 9ae566d8cb..38c5b90adf 100644
--- a/m4/vlc.m4
+++ b/m4/vlc.m4
@@ -111,15 +111,9 @@ AC_DEFUN([VLC_OUTPUT_VLC_CONFIG_IN], [
     fi
     if test "`eval echo @'$'CXXFLAGS_${x}@`" != "@@"; then
       echo "      cxxflags=\"\${cxxflags} `eval echo '$'CXXFLAGS_${x}`\""
-      if test "${x}" != "plugin" -a "${x}" != "builtin"; then
-        echo "      linkage=\"c++\""
-      fi
     fi
     if test "`eval echo @'$'OBJCFLAGS_${x}@`" != "@@"; then
       echo "      objcflags=\"\${objcflags} `eval echo '$'OBJCFLAGS_${x}`\""
-      if test "${x}" != "plugin" -a "${x}" != "builtin"; then
-        echo "      if test \"\${linkage}\" = \"c\"; then linkage=\"objc\"; fi"
-      fi
     fi
     if test "`eval echo @'$'LDFLAGS_${x}@`" != "@@"; then
       echo "      ldflags=\"\${ldflags} `eval echo '$'LDFLAGS_${x}`\""
diff --git a/vlc-config.in.in b/vlc-config.in.in
index 129c7b7bb6..14e0b46eb3 100644
--- a/vlc-config.in.in
+++ b/vlc-config.in.in
@@ -30,7 +30,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
@@ -68,7 +67,6 @@ fi
 includes="${includes}"
 cppflags="${includes}"
 module=""
-linkage="c"
 
 #
 #  On Linux and Solaris, activate 64-bit off_t (by default under BSD)
@@ -131,9 +129,6 @@ while test $# -gt 0; do
       echo "@VERSION@"
       exit 0
       ;;
-    --linkage)
-      echo_linkage=yes
-      ;;
     --list)
       echo_list=yes
       ;;
@@ -192,11 +187,6 @@ 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}"