Magellan Linux

Annotation of /trunk/mjpegtools/patches/mjpegtools-1.8.0-no-jpeg-mmx.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 224 - (hide annotations) (download)
Sat Jun 23 13:53:28 2007 UTC (16 years, 11 months ago) by niro
File size: 1539 byte(s)
-new fixes

1 niro 224 diff -ru mjpegtools-1.8.0-orig/configure.ac mjpegtools-1.8.0-no-jpeg-mmx/configure.ac
2     --- mjpegtools-1.8.0-orig/configure.ac 2006-11-19 17:11:41.000000000 +0100
3     +++ mjpegtools-1.8.0-no-jpeg-mmx/configure.ac 2006-11-20 13:56:47.000000000 +0100
4     @@ -197,29 +197,32 @@
5     AC_MSG_ERROR([
6     *** A directory must be specified for --with-jpeg-mmx option.])
7     fi
8     -if test x$with_jpeg_mmx = x ; then
9     - dnl Special case for building .deb's
10     - if test -d ../jpeg-mmx ; then
11     - with_jpeg_mmx=`pwd`/../jpeg-mmx
12     - else
13     - with_jpeg_mmx=/usr/local/src/jpeg-mmx
14     +if test x$with_jpeg_mmx != xno ; then
15     + if test x$with_jpeg_mmx = x ; then
16     + dnl Special case for building .deb's
17     + if test -d ../jpeg-mmx ; then
18     + with_jpeg_mmx=`pwd`/../jpeg-mmx
19     + else
20     + with_jpeg_mmx=/usr/local/src/jpeg-mmx
21     + fi
22     fi
23     -fi
24    
25     dnl
26     dnl Look for the installed/specified copy
27     dnl
28    
29     -OLD_CFLAGS="$CFLAGS"
30     -OLD_LIBS="$LIBS"
31     -LIBS="$LIBS -L$with_jpeg_mmx"
32     -CFLAGS="$CFLAGS -I$with_jpeg_mmx"
33     -AC_CHECK_LIB(jpeg-mmx, jpeg_start_compress,
34     - [ JPEG_LIBS="$LIBS -ljpeg-mmx"
35     - JPEG_CFLAGS="-I$with_jpeg_mmx"
36     - have_jpeg=true ],,)
37     - LIBS="$OLD_LIBS"
38     - CFLAGS="$OLD_CFLAGS"
39     + OLD_CFLAGS="$CFLAGS"
40     + OLD_LIBS="$LIBS"
41     + LIBS="$LIBS -L$with_jpeg_mmx"
42     + CFLAGS="$CFLAGS -I$with_jpeg_mmx"
43     + AC_CHECK_LIB(jpeg-mmx, jpeg_start_compress,
44     + [ JPEG_LIBS="$LIBS -ljpeg-mmx"
45     + JPEG_CFLAGS="-I$with_jpeg_mmx"
46     + have_jpeg=true ],,)
47     + LIBS="$OLD_LIBS"
48     + CFLAGS="$OLD_CFLAGS"
49     +
50     +fi
51    
52     dnl
53     dnl Look for _a_ jpeg lib that will work.