comparison configure @ 27388:ac03760f7fcc

Rename all preprocessor directives related to Apple / Mac OS X. Switch them from a HAVE_ to a CONFIG_ prefix.
author diego
date Wed, 06 Aug 2008 07:42:26 +0000
parents eb7bdbd98210
children 9d95dc936e66
comparison
equal deleted inserted replaced
27387:eb7bdbd98210 27388:ac03760f7fcc
3575 } 3575 }
3576 EOF 3576 EOF
3577 if cc_check -framework Carbon -framework QuickTime -framework CoreAudio; then 3577 if cc_check -framework Carbon -framework QuickTime -framework CoreAudio; then
3578 _ld_extra="$_ld_extra -framework Carbon -framework QuickTime -framework CoreAudio -framework AudioUnit -framework AudioToolbox" 3578 _ld_extra="$_ld_extra -framework Carbon -framework QuickTime -framework CoreAudio -framework AudioUnit -framework AudioToolbox"
3579 _coreaudio=yes 3579 _coreaudio=yes
3580 _def_coreaudio='#define HAVE_COREAUDIO 1' 3580 _def_coreaudio='#define CONFIG_COREAUDIO 1'
3581 _aosrc="$_aosrc ao_macosx.c" 3581 _aosrc="$_aosrc ao_macosx.c"
3582 _aomodules="macosx $_aomodules" 3582 _aomodules="macosx $_aomodules"
3583 _def_quartz='#define HAVE_QUARTZ 1' 3583 _def_quartz='#define CONFIG_QUARTZ 1'
3584 _vosrc="$_vosrc vo_quartz.c" 3584 _vosrc="$_vosrc vo_quartz.c"
3585 _vomodules="quartz $_vomodules" 3585 _vomodules="quartz $_vomodules"
3586 _def_quicktime='#define HAVE_QUICKTIME 1' 3586 _def_quicktime='#define CONFIG_QUICKTIME 1'
3587 else 3587 else
3588 _macosx=no 3588 _macosx=no
3589 _coreaudio=no 3589 _coreaudio=no
3590 _def_coreaudio='#undef HAVE_COREAUDIO' 3590 _def_coreaudio='#undef CONFIG_COREAUDIO'
3591 _noaomodules="macosx $_noaomodules" 3591 _noaomodules="macosx $_noaomodules"
3592 _def_quartz='#undef HAVE_QUARTZ' 3592 _def_quartz='#undef CONFIG_QUARTZ'
3593 _novomodules="quartz $_novomodules" 3593 _novomodules="quartz $_novomodules"
3594 _def_quicktime='#undef HAVE_QUICKTIME' 3594 _def_quicktime='#undef CONFIG_QUICKTIME'
3595 fi 3595 fi
3596 cat > $TMPC <<EOF 3596 cat > $TMPC <<EOF
3597 #include <Carbon/Carbon.h> 3597 #include <Carbon/Carbon.h>
3598 #include <QuartzCore/CoreVideo.h> 3598 #include <QuartzCore/CoreVideo.h>
3599 int main(void) { return 0; } 3599 int main(void) { return 0; }
3600 EOF 3600 EOF
3601 if cc_check -framework Carbon -framework QuartzCore -framework OpenGL; then 3601 if cc_check -framework Carbon -framework QuartzCore -framework OpenGL; then
3602 _vosrc="$_vosrc vo_macosx.m" 3602 _vosrc="$_vosrc vo_macosx.m"
3603 _vomodules="macosx $_vomodules" 3603 _vomodules="macosx $_vomodules"
3604 _ld_extra="$_ld_extra -framework Cocoa -framework QuartzCore -framework OpenGL" 3604 _ld_extra="$_ld_extra -framework Cocoa -framework QuartzCore -framework OpenGL"
3605 _def_corevideo='#define HAVE_COREVIDEO 1' 3605 _def_corevideo='#define CONFIG_COREVIDEO 1'
3606 _corevideo=yes 3606 _corevideo=yes
3607 else 3607 else
3608 _novomodules="macosx $_novomodules" 3608 _novomodules="macosx $_novomodules"
3609 _def_corevideo='#undef HAVE_COREVIDEO' 3609 _def_corevideo='#undef CONFIG_COREVIDEO'
3610 _corevideo=no 3610 _corevideo=no
3611 fi 3611 fi
3612 fi 3612 fi
3613 echores "$_macosx" 3613 echores "$_macosx"
3614 3614
3665 } 3665 }
3666 EOF 3666 EOF
3667 cc_check -framework IOKit && tmp_run && _apple_remote=yes 3667 cc_check -framework IOKit && tmp_run && _apple_remote=yes
3668 fi 3668 fi
3669 if test "$_apple_remote" = yes ; then 3669 if test "$_apple_remote" = yes ; then
3670 _def_apple_remote='#define HAVE_APPLE_REMOTE 1' 3670 _def_apple_remote='#define CONFIG_APPLE_REMOTE 1'
3671 _ld_extra="$_ld_extra -framework IOKit" 3671 _ld_extra="$_ld_extra -framework IOKit"
3672 else 3672 else
3673 _def_apple_remote='#undef HAVE_APPLE_REMOTE' 3673 _def_apple_remote='#undef CONFIG_APPLE_REMOTE'
3674 fi 3674 fi
3675 echores "$_apple_remote" 3675 echores "$_apple_remote"
3676 3676
3677 fi #if darwin 3677 fi #if darwin
3678 3678
3691 } 3691 }
3692 EOF 3692 EOF
3693 cc_check && tmp_run && _apple_ir=yes 3693 cc_check && tmp_run && _apple_ir=yes
3694 fi 3694 fi
3695 if test "$_apple_ir" = yes ; then 3695 if test "$_apple_ir" = yes ; then
3696 _def_apple_ir='#define HAVE_APPLE_IR 1' 3696 _def_apple_ir='#define CONFIG_APPLE_IR 1'
3697 else 3697 else
3698 _def_apple_ir='#undef HAVE_APPLE_IR' 3698 _def_apple_ir='#undef CONFIG_APPLE_IR'
3699 fi 3699 fi
3700 echores "$_apple_ir" 3700 echores "$_apple_ir"
3701 fi #if linux 3701 fi #if linux
3702 3702
3703 echocheck "pkg-config" 3703 echocheck "pkg-config"