Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 340793
Collapse All | Expand All

(-)a/configure.ac (-4 / +15 lines)
Lines 93-110 Link Here
93
AC_FUNC_MALLOC
93
AC_FUNC_MALLOC
94
AC_CHECK_FUNCS([floor memset pow sqrt])
94
AC_CHECK_FUNCS([floor memset pow sqrt])
95
95
96
AC_ARG_ENABLE([opencv], [  --enable-opencv     enable plugins that need opencv (facebl0r and facedetect)],
97
  [opencv=${enableval}], [opencv=no])
98
96
HAVE_OPENCV=false
99
HAVE_OPENCV=false
97
PKG_CHECK_MODULES(OPENCV, opencv >= 1.0.0, [HAVE_OPENCV=true], [true])
100
if test "x${opencv}" = xyes; then
98
AM_CONDITIONAL([HAVE_OPENCV], [test x$HAVE_OPENCV = xtrue])
101
  PKG_CHECK_MODULES(OPENCV, opencv >= 1.0.0, [HAVE_OPENCV=true], [true])
99
if test x$HAVE_OPENCV = xtrue; then
102
  if test x$HAVE_OPENCV = xtrue; then
100
#    OPENCV_CFLAGS="$OPENCV_CFLAGS -DOPENCV_PREFIX=`pkg-config opencv --variable=prefix`"
103
#    OPENCV_CFLAGS="$OPENCV_CFLAGS -DOPENCV_PREFIX=`pkg-config opencv --variable=prefix`"
101
    AC_DEFINE(HAVE_OPENCV,1,[compiled including opencv])
104
    AC_DEFINE(HAVE_OPENCV,1,[compiled including opencv])
102
    AC_DEFINE(OPENCV_DATA_DIR,[${prefix}/share/opencv],opencv data prefix)
105
    AC_DEFINE(OPENCV_DATA_DIR,[${prefix}/share/opencv],opencv data prefix)
106
  fi
103
fi
107
fi
108
AM_CONDITIONAL([HAVE_OPENCV], [test x$HAVE_OPENCV = xtrue])
104
AC_SUBST(HAVE_OPENCV)
109
AC_SUBST(HAVE_OPENCV)
105
110
111
112
AC_ARG_ENABLE([gavl], [  --enable-gavl     enable plugins that need gavl (rgbparade, scale0tilt and vectorscope)],
113
  [gavl=${enableval}], [gavl=no])
114
106
HAVE_GAVL=false
115
HAVE_GAVL=false
107
PKG_CHECK_MODULES(GAVL, gavl >= 0.2.3, [HAVE_GAVL=true], [true])
116
if test "x${gavl}" = xyes; then
117
  PKG_CHECK_MODULES(GAVL, gavl >= 0.2.3, [HAVE_GAVL=true], [true])
118
fi
108
AM_CONDITIONAL([HAVE_GAVL], [test x$HAVE_GAVL = xtrue])
119
AM_CONDITIONAL([HAVE_GAVL], [test x$HAVE_GAVL = xtrue])
109
120
110
AC_CHECK_PROG([DOXYGEN], [doxygen], [doxygen])
121
AC_CHECK_PROG([DOXYGEN], [doxygen], [doxygen])
(-)a/Makefile.am (-2 lines)
Lines 15-19 Link Here
15
pkgconfigdir = $(libdir)/pkgconfig
15
pkgconfigdir = $(libdir)/pkgconfig
16
pkgconfig_DATA = frei0r.pc
16
pkgconfig_DATA = frei0r.pc
17
17
18
docsdir = ${prefix}/share/doc/${PACKAGE}
19
docs_DATA = README ChangeLog TODO AUTHORS 

Return to bug 340793