summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Grenier <grenier@cgsecurity.org>2012-06-09 15:35:56 +0200
committerChristophe Grenier <grenier@cgsecurity.org>2012-06-09 15:35:56 +0200
commit9445d6ca9c12882d9cd7d5a8491003b9cd9c6c44 (patch)
tree7ede3a4af16e9b34a63fcecdb4c04725c01b51c2
parent17a8a827a15df48c7b7ce7958e4408f463e0149f (diff)
Improve cross-compilation when calling moc-qt4/moc
-rwxr-xr-xcompile.sh8
-rw-r--r--configure.ac5
2 files changed, 12 insertions, 1 deletions
diff --git a/compile.sh b/compile.sh
index 9cfb834..580f1c1 100755
--- a/compile.sh
+++ b/compile.sh
@@ -19,6 +19,14 @@ else
crosscompile_target=$1
TESTDISKCC=$crosscompile_target-gcc
PKG_CONFIG_PATH=/usr/$crosscompile_target/lib/pkgconfig
+ if [ ! -d $PKG_CONFIG_PATH ];
+ then
+ PKG_CONFIG_PATH=/usr/$crosscompile_target/sys-root/mingw/lib/pkgconfig
+ fi
+ if [ ! -d $PKG_CONFIG_PATH ];
+ then
+ unset PKG_CONFIG_PATH
+ fi
export PKG_CONFIG_PATH
fi
fi
diff --git a/configure.ac b/configure.ac
index 1a86fb0..e1c707b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -777,7 +777,10 @@ if test "$use_qt" = "true";
then
PKG_CHECK_MODULES(QTCORE, QtCore >= 4.0.1)
PKG_CHECK_MODULES(QTGUI, QtGui >= 4.0.1)
- MOC=`$PKG_CONFIG QtGui --variable=moc_location`
+ AC_CHECK_TOOLS(MOC,[moc-qt4 moc],)
+ if test x$MOC = x ; then
+ AC_MSG_WARN(Could not find a moc-qt4 or moc tool in your PATH.)
+ fi
qphotorec_LDADD="$qphotorec_LDADD $QTGUI_LIBS"
CXXFLAGS="$CXXFLAGS $QTCORE_CFLAGS $QTGUI_CFLAGS"
fi