Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix for crosscompilation
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4726 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
rblazek committed Jan 23, 2006
1 parent fbf1787 commit 1e5cacc
Showing 1 changed file with 20 additions and 11 deletions.
31 changes: 20 additions & 11 deletions acinclude.m4
Expand Up @@ -243,22 +243,31 @@ if test $QT_MAJOR = "4" ; then
if test x$MOC = x ; then
AC_MSG_ERROR([*** moc must be in path])
fi
# uic is the Qt user interface compiler
AC_CHECK_PROG(UIC, uic, uic)
if test x$UIC = x ; then
AC_MSG_ERROR([*** uic must be in path])
fi
# check for rcc
AC_CHECK_PROG(RCC, rcc, rcc)
if test x$RCC = x ; then
AC_MSG_ERROR([*** rcc must be in path])
fi
else
AC_CHECK_PROG(MOC, moc, $QTDIR/bin/moc, , $QTDIR/bin)
if test x$MOC = x ; then
AC_MSG_ERROR([*** moc must be in path])
fi
fi
# uic is the Qt user interface compiler
AC_CHECK_PROG(UIC, uic, $QTDIR/bin/uic, , $QTDIR/bin)
if test x$UIC = x ; then
AC_MSG_ERROR([*** uic must be in path])
fi
# check for rcc
AC_CHECK_PROG(RCC, rcc, $QTDIR/bin/rcc, , $QTDIR/bin)
if test x$RCC = x ; then
AC_MSG_ERROR([*** rcc must be in path])
# uic is the Qt user interface compiler
AC_CHECK_PROG(UIC, uic, $QTDIR/bin/uic, , $QTDIR/bin)
if test x$UIC = x ; then
AC_MSG_ERROR([*** uic must be in path])
fi
# check for rcc
AC_CHECK_PROG(RCC, rcc, $QTDIR/bin/rcc, , $QTDIR/bin)
if test x$RCC = x ; then
AC_MSG_ERROR([*** rcc must be in path])
fi
fi
fi
Expand Down

0 comments on commit 1e5cacc

Please sign in to comment.