Source: djview4
Version: 4.12-1
Tags: patch upstream
User: debian-cr...@lists.debian.org
Usertags: ftcbfs
djview4 still fails to cross build from source after we fixed the
pkg-config issue, because its configure script fails to detect a working
qmake. In the mean time, qmake added a cross wrapper. djview4 tries the
regular build architecture qmake, but doesn't try the working host
architecture qmake cross wrapper. The attached patch makes it use the
host architecture one. With it, djview4 becomes cross buildable. Please
consider applying it.
Helmut
--- djview4-4.12.orig/config/acinclude.m4
+++ djview4-4.12/config/acinclude.m4
@@ -272,7 +272,7 @@
path=$QTDIR/bin:$PATH
fi
if test -z "$QMAKE" ; then
- AC_PATH_PROGS([QMAKE], [qmake], [], [$path])
+ AC_PATH_TOOL([QMAKE], [qmake], [], [$path])
fi
if test -z "$QMAKE" ; then
AC_MSG_ERROR([Cannot find the Qt program qmake.
@@ -327,7 +327,7 @@
altrcc="rcc-${qtversion}"
altlupdate="lupdate-${qtversion}"
altlrelease="lrelease-${qtversion}"
- else
+ elif test `basename "$QMAKE"` = qmake ; then
AC_MSG_CHECKING([for real qmake path])
test -x "$QT_INSTALL_BINS/qmake" && QMAKE="$QT_INSTALL_BINS/qmake"
AC_MSG_RESULT([$QMAKE])
