diff options
author | 2008-10-14 23:00:04 +0000 | |
---|---|---|
committer | 2008-10-14 23:00:04 +0000 | |
commit | 883557290d9e5ee140c8a603d05f49949b63cf0b (patch) | |
tree | 257166e82516235b07d43c91a93e43be9ac98c2d | |
parent | 07589781f454a0fa320a2925cc043465b1b512da (diff) |
cosmetics: Consistently name all header #define variables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27774 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-x | configure | 80 |
1 files changed, 40 insertions, 40 deletions
@@ -2397,13 +2397,13 @@ EOF if $(cc_check -maltivec -mabi=altivec) ; then _altivec_gcc_flags="-maltivec -mabi=altivec" # check if <altivec.h> should be included - _def_altivec_h='#undef HAVE_ALTIVEC_H' + def_altivec_h='#undef HAVE_ALTIVEC_H' cat > $TMPC << EOF #include <altivec.h> int main(void) { return 0; } EOF if $(cc_check $_altivec_gcc_flags) ; then - _def_altivec_h='#define HAVE_ALTIVEC_H 1' + def_altivec_h='#define HAVE_ALTIVEC_H 1' inc_altivec_h='#include <altivec.h>' else cat > $TMPC << EOF @@ -2770,9 +2770,9 @@ echores "$_socklib" if test $_winsock2_h = yes ; then _ld_sock="-lws2_32" - _def_winsock2_h='#define HAVE_WINSOCK2_H 1' + def_winsock2_h='#define HAVE_WINSOCK2_H 1' else - _def_winsock2_h='#undef HAVE_WINSOCK2_H' + def_winsock2_h='#undef HAVE_WINSOCK2_H' fi @@ -2931,12 +2931,12 @@ EOF _malloc=no cc_check && _malloc=yes if test "$_malloc" = yes ; then - _def_malloc='#define HAVE_MALLOC_H 1' + def_malloc_h='#define HAVE_MALLOC_H 1' else - _def_malloc='#undef HAVE_MALLOC_H' + def_malloc_h='#undef HAVE_MALLOC_H' fi # malloc.h emits a warning in FreeBSD and OpenBSD -freebsd || openbsd || dragonfly && _def_malloc='#undef HAVE_MALLOC_H' +freebsd || openbsd || dragonfly && def_malloc_h='#undef HAVE_MALLOC_H' echores "$_malloc" @@ -2966,9 +2966,9 @@ EOF _alloca=no cc_check && _alloca=yes if cc_check ; then - _def_alloca='#define HAVE_ALLOCA_H 1' + def_alloca_h='#define HAVE_ALLOCA_H 1' else - _def_alloca='#undef HAVE_ALLOCA_H' + def_alloca_h='#undef HAVE_ALLOCA_H' fi echores "$_alloca" @@ -2982,9 +2982,9 @@ EOF _mman=no cc_check && _mman=yes if test "$_mman" = yes ; then - _def_mman='#define HAVE_SYS_MMAN_H 1' + def_mman_h='#define HAVE_SYS_MMAN_H 1' else - _def_mman='#undef HAVE_SYS_MMAN_H' + def_mman_h='#undef HAVE_SYS_MMAN_H' os2 && _need_mmap=yes fi echores "$_mman" @@ -3133,8 +3133,8 @@ echores "$_iconv" echocheck "soundcard.h" _soundcard_h=no -_def_soundcard='#undef HAVE_SOUNDCARD_H' -_def_sys_soundcard='#undef HAVE_SYS_SOUNDCARD_H' +def_soundcard_h='#undef HAVE_SOUNDCARD_H' +def_sys_soundcard_h='#undef HAVE_SYS_SOUNDCARD_H' for _soundcard_header in "sys/soundcard.h" "soundcard.h"; do cat > $TMPC << EOF #include <$_soundcard_header> @@ -3145,9 +3145,9 @@ done if test "$_soundcard_h" = yes ; then if test $_soundcard_header = "sys/soundcard.h"; then - _def_sys_soundcard='#define HAVE_SYS_SOUNDCARD_H 1' + def_sys_soundcard_h='#define HAVE_SYS_SOUNDCARD_H 1' else - _def_soundcard='#define HAVE_SOUNDCARD_H 1' + def_soundcard_h='#define HAVE_SOUNDCARD_H 1' fi fi echores "$_soundcard_h" @@ -3295,8 +3295,8 @@ echores "$_termcap" echocheck "termios" _def_termios='#undef HAVE_TERMIOS' -_def_termios_h='#undef HAVE_TERMIOS_H' -_def_termios_sys_h='#undef HAVE_SYS_TERMIOS_H' +def_termios_h='#undef HAVE_TERMIOS_H' +def_termios_sys_h='#undef HAVE_SYS_TERMIOS_H' if test "$_termios" = auto ; then _termios=no for _termios_header in "sys/termios.h" "termios.h"; do @@ -3311,9 +3311,9 @@ fi if test "$_termios" = yes ; then _def_termios='#define HAVE_TERMIOS 1' if test "$_termios_header" = "termios.h" ; then - _def_termios_h='#define HAVE_TERMIOS_H 1' + def_termios_h='#define HAVE_TERMIOS_H 1' else - _def_termios_sys_h='#define HAVE_SYS_TERMIOS_H 1' + def_termios_sys_h='#define HAVE_SYS_TERMIOS_H 1' fi fi echores "$_termios" @@ -3494,9 +3494,9 @@ EOF _sys_sysinfo=no cc_check && _sys_sysinfo=yes if test "$_sys_sysinfo" = yes ; then - _def_sys_sysinfo='#define HAVE_SYS_SYSINFO_H 1' + def_sys_sysinfo_h='#define HAVE_SYS_SYSINFO_H 1' else - _def_sys_sysinfo='#undef HAVE_SYS_SYSINFO_H' + def_sys_sysinfo_h='#undef HAVE_SYS_SYSINFO_H' fi echores "$_sys_sysinfo" @@ -5258,8 +5258,8 @@ _def_alsa='#undef CONFIG_ALSA' _def_alsa5='#undef CONFIG_ALSA5' _def_alsa9='#undef CONFIG_ALSA9' _def_alsa1x='#undef CONFIG_ALSA1X' -_def_sys_asoundlib_h='#undef HAVE_SYS_ASOUNDLIB_H' -_def_alsa_asoundlib_h='#undef HAVE_ALSA_ASOUNDLIB_H' +def_sys_asoundlib_h='#undef HAVE_SYS_ASOUNDLIB_H' +def_alsa_asoundlib_h='#undef HAVE_ALSA_ASOUNDLIB_H' if test "$_alsaver" ; then _alsa=yes if test "$_alsaver" = '0.5.x' ; then @@ -5267,7 +5267,7 @@ if test "$_alsaver" ; then _aosrc="$_aosrc ao_alsa5.c" _aomodules="alsa5 $_aomodules" _def_alsa5='#define CONFIG_ALSA5 1' - _def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' + def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' _res_comment="using alsa 0.5.x and sys/asoundlib.h" elif test "$_alsaver" = '0.9.x-sys' ; then _alsa9=yes @@ -5275,7 +5275,7 @@ if test "$_alsaver" ; then _aomodules="alsa $_aomodules" _def_alsa='#define CONFIG_ALSA 1' _def_alsa9='#define CONFIG_ALSA9 1' - _def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' + def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' _res_comment="using alsa 0.9.x and sys/asoundlib.h" elif test "$_alsaver" = '0.9.x-alsa' ; then _alsa9=yes @@ -5283,7 +5283,7 @@ if test "$_alsaver" ; then _aomodules="alsa $_aomodules" _def_alsa='#define CONFIG_ALSA 1' _def_alsa9='#define CONFIG_ALSA9 1' - _def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1' + def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1' _res_comment="using alsa 0.9.x and alsa/asoundlib.h" elif test "$_alsaver" = '1.0.x-sys' ; then _alsa1x=yes @@ -5291,7 +5291,7 @@ if test "$_alsaver" ; then _aomodules="alsa $_aomodules" _def_alsa='#define CONFIG_ALSA 1' _def_alsa1x="#define CONFIG_ALSA1X 1" - _def_alsa_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' + def_alsa_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' _res_comment="using alsa 1.0.x and sys/asoundlib.h" elif test "$_alsaver" = '1.0.x-alsa' ; then _alsa1x=yes @@ -5299,7 +5299,7 @@ if test "$_alsaver" ; then _aomodules="alsa $_aomodules" _def_alsa='#define CONFIG_ALSA 1' _def_alsa1x="#define CONFIG_ALSA1X 1" - _def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1' + def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1' _res_comment="using alsa 1.0.x and alsa/asoundlib.h" else _alsa=no @@ -8052,24 +8052,24 @@ $_def_fast_inttypes #define HAVE_UINTPTR_T 1 /* Define this if your system has the "alloca.h" header file */ -$_def_alloca +$def_alloca_h /* Define this if your system has the "sys/mman.h" header file */ -$_def_mman +$def_mman_h $_def_mman_has_map_failed /* Define this if your system has the header file for the OSS sound interface */ -$_def_sys_soundcard +$def_sys_soundcard_h /* Define this if your system has the header file for the OSS sound interface * in /usr/include */ -$_def_soundcard +$def_soundcard_h /* Define this if your system has the sysinfo header */ -$_def_sys_sysinfo +$def_sys_sysinfo_h /* Define this if your system has the "malloc.h" header file */ -$_def_malloc +$def_malloc_h /* memalign is mapped to malloc if unsupported */ $_def_memalign @@ -8136,7 +8136,7 @@ $_def_fast_unaligned `ff_config_enable "$_cpuexts_all" "$_cpuexts" "HAVE"` /* altivec.h support */ -$_def_altivec_h +$def_altivec_h /* For the PPC. G5 has the dcbzl when in 64bit mode but G4s and earlier do not have the instruction. */ @@ -8410,8 +8410,8 @@ $_def_pulse $_def_jack $_def_openal $_def_openal_h -$_def_sys_asoundlib_h -$_def_alsa_asoundlib_h +$def_sys_asoundlib_h +$def_alsa_asoundlib_h $_def_sunaudio $_def_sgiaudio $_def_win32waveout @@ -8465,8 +8465,8 @@ $_def_termcap /* termios flag for getch2.c */ $_def_termios -$_def_termios_h -$_def_termios_sys_h +$def_termios_h +$def_termios_sys_h /* enable PNG support */ $_def_png @@ -8534,7 +8534,7 @@ $_def_ftp $_def_vstream /* enable winsock2 instead of Unix functions*/ -$_def_winsock2_h +$def_winsock2_h /* define this to use inet_aton() instead of inet_pton() */ $_def_use_aton |