From: Debian BOINC Maintainers <pkg-boinc-devel@lists.alioth.debian.org>
Date: Tue, 28 Aug 2012 03:05:07 +0000 (+0000)
Subject: _dont_use_own_jpeglib
X-Git-Tag: archive/raspbian/8.00_svn3363-4+rpi1~1^2^2^2~8
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=db1ab94d58fcafd96a665c24d8c909e05755a11d;p=boinc-app-seti.git

_dont_use_own_jpeglib

The commented SAH_CHECK_JPEGLIB in configure.ac prevents that setiathome
will be linked against libjpeg. If the package should be configured with
"--enable-graphics" this needs to be uncommented.


Gbp-Pq: Name 003_dont_use_own_jpeglib.patch
---

diff --git a/Makefile.am b/Makefile.am
index 3b01331..abe8098 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,7 @@ if USE_MY_GLUT
 endif
 
 
-SUBDIRS = $(JPEGDIR) $(IMDIR) $(GLUTDIR) $(CLIENT_SUBDIRS) $(SERVER_SUBDIRS)
+SUBDIRS = $(IMDIR) $(GLUTDIR) $(CLIENT_SUBDIRS) $(SERVER_SUBDIRS)
 
 dist-hook:
 	rm -rf `find $(distdir) -name .backup -prune -o -name '*~' -o -name CVS`
diff --git a/configure.ac b/configure.ac
index 2e17b3f..f438a72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -420,6 +420,7 @@ SAH_FUNCS_IN_NAMESPACE([['min(0,0)'] ['max(0,0)'] ['transform((char *)0,(char *)
 
 SAH_AVX
 
+AM_CONDITIONAL(USE_MY_LIBJPEG, [false])
 AM_CONDITIONAL(USE_MY_IMAGELIBS, [false])
 AM_CONDITIONAL(USE_MY_GLUT, [false])
 AM_CONDITIONAL(ENABLE_TESTS, [test "${enable_tests}" = yes])
@@ -484,7 +485,6 @@ AH_BOTTOM([
 ])
 
 AC_CONFIG_FILES([Makefile
-                 jpeglib/Makefile
                  client/Makefile
 		 tools/Makefile
                  db/Makefile