libraries/proxyface
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

find all tools in same dir as moc; refs #40

Browse Source
This commit is contained in:
Marc Wäckerlin
2014-05-05 12:35:42 +00:00
parent d760542ebb
commit 26dc507d68
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
configure.in
View File

@@ -128,13 +128,13 @@ AC_SUBST(AM_CXXFLAGS)
AC_SUBST(AM_CPPFLAGS) AC_SUBST(AM_CPPFLAGS)
AC_SUBST(LIBS) AC_SUBST(LIBS)
# Qt Environment # Qt Environment
AC_MSG_CHECKING(QT4 directory) AC_MSG_CHECKING(QT directory)
QTDIR="no" QTDIR="no"
AC_ARG_WITH([qt-dir], AC_ARG_WITH([qt-dir],
AC_HELP_STRING([--with-qt-dir=/path/to/Qt4], AC_HELP_STRING([--with-qt-dir=/path/to/Qt],
[to specify the path to the Qt4 directory.]), [to specify the path to the Qt directory.]),
[QTPATHS="$withval"], [QTPATHS="$withval"],
[QTPATHS="/usr/include/qt4 /usr/local/include/qt4 /opt/include/qt4 /opt/local/include/qt4 /opt/local/libexec/qt4-mac/include /usr/include /usr/local/include /opt/include /opt/local/include"]) [QTPATHS="/usr/include /usr/local/include /opt/include /opt/local/include /usr/include/qt4 /usr/local/include/qt4 /opt/include/qt4 /opt/local/include/qt4 /opt/local/libexec/qt4-mac/include"])
for x in $QTPATHS; do for x in $QTPATHS; do
if test -d $x/QtCore ; then if test -d $x/QtCore ; then
QTINCDIR=$x QTINCDIR=$x
@@ -181,15 +181,15 @@ else
AC_HELP_STRING([--with-moc=/path/to/moc], AC_HELP_STRING([--with-moc=/path/to/moc],
[to specify the path to qt moc.]), [to specify the path to qt moc.]),
[MOC="$withval" [MOC="$withval"
RCC="$(dirname $withval")/rcc" RCC="$(dirname $withval)/rcc"
UIC="$(dirname $withval")/uic" UIC="$(dirname $withval)/uic"
LRELEASE="$(dirname $withval")/lrelease" LRELEASE="$(dirname $withval)/lrelease"
LUPDATE="$(dirname $withval")/lupdate"], LUPDATE="$(dirname $withval)/lupdate"],
[MOC="" [MOC="${QTDIR}/bin/moc"
RCC="" RCC="${QTDIR}/bin/rcc"
UIC="" UIC="${QTDIR}/bin/uic"
LRELEASE="" LRELEASE="${QTDIR}/bin/lrelease"
LUPDATE=""]) LUPDATE="${QTDIR}/bin/lupdate"])
AC_CHECK_PROGS([MOC], ["$MOC" moc moc-qt4 moc-mac]) AC_CHECK_PROGS([MOC], ["$MOC" moc moc-qt4 moc-mac])
test -n "$MOC" || AC_MSG_ERROR([moc for Qt not found!]) test -n "$MOC" || AC_MSG_ERROR([moc for Qt not found!])
AC_SUBST(MOC) AC_SUBST(MOC)