diff -uNr xawdecode/configure.in xawdecode-new/configure.in --- xawdecode/configure.in 2007-09-10 02:07:08 +0400 +++ xawdecode-new/configure.in 2007-09-10 02:03:07 +0400 @@ -1,5 +1,5 @@ dnl --------------------------------------------------------------------- -dnl $Id: configure.in,v 1.205 2007/05/18 16:30:36 pingus77 Exp $ +dnl $Id: configure.in,v 1.213 2007/07/12 21:57:21 pingus77 Exp $ dnl --------------------------------------------------------------------- dnl Process this file with autoconf to produce a configure script. dnl --------------------------------------------------------------------- @@ -44,140 +44,148 @@ dnl Options AC_ARG_ENABLE(mmx, - [ --enable-mmx disables any mmx features (default) - --disable-mmx disable any mmx feature]) + [ --disable-mmx disable the mmx features (default) + --enable-mmx enable the mmx features]) + + AC_ARG_ENABLE(sse3, + [ --disable-sse3 disable the sse3 features (default) + --enable-sse3 enable the sse3 features]) + + AC_ARG_ENABLE(ebp, + [ --disable-ebp disable the ebp asm function (default) + --enable-ebp enable the ebp asm function]) + + AC_ARG_ENABLE(ebx, + [ --disable-ebx disable the ebx asm function (default) + --enable-ebx enable the ebx asm function]) AC_ARG_ENABLE(cpu_detection, - [ --enable-cpu-detection detect CPU type and guess gcc best optimization values (default) - --disable-cpu-detection do not try to detect CPU, use default values instead]) + [ --disable-cpu-detection do not try to detect CPU, use default values instead (default) + --enable-cpu-detection try to detect CPU type and guess gcc best optimization values]) AC_ARG_ENABLE(jpeg, - [ --enable-jpeg enables jpeg support (for snapshots), (default) - --disable-jpeg disable jpeg support (for snapshots)]) + [ --enable-jpeg enable the jpeg support (for snapshots) (default) + --disable-jpeg disable the jpeg support (for snapshots)]) AC_ARG_ENABLE(png, - [ --enable-png enables png support (for zvbi & alevt-cap), (default) - --disable-png disable png support (for zvbi & alevt-cap)]) + [ --enable-png enable the png support (for zvbi & alevt-cap) (default) + --disable-png disable the png support (for zvbi & alevt-cap)]) AC_ARG_ENABLE(xaw3d, [ --enable-xaw3d use Xaw3D (default) - --disable-xaw3d do not make use of Xaw3D]) + --disable-xaw3d do not use Xaw3D]) AC_ARG_ENABLE(xaw95, [ --enable-xaw95 use Xaw95 (default) - --disable-xaw95 do not make use of Xaw95]) + --disable-xaw95 do not use Xaw95]) AC_ARG_ENABLE(xawm, [ --enable-xawm use XawM (default) - --disable-xawm do not make use of XawM]) + --disable-xawm do not use XawM]) AC_ARG_ENABLE(nextaw, [ --enable-nextaw use neXtaw (default) - --disable-nextaw do not make use of neXtaw]) + --disable-nextaw do not use neXtaw]) AC_ARG_ENABLE(mowitz, [ --enable-mowitz use Mowitz (default) - --disable-mowitz do not make use of Mowitz]) + --disable-mowitz do not use Mowitz]) AC_ARG_ENABLE(x11-ext, - [ --enable-x11-ext use X11 extentions (DGA,VidMode,DPMS), (default) - --disable-x11-ext do not make use of X11 extentions (DGA,VidMode,DPMS)]) + [ --enable-x11-ext enable the X11 extentions (DGA,VidMode,DPMS) (default) + --disable-x11-ext disable the X11 extentions (DGA,VidMode,DPMS)]) AC_ARG_ENABLE(x11-ext, - [ --enable-x11-ext-checking enables X11 extentions (DGA,VidMode,DPMS) version checking at runtime, (default) - --disable-x11-ext-checking disables X11 extentions (DGA,VidMode,DPMS) version checking at runtime]) + [ --enable-x11-ext-checking enable X11 extentions (DGA,VidMode,DPMS) version checking at runtime (default) + --disable-x11-ext-checking disable X11 extentions (DGA,VidMode,DPMS) version checking at runtime]) AC_ARG_ENABLE(xvideo, - [ --enable-xvideo use the Xvideo extention (default) - --disable-xvideo do not make use of the Xvideo extention]) + [ --enable-xvideo enable the Xvideo extention (default) + --disable-xvideo disable the Xvideo extention]) AC_ARG_ENABLE(lirc, - [ --enable-lirc lirc support (default) - --disable-lirc disable lirc support]) + [ --enable-lirc enable the lirc support (default) + --disable-lirc disable the lirc support]) AC_ARG_ENABLE(alsa, - [ --enable-alsa alsa support (default) - --disable-alsa disable alsa support]) + [ --enable-alsa enable the alsa support (default) + --disable-alsa disable the alsa support]) AC_ARG_ENABLE(divx4linux, - [ --enable-divx4linux enable divx4linux video codec support (default) - --disable-divx4linux disable divx4linux video codec support]) + [ --enable-divx4linux enable the divx4linux video codec support (default) + --disable-divx4linux disable the divx4linux video codec support]) AC_ARG_ENABLE(ffmpeg, - [ --enable-ffmpeg enable ffmpeg video codec support (default) - --disable-ffmpeg disable ffmpeg video codec support]) + [ --enable-ffmpeg enable the ffmpeg video codec support (default) + --disable-ffmpeg disable the ffmpeg video codec support]) AC_ARG_ENABLE(ffmpeg-swscale, - [ --enable-ffmpeg-swscale enable ffmpeg swscale support (default) - --disable-ffmpeg-swscale disable ffmpeg swscale support]) + [ --enable-ffmpeg-swscale enable the ffmpeg swscale support (default) + --disable-ffmpeg-swscale disable the ffmpeg swscale support]) AC_ARG_ENABLE(ffmpeg-amrnb, - [ --disable-ffmpeg-amrnb disable ffmpeg amr_nb audio codec support (default) - --enable-ffmpeg-amrnb enable ffmpeg amr_nb audio codec support]) - -AC_ARG_ENABLE(ffmpeg-amrnb-fixed, - [ --disable-ffmpeg-amrnb-fixed disable ffmpeg amr_nb_fixed audio codec support (default) - --enable-ffmpeg-amrnb-fixed enable ffmpeg amr_nb_fixed audio codec support]) + [ --disable-ffmpeg-amrnb disable the ffmpeg amr_nb floating point audio codec support (default) + --enable-ffmpeg-amrnb enable the ffmpeg amr_nb floating point audio codec support]) AC_ARG_ENABLE(ffmpeg-amrwb, - [ --disable-ffmpeg-amrwb disable ffmpeg amr_wb audio codec support (default) - --enable-ffmpeg-amrwb enable ffmpeg amr_wb audio codec support]) + [ --disable-ffmpeg-amrwb disable the ffmpeg amr_wb floating point audio codec support (default) + --enable-ffmpeg-amrwb enable the ffmpeg amr_wb floating point audio codec support]) AC_ARG_ENABLE(xvid, - [ --enable-xvid enable XviD video codec support (default) - --disable-xvid disable XviD video codec support]) + [ --enable-xvid enable the XviD video codec support (default) + --disable-xvid disable the XviD video codec support]) AC_ARG_ENABLE(lame, - [ --enable-lame enable lame audio compression (default) - --disable-lame disable lame audio compression]) + [ --enable-lame enable the lame audio compression (default) + --disable-lame disable the lame audio compression]) AC_ARG_ENABLE(ogg, - [ --enable-ogg enable ogg (and theora/vorbis too) support (default) - --disable-ogg disable ogg support support]) + [ --enable-ogg enable the ogg/theora/vorbis support (default) + --disable-ogg disable the ogg/theora/vorbis support support]) AC_ARG_ENABLE(faac, - [ --enable-faac enable faac audio codec support (default) - --disable-faac disable faac audio codec support]) + [ --enable-faac enable the faac audio codec support (default) + --disable-faac disable the faac audio codec support]) AC_ARG_ENABLE(x264, - [ --enable-x264 enable x264 video codec support (default) - --disable-x264 disable x264 video codec support]) + [ --enable-x264 enable the x264 video codec support (default) + --disable-x264 disable the x264 video codec support]) AC_ARG_ENABLE(zvbi, - [ --enable-zvbi enables zvbi support (default) - --disable-zvbi disables zvbi]) + [ --enable-zvbi enable the zvbi support (default) + --disable-zvbi disable the zvbi support]) AC_ARG_ENABLE(xvtv, - [ --enable-xvtv enables Xvideo TV-card driver (default) - --disable-xvtv disables Xvideo TV-card driver]) + [ --enable-xvtv enable the Xvideo TV-card driver (default) + --disable-xvtv disable the Xvideo TV-card driver]) AC_ARG_ENABLE(debug, - [ --enable-nodebug compiles without debug symbols (default) - --disable-nodebug compiles with debug symbols]) + [ --enable-nodebug compile without any debug symbols (default) + --disable-nodebug compile with some debug symbols]) AC_ARG_ENABLE(xinerama, - [ --enable-xinerama enable xinerama extension (default) - --disable-xinerama Don't use xinerama extension]) + [ --enable-xinerama enable the xinerama extension (default) + --disable-xinerama disable the xinerama extension]) AC_ARG_ENABLE(pixmaps, - [ --enable-pixmaps enables pixmaps (default) - --disable-pixmaps disables pixmpas]) + [ --enable-pixmaps enable the pixmaps (default) + --disable-pixmaps disable the pixmpas]) AC_ARG_ENABLE(nls, - [ --enable-nls enables natural language support (default) - --disable-nls disables natural language support]) + [ --enable-nls enable the natural language support (default) + --disable-nls disable the natural language support]) AC_ARG_ENABLE(dvb, - [ --enable-dvb enables DVB support (default) - --disable-dvb disables DVB]) + [ --enable-dvb enable the DVB support (default) + --disable-dvb disable the DVB support]) AC_ARG_ENABLE(smallfont, - [ --enable-smallfont enables AleVT Small Font - --disable-smallfont disables AleVT Small Font (default)]) + [ --enable-smallfont enable the AleVT Small Fonts + --disable-smallfont disable the AleVT Small Fonts (default)]) AC_ARG_ENABLE(makefonts, - [ --enable-makefonts enables the OSD Fonts compilation (default) - --disable-makefonts disables the OSD Fonts compilation]) + [ --enable-makefonts enable the OSD Fonts compilation (default) + --disable-makefonts disable the OSD Fonts compilation]) dnl --------------------------------------------------------------------- dnl Checks for programs. @@ -223,10 +231,21 @@ AC_PROG_GCC_TRADITIONAL AC_HEADER_MAJOR AC_FUNC_MMAP -AC_CHECK_FUNCS(getcwd gettimeofday mkdir strdup strerror sigrelse) + +AC_CHECK_FUNCS(getcwd gettimeofday mkdir mkstemp strdup strerror sigrelse) + +dnl -------------------------------------------------------------------- +dnl Check for Xterm + +AC_CHECK_PROG(XTERM_PROG,xterm,yes,no) + +if test x$XTERM_PROG = xno; then + AC_MSG_ERROR(*** Can't find the needed X terminal emulator ***) +fi dnl ------------------------------------------ dnl defines WORDS_BIGENDIAN in config.h if the host is bigendian +dnl it's also used with the internal FFmpeg AC_C_BIGENDIAN dnl --------------------------------------------------------------------- @@ -238,36 +257,50 @@ cc_major=`echo $cc_version | awk -F. '{print $1}'` cc_minor=`echo $cc_version | awk -F. '{print $2}'` -AC_MSG_CHECKING(for mmx support) - case ${host_cpu} in - i386 | i486 | i586 | i686 | pentium | athlon) have_mmx=yes; host_arch=i386 ;; - x86_64 | amd64) have_mmx=yes; host_arch=x86_64 ;; - alpha*) have_mmx=no; host_arch=alpha ;; - sparc) have_mmx=no; host_arch=sparc ;; - sun4u | sparc64) have_mmx=no; host_arch=sparc64 ;; - ppc | powerpc) have_mmx=no; host_arch=powerpc ;; - ppc64) have_mmx=no; host_arch=powerpc64 ;; - ia64*) have_mmx=no; host_arch=ia64 ;; - *) have_mmx=no; host_arch=UNKNOWN ;; + case ${host_cpu} in + i386 | i486 | i586 | i686 | pentium | athlon) host_arch=i386 ;; + x86_64 | amd64) host_arch=x86_64 ;; + alpha*) host_arch=alpha ;; + sparc) host_arch=sparc ;; + sun4u | sparc64) host_arch=sparc64 ;; + ppc | powerpc) host_arch=powerpc ;; + ppc64) host_arch=powerpc64 ;; + ia64*) host_arch=ia64 ;; + *) host_arch=UNKNOWN ;; esac - if test "x$enable_mmx" = "xno"; then - have_mmx=no - fi - #mmx assembler non-compilable -> no assembler - if test "x$have_mmx" = "xyes"; then - AC_TRY_COMPILE(,[ __asm__ __volatile__ ("emms":::"memory") ],, - have_mmx=no) + if test "x$enable_mmx" == xyes; then + AC_MSG_CHECKING(for mmx support) + AC_TRY_COMPILE(,[ __asm__ __volatile__ ("emms":::"memory") ],, enable_mmx=no) + AC_MSG_RESULT($enable_mmx) fi - if test "x$have_mmx" = "xyes"; then + if test "x$enable_mmx" == xyes; then AC_DEFINE(HAVE_MMX, 1, FFMPEG & XDTV) + fi + #ebp assembler non-compilable -> no assembler + if test "x$enable_ebp" == xyes; then + AC_MSG_CHECKING(for ebp asm function) + AC_TRY_COMPILE(,[ __asm__ __volatile__ ("xorl %%ebp, %%ebp"::: "%ebp") ],,enable_ebp=no) + AC_MSG_RESULT($enable_ebp) fi -AC_MSG_RESULT($have_mmx) + #ebx assembler non-compilable -> no assembler + if test "x$enable_ebx" == xyes; then + AC_MSG_CHECKING(for ebx asm function) + AC_TRY_COMPILE(,[ __asm__ __volatile__ ("":::"%ebx") ],,enable_ebx=no) + AC_MSG_RESULT($enable_ebx) + fi -if test "$enable_cpu_detection" != "no"; then + #sse3 assembler non-compilable -> no assembler + if test "x$enable_sse3" == xyes; then + AC_MSG_CHECKING(for sse3 support) + AC_TRY_COMPILE(,[ __asm__ __volatile__ ("pabsw %xmm0, %xmm0") ],,enable_sse3=no) + AC_MSG_RESULT($enable_sse3) + fi + +if test x"$enable_cpu_detection" == xyes; then dnl --------------------------------------------------------------------- dnl Checks for host_arch @@ -308,6 +341,7 @@ _mmx2=no _sse=no _sse2=no + _sse3=no _mtrr=no _altivec=no @@ -321,22 +355,29 @@ mtrr|k6_mtrr|cyrix_arr) _mtrr=yes ;; xmm|sse|kni) _sse=yes _mmx2=yes ;; sse2) _sse2=yes ;; + sse3) _sse3=yes ;; esac done AC_MSG_CHECKING(CPU vendor) AC_MSG_RESULT($pvendor ($pfamily:$pmodel:$pstepping)) -AC_MSG_CHECKING(CPU type) +AC_MSG_CHECKING(CPU type with cpuinfo) AC_MSG_RESULT($pname) -AC_MSG_CHECKING(Check for sse) +AC_MSG_CHECKING(Check for sse with cpuinfo) AC_MSG_RESULT($_sse) -AC_MSG_CHECKING(Check for 3DNow!) +AC_MSG_CHECKING(Check for sse2 with cpuinfo) +AC_MSG_RESULT($_sse2) + +AC_MSG_CHECKING(Check for sse3 with cpuinfo) +AC_MSG_RESULT($_sse3) + +AC_MSG_CHECKING(Check for 3DNow! with cpuinfo) AC_MSG_RESULT($_3dnow) -AC_MSG_CHECKING(Check for Extended 3DNow!) +AC_MSG_CHECKING(Check for Extended 3DNow! with cpuinfo) AC_MSG_RESULT($_3dnowex) else @@ -587,7 +628,7 @@ AC_PATH_XTRA if test "-DX_DISPLAY_MISSING" = "$X_CFLAGS"; then - AC_MSG_ERROR(can not find X11) + AC_MSG_ERROR(*** can not find X11 ***) fi AC_SUBST(X_CFLAGS) AC_SUBST(X_LIBS) @@ -677,24 +718,24 @@ AC_PATH_PROG(MKFONTDIR, mkfontdir, no) if test x$BDFTOPCF = xno; then - AC_MSG_ERROR(Couldn't find the bdftopcf program. Please install it.) + AC_MSG_ERROR(*** Couldn't find the bdftopcf program. Please install it. ***) exit 1 fi if test x$MKFONTSCALE = xno; then - AC_MSG_ERROR(Couldn't find the mkfontscale program. Please install it.) + AC_MSG_ERROR(*** Couldn't find the mkfontscale program. Please install it. ***) exit 1 fi if test x$MKFONTDIR = xno; then - AC_MSG_ERROR(Couldn't find the mkfontdir program. Please install it.) + AC_MSG_ERROR(*** Couldn't find the mkfontdir program. Please install it. ***) exit 1 fi fi AC_PATH_PROG(XSET, xset, no) if test x$XSET = xno; then - AC_MSG_ERROR(Couldn't find the xset program. Please install it.) + AC_MSG_ERROR(*** Couldn't find the xset program. Please install it. ***) exit 1 fi @@ -1175,6 +1216,10 @@ LIBS="$saved_LIBS $FFMPEG_LIBS" AC_TRY_LINK([#include ],[register_avcodec(&faac_encoder)], ffmpeg_aac=yes,ffmpeg_aac=no) + if test x"$ffmpeg_aac" == x"no"; then + AC_TRY_LINK([#include ],[register_avcodec(&libfaac_encoder)], + ffmpeg_aac=yes,ffmpeg_aac=no) + fi LIBS="$saved_LIBS" if test x"$ffmpeg_aac" != x"no"; then AC_DEFINE(HAVE_FFMPEG_AAC, 1, ffmpeg is build with the aac support) @@ -1205,6 +1250,10 @@ LIBS="$saved_LIBS $FFMPEG_LIBS" AC_TRY_LINK([#include ],[register_avcodec(&amr_nb_encoder)], ffmpeg_amr_nb=yes,ffmpeg_amr_nb=no) + if test x"$ffmpeg_amr_nb" == x"no"; then + AC_TRY_LINK([#include ],[register_avcodec(&libamr_nb_encoder)], + ffmpeg_amr_nb=yes,ffmpeg_amr_nb=no) + fi LIBS="$saved_LIBS" if test x"$ffmpeg_amr_nb" != x"no"; then AC_DEFINE(HAVE_FFMPEG_AMR_NB, 1, ffmpeg is build with the amr_nb support) @@ -1220,6 +1269,10 @@ LIBS="$saved_LIBS $FFMPEG_LIBS" AC_TRY_LINK([#include ],[register_avcodec(&amr_wb_encoder)], ffmpeg_amr_wb=yes,ffmpeg_amr_wb=no) + if test x"$ffmpeg_amr_wb" == x"no"; then + AC_TRY_LINK([#include ],[register_avcodec(&libamr_wb_encoder)], + ffmpeg_amr_wb=yes,ffmpeg_amr_wb=no) + fi LIBS="$saved_LIBS" if test x"$ffmpeg_amr_wb" != x"no"; then AC_DEFINE(HAVE_FFMPEG_AMR_WB, 1, ffmpeg is build with the amr_wb support) @@ -1731,7 +1784,7 @@ PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= $DBUS_REQS_MIN, enable_dbus=yes, enable_dbus=no) if test "x$with_dbus" = xyes && test "x$enable_dbus" = xno; then - AC_MSG_ERROR([DBUS explicitly requested but no support found]) + AC_MSG_ERROR(*** DBUS explicitly requested but no support found ***) fi if test "x$enable_dbus" = xyes; then @@ -1815,6 +1868,8 @@ FFMPEGFOLDER="libavutil libpostproc libswscale libavcodec libavformat" FFMPEGLINK="../libavformat/libavformat.a ../libavutil/libavutil.a ../libpostproc/libpostproc.a ../libswscale/libswscale.a ../libavcodec/libavcodec.a" FFMPEGINC="-I../libavutil -I../libpostproc -I../libswscale -I../libavformat -I../libavcodec" + dnl AC_DEFINE(CONFIG_SWSCALER,1,FFMPEG) + dnl AC_DEFINE(HAVE_SWSCALER,1,FFMPEG) else FFMPEGFOLDER="libavutil libpostproc libavcodec libavformat" FFMPEGLINK="../libavformat/libavformat.a ../libavutil/libavutil.a ../libpostproc/libpostproc.a ../libavcodec/libavcodec.a" @@ -1998,7 +2053,6 @@ AC_DEFINE(CONFIG_MP4_MUXER,1,FFMPEG) echo "CONFIG_MP4_MUXER=yes" >> config.mak.in - AC_DEFINE(ENABLE_ASF_MUXER,1,FFMPEG) AC_DEFINE(CONFIG_ASF_MUXER,1,FFMPEG) echo "CONFIG_ASF_MUXER=yes" >> config.mak.in @@ -2118,8 +2172,6 @@ AC_DEFINE(ENABLE_PNG_ENCODER,0,FFMPEG) AC_DEFINE(ENABLE_LIBGSM_ENCODER,0,FFMPEG) AC_DEFINE(ENABLE_OGGVORBIS_ENCODER,0,FFMPEG) - AC_DEFINE(ENABLE_LIBAMR_NB_ENCODER,0,FFMPEG) - AC_DEFINE(ENABLE_LIBAMR_WB_ENCODER,0,FFMPEG) AC_DEFINE(ENABLE_LIBTHEORA_ENCODER,0,FFMPEG) AC_DEFINE(ENABLE_BMP_ENCODER,0,FFMPEG) AC_DEFINE(ENABLE_WMAV1_ENCODER,0,FFMPEG) @@ -2129,12 +2181,14 @@ AC_DEFINE(ENABLE_SGI_ENCODER,0,FFMPEG) AC_DEFINE(ENABLE_ROQ_DPCM_ENCODER,0,FFMPEG) AC_DEFINE(ENABLE_DVDSUB_ENCODER,0,FFMPEG) + AC_DEFINE(ENABLE_LIBFAAC_ENCODER,0,FFMPEG) + AC_DEFINE(ENABLE_ROQ_ENCODER,0,FFMPEG) + AC_DEFINE(ENABLE_QTRLE_ENCODER,0,FFMPEG) dnl ----------- bizarre ------------------------------------------- AC_DEFINE(ENABLE_LIBVORBIS_ENCODER,0,FFMPEG) AC_DEFINE(ENABLE_VORBIS_ENCODER,0,FFMPEG) - dnl we don't use these decoders --------------------------- AC_DEFINE(ENABLE_AASC_DECODER,0,FFMPEG) AC_DEFINE(ENABLE_ASV1_DECODER,0,FFMPEG) @@ -2290,7 +2344,7 @@ AC_DEFINE(ENABLE_LIBDTS_DECODER,0,FFMPEG) AC_DEFINE(ENABLE_LIBGSM_DECODER,0,FFMPEG) AC_DEFINE(ENABLE_OGGVORBIS_DECODER,0,FFMPEG) - AC_DEFINE(ENABLE_AAC_DECODER,0,FFMPEG) + AC_DEFINE(ENABLE_LIBFAAD_DECODER,0,FFMPEG) AC_DEFINE(ENABLE_MPEG4AAC_DECODER,0,FFMPEG) AC_DEFINE(ENABLE_LIBAMR_NB_DECODER,0,FFMPEG) AC_DEFINE(ENABLE_LIBAMR_WB_DECODER,0,FFMPEG) @@ -2309,8 +2363,7 @@ AC_DEFINE(ENABLE_TXD_DECODER,0,FFMPEG) AC_DEFINE(ENABLE_DVDSUB_DECODER,0,FFMPEG) AC_DEFINE(ENABLE_H263_DECODER,0,FFMPEG) - - + AC_DEFINE(ENABLE_JPEGLS_DECODER,0,FFMPEG) dnl ----------- bizarre ------------------------------------------- AC_DEFINE(ENABLE_LIBVORBIS_DECODER,0,FFMPEG) @@ -2477,6 +2530,7 @@ AC_DEFINE(ENABLE_LIBNUT_DEMUXER,0,FFMPEG) AC_DEFINE(ENABLE_LIBNUT_MUXER,0,FFMPEG) AC_DEFINE(ENABLE_VC1_DEMUXER,0,FFMPEG) + AC_DEFINE(ENABLE_MPEGTSRAW_DEMUXER,0,FFMPEG) dnl we don't use these protocols ---------------------------- AC_DEFINE(ENABLE_HTTP_PROTOCOL,0,FFMPEG) @@ -2485,269 +2539,283 @@ AC_DEFINE(ENABLE_TCP_PROTOCOL,0,FFMPEG) AC_DEFINE(ENABLE_UDP_PROTOCOL,0,FFMPEG) - AMRNB="" + dnl ---- others --------------------------------------- + AC_DEFINE(ENABLE_SMALL,0,FFMPEG) + AC_DEFINE(ENABLE_THREADS,0,FFMPEG) + + dnl archs & co we don't use ---------------------------- + AC_DEFINE(ENABLE_ARMV4L,0,FFMPEG) + AC_DEFINE(ENABLE_BFIN,0,FFMPEG) + AC_DEFINE(ENABLE_MLIB,0,FFMPEG) + AC_DEFINE(ENABLE_MMI,0,FFMPEG) + AC_DEFINE(ENABLE_SH4,0,FFMPEG) + AC_DEFINE(ENABLE_M68K,0,FFMPEG) + AC_DEFINE(ENABLE_MIPS,0,FFMPEG) + AC_DEFINE(ENABLE_PARISC,0,FFMPEG) + AC_DEFINE(ENABLE_S390,0,FFMPEG) + AC_DEFINE(ENABLE_ALTIVEC,0,FFMPEG) + AC_DEFINE(ENABLE_ARMV5TE,0,FFMPEG) + AC_DEFINE(ENABLE_ARMV6,0,FFMPEG) + AC_DEFINE(ENABLE_IWMMXT,0,FFMPEG) + AC_DEFINE(ENABLE_SH4,0,FFMPEG) + AC_DEFINE(ENABLE_SH4,0,FFMPEG) - if test x"$enable_ffmpeg_amrnb" == xyes; then - enable_ffmpeg_amrnb_fixed="no" - fi + dnl --- BURKKKKKKKKKK --------------------------------------- + AC_DEFINE(CONFIG_MPEG1VCD_MUXER,1,FFMPEG) + AC_DEFINE(CONFIG_MPEG2VOB_MUXER,1,FFMPEG) + AC_DEFINE(CONFIG_MPEG2SVCD_MUXER,1,FFMPEG) + AC_DEFINE(CONFIG_MPEG2DVD_MUXER,1,FFMPEG) - if test x"$enable_ffmpeg_amrnb_fixed" == xyes; then - enable_ffmpeg_amrnb="no" - fi + dnl -------- amrnb / amrwb ---------------------------------- if test x"$enable_ffmpeg_amrnb" == xyes; then - dnl ---------XdTV flag------- - AC_DEFINE(HAVE_FFMPEG_AMR_NB,1,FFMPEG AMR_NB activation!) - AMRNB="1" - AC_SUBST(AMRNB) - - dnl ---------ffmpeg flags------- - AC_DEFINE(CONFIG_AMR,1,FFMPEG AMR activation!) - echo "CONFIG_AMR=yes" >> config.mak.in - - AC_DEFINE(CONFIG_AMR_NB,1,AMR_NB activation!) - echo "CONFIG_AMR_NB=yes" >> config.mak.in - - AC_DEFINE(CONFIG_AMR_NB_ENCODER,1,AMR_NB ENCODER activation!) - AC_DEFINE(ENABLE_AMR_NB_ENCODER,1,AMR_NB ENCODER activation!) - echo "CONFIG_AMR_NB_ENCODER=yes" >> config.mak.in - - AC_MSG_RESULT(*** FFMPEG AMR_NB_FLOAT: $enable_ffmpeg_amrnb ***) - AC_MSG_RESULT(*** FFMPEG AMR_NB_FIXED: $enable_ffmpeg_amrnb_fixed ***) - - echo "" - echo "*** AMR NB FLOAT NOTICE ! Make sure you have downloaded TS26.104 ***" - echo "*** REL-5 V5.1.0 from ***" - echo "*** http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26104-5??.zip ***" - echo "*** and extracted the source to libavcodec/amr_float ***" - echo "*** If you try this on alpha, you may need to change Word32 to int in amr/typedef.h ***" - echo "" - fi - - if test x"$enable_ffmpeg_amrnb_fixed" == xyes; then - - dnl ---------XdTV flag------- - AC_DEFINE(HAVE_FFMPEG_AMR_NB,1,FFMPEG AMR_NB activation!) - AMRNB="1" - AC_SUBST(AMRNB) - - dnl ---------ffmpeg flags------- - AC_DEFINE(CONFIG_AMR,1,FFMPEG AMR activation!) - echo "CONFIG_AMR=yes" >> config.mak.in - - AC_DEFINE(CONFIG_AMR_NB_FIXED,1,AMR_NB_FIXED activation!) - dnl AC_DEFINE(ENABLE_AMR_NB_FIXED_ENCODER,1,AMR_NB_FIXED_ENCODER activation!) - echo "CONFIG_AMR_NB_FIXED=yes" >> config.mak.in - - AC_DEFINE(CONFIG_AMR_NB_ENCODER,1,AMR_NB ENCODER activation!) - AC_DEFINE(ENABLE_AMR_NB_ENCODER,1,AMR_NB ENCODER activation!) - echo "CONFIG_AMR_NB_ENCODER=yes" >> config.mak.in - - AC_MSG_RESULT(*** FFMPEG AMR_NB_FLOAT: $enable_ffmpeg_amrnb ***) - AC_MSG_RESULT(*** FFMPEG AMR_NB_FIXED: $enable_ffmpeg_amrnb_fixed ***) - - echo "" - echo "*** AMR NB FIXED POINT NOTICE! Make sure you have downloaded TS26.073 ***" - echo "*** REL-5 version 5.1.0 from ***" - echo "*** http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26073-5??.zip ***" - echo "*** and extracted src to libavcodec/amr ***" - echo "*** You must also add -DMMS_IO and remove -pedantic-errors to/from CFLAGS in libavcodec/amr/makefile ***" - echo "*** i.e. CFLAGS = -Wall -I. \$(CFLAGS_\$(MODE)) -D\$(VAD) -DMMS_IO ***" - echo "" - fi - - if test "$AMRNB" == ""; then - AC_DEFINE(ENABLE_AMR_NB_ENCODER,0,AMR_NB ENCODER activation!) + AC_CHECK_HEADER(amrnb/interf_dec.h,LIBAMRNB="-lamrnb -lm",LIBAMRNB="") + if test "$LIBAMRNB" != ""; then + AC_CHECK_LIB(amrnb,Speech_Decode_Frame_init,LIBAMRNB="-lamrnb -lm",LIBAMRNB="",-lm ) + fi + AC_SUBST(LIBAMRNB) + + if test "$LIBAMRNB" != ""; then + AC_DEFINE(HAVE_FFMPEG_AMR_NB,1,XDTV) + + AC_DEFINE(CONFIG_LIBAMR,1,FFMPEG) + AC_DEFINE(ENABLE_LIBAMR,1,FFMPEG) + AC_DEFINE(CONFIG_LIBAMR_NB,1,FFMPEG) + AC_DEFINE(ENABLE_LIBAMR_NB,1,FFMPEG) + AC_DEFINE(CONFIG_LIBAMR_NB_ENCODER,1,FFMPEG) + AC_DEFINE(ENABLE_LIBAMR_NB_ENCODER,1,FFMPEG) + echo "CONFIG_LIBAMR=yes" >> config.mak.in + echo "CONFIG_LIBAMR_NB=yes" >> config.mak.in + echo "CONFIG_LIBAMR_NB_ENCODER=yes" >> config.mak.in + + echo "*** FFMPEG LIBAMR_NB: $enable_ffmpeg_amrnb ***" + else + echo "*** FFMPEG LIBAMR_NB support disabled ***" + fi + else + AC_DEFINE(ENABLE_LIBAMR_NB_ENCODER,0,FFMPEG) fi if test x"$enable_ffmpeg_amrwb" == xyes; then - dnl ---------XdTV flag------- - AC_DEFINE(HAVE_FFMPEG_AMR_WB,1,FFMPEG AMR_WB activation!) - - dnl ---------ffmpeg flags------- - AC_DEFINE(CONFIG_AMR,1,FFMPEG AMR activation!) - echo "CONFIG_AMR=yes" >> config.mak.in - - AC_DEFINE(CONFIG_AMR_WB,1,AMR_NB activation!) - echo "CONFIG_AMR_WB=yes" >> config.mak.in - - AC_DEFINE(CONFIG_AMR_WB_ENCODER,1,AMR_WB_ENCODER activation!) - AC_DEFINE(ENABLE_AMR_WB_ENCODER,1,AMR_WB_ENCODER activation!) - echo "CONFIG_AMR_WB_ENCODER=yes" >> config.mak.in - - AC_MSG_RESULT(*** FFMPEG AMR_WB_FLOAT: $enable_ffmpeg_amrwb ***) + AC_CHECK_HEADER(amrwb/dec_if.h,LIBAMRWB="-lamrwb -lm",LIBAMRWB="") + if test "$LIBAMRWB" != ""; then + AC_CHECK_LIB(amrwb,D_IF_init,LIBAMRWB="-lamrwb -lm",LIBAMRWB="",-lm ) + fi + AC_SUBST(LIBAMRWB) + + if test "$LIBAMRWB" != ""; then + AC_DEFINE(HAVE_FFMPEG_AMR_WB,1,XDTV) + + AC_DEFINE(CONFIG_LIBAMR,1,FFMPEG) + AC_DEFINE(ENABLE_LIBAMR,1,FFMPEG) + AC_DEFINE(CONFIG_LIBAMR_WB,1,FFMPEG) + AC_DEFINE(ENABLE_LIBAMR_WB,1,FFMPEG) + AC_DEFINE(CONFIG_LIBAMR_WB_ENCODER,1,FFMPEG) + AC_DEFINE(ENABLE_LIBAMR_WB_ENCODER,1,FFMPEG) + echo "CONFIG_LIBAMR=yes" >> config.mak.in + echo "CONFIG_LIBAMR_WB=yes" >> config.mak.in + echo "CONFIG_LIBAMR_WB_ENCODER=yes" >> config.mak.in + + echo "*** FFMPEG LIBAMR_WB: $enable_ffmpeg_amrwb ***" + else + echo "*** FFMPEG LIBAMR_WB support disabled ***" + fi + else + AC_DEFINE(ENABLE_LIBAMR_WB_ENCODER,0,FFMPEG) + fi + if test x"$enable_ffmpeg_amrnb" == xyes -o x"$enable_ffmpeg_amrwb" == xyes; then echo "" - echo "*** AMR WB FLOAT NOTICE ! Make sure you have downloaded TS26.204 ***" - echo "*** V5.1.0 from ***" - echo "*** http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-510.zip ***" - echo "*** and extracted the source to libavcodec/amrwb_float ***" - echo "*** ***" - echo "*** Make sure you have also downloaded TS26.104 ***" - echo "*** REL-5 V5.1.0 from ***" - echo "*** http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26104-5??.zip ***" - echo "*** and extracted the source to libavcodec/amr_float ***" - echo "*** If you try this on alpha, you may need to change Word32 to int in amr/typedef.h ***" + echo " Go to http://www.penguin.cz/~utx/amr" + echo " and follow the instructions for installing the libraries." echo "" - else - AC_DEFINE(ENABLE_AMR_WB_ENCODER,0,AMR_WB_ENCODER activation!) fi if test "$LIBLAME" != ""; then + AC_DEFINE(HAVE_FFMPEG_MP3,1,XDTV) - dnl ---------XdTV flags-------------- - AC_DEFINE(HAVE_FFMPEG_MP3,1,FFMPEG lame library) - - dnl ---------ffmpeg flags-------------- - AC_DEFINE(CONFIG_MP3LAME_ENCODER,1,FFMPEG) AC_DEFINE(CONFIG_LIBMP3LAME,1,FFMPEG) - AC_DEFINE(ENABLE_MP3LAME_ENCODER,1,FFMPEG) + AC_DEFINE(ENABLE_LIBMP3LAME,1,FFMPEG) + AC_DEFINE(CONFIG_LIBMP3LAME_ENCODER,1,FFMPEG) + AC_DEFINE(ENABLE_LIBMP3LAME_ENCODER,1,FFMPEG) echo "CONFIG_LIBMP3LAME=yes" >> config.mak.in - echo "CONFIG_MP3LAME_ENCODER=yes" >> config.mak.in + echo "CONFIG_LIBMP3LAME_ENCODER=yes" >> config.mak.in - AC_MSG_RESULT(*** FFMPEG LIBLAME: yes ***) + AC_MSG_RESULT(*** FFMPEG LIBMP3LAME: yes ***) else - AC_DEFINE(ENABLE_MP3LAME_ENCODER,0,FFMPEG) + AC_DEFINE(ENABLE_LIBMP3LAME_ENCODER,0,FFMPEG) fi if test "$LIBXVID" != ""; then + AC_DEFINE(HAVE_FFMPEG_XVID,1, XDTV) - dnl ---------XdTV flags-------------- - AC_DEFINE(HAVE_FFMPEG_XVID,1, FFMPEG XviD librairies) + AC_DEFINE(CONFIG_LIBXVID,1,FFMPEG) + AC_DEFINE(ENABLE_LIBXVID,1,FFMPEG) + AC_DEFINE(CONFIG_LIBXVID_ENCODER,1,FFMPEG) + AC_DEFINE(ENABLE_LIBXVID_ENCODER,1,FFMPEG) + echo "CONFIG_LIBXVID=yes" >> config.mak.in + echo "CONFIG_LIBXVID_ENCODER=yes" >> config.mak.in - dnl ---------ffmpeg flags-------------- - AC_DEFINE(CONFIG_XVID,1,FFMPEG) - AC_DEFINE(CONFIG_XVID_ENCODER,1,FFMPEG) - AC_DEFINE(ENABLE_XVID_ENCODER,1,FFMPEG) - echo "CONFIG_XVID=yes" >> config.mak.in - echo "CONFIG_XVID_ENCODER=yes" >> config.mak.in - - AC_MSG_RESULT(*** FFMPEG XVID: yes ***) + AC_MSG_RESULT(*** FFMPEG LIBXVID: yes ***) else - AC_DEFINE(ENABLE_XVID_ENCODER,0,FFMPEG) + AC_DEFINE(ENABLE_LIBXVID_ENCODER,0,FFMPEG) fi if test "$LIBFAAC" != ""; then + AC_DEFINE(HAVE_FFMPEG_AAC,1, XDTV) - dnl ---------XdTV flags-------------- - AC_DEFINE(HAVE_FFMPEG_AAC,1, FFMPEG AAC librairies) - - dnl ---------ffmpeg flags-------------- - AC_DEFINE(CONFIG_LIBFAAC,1,FFMPEG AAC is inside XdTV now!) - AC_DEFINE(CONFIG_FAAC_ENCODER,1,FFMPEG AAC is inside XdTV now!) - AC_DEFINE(ENABLE_FAAC_ENCODER,1,FFMPEG AAC is inside XdTV now!) + AC_DEFINE(CONFIG_LIBFAAC,1,FFMPEG) + AC_DEFINE(ENABLE_LIBFAAC,1,FFMPEG) + AC_DEFINE(CONFIG_LIBFFAAC_ENCODER,1,FFMPEG) + AC_DEFINE(ENABLE_LIBFFAAC_ENCODER,1,FFMPEG) echo "CONFIG_LIBFAAC=yes" >> config.mak.in - echo "CONFIG_FAAC_ENCODER=yes" >> config.mak.in + echo "CONFIG_LIBFAAC_ENCODER=yes" >> config.mak.in AC_MSG_RESULT(*** FFMPEG LIBFAAC: yes ***) else - AC_DEFINE(ENABLE_FAAC_ENCODER,0,FFMPEG AAC is inside XdTV now!) + AC_DEFINE(ENABLE_LIBFAAC_ENCODER,0,FFMPEG) fi if test "$LIBX264" != ""; then + AC_DEFINE(HAVE_FFMPEG_X264,1, XDTV) - dnl ---------XdTV flags-------------- - AC_DEFINE(HAVE_FFMPEG_X264,1, FFMPEG X264 librairies) - - dnl ---------ffmpeg flags-------------- - AC_DEFINE(CONFIG_X264,1,FFMPEG X264 is inside XdTV now!) - AC_DEFINE(CONFIG_X264_ENCODER,1,FFMPEG X264 is inside XdTV now!) - AC_DEFINE(ENABLE_X264_ENCODER,1,FFMPEG X264 is inside XdTV now!) - echo "CONFIG_X264=yes" >> config.mak.in - echo "CONFIG_X264_ENCODER=yes" >> config.mak.in + AC_DEFINE(CONFIG_LIBX264,1,FFMPEG FFMPEG) + AC_DEFINE(ENABLE_LIBX264,1,FFMPEG FFMPEG) + AC_DEFINE(CONFIG_LIBX264_ENCODER,1,FFMPEG) + AC_DEFINE(ENABLE_LIBX264_ENCODER,1,FFMPEG) + echo "CONFIG_LIBX264=yes" >> config.mak.in + echo "CONFIG_LIBX264_ENCODER=yes" >> config.mak.in - AC_MSG_RESULT(*** FFMPEG X264: yes ***) + AC_MSG_RESULT(*** FFMPEG LIBX264: yes ***) else - AC_DEFINE(ENABLE_X264_ENCODER,0,FFMPEG X264 is inside XdTV now!) + AC_DEFINE(ENABLE_LIBX264_ENCODER,0,FFMPEG) fi - dnl ---------ffmpeg optimization-------------- - if test x"$have_mmx" == xyes; then - AC_DEFINE(TARGET_MMX,1,FFMPEG) - echo "TARGET_MMX=yes" >> config.mak.in + dnl ---------ffmpeg mmx sse3 ebp & ebx optimizations-------------- + if test x"$enable_mmx" == xyes; then + AC_DEFINE(ENABLE_MMX,1,FFMPEG) + AC_DEFINE(HAVE_MMX,1,FFMPEG) + echo "HAVE_MMX=yes" >> config.mak.in echo "HAVE_MMX=yes" >> config.mak.in AC_DEFINE(__CPU__,586,FFMPEG) AC_MSG_RESULT(*** FFMPEG with MMX: yes ***) + else + AC_DEFINE(ENABLE_MMX,0,FFMPEG) + fi + + if test x"$enable_sse3" == xyes; then + AC_DEFINE(ENABLE_SSSE3,1,FFMPEG) + AC_DEFINE(HAVE_SSSE3,1,FFMPEG) + echo "HAVE_SSSE3=yes" >> config.mak.in + else + AC_DEFINE(ENABLE_SSSE3,0,FFMPEG) fi - dnl ---------ffmpeg arch-------------- + if test x"$enable_ebp" == xyes; then + AC_DEFINE(ENABLE_EBP_AVAILABLE,1,FFMPEG) + AC_DEFINE(HAVE_EBP_AVAILABLE,1,FFMPEG) + echo "HAVE_EBP_AVAILABLE=yes" >> config.mak.in + else + AC_DEFINE(ENABLE_EBP_AVAILABLE,0,FFMPEG) + fi + + if test x"$enable_ebx" == xyes; then + AC_DEFINE(ENABLE_EBX_AVAILABLE,1,FFMPEG) + AC_DEFINE(HAVE_EBX_AVAILABLE,1,FFMPEG) + echo "HAVE_EBX_AVAILABLE=yes" >> config.mak.in + else + AC_DEFINE(ENABLE_EBX_AVAILABLE,0,FFMPEG) + fi + + dnl ---------ffmpeg arch & some other optimizations -------------- if test x"$host_arch" == xi386; then + AC_DEFINE(ENABLE_X86_32,1,FFMPEG) AC_DEFINE(ARCH_X86_32,1,FFMPEG) AC_DEFINE(ARCH_X86,1,FFMPEG) - echo "TARGET_ARCH_X86_32=yes" >> config.mak.in - echo "TARGET_ARCH_X86=yes" >> config.mak.in + echo "ARCH_X86_32=yes" >> config.mak.in + echo "ARCH_X86=yes" >> config.mak.in - AC_DEFINE(HAVE_EBP_AVAILABLE,1,FFMPEG) - AC_DEFINE(HAVE_EBP_AVAILABLE,1,FFMPEG) - AC_DEFINE(HAVE_SSSE3,1,FFMPEG) AC_DEFINE(HAVE_FAST_UNALIGNED,1,FFMPEG) - - dnl echo "HAVE_EBP_AVAILABLE=yes" >> config.mak.in - dnl echo "HAVE_EBP_AVAILABLE=yes" >> config.mak.in - dnl echo "HAVE_SSSE3=yes" >> config.mak.in - dnl echo "HAVE_FAST_UNALIGNED=yes" >> config.mak.in - + echo "HAVE_FAST_UNALIGNED=yes" >> config.mak.in + else + AC_DEFINE(ENABLE_X86_32,0,FFMPEG) fi if test x"$host_arch" == xx86_64; then + AC_DEFINE(ENABLE_X86_64,1,FFMPEG) AC_DEFINE(ARCH_X86_64,1,FFMPEG) AC_DEFINE(ARCH_X86,1,FFMPEG) AC_DEFINE(HAVE_FAST_64BIT,1,FFMPEG) - echo "TARGET_ARCH_X86_64=yes" >> config.mak.in - echo "TARGET_ARCH_X86=yes" >> config.mak.in - echo "HAVE_FAST_64BIT=yes" >> config.mak.in - - AC_DEFINE(HAVE_EBP_AVAILABLE,1,FFMPEG) - AC_DEFINE(HAVE_EBP_AVAILABLE,1,FFMPEG) - AC_DEFINE(HAVE_SSSE3,1,FFMPEG) - AC_DEFINE(HAVE_FAST_UNALIGNED,1,FFMPEG) - - dnl echo "HAVE_EBP_AVAILABLE=yes" >> config.mak.in - dnl echo "HAVE_EBP_AVAILABLE=yes" >> config.mak.in - dnl echo "HAVE_SSSE3=yes" >> config.mak.in - dnl echo "HAVE_FAST_UNALIGNED=yes" >> config.mak.in + echo "ARCH_X86_64=yes" >> config.mak.in + echo "ARCH_X86=yes" >> config.mak.in + AC_DEFINE(HAVE_FAST_64BIT,1,FFMPEG) + echo "HAVE_FAST_64BIT=yes" >> config.mak.in + else + AC_DEFINE(ENABLE_X86_64,0,FFMPEG) fi if test x"$host_arch" == xalpha; then + AC_DEFINE(ENABLE_ALPHA,1,FFMPEG) AC_DEFINE(ARCH_ALPHA,1,FFMPEG) + echo "ARCH_ALPHA=yes" >> config.mak.in + AC_DEFINE(HAVE_FAST_64BIT,1,FFMPEG) - echo "TARGET_ARCH_ALPHA=yes" >> config.mak.in echo "HAVE_FAST_64BIT=yes" >> config.mak.in + else + AC_DEFINE(ENABLE_ALPHA,0,FFMPEG) fi if test x"$host_arch" == xsparc; then + AC_DEFINE(ENABLE_SPARC,1,FFMPEG) AC_DEFINE(ARCH_SPARC,1,FFMPEG) - echo "TARGET_ARCH_SPARC=yes" >> config.mak.in + echo "ARCH_SPARC=yes" >> config.mak.in + else + AC_DEFINE(ENABLE_SPARC,0,FFMPEG) fi if test x"$host_arch" == xsparc64; then + AC_DEFINE(ENABLE_SPARC64,1,FFMPEG) AC_DEFINE(ARCH_SPARC,1,FFMPEG) + echo "ARCH_SPARC=yes" >> config.mak.in + AC_DEFINE(HAVE_FAST_64BIT,1,FFMPEG) - echo "TARGET_ARCH_SPARC=yes" >> config.mak.in echo "HAVE_FAST_64BIT=yes" >> config.mak.in + else + AC_DEFINE(ENABLE_SPARC64,0,FFMPEG) fi if test x"$host_arch" == xpowerpc; then + AC_DEFINE(ENABLE_POWERPC,1,FFMPEG) AC_DEFINE(ARCH_POWERPC,1,FFMPEG) - echo "TARGET_ARCH_POWERPC=yes" >> config.mak.in + echo "ARCH_POWERPC=yes" >> config.mak.in + else + AC_DEFINE(ENABLE_POWERPC,0,FFMPEG) fi if test x"$host_arch" == xpowerpc64; then + AC_DEFINE(ENABLE_POWERPC,1,FFMPEG) AC_DEFINE(ARCH_POWERPC,1,FFMPEG) + echo "ARCH_POWERPC=yes" >> config.mak.in + AC_DEFINE(HAVE_FAST_64BIT,1,FFMPEG) - echo "TARGET_ARCH_POWERPC=yes" >> config.mak.in echo "HAVE_FAST_64BIT=yes" >> config.mak.in + else + AC_DEFINE(ENABLE_POWERPC,0,FFMPEG) fi if test x"$host_arch" == xia64; then + AC_DEFINE(ENABLE_IA64,1,FFMPEG) AC_DEFINE(ARCH_IA64,1,FFMPEG) + echo "ARCH_IA64=yes" >> config.mak.in + AC_DEFINE(HAVE_FAST_64BIT,1,FFMPEG) - echo "TARGET_ARCH_IA64=yes" >> config.mak.in echo "HAVE_FAST_64BIT=yes" >> config.mak.in + else + AC_DEFINE(ENABLE_IA64,0,FFMPEG) fi fi