Source: djview4 Version: 4.10.6-3 Tags: patch upstream User: helm...@debian.org Usertags: rebootstrap
djview4 fails to cross build from source, because it uses the build architecture pkg-config rather than the host architecture one. This is due to its use of AC_PROG_PKG_CONFIG, which fails to consider $ac_tool_prefix. After replacing the macro with the upstream macro PKG_PROG_PKG_CONFIG (from pkg.m4 in pkg-config), the build continues a bit further and uses the wrong qmake. I need to discuss the qmake issue with the qt people. Can you apply the attached patch anyway and close this bug report when doing so? That'd make the qmake failure immediately visible and thus easier to discuss. Helmut
Index: djview4-4.10.6/config/acinclude.m4 =================================================================== --- djview4-4.10.6.orig/config/acinclude.m4 +++ djview4-4.10.6/config/acinclude.m4 @@ -168,28 +168,6 @@ - -dnl ------------------------------------------------------------------ -dnl @synopsis AC_PROG_PKG_CONFIG([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) -dnl Sets output variables PKG_CONFIG -dnl ------------------------------------------------------------------ - - -AC_DEFUN([AC_PROG_PKG_CONFIG], -[ - AC_ARG_VAR(PKG_CONFIG,[Location of the pkg-config program.]) - AC_ARG_VAR(PKG_CONFIG_PATH, [Path for pkg-config descriptors.]) - AC_PATH_PROG(PKG_CONFIG, pkg-config) - if test -z "$PKG_CONFIG" ; then - ifelse([$2],,:,[$2]) - else - ifelse([$1],,:,[$1]) - fi -]) - - - - dnl ------------------------------------------------------------------ dnl @synopsis AC_PATH_DDJVUUAPI([action-if-found],[action-if-notfound]) dnl Search for ddjvuapi. Defines HAVE_DDJVUAPI. @@ -198,7 +176,7 @@ AC_DEFUN([AC_PATH_DDJVUAPI], [ - AC_REQUIRE([AC_PROG_PKG_CONFIG]) + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) AC_ARG_VAR(DDJVUAPI_LIBS, [Libraries for ddjvuapi]) AC_ARG_VAR(DDJVUAPI_CFLAGS, [Compilation flags for ddjvuapi]) AC_MSG_CHECKING([for ddjvuapi]) @@ -236,7 +214,7 @@ AC_DEFUN([AC_PATH_GLIB], [ - AC_REQUIRE([AC_PROG_PKG_CONFIG]) + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) AC_ARG_VAR(GLIB_LIBS, [Libraries for glib-2.0]) AC_ARG_VAR(GLIB_CFLAGS, [Compilation flags for glib-2.0]) AC_MSG_CHECKING([for glib]) Index: djview4-4.10.6/configure.ac =================================================================== --- djview4-4.10.6.orig/configure.ac +++ djview4-4.10.6/configure.ac @@ -171,7 +171,8 @@ # Packages # ---------------------------------------- -AC_PROG_PKG_CONFIG([],[ +PKG_PROG_PKG_CONFIG +AS_IF([test -z "$PKG_CONFIG"],[ AC_MSG_ERROR([Cannot find required program pkg-config.]) ])
