From 7176effe41d81960067c9d0f1dd09f534f2bd437 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Tue, 13 Mar 2012 12:14:34 +0000 Subject: [PATCH] add option to choose moc; refs #32 --- configure.in | 7 ++++++- install-64-and-32-bit-linux.sh | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index ab7cd56..5747917 100644 --- a/configure.in +++ b/configure.in @@ -177,7 +177,12 @@ else CPPFLAGS+=" -DUNICODE -DQT_NO_DEBUG" CPPFLAGS+=" -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_WEBKIT_LIB -DQT_CORE_LIB" CPPFLAGS+=" -I$QTINCDIR" - AC_CHECK_PROGS([MOC], [moc-qt4 moc-mac moc]) + AC_ARG_WITH([moc], + AC_HELP_STRING([--with-moc=/path/to/moc], + [to specify the path to qt4 moc.]), + [MOC="$withval"], + [MOC=""]) + AC_CHECK_PROGS([MOC], [$MOC moc-qt4 moc-mac moc]) test -n "$MOC" || AC_MSG_ERROR([moc for Qt 4 not found!]) AC_SUBST(MOC) AC_CHECK_PROGS([RCC], [rcc-qt4 rcc-mac rcc]) diff --git a/install-64-and-32-bit-linux.sh b/install-64-and-32-bit-linux.sh index 6d3f8a2..14f5630 100755 --- a/install-64-and-32-bit-linux.sh +++ b/install-64-and-32-bit-linux.sh @@ -11,7 +11,8 @@ LDFLAGS="-L/opt/local/i586-mingw32msvc/lib" \ ./configure \ --prefix=/opt/local/i586-mingw32msvc \ --build=x86_64 \ - --host=i586-mingw32msvc && \ + --host=i586-mingw32msvc \ + --with-moc=/usr/local/Trolltech/Qt-4.8.0/bin/moc && \ make && \ sudo make install && \ make clean && \