]>
Commit | Line | Data |
---|---|---|
02031f44 | 1 | diff -Nur NVrec.orig/Makefile.am NVrec-20010808/Makefile.am |
2 | --- NVrec.orig/Makefile.am Wed Aug 8 12:41:25 2001 | |
3 | +++ NVrec-20010808/Makefile.am Fri Aug 31 14:22:28 2001 | |
4 | @@ -50,11 +50,11 @@ | |
5 | # AVIfile / DivX ;-) record | |
6 | DIVXrec_SOURCES = ${COREFILES} DIVXrec.c divxfile_core.cpp | |
7 | CXXFLAGS = ${CFLAGS} @AVIFILE_CFLAGS@ | |
8 | -DIVXrec_LDADD = @AVIFILE_LIBS@ | |
9 | +DIVXrec_LDADD = @AVIFILE_LIBS@ -laviplay | |
10 | ||
11 | # DIVX4 record | |
12 | DIVX4rec_SOURCES = ${COREFILES} DIVX4rec.c | |
13 | -DIVX4rec_LDADD = divx4/libdivx4file_core.a divx4/lame3.70/libmp3lame.a -lm @DIVX4LINUX_LIBS@ | |
14 | +DIVX4rec_LDADD = divx4/libdivx4file_core.a /usr/lib/libmp3lame.a -lm @DIVX4LINUX_LIBS@ | |
15 | ||
16 | # included the created .spec file in the tarball | |
17 | dist-hook: NVrec.spec | |
18 | diff -Nur NVrec.orig/configure.in NVrec-20010808/configure.in | |
19 | --- NVrec.orig/configure.in Wed Aug 8 12:41:25 2001 | |
20 | +++ NVrec-20010808/configure.in Fri Aug 31 14:21:52 2001 | |
21 | @@ -163,7 +163,7 @@ | |
22 | enable_divx4linux=yes) | |
23 | if eval "test x$enable_divx4linux = xyes"; then | |
24 | AC_CHECK_LIB(divxencore, encore, HAVE_LIBDIVX4LINUX=yes, HAVE_LIBDIVX4LINUX=no, ) | |
25 | - AC_CHECK_HEADER(encore2.h, :, HAVE_LIBDIVX4LINUX=no) | |
26 | + AC_CHECK_HEADER(divx/encore2.h, :, HAVE_LIBDIVX4LINUX=no) | |
27 | DIVX4LINUX_LIBS=-ldivxencore | |
28 | else | |
29 | HAVE_LIBDIVX4LINUX=no | |
30 | diff -Nur NVrec.orig/divx4/Makefile.am NVrec-20010808/divx4/Makefile.am | |
31 | --- NVrec.orig/divx4/Makefile.am Wed Aug 8 12:41:25 2001 | |
32 | +++ NVrec-20010808/divx4/Makefile.am Fri Aug 31 14:22:05 2001 | |
33 | @@ -1,11 +1,6 @@ | |
34 | -SUBDIRS = lame3.70 | |
35 | - | |
36 | noinst_LIBRARIES = libdivx4file_core.a | |
37 | noinst_HEADERS = avilib.h | |
38 | CFLAGS = ${MIN_CFLAGS} | |
39 | ||
40 | libdivx4file_core_a_SOURCES = avilib.c divx4file_core.c | |
41 | -libdivx4file_core_a_LIBADD = lame3.70/libmp3lame.a | |
42 | - | |
43 | -lame3.70/libmp3lame.a: | |
44 | - make -C lame3.70 libmp3lame.a | |
45 | +libdivx4file_core_a_LIBADD = /usr/lib/libmp3lame.a | |
46 | diff -Nur NVrec.orig/tools/Makefile.am NVrec-20010808/tools/Makefile.am | |
47 | --- NVrec.orig/tools/Makefile.am Wed Aug 8 12:41:25 2001 | |
48 | +++ NVrec-20010808/tools/Makefile.am Fri Aug 31 14:21:52 2001 | |
49 | @@ -17,7 +17,7 @@ | |
50 | ||
51 | CXXFLAGS = ${CFLAGS} @AVIFILE_CFLAGS@ | |
52 | qt2divx_SOURCES = qt2divx.cpp | |
53 | -qt2divx_LDADD = @QUICKTIME_LIBS@ @AVIFILE_LIBS@ | |
54 | +qt2divx_LDADD = @QUICKTIME_LIBS@ @AVIFILE_LIBS@ -laviplay | |
55 | ||
56 | quicktime_codec_RTJ0_so_SOURCES = libquicktime_codec_RTJ0.a | |
57 |