]>
Commit | Line | Data |
---|---|---|
f72c5a76 AF |
1 | --- avifile-0.6/acinclude.m4.wiget Mon Jul 16 16:03:09 2001 |
2 | +++ avifile-0.6/acinclude.m4 Mon Jul 16 16:04:20 2001 | |
f72c5a76 AF |
3 | @@ -1662,52 +1662,6 @@ |
4 | AC_SUBST($1)dnl | |
5 | ]) | |
6 | ||
7 | - | |
8 | -# Check whether LC_MESSAGES is available in <locale.h>. | |
9 | -# Ulrich Drepper <drepper@cygnus.com>, 1995. | |
10 | - | |
11 | -# serial 1 | |
12 | - | |
13 | -AC_DEFUN(AM_LC_MESSAGES, | |
14 | - [if test $ac_cv_header_locale_h = yes; then | |
15 | - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, | |
16 | - [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], | |
17 | - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) | |
18 | - if test $am_cv_val_LC_MESSAGES = yes; then | |
19 | - AC_DEFINE(HAVE_LC_MESSAGES) | |
20 | - fi | |
21 | - fi]) | |
22 | - | |
23 | -dnl From Jim Meyering. | |
24 | -dnl FIXME: migrate into libit. | |
25 | - | |
26 | -AC_DEFUN(AM_FUNC_OBSTACK, | |
27 | -[AC_CACHE_CHECK([for obstacks], am_cv_func_obstack, | |
28 | - [AC_TRY_LINK([#include "obstack.h"], | |
29 | - [struct obstack *mem;obstack_free(mem,(char *) 0)], | |
30 | - am_cv_func_obstack=yes, | |
31 | - am_cv_func_obstack=no)]) | |
32 | - if test $am_cv_func_obstack = yes; then | |
33 | - AC_DEFINE(HAVE_OBSTACK) | |
34 | - else | |
35 | - LIBOBJS="$LIBOBJS obstack.o" | |
36 | - fi | |
37 | -]) | |
38 | - | |
39 | -dnl From Jim Meyering. Use this if you use the GNU error.[ch]. | |
40 | -dnl FIXME: Migrate into libit | |
41 | - | |
42 | -AC_DEFUN(AM_FUNC_ERROR_AT_LINE, | |
43 | -[AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line, | |
44 | - [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");], | |
45 | - am_cv_lib_error_at_line=yes, | |
46 | - am_cv_lib_error_at_line=no)]) | |
47 | - if test $am_cv_lib_error_at_line = no; then | |
48 | - LIBOBJS="$LIBOBJS error.o" | |
49 | - fi | |
50 | - AC_SUBST(LIBOBJS)dnl | |
51 | -]) | |
52 | - | |
53 | # Macro to add for using GNU gettext. | |
54 | # Ulrich Drepper <drepper@cygnus.com>, 1995. | |
55 | ||
00140095 JR |
56 | --- avifile-0.6/plugins/libffmpeg/libavcodec/i386/Makefile.am~ Tue Jul 17 16:12:43 2001 |
57 | +++ avifile-0.6/plugins/libffmpeg/libavcodec/i386/Makefile.am Sat Jul 21 02:36:14 2001 | |
58 | @@ -7,4 +7,4 @@ | |
59 | ||
60 | # incompatible with libtool!! | |
61 | %.lo: %.s | |
62 | - nasm -f elf -o $@ $< | |
63 | + $(LIBTOOL) --mode=compile --tag=shit nasm -f elf -o $@ $< -prefer-non-pic |