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