1diff -ur jpeg.org/Makefile.am jpeg/Makefile.am 2--- jpeg.org/Makefile.am 2014-11-14 12:05:43.349386578 +0100 3+++ jpeg/Makefile.am 2014-11-14 12:06:21.005387021 +0100 4@@ -174,8 +174,6 @@ 5 rm -rf `find $(distdir) -name .svn` 6 7 8-SUBDIRS += md5 9- 10 if WITH_12BIT 11 12 TESTORIG = testorig12.jpg 13diff -ru jpeg-turbo.orig/Makefile.in jpeg-turbo/Makefile.in 14--- jpeg-turbo.orig/Makefile.in 2015-09-21 20:48:45.000000000 +0200 15+++ jpeg-turbo/Makefile.in 2015-11-22 16:17:10.326527000 +0100 16@@ -405,7 +405,7 @@ 17 ETAGS = etags 18 CTAGS = ctags 19 CSCOPE = cscope 20-DIST_SUBDIRS = java simd md5 21+DIST_SUBDIRS = java simd 22 am__DIST_COMMON = $(dist_man1_MANS) $(srcdir)/Makefile.in \ 23 $(srcdir)/config.h.in $(srcdir)/jconfig.h.in \ 24 $(srcdir)/jconfigint.h.in $(srcdir)/libjpeg.map.in \ 25@@ -622,7 +622,7 @@ 26 jidctflt.c jidctfst.c jidctint.c jidctred.c jquant1.c \ 27 jquant2.c jutils.c jmemmgr.c jmemnobs.c $(am__append_4) \ 28 $(am__append_5) $(am__append_6) $(am__append_11) 29-SUBDIRS = java $(am__append_10) md5 30+SUBDIRS = java $(am__append_10) 31 @WITH_TURBOJPEG_TRUE@libturbojpeg_la_SOURCES = $(libjpeg_la_SOURCES) \ 32 @WITH_TURBOJPEG_TRUE@ turbojpeg.c turbojpeg.h transupp.c \ 33 @WITH_TURBOJPEG_TRUE@ transupp.h jdatadst-tj.c jdatasrc-tj.c \ 34diff -ru jpeg-turbo.orig/configure jpeg-turbo/configure 35--- jpeg-turbo.orig/configure 2015-09-21 20:48:41.000000000 +0200 36+++ jpeg-turbo/configure 2015-11-22 15:23:25.387071000 +0100 37@@ -14630,9 +14630,7 @@ 38 $as_echo "yes" >&6; } 39 else 40 rm -rf conftest* 41- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 42-$as_echo "no" >&6; } 43- as_fn_error $? "configuration problem: maybe object file format mismatch." "$LINENO" 5 44+ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 45 fi 46 47 48@@ -14828,9 +14826,7 @@ 49 $as_echo "yes" >&6; } 50 else 51 rm -rf conftest* 52- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 53-$as_echo "no" >&6; } 54- as_fn_error $? "configuration problem: maybe object file format mismatch." "$LINENO" 5 55+ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 56 fi 57 58 59
