Source: eviacam
Version: 2.1.4-2
Tags: patch upstream
User: [email protected]
Usertags: ftcbfs
eviacam fails to cross build from source, because configure.ac hard
codes the build architecture pkg-config. Please use PKG_PROG_PKG_CONFIG
to discover the correct pkg-config. I'm attaching a patch for this and
it makes eviacam cross buildable. An even better solution would be
switching to the PKG_CHECK_MODULES macro if upstream so wishes. Please
consider applying the attached patch as a minimal improvement.
Helmut
--- eviacam-2.1.4.orig/configure.ac
+++ eviacam-2.1.4/configure.ac
@@ -104,25 +104,26 @@
AC_DEFUN([GTKTEST],
[
+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
AC_REQUIRE([AC_PROG_AWK])
AC_MSG_CHECKING([gtk version])
- if gtkversion=`pkg-config gtk+-3.0 --silence-errors --modversion`; then
+ if gtkversion=`$PKG_CONFIG gtk+-3.0 --silence-errors --modversion`; then
AC_MSG_RESULT([$gtkversion])
- GTKCONFIG='pkg-config gtk+-3.0'
- elif gtkversion=`pkg-config gtk+-2.0 --silence-errors --modversion`; then
+ GTKCONFIG="$PKG_CONFIG gtk+-3.0"
+ elif gtkversion=`$PKG_CONFIG gtk+-2.0 --silence-errors --modversion`; then
AC_MSG_RESULT([$gtkversion])
- GTKCONFIG='pkg-config gtk+-2.0'
+ GTKCONFIG="$PKG_CONFIG gtk+-2.0"
else
AC_MSG_RESULT([not found])
AC_MSG_ERROR([gtk+-2 or 3 is required.])
fi
])
-if test "x$WITH_DEPENDENCIES_CHECK" = "xyes"; then
+AS_IF([test "x$WITH_DEPENDENCIES_CHECK" = "xyes"],[
GTKTEST()
GTK_CPPFLAGS="`$GTKCONFIG --cflags`"
GTK_LIBS="`$GTKCONFIG --libs`"
-fi
+])
# ----------------- gtk+ --------------------
# ----------------- wxWidgets --------------------
@@ -174,20 +175,21 @@
# ----------------- opencv --------------------
AC_DEFUN([OPENCVTEST],
[
+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
AC_REQUIRE([AC_PROG_AWK])
AC_MSG_CHECKING([opencv version])
- if opencvversion=`pkg-config opencv --modversion`; then
- OPENCVCONFIG='pkg-config opencv'
+ if opencvversion=`$PKG_CONFIG opencv --modversion`; then
+ OPENCVCONFIG="$PKG_CONFIG opencv"
AC_MSG_RESULT([$opencvversion])
- elif opencvversion=`pkg-config opencv4 --modversion`; then
- OPENCVCONFIG='pkg-config opencv4'
+ elif opencvversion=`$PKG_CONFIG opencv4 --modversion`; then
+ OPENCVCONFIG="$PKG_CONFIG opencv4"
AC_MSG_RESULT([$opencvversion])
else
AC_MSG_RESULT([not found])
AC_MSG_ERROR([opencv is required.])
fi])
-if test "x$WITH_DEPENDENCIES_CHECK" = "xyes"; then
+AS_IF([test "x$WITH_DEPENDENCIES_CHECK" = "xyes"],[
# Call OPENCVTEST func
OPENCVTEST
@@ -199,7 +201,7 @@
else
OPENCV_LIBS=" -lopencv_core -lopencv_highgui -lopencv_imgproc -lopencv_objdetect -lopencv_video"
fi
-fi
+])
# ----------------- opencv --------------------
# Checks for header files.
