stuff

ChangeLog

@@ -3,6 +3,7 @@
 - write MAGIC correctly on sparc/powerpc machines (thanks Joe)
 - oop, we were still making fade threads even when not fading
 - tiny cond jump fixes for valgrind in colour.c
+- remove -lstdc++ to avoid being kicked out of Debian
 
 25/1/08 started 7.14.0
 - bump all version numbers for new stable

TODO

@@ -4,8 +4,12 @@ https://sourceforge.net/tracker/index.php?func=detail&aid=1836080&group_id=10005
 
 - docs include figures twice! yuk
 
-WONTFIX
-=======
+  fixed? not sure, check again
+
+- check for <linux/video.h> more carefully: don't just test for file-exists,
+  try compiling a tiny prog
+
+  using icc, for example, breaks some linux headers
 
 - unsharp should work on GREY16? shuld be easy to add GREY16->LABS
 

configure.in

@@ -329,7 +329,6 @@ AC_ARG_WITH([cimg], AS_HELP_STRING([--without-cimg], [build without CImg (defaul
 if test x"$with_cimg" != "xno"; then
   AM_CONDITIONAL(WITH_CIMG, true)
   AC_DEFINE(WITH_CIMG,1,[include cimg package])
-  CIMG_LIBS=-lstdc++
 else
   AM_CONDITIONAL(WITH_CIMG, false)
   AC_MSG_WARN([disabling CImg binding])
@@ -338,7 +337,7 @@ fi
 # Gather all up for VIPS_CFLAGS, VIPS_INCLUDES and VIPS_LIBS
 VIPS_CFLAGS="$VIPS_CFLAGS $GTHREAD_CFLAGS $REQUIRED_CFLAGS $PANGOFT2_CFLAGS $FFTW3_CFLAGS $MAGICK_CFLAGS $PNG_CFLAGS $EXIF_CFLAGS $OPENEXR_CFLAGS $LIBOIL_CFLAGS"
 VIPS_INCLUDES="$PNG_INCLUDES $TIFF_INCLUDES $ZIP_INCLUDES $JPEG_INCLUDES $FFTW_INCLUDES $LCMS_INCLUDES" 
-VIPS_LIBS="$MAGICK_LIBS $PNG_LIBS $TIFF_LIBS $ZIP_LIBS $JPEG_LIBS $GTHREAD_LIBS $REQUIRED_LIBS $PANGOFT2_LIBS $FFTW3_LIBS $FFTW_LIBS $LCMS_LIBS $LIBOIL_LIBS $OPENEXR_LIBS $EXIF_LIBS -lm $CIMG_LIBS"
+VIPS_LIBS="$MAGICK_LIBS $PNG_LIBS $TIFF_LIBS $ZIP_LIBS $JPEG_LIBS $GTHREAD_LIBS $REQUIRED_LIBS $PANGOFT2_LIBS $FFTW3_LIBS $FFTW_LIBS $LCMS_LIBS $LIBOIL_LIBS $OPENEXR_LIBS $EXIF_LIBS -lm"
 
 AC_SUBST(VIPS_CFLAGS)
 AC_SUBST(VIPS_INCLUDES)