1 --- avifile-0.6/plugins/libffmpeg/libavcodec/Makefile.am.wiget Mon Jul 16 16:02:37 2001
2 +++ avifile-0.6/plugins/libffmpeg/libavcodec/Makefile.am Mon Jul 16 16:02:37 2001
4 noinst_LTLIBRARIES = libavcodec.la
6 -I386_SOURCE_FILES = 386/fdct_mmx.s i386/fdctdata.s i386/sad_mmx.s
7 +I386_SOURCE_FILES_C = i386/fdctdata.c
8 +I386_SOURCE_FILES_S = i386/fdct_mmx.s i386/sad_mmx.s
10 libavcodec_la_SOURCES = common.c utils.c mpegvideo.c h263.c jrevdct.c \
11 jfdctfst.c mpegaudio.c ac3enc.c mjpegenc.c resample.c dsputil.c \
12 motion_est.c imgconvert.c imgresample.c msmpeg4.c \
13 - mpeg12.c h263dec.c mpegaudiodec.c $(I386_SOURCE_FILES)
14 + mpeg12.c h263dec.c mpegaudiodec.c
16 libavcodec_la_LDFLAGS = -module
18 +libavcodec_la_LIBADD = $(patsubst %.c, %.o, $(I386_SOURCE_FILES_C)) $(patsubst %.s, %.o, $(I386_SOURCE_FILES_S))
23 # SSE can also be added
24 #CFLAGS += -DCONFIG_SSE
27 -# nasm -f elf -o $@ $<
29 + nasm -f elf -o $@ $<
30 --- avifile-0.6/acinclude.m4.wiget Mon Jul 16 16:03:09 2001
31 +++ avifile-0.6/acinclude.m4 Mon Jul 16 16:04:20 2001
33 AC_CACHE_VAL(ac_cv_have_x,
34 [# One or both of the vars are not set, and there is no cached value.
35 ac_x_includes=NO ac_x_libraries=NO
40 if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then
41 AC_MSG_ERROR([Can't find X includes. Please check your installation and add the correct paths!])
43 @@ -1662,52 +1662,6 @@
48 -# Check whether LC_MESSAGES is available in <locale.h>.
49 -# Ulrich Drepper <drepper@cygnus.com>, 1995.
53 -AC_DEFUN(AM_LC_MESSAGES,
54 - [if test $ac_cv_header_locale_h = yes; then
55 - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
56 - [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
57 - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
58 - if test $am_cv_val_LC_MESSAGES = yes; then
59 - AC_DEFINE(HAVE_LC_MESSAGES)
63 -dnl From Jim Meyering.
64 -dnl FIXME: migrate into libit.
66 -AC_DEFUN(AM_FUNC_OBSTACK,
67 -[AC_CACHE_CHECK([for obstacks], am_cv_func_obstack,
68 - [AC_TRY_LINK([#include "obstack.h"],
69 - [struct obstack *mem;obstack_free(mem,(char *) 0)],
70 - am_cv_func_obstack=yes,
71 - am_cv_func_obstack=no)])
72 - if test $am_cv_func_obstack = yes; then
73 - AC_DEFINE(HAVE_OBSTACK)
75 - LIBOBJS="$LIBOBJS obstack.o"
79 -dnl From Jim Meyering. Use this if you use the GNU error.[ch].
80 -dnl FIXME: Migrate into libit
82 -AC_DEFUN(AM_FUNC_ERROR_AT_LINE,
83 -[AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line,
84 - [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");],
85 - am_cv_lib_error_at_line=yes,
86 - am_cv_lib_error_at_line=no)])
87 - if test $am_cv_lib_error_at_line = no; then
88 - LIBOBJS="$LIBOBJS error.o"
90 - AC_SUBST(LIBOBJS)dnl
93 # Macro to add for using GNU gettext.
94 # Ulrich Drepper <drepper@cygnus.com>, 1995.