Commit 8b5b0cfa authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

vlc-config: remove unused linkage command

parent 2c9b0d37
...@@ -111,15 +111,9 @@ AC_DEFUN([VLC_OUTPUT_VLC_CONFIG_IN], [ ...@@ -111,15 +111,9 @@ AC_DEFUN([VLC_OUTPUT_VLC_CONFIG_IN], [
fi fi
if test "`eval echo @'$'CXXFLAGS_${x}@`" != "@@"; then if test "`eval echo @'$'CXXFLAGS_${x}@`" != "@@"; then
echo " cxxflags=\"\${cxxflags} `eval echo '$'CXXFLAGS_${x}`\"" echo " cxxflags=\"\${cxxflags} `eval echo '$'CXXFLAGS_${x}`\""
if test "${x}" != "plugin" -a "${x}" != "builtin"; then
echo " linkage=\"c++\""
fi
fi fi
if test "`eval echo @'$'OBJCFLAGS_${x}@`" != "@@"; then if test "`eval echo @'$'OBJCFLAGS_${x}@`" != "@@"; then
echo " objcflags=\"\${objcflags} `eval echo '$'OBJCFLAGS_${x}`\"" 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 fi
if test "`eval echo @'$'LDFLAGS_${x}@`" != "@@"; then if test "`eval echo @'$'LDFLAGS_${x}@`" != "@@"; then
echo " ldflags=\"\${ldflags} `eval echo '$'LDFLAGS_${x}`\"" echo " ldflags=\"\${ldflags} `eval echo '$'LDFLAGS_${x}`\""
......
...@@ -30,7 +30,6 @@ Options: ...@@ -30,7 +30,6 @@ Options:
[--prefix[=DIR]] set prefix [--prefix[=DIR]] set prefix
[--exec-prefix[=DIR]] set exec 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 [--list] print modules names and exit
[--libs] output linking flags [--libs] output linking flags
[--cflags] output C compilation flags [--cflags] output C compilation flags
...@@ -68,7 +67,6 @@ fi ...@@ -68,7 +67,6 @@ fi
includes="${includes}" includes="${includes}"
cppflags="${includes}" cppflags="${includes}"
module="" module=""
linkage="c"
# #
# On Linux and Solaris, activate 64-bit off_t (by default under BSD) # On Linux and Solaris, activate 64-bit off_t (by default under BSD)
...@@ -131,9 +129,6 @@ while test $# -gt 0; do ...@@ -131,9 +129,6 @@ while test $# -gt 0; do
echo "@VERSION@" echo "@VERSION@"
exit 0 exit 0
;; ;;
--linkage)
echo_linkage=yes
;;
--list) --list)
echo_list=yes echo_list=yes
;; ;;
...@@ -192,11 +187,6 @@ fi ...@@ -192,11 +187,6 @@ fi
# #
# 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_list}" = yes; then
if test "${echo_plugin}" = yes; then if test "${echo_plugin}" = yes; then
echo "${plugins}" echo "${plugins}"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment