[vlc-commits] commit: contrib: Define HAVE_MACOSX when distro=macosx* (Pierre d' Herbemont )

[git at videolan.org]

vlc | branch: master | Pierre d'Herbemont <pdherbemont at free.fr> | Sat Nov  6 12:49:20 2010 +0100| [0caf16b420fd60c81d052594c7b3181a1c541dcb] | committer: Pierre d'Herbemont 

contrib: Define HAVE_MACOSX when distro=macosx*

(We don't want HAVE_MACOSX when building for iOS simulator.)

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

 extras/contrib/bootstrap |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index dd9e32b..c4893ba 100755
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -212,7 +212,6 @@ case $TARGET in
     powerpc-apple-darwin9)
         hint_distro macosx32
         HAVE_DARWIN_32=1
-        add_enabled_makefile_cfg "HAVE_MACOSX"
 
         CFLAGS_TUNING=" -arch ppc -mtune=G4"
         EXTRA_LDFLAGS=" -arch ppc"
@@ -223,7 +222,6 @@ case $TARGET in
     i686-apple-darwin*)
         hint_distro macosx32
         HAVE_DARWIN_32=1
-        add_enabled_makefile_cfg "HAVE_MACOSX"
 
         CFLAGS_TUNING=" -march=prescott -mtune=generic -arch i386 -m32"
         EXTRA_LDFLAGS=" -arch i386"
@@ -231,7 +229,6 @@ case $TARGET in
     x86_64-apple-darwin*)
         hint_distro macosx64
         HAVE_DARWIN_64=1
-        add_enabled_makefile_cfg "HAVE_MACOSX"
 
         CFLAGS_TUNING=" -march=core2 -mtune=core2 -m64 -arch x86_64"
         EXTRA_LDFLAGS=" -arch x86_64"
@@ -341,6 +338,7 @@ case "$DISTRO" in
     add_makefile_cfg "SDK_TARGET = ${SDK_TARGET}"
     add_makefile_cfg "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}"
     add_makefile_cfg "MACOSX_SDK = /Developer/SDKs/MacOSX${SDK_TARGET}.sdk"
+    add_enabled_makefile_cfg "HAVE_MACOSX"
 
     case $TARGET in
     x86_64*|i686*) add_enabled_makefile_cfg "HAVE_MACOSX_ON_INTEL" ;;