_dont_use_own_jpeglib_and_glut

Gbp-Pq: Name 003_dont_use_own_jpeglib_and_glut.patch

diff --git a/Makefile.am b/Makefile.am
index 6ab54d07ba4550a83e65285e77cdce86091c9301..f65ddff8fcc0e631a90b871c611d9a48d07eb4a7 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) $(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 36a48ffd28d85e2fafcad33feaff71da7e1b97d0..d898453410b7611900912060b63725214b3d99fe 100644 (file)
--- 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