--- a/configure.ac	2010-09-13 12:00:31.000000000 +0200
+++ b/configure.ac	2010-09-15 22:16:54.086640782 +0200
@@ -93,18 +93,29 @@
 AC_FUNC_MALLOC
 AC_CHECK_FUNCS([floor memset pow sqrt])
 
+AC_ARG_ENABLE([opencv], [  --enable-opencv     enable plugins that need opencv (facebl0r and facedetect)],
+  [opencv=${enableval}], [opencv=no])
+
 HAVE_OPENCV=false
-PKG_CHECK_MODULES(OPENCV, opencv >= 1.0.0, [HAVE_OPENCV=true], [true])
-AM_CONDITIONAL([HAVE_OPENCV], [test x$HAVE_OPENCV = xtrue])
-if test x$HAVE_OPENCV = xtrue; then
+if test "x${opencv}" = xyes; then
+  PKG_CHECK_MODULES(OPENCV, opencv >= 1.0.0, [HAVE_OPENCV=true], [true])
+  if test x$HAVE_OPENCV = xtrue; then
 #    OPENCV_CFLAGS="$OPENCV_CFLAGS -DOPENCV_PREFIX=`pkg-config opencv --variable=prefix`"
     AC_DEFINE(HAVE_OPENCV,1,[compiled including opencv])
     AC_DEFINE(OPENCV_DATA_DIR,[${prefix}/share/opencv],opencv data prefix)
+  fi
 fi
+AM_CONDITIONAL([HAVE_OPENCV], [test x$HAVE_OPENCV = xtrue])
 AC_SUBST(HAVE_OPENCV)
 
+
+AC_ARG_ENABLE([gavl], [  --enable-gavl     enable plugins that need gavl (rgbparade, scale0tilt and vectorscope)],
+  [gavl=${enableval}], [gavl=no])
+
 HAVE_GAVL=false
-PKG_CHECK_MODULES(GAVL, gavl >= 0.2.3, [HAVE_GAVL=true], [true])
+if test "x${gavl}" = xyes; then
+  PKG_CHECK_MODULES(GAVL, gavl >= 0.2.3, [HAVE_GAVL=true], [true])
+fi
 AM_CONDITIONAL([HAVE_GAVL], [test x$HAVE_GAVL = xtrue])
 
 AC_CHECK_PROG([DOXYGEN], [doxygen], [doxygen])
--- a/Makefile.am	2011-03-09 10:02:25.000000000 +0100
+++ b/Makefile.am	2011-05-22 17:26:45.650209295 +0200
@@ -15,5 +15,3 @@
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = frei0r.pc
 
-docsdir = ${prefix}/share/doc/${PACKAGE}
-docs_DATA = README ChangeLog TODO AUTHORS