comparison configure @ 27740:4ee7585c9985

cosmetics: Consistently name all header #define variables.
author diego
date Tue, 14 Oct 2008 23:00:04 +0000
parents 85a9b1052a44
children 0401eef4408f
comparison
equal deleted inserted replaced
27739:c59e6672574e 27740:4ee7585c9985
2395 int main(void) { return 0; } 2395 int main(void) { return 0; }
2396 EOF 2396 EOF
2397 if $(cc_check -maltivec -mabi=altivec) ; then 2397 if $(cc_check -maltivec -mabi=altivec) ; then
2398 _altivec_gcc_flags="-maltivec -mabi=altivec" 2398 _altivec_gcc_flags="-maltivec -mabi=altivec"
2399 # check if <altivec.h> should be included 2399 # check if <altivec.h> should be included
2400 _def_altivec_h='#undef HAVE_ALTIVEC_H' 2400 def_altivec_h='#undef HAVE_ALTIVEC_H'
2401 cat > $TMPC << EOF 2401 cat > $TMPC << EOF
2402 #include <altivec.h> 2402 #include <altivec.h>
2403 int main(void) { return 0; } 2403 int main(void) { return 0; }
2404 EOF 2404 EOF
2405 if $(cc_check $_altivec_gcc_flags) ; then 2405 if $(cc_check $_altivec_gcc_flags) ; then
2406 _def_altivec_h='#define HAVE_ALTIVEC_H 1' 2406 def_altivec_h='#define HAVE_ALTIVEC_H 1'
2407 inc_altivec_h='#include <altivec.h>' 2407 inc_altivec_h='#include <altivec.h>'
2408 else 2408 else
2409 cat > $TMPC << EOF 2409 cat > $TMPC << EOF
2410 int main(void) { return 0; } 2410 int main(void) { return 0; }
2411 EOF 2411 EOF
2768 echores "$_socklib" 2768 echores "$_socklib"
2769 2769
2770 2770
2771 if test $_winsock2_h = yes ; then 2771 if test $_winsock2_h = yes ; then
2772 _ld_sock="-lws2_32" 2772 _ld_sock="-lws2_32"
2773 _def_winsock2_h='#define HAVE_WINSOCK2_H 1' 2773 def_winsock2_h='#define HAVE_WINSOCK2_H 1'
2774 else 2774 else
2775 _def_winsock2_h='#undef HAVE_WINSOCK2_H' 2775 def_winsock2_h='#undef HAVE_WINSOCK2_H'
2776 fi 2776 fi
2777 2777
2778 2778
2779 _use_aton=no 2779 _use_aton=no
2780 echocheck "inet_pton()" 2780 echocheck "inet_pton()"
2929 int main(void) { (void) malloc(0); return 0; } 2929 int main(void) { (void) malloc(0); return 0; }
2930 EOF 2930 EOF
2931 _malloc=no 2931 _malloc=no
2932 cc_check && _malloc=yes 2932 cc_check && _malloc=yes
2933 if test "$_malloc" = yes ; then 2933 if test "$_malloc" = yes ; then
2934 _def_malloc='#define HAVE_MALLOC_H 1' 2934 def_malloc_h='#define HAVE_MALLOC_H 1'
2935 else 2935 else
2936 _def_malloc='#undef HAVE_MALLOC_H' 2936 def_malloc_h='#undef HAVE_MALLOC_H'
2937 fi 2937 fi
2938 # malloc.h emits a warning in FreeBSD and OpenBSD 2938 # malloc.h emits a warning in FreeBSD and OpenBSD
2939 freebsd || openbsd || dragonfly && _def_malloc='#undef HAVE_MALLOC_H' 2939 freebsd || openbsd || dragonfly && def_malloc_h='#undef HAVE_MALLOC_H'
2940 echores "$_malloc" 2940 echores "$_malloc"
2941 2941
2942 2942
2943 echocheck "memalign()" 2943 echocheck "memalign()"
2944 # XXX restrict to x86 ? extend to other CPUs/cacheline sizes ? 2944 # XXX restrict to x86 ? extend to other CPUs/cacheline sizes ?
2964 int main(void) { (void) alloca(0); return 0; } 2964 int main(void) { (void) alloca(0); return 0; }
2965 EOF 2965 EOF
2966 _alloca=no 2966 _alloca=no
2967 cc_check && _alloca=yes 2967 cc_check && _alloca=yes
2968 if cc_check ; then 2968 if cc_check ; then
2969 _def_alloca='#define HAVE_ALLOCA_H 1' 2969 def_alloca_h='#define HAVE_ALLOCA_H 1'
2970 else 2970 else
2971 _def_alloca='#undef HAVE_ALLOCA_H' 2971 def_alloca_h='#undef HAVE_ALLOCA_H'
2972 fi 2972 fi
2973 echores "$_alloca" 2973 echores "$_alloca"
2974 2974
2975 2975
2976 echocheck "mman.h" 2976 echocheck "mman.h"
2980 int main(void) { (void) mmap(0, 0, 0, 0, 0, 0); return 0; } 2980 int main(void) { (void) mmap(0, 0, 0, 0, 0, 0); return 0; }
2981 EOF 2981 EOF
2982 _mman=no 2982 _mman=no
2983 cc_check && _mman=yes 2983 cc_check && _mman=yes
2984 if test "$_mman" = yes ; then 2984 if test "$_mman" = yes ; then
2985 _def_mman='#define HAVE_SYS_MMAN_H 1' 2985 def_mman_h='#define HAVE_SYS_MMAN_H 1'
2986 else 2986 else
2987 _def_mman='#undef HAVE_SYS_MMAN_H' 2987 def_mman_h='#undef HAVE_SYS_MMAN_H'
2988 os2 && _need_mmap=yes 2988 os2 && _need_mmap=yes
2989 fi 2989 fi
2990 echores "$_mman" 2990 echores "$_mman"
2991 2991
2992 cat > $TMPC << EOF 2992 cat > $TMPC << EOF
3131 echores "$_iconv" 3131 echores "$_iconv"
3132 3132
3133 3133
3134 echocheck "soundcard.h" 3134 echocheck "soundcard.h"
3135 _soundcard_h=no 3135 _soundcard_h=no
3136 _def_soundcard='#undef HAVE_SOUNDCARD_H' 3136 def_soundcard_h='#undef HAVE_SOUNDCARD_H'
3137 _def_sys_soundcard='#undef HAVE_SYS_SOUNDCARD_H' 3137 def_sys_soundcard_h='#undef HAVE_SYS_SOUNDCARD_H'
3138 for _soundcard_header in "sys/soundcard.h" "soundcard.h"; do 3138 for _soundcard_header in "sys/soundcard.h" "soundcard.h"; do
3139 cat > $TMPC << EOF 3139 cat > $TMPC << EOF
3140 #include <$_soundcard_header> 3140 #include <$_soundcard_header>
3141 int main(void) { return 0; } 3141 int main(void) { return 0; }
3142 EOF 3142 EOF
3143 cc_check && _soundcard_h=yes && _res_comment="$_soundcard_header" && break 3143 cc_check && _soundcard_h=yes && _res_comment="$_soundcard_header" && break
3144 done 3144 done
3145 3145
3146 if test "$_soundcard_h" = yes ; then 3146 if test "$_soundcard_h" = yes ; then
3147 if test $_soundcard_header = "sys/soundcard.h"; then 3147 if test $_soundcard_header = "sys/soundcard.h"; then
3148 _def_sys_soundcard='#define HAVE_SYS_SOUNDCARD_H 1' 3148 def_sys_soundcard_h='#define HAVE_SYS_SOUNDCARD_H 1'
3149 else 3149 else
3150 _def_soundcard='#define HAVE_SOUNDCARD_H 1' 3150 def_soundcard_h='#define HAVE_SOUNDCARD_H 1'
3151 fi 3151 fi
3152 fi 3152 fi
3153 echores "$_soundcard_h" 3153 echores "$_soundcard_h"
3154 3154
3155 3155
3293 echores "$_termcap" 3293 echores "$_termcap"
3294 3294
3295 3295
3296 echocheck "termios" 3296 echocheck "termios"
3297 _def_termios='#undef HAVE_TERMIOS' 3297 _def_termios='#undef HAVE_TERMIOS'
3298 _def_termios_h='#undef HAVE_TERMIOS_H' 3298 def_termios_h='#undef HAVE_TERMIOS_H'
3299 _def_termios_sys_h='#undef HAVE_SYS_TERMIOS_H' 3299 def_termios_sys_h='#undef HAVE_SYS_TERMIOS_H'
3300 if test "$_termios" = auto ; then 3300 if test "$_termios" = auto ; then
3301 _termios=no 3301 _termios=no
3302 for _termios_header in "sys/termios.h" "termios.h"; do 3302 for _termios_header in "sys/termios.h" "termios.h"; do
3303 cat > $TMPC <<EOF 3303 cat > $TMPC <<EOF
3304 #include <$_termios_header> 3304 #include <$_termios_header>
3309 fi 3309 fi
3310 3310
3311 if test "$_termios" = yes ; then 3311 if test "$_termios" = yes ; then
3312 _def_termios='#define HAVE_TERMIOS 1' 3312 _def_termios='#define HAVE_TERMIOS 1'
3313 if test "$_termios_header" = "termios.h" ; then 3313 if test "$_termios_header" = "termios.h" ; then
3314 _def_termios_h='#define HAVE_TERMIOS_H 1' 3314 def_termios_h='#define HAVE_TERMIOS_H 1'
3315 else 3315 else
3316 _def_termios_sys_h='#define HAVE_SYS_TERMIOS_H 1' 3316 def_termios_sys_h='#define HAVE_SYS_TERMIOS_H 1'
3317 fi 3317 fi
3318 fi 3318 fi
3319 echores "$_termios" 3319 echores "$_termios"
3320 3320
3321 3321
3492 } 3492 }
3493 EOF 3493 EOF
3494 _sys_sysinfo=no 3494 _sys_sysinfo=no
3495 cc_check && _sys_sysinfo=yes 3495 cc_check && _sys_sysinfo=yes
3496 if test "$_sys_sysinfo" = yes ; then 3496 if test "$_sys_sysinfo" = yes ; then
3497 _def_sys_sysinfo='#define HAVE_SYS_SYSINFO_H 1' 3497 def_sys_sysinfo_h='#define HAVE_SYS_SYSINFO_H 1'
3498 else 3498 else
3499 _def_sys_sysinfo='#undef HAVE_SYS_SYSINFO_H' 3499 def_sys_sysinfo_h='#undef HAVE_SYS_SYSINFO_H'
3500 fi 3500 fi
3501 echores "$_sys_sysinfo" 3501 echores "$_sys_sysinfo"
3502 3502
3503 3503
3504 if darwin; then 3504 if darwin; then
5256 fi 5256 fi
5257 _def_alsa='#undef CONFIG_ALSA' 5257 _def_alsa='#undef CONFIG_ALSA'
5258 _def_alsa5='#undef CONFIG_ALSA5' 5258 _def_alsa5='#undef CONFIG_ALSA5'
5259 _def_alsa9='#undef CONFIG_ALSA9' 5259 _def_alsa9='#undef CONFIG_ALSA9'
5260 _def_alsa1x='#undef CONFIG_ALSA1X' 5260 _def_alsa1x='#undef CONFIG_ALSA1X'
5261 _def_sys_asoundlib_h='#undef HAVE_SYS_ASOUNDLIB_H' 5261 def_sys_asoundlib_h='#undef HAVE_SYS_ASOUNDLIB_H'
5262 _def_alsa_asoundlib_h='#undef HAVE_ALSA_ASOUNDLIB_H' 5262 def_alsa_asoundlib_h='#undef HAVE_ALSA_ASOUNDLIB_H'
5263 if test "$_alsaver" ; then 5263 if test "$_alsaver" ; then
5264 _alsa=yes 5264 _alsa=yes
5265 if test "$_alsaver" = '0.5.x' ; then 5265 if test "$_alsaver" = '0.5.x' ; then
5266 _alsa5=yes 5266 _alsa5=yes
5267 _aosrc="$_aosrc ao_alsa5.c" 5267 _aosrc="$_aosrc ao_alsa5.c"
5268 _aomodules="alsa5 $_aomodules" 5268 _aomodules="alsa5 $_aomodules"
5269 _def_alsa5='#define CONFIG_ALSA5 1' 5269 _def_alsa5='#define CONFIG_ALSA5 1'
5270 _def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' 5270 def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1'
5271 _res_comment="using alsa 0.5.x and sys/asoundlib.h" 5271 _res_comment="using alsa 0.5.x and sys/asoundlib.h"
5272 elif test "$_alsaver" = '0.9.x-sys' ; then 5272 elif test "$_alsaver" = '0.9.x-sys' ; then
5273 _alsa9=yes 5273 _alsa9=yes
5274 _aosrc="$_aosrc ao_alsa.c" 5274 _aosrc="$_aosrc ao_alsa.c"
5275 _aomodules="alsa $_aomodules" 5275 _aomodules="alsa $_aomodules"
5276 _def_alsa='#define CONFIG_ALSA 1' 5276 _def_alsa='#define CONFIG_ALSA 1'
5277 _def_alsa9='#define CONFIG_ALSA9 1' 5277 _def_alsa9='#define CONFIG_ALSA9 1'
5278 _def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' 5278 def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1'
5279 _res_comment="using alsa 0.9.x and sys/asoundlib.h" 5279 _res_comment="using alsa 0.9.x and sys/asoundlib.h"
5280 elif test "$_alsaver" = '0.9.x-alsa' ; then 5280 elif test "$_alsaver" = '0.9.x-alsa' ; then
5281 _alsa9=yes 5281 _alsa9=yes
5282 _aosrc="$_aosrc ao_alsa.c" 5282 _aosrc="$_aosrc ao_alsa.c"
5283 _aomodules="alsa $_aomodules" 5283 _aomodules="alsa $_aomodules"
5284 _def_alsa='#define CONFIG_ALSA 1' 5284 _def_alsa='#define CONFIG_ALSA 1'
5285 _def_alsa9='#define CONFIG_ALSA9 1' 5285 _def_alsa9='#define CONFIG_ALSA9 1'
5286 _def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1' 5286 def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1'
5287 _res_comment="using alsa 0.9.x and alsa/asoundlib.h" 5287 _res_comment="using alsa 0.9.x and alsa/asoundlib.h"
5288 elif test "$_alsaver" = '1.0.x-sys' ; then 5288 elif test "$_alsaver" = '1.0.x-sys' ; then
5289 _alsa1x=yes 5289 _alsa1x=yes
5290 _aosrc="$_aosrc ao_alsa.c" 5290 _aosrc="$_aosrc ao_alsa.c"
5291 _aomodules="alsa $_aomodules" 5291 _aomodules="alsa $_aomodules"
5292 _def_alsa='#define CONFIG_ALSA 1' 5292 _def_alsa='#define CONFIG_ALSA 1'
5293 _def_alsa1x="#define CONFIG_ALSA1X 1" 5293 _def_alsa1x="#define CONFIG_ALSA1X 1"
5294 _def_alsa_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' 5294 def_alsa_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1'
5295 _res_comment="using alsa 1.0.x and sys/asoundlib.h" 5295 _res_comment="using alsa 1.0.x and sys/asoundlib.h"
5296 elif test "$_alsaver" = '1.0.x-alsa' ; then 5296 elif test "$_alsaver" = '1.0.x-alsa' ; then
5297 _alsa1x=yes 5297 _alsa1x=yes
5298 _aosrc="$_aosrc ao_alsa.c" 5298 _aosrc="$_aosrc ao_alsa.c"
5299 _aomodules="alsa $_aomodules" 5299 _aomodules="alsa $_aomodules"
5300 _def_alsa='#define CONFIG_ALSA 1' 5300 _def_alsa='#define CONFIG_ALSA 1'
5301 _def_alsa1x="#define CONFIG_ALSA1X 1" 5301 _def_alsa1x="#define CONFIG_ALSA1X 1"
5302 _def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1' 5302 def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1'
5303 _res_comment="using alsa 1.0.x and alsa/asoundlib.h" 5303 _res_comment="using alsa 1.0.x and alsa/asoundlib.h"
5304 else 5304 else
5305 _alsa=no 5305 _alsa=no
5306 _res_comment="unknown version" 5306 _res_comment="unknown version"
5307 fi 5307 fi
8050 8050
8051 /* libdvdread */ 8051 /* libdvdread */
8052 #define HAVE_UINTPTR_T 1 8052 #define HAVE_UINTPTR_T 1
8053 8053
8054 /* Define this if your system has the "alloca.h" header file */ 8054 /* Define this if your system has the "alloca.h" header file */
8055 $_def_alloca 8055 $def_alloca_h
8056 8056
8057 /* Define this if your system has the "sys/mman.h" header file */ 8057 /* Define this if your system has the "sys/mman.h" header file */
8058 $_def_mman 8058 $def_mman_h
8059 $_def_mman_has_map_failed 8059 $_def_mman_has_map_failed
8060 8060
8061 /* Define this if your system has the header file for the OSS sound interface */ 8061 /* Define this if your system has the header file for the OSS sound interface */
8062 $_def_sys_soundcard 8062 $def_sys_soundcard_h
8063 8063
8064 /* Define this if your system has the header file for the OSS sound interface 8064 /* Define this if your system has the header file for the OSS sound interface
8065 * in /usr/include */ 8065 * in /usr/include */
8066 $_def_soundcard 8066 $def_soundcard_h
8067 8067
8068 /* Define this if your system has the sysinfo header */ 8068 /* Define this if your system has the sysinfo header */
8069 $_def_sys_sysinfo 8069 $def_sys_sysinfo_h
8070 8070
8071 /* Define this if your system has the "malloc.h" header file */ 8071 /* Define this if your system has the "malloc.h" header file */
8072 $_def_malloc 8072 $def_malloc_h
8073 8073
8074 /* memalign is mapped to malloc if unsupported */ 8074 /* memalign is mapped to malloc if unsupported */
8075 $_def_memalign 8075 $_def_memalign
8076 $_def_map_memalign 8076 $_def_map_memalign
8077 $_def_memalign_hack 8077 $_def_memalign_hack
8134 8134
8135 /* Extension defines */ 8135 /* Extension defines */
8136 `ff_config_enable "$_cpuexts_all" "$_cpuexts" "HAVE"` 8136 `ff_config_enable "$_cpuexts_all" "$_cpuexts" "HAVE"`
8137 8137
8138 /* altivec.h support */ 8138 /* altivec.h support */
8139 $_def_altivec_h 8139 $def_altivec_h
8140 8140
8141 /* For the PPC. G5 has the dcbzl when in 64bit mode but G4s and earlier do not 8141 /* For the PPC. G5 has the dcbzl when in 64bit mode but G4s and earlier do not
8142 have the instruction. */ 8142 have the instruction. */
8143 $_def_dcbzl 8143 $_def_dcbzl
8144 8144
8408 $_def_esd_latency 8408 $_def_esd_latency
8409 $_def_pulse 8409 $_def_pulse
8410 $_def_jack 8410 $_def_jack
8411 $_def_openal 8411 $_def_openal
8412 $_def_openal_h 8412 $_def_openal_h
8413 $_def_sys_asoundlib_h 8413 $def_sys_asoundlib_h
8414 $_def_alsa_asoundlib_h 8414 $def_alsa_asoundlib_h
8415 $_def_sunaudio 8415 $_def_sunaudio
8416 $_def_sgiaudio 8416 $_def_sgiaudio
8417 $_def_win32waveout 8417 $_def_win32waveout
8418 $_def_nas 8418 $_def_nas
8419 8419
8463 /* termcap flag for getch2.c */ 8463 /* termcap flag for getch2.c */
8464 $_def_termcap 8464 $_def_termcap
8465 8465
8466 /* termios flag for getch2.c */ 8466 /* termios flag for getch2.c */
8467 $_def_termios 8467 $_def_termios
8468 $_def_termios_h 8468 $def_termios_h
8469 $_def_termios_sys_h 8469 $def_termios_sys_h
8470 8470
8471 /* enable PNG support */ 8471 /* enable PNG support */
8472 $_def_png 8472 $_def_png
8473 8473
8474 /* enable JPEG support */ 8474 /* enable JPEG support */
8532 8532
8533 /* enable vstream support */ 8533 /* enable vstream support */
8534 $_def_vstream 8534 $_def_vstream
8535 8535
8536 /* enable winsock2 instead of Unix functions*/ 8536 /* enable winsock2 instead of Unix functions*/
8537 $_def_winsock2_h 8537 $def_winsock2_h
8538 8538
8539 /* define this to use inet_aton() instead of inet_pton() */ 8539 /* define this to use inet_aton() instead of inet_pton() */
8540 $_def_use_aton 8540 $_def_use_aton
8541 8541
8542 /* socklen_t support */ 8542 /* socklen_t support */