Commit a5634f95 authored by Cyril Deguet's avatar Cyril Deguet

- thou shalt keep menuconfig up-to-date and not disable it

parent 0aa57443
...@@ -87,6 +87,7 @@ WITHFFMPEGFAAC ffmpeg-faac ...@@ -87,6 +87,7 @@ WITHFFMPEGFAAC ffmpeg-faac
GALAKTOS galaktos GALAKTOS galaktos
HTTPD httpd HTTPD httpd
JACK jack JACK jack
QT4 qt4
" "
PATHS=" PATHS="
WITHXML2CONFIGPATH xml2-config-path WITHXML2CONFIGPATH xml2-config-path
...@@ -136,15 +137,15 @@ then ...@@ -136,15 +137,15 @@ then
fi fi
echo -n "./configure " > .cmd echo -n "./configure " > .cmd
source .config . ./.config
check_features () { check_features () {
while [ -n "$1" ] while [ -n "$1" ]
do do
eval x="\$CONFIG_$1" eval x="\$CONFIG_$1"
if [ "$x" == "y" ] if [ "$x" = "y" ]
then then
if [ "$1" == "WITHFFMPEGMP3LAME" ] || [ "$1" == "WITHFFMPEGFAAC" ] if [ "$1" = "WITHFFMPEGMP3LAME" ] || [ "$1" = "WITHFFMPEGFAAC" ]
then then
echo -n "--with-$2 " >> .cmd echo -n "--with-$2 " >> .cmd
else else
...@@ -186,6 +187,6 @@ then ...@@ -186,6 +187,6 @@ then
./bootstrap ./bootstrap
fi fi
source .cmd . ./.cmd
make make
rm -f .cmd rm -f .cmd
...@@ -16,6 +16,7 @@ if [ "$CONFIG_WXWIDGETS" = "y" ]; then ...@@ -16,6 +16,7 @@ if [ "$CONFIG_WXWIDGETS" = "y" ]; then
string 'wx-config path' CONFIG_WITHWXCONFIGPATH "" string 'wx-config path' CONFIG_WITHWXCONFIGPATH ""
string 'wx-config name' CONFIG_WITHWXCONFIG "" string 'wx-config name' CONFIG_WITHWXCONFIG ""
fi fi
bool 'QT4 interface' CONFIG_QT4
bool 'Skins interface' CONFIG_SKINS bool 'Skins interface' CONFIG_SKINS
if [ "$CONFIG_SKINS" = "y" ]; then if [ "$CONFIG_SKINS" = "y" ]; then
string 'xml2-config path' CONFIG_WITHXML2CONFIGPATH "" string 'xml2-config path' CONFIG_WITHXML2CONFIGPATH ""
......
...@@ -4542,7 +4542,7 @@ dnl ...@@ -4542,7 +4542,7 @@ dnl
dnl Skins2 module dnl Skins2 module
dnl dnl
AC_ARG_ENABLE(skins2, AC_ARG_ENABLE(skins2,
[ --enable-skins2 Skins2 interface module (experimental)]) [ --enable-skins2 Skins2 interface module (default disabled)])
if test "${enable_skins2}" = "yes" || if test "${enable_skins2}" = "yes" ||
(test "${SYS}" != "darwin" && test "${SYS}" != "beos" && (test "${SYS}" != "darwin" && test "${SYS}" != "beos" &&
test "${SYS}" != "mingwce" && test "${enable_skins2}" != "no"); then test "${SYS}" != "mingwce" && test "${enable_skins2}" != "no"); then
......
#! /bin/sh #! /bin/bash
# #
# VLC media player configuration script, borrowed from linux menuconfig # VLC media player configuration script, borrowed from linux menuconfig
# Cyril Deguet <asmax@videolan.org> # Cyril Deguet <asmax@videolan.org>
# Currently out of date
echo "'./menuconfig' is currently not maintained and out-of-date. Use './configure' instead."
exit 1
# #
#----------------------------------------------------------------- #-----------------------------------------------------------------
# William Roadcap was the original author of Menuconfig. # William Roadcap was the original author of Menuconfig.
......
Markdown is supported
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