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

diff --git a/build-vlc b/build-vlc
index 10b4a08fc630093e11a5f5072bf3f00d512685c3..e6aa06aeaba933f1774fadc46c6782c70a424ac7 100755 (executable)
--- a/build-vlc
+++ b/build-vlc
@@ -87,6 +87,7 @@ WITHFFMPEGFAAC ffmpeg-faac
 GALAKTOS galaktos
 HTTPD httpd
 JACK jack
+QT4 qt4
 "
 PATHS="
 WITHXML2CONFIGPATH xml2-config-path
@@ -136,15 +137,15 @@ then
 fi
 
 echo -n "./configure " > .cmd
-source .config
+. ./.config
 
 check_features () {
 while [ -n "$1" ]
 do
    eval x="\$CONFIG_$1"
-   if [ "$x" == "y" ]
+   if [ "$x" = "y" ]
    then
-      if [ "$1" == "WITHFFMPEGMP3LAME" ] || [ "$1" == "WITHFFMPEGFAAC" ]
+      if [ "$1" = "WITHFFMPEGMP3LAME" ] || [ "$1" = "WITHFFMPEGFAAC" ]
       then
          echo -n "--with-$2 " >> .cmd
       else
@@ -186,6 +187,6 @@ then
    ./bootstrap
 fi
 
-source .cmd
+. ./.cmd
 make
 rm -f .cmd

diff --git a/config.in b/config.in
index b69dff6778c41c6083da0f6d4621ede1a6ac01cc..0a1b35bec6244a9d911b626adac7489e13146283 100644 (file)
--- a/config.in
+++ b/config.in
@@ -16,6 +16,7 @@ if [ "$CONFIG_WXWIDGETS" = "y" ]; then
   string 'wx-config path' CONFIG_WITHWXCONFIGPATH ""
   string 'wx-config name' CONFIG_WITHWXCONFIG ""
 fi
+bool 'QT4 interface' CONFIG_QT4
 bool 'Skins interface' CONFIG_SKINS
 if [ "$CONFIG_SKINS" = "y" ]; then
   string 'xml2-config path' CONFIG_WITHXML2CONFIGPATH ""

diff --git a/configure.ac b/configure.ac
index 60368a066c94090cb34f91e8a8725cf24d7eaa53..74ae3bdbd52b95d748fb7f29300bc6c738a2abe2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4542,7 +4542,7 @@ dnl
 dnl Skins2 module
 dnl
 AC_ARG_ENABLE(skins2,
-  [  --enable-skins2         Skins2 interface module (experimental)])
+  [  --enable-skins2         Skins2 interface module (default disabled)])
 if test "${enable_skins2}" = "yes" ||
   (test "${SYS}" != "darwin" && test "${SYS}" != "beos" &&
    test "${SYS}" != "mingwce" && test "${enable_skins2}" != "no"); then

diff --git a/menuconfig b/menuconfig
index 2af7d6e1c4fedbb27c6add57f5de59e68edec55e..a2b80b83adc6bf344f9c94b28f8341954594e006 100755 (executable)
--- a/menuconfig
+++ b/menuconfig
@@ -1,14 +1,7 @@
-#! /bin/sh
+#! /bin/bash
 #
 # VLC media player configuration script, borrowed from linux menuconfig
 # 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.