_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 3b01331ee1fc87359f9d9ace09bc5a1a06b9c65f..abe80984653c5981b63ede7fe1677d1810a1934e 100644 (file)
--- 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 2e17b3f9b6d82c9e3ff41300425c6e1fb2435348..f438a72565f96bc585c93f4c3650cb8807ecbbbb 100644 (file)
--- 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