[vlc-commits] remove --enable-macosx-defaults, move to shell script

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Wed Nov 23 17:28:08 2011 -0500| [2bb4972e1e4b0a7ab735a6902c2bb616c0f07be4] | committer: Rafaël Carré

remove --enable-macosx-defaults, move to shell script

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2bb4972e1e4b0a7ab735a6902c2bb616c0f07be4
---

 configure.ac                       |   36 +-----------------------------------
 extras/package/macosx/configure.sh |   19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 35 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5ff616b..dd25e2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -160,41 +160,7 @@ case "${host_os}" in
     VLC_ADD_LIBS([avcodec avformat access_avio swscale postproc i420_rgb_mmx x264],[-Wl,-read_only_relocs,suppress])
     VLC_ADD_CFLAGS([motion],[-fconstant-cfstrings])
     VLC_ADD_LIBS([libvlccore],[-Wl,-framework,CoreFoundation])
-    AC_ARG_ENABLE(macosx-defaults,
-      AS_HELP_STRING([--enable-macosx-defaults],[Build the default configuration on Mac OS X (default enabled)]))
-    if test "x${enable_macosx_defaults}" != "xno"
-    then
-        echo ""
-        echo "Building with Mac OS X defaults:"
-        build_dir=`pwd`
-        echo "  Assuming --prefix=${build_dir}/vlc_install_dir"
-        ac_default_prefix="${build_dir}/vlc_install_dir"
-        enable_faad="yes"
-        echo "  Assuming --enable-faad"
-        enable_flac="yes"
-        echo "  Assuming --enable-flac"
-        enable_theora="yes"
-        echo "  Assuming --enable-theora"
-        enable_shout="yes"
-        echo "  Assuming --enable-shout"
-        enable_vcdx="yes"
-        echo "  Assuming --enable-vcdx"
-        enable_caca="yes"
-        echo "  Assuming --enable-caca"
-        enable_ncurses="yes"
-        echo "  Assuming --enable-ncurses"
-        enable_twolame="yes"
-        echo "  Assuming --enable-twolame"
-        enable_realrtsp="yes"
-        echo "  Assuming --enable-realrtsp"
-        enable_libass="yes"
-        echo "  Assuming --enable-libass"
-
-        enable_skins2="no"
-        echo "  Assuming --disable-skins2"
-        enable_xcb="no"
-        echo "  Assuming --disable-xcb"
-    fi
+
     dnl
     dnl  Check for Mac OS X SDK settings
     dnl
diff --git a/extras/package/macosx/configure.sh b/extras/package/macosx/configure.sh
new file mode 100755
index 0000000..9ccbaf0
--- /dev/null
+++ b/extras/package/macosx/configure.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+OPTIONS="
+        --prefix=`pwd`/vlc_install_dir
+        --enable-faad
+        --enable-flac
+        --enable-theora
+        --enable-shout
+        --enable-vcdx
+        --enable-caca
+        --enable-ncurses
+        --enable-twolame
+        --enable-realrtsp
+        --enable-libass
+        --disable-skins2
+        --disable-xcb
+"
+
+sh "$(dirname $0)"/../../../configure ${OPTIONS} $*