From 33ee6f96b682acc2e3793ede1c8073058bb95779 Mon Sep 17 00:00:00 2001 From: Debian BOINC Maintainers Date: Mon, 11 Sep 2017 18:33:46 +0100 Subject: [PATCH] _dont_use_own_jpeglib_and_glut Gbp-Pq: Name 003_dont_use_own_jpeglib_and_glut.patch --- Makefile.am | 2 +- configure.ac | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 6ab54d0..f65ddff 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) $(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 36a48ff..d898453 100644 --- a/configure.ac +++ b/configure.ac @@ -565,6 +565,7 @@ SAH_FUNCS_IN_NAMESPACE([['min(0,0)'] ['max(0,0)'] ['transform((char *)0,(char *) #SAH_AVX have_avx=no +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]) @@ -670,9 +671,7 @@ AH_BOTTOM([ AC_SUBST([CLIENT_EXTRA_LIBS]) AC_CONFIG_FILES([Makefile - glut/Makefile image_libs/Makefile - jpeglib/Makefile client/Makefile tools/Makefile db/Makefile -- 2.30.2