blob: 85cd7f64517321d238981fe643d860c7f5322fb6 (
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
54
55
56
57
58
|
diff -ur jpeg.org/Makefile.am jpeg/Makefile.am
--- jpeg.org/Makefile.am 2014-11-14 12:05:43.349386578 +0100
+++ jpeg/Makefile.am 2014-11-14 12:06:21.005387021 +0100
@@ -174,8 +174,6 @@
rm -rf `find $(distdir) -name .svn`
-SUBDIRS += md5
-
if WITH_12BIT
TESTORIG = testorig12.jpg
diff -ru jpeg-turbo.orig/Makefile.in jpeg-turbo/Makefile.in
--- jpeg-turbo.orig/Makefile.in 2015-09-21 20:48:45.000000000 +0200
+++ jpeg-turbo/Makefile.in 2015-11-22 16:17:10.326527000 +0100
@@ -405,7 +405,7 @@
ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
-DIST_SUBDIRS = java simd md5
+DIST_SUBDIRS = java simd
am__DIST_COMMON = $(dist_man1_MANS) $(srcdir)/Makefile.in \
$(srcdir)/config.h.in $(srcdir)/jconfig.h.in \
$(srcdir)/jconfigint.h.in $(srcdir)/libjpeg.map.in \
@@ -622,7 +622,7 @@
jidctflt.c jidctfst.c jidctint.c jidctred.c jquant1.c \
jquant2.c jutils.c jmemmgr.c jmemnobs.c $(am__append_3) \
$(am__append_4) $(am__append_5) $(am__append_10)
-SUBDIRS = java $(am__append_9) md5
+SUBDIRS = java $(am__append_9)
@WITH_TURBOJPEG_TRUE@libturbojpeg_la_SOURCES = $(libjpeg_la_SOURCES) \
@WITH_TURBOJPEG_TRUE@ turbojpeg.c turbojpeg.h transupp.c \
@WITH_TURBOJPEG_TRUE@ transupp.h jdatadst-tj.c jdatasrc-tj.c \
diff -ru jpeg-turbo.orig/configure jpeg-turbo/configure
--- jpeg-turbo.orig/configure 2015-09-21 20:48:41.000000000 +0200
+++ jpeg-turbo/configure 2015-11-22 15:23:25.387071000 +0100
@@ -14630,9 +14630,7 @@
$as_echo "yes" >&6; }
else
rm -rf conftest*
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- as_fn_error $? "configuration problem: maybe object file format mismatch." "$LINENO" 5
+ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
fi
@@ -14828,9 +14826,7 @@
$as_echo "yes" >&6; }
else
rm -rf conftest*
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- as_fn_error $? "configuration problem: maybe object file format mismatch." "$LINENO" 5
+ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
fi
|
