|
|
@@ -2361,40 +2361,45 @@ if test "x$enable_starpu_top" != "xno" ; then
|
|
|
AC_PATH_PROGS([QMAKE], [qmake-qt4 qmake], [not-found])
|
|
|
if test x$QMAKE != xnot-found; then
|
|
|
QMAKE_VERSION=`$QMAKE --version 2>&1 | head -n 1 | cut -d '.' -f 1 | cut -d ' ' -f 3`
|
|
|
- if test $QMAKE_VERSION -ge 2 ; then
|
|
|
+ QT_VERSION=`$QMAKE --version 2>&1 | tail -n 1 | cut -d '.' -f 1 | cut -d ' ' -f 4`
|
|
|
+ if test $QT_VERSION -ge 5 ; then
|
|
|
+ can_build_starpu_top=yes
|
|
|
+ elif test $QMAKE_VERSION -ge 2 ; then
|
|
|
PKG_CHECK_EXISTS([QtGui QtOpenGL QtSql], [
|
|
|
QT_MAJVERSION=`$PKG_CONFIG --modversion QtGui | cut -d '.' -f 1`
|
|
|
QT_MINVERSION=`$PKG_CONFIG --modversion QtGui | cut -d '.' -f 2`
|
|
|
if test $QT_MAJVERSION -gt 4 -o \( $QT_MAJVERSION -eq 4 -a $QT_MINVERSION -ge 7 \) ; then
|
|
|
can_build_starpu_top=yes
|
|
|
fi
|
|
|
- QWT_PRI=embed
|
|
|
- AC_ARG_WITH(qwt-include-dir,
|
|
|
- [AS_HELP_STRING([--with-qwt-include-dir=<path>],
|
|
|
- [specify installed libqwt include path])],
|
|
|
- [
|
|
|
- STARPU_QWT_INCLUDE="$withval"
|
|
|
- AC_SUBST(STARPU_QWT_INCLUDE)
|
|
|
- QWT_PRI=system
|
|
|
- ])
|
|
|
- AC_ARG_WITH(qwt-lib-dir,
|
|
|
- [AS_HELP_STRING([--with-qwt-lib-dir=<path>],
|
|
|
- [specify installed libqwt library path])],
|
|
|
- [
|
|
|
- STARPU_QWT_LDFLAGS="-L$withval"
|
|
|
- QWT_PRI=system
|
|
|
- ])
|
|
|
- AC_ARG_WITH(qwt-lib,
|
|
|
- [AS_HELP_STRING([--with-qwt-lib=<name>],
|
|
|
- [specify installed libqwt library name])],
|
|
|
- [
|
|
|
- STARPU_QWT_LDFLAGS="${STARPU_QWT_LDFLAGS} -l$withval"
|
|
|
- QWT_PRI=system
|
|
|
- ])
|
|
|
- AC_SUBST(STARPU_QWT_LDFLAGS)
|
|
|
- AC_SUBST(QWT_PRI)
|
|
|
])
|
|
|
fi
|
|
|
+ if test x$can_build_starpu_top = xyes; then
|
|
|
+ QWT_PRI=embed
|
|
|
+ AC_ARG_WITH(qwt-include-dir,
|
|
|
+ [AS_HELP_STRING([--with-qwt-include-dir=<path>],
|
|
|
+ [specify installed libqwt include path])],
|
|
|
+ [
|
|
|
+ STARPU_QWT_INCLUDE="$withval"
|
|
|
+ AC_SUBST(STARPU_QWT_INCLUDE)
|
|
|
+ QWT_PRI=system
|
|
|
+ ])
|
|
|
+ AC_ARG_WITH(qwt-lib-dir,
|
|
|
+ [AS_HELP_STRING([--with-qwt-lib-dir=<path>],
|
|
|
+ [specify installed libqwt library path])],
|
|
|
+ [
|
|
|
+ STARPU_QWT_LDFLAGS="-L$withval"
|
|
|
+ QWT_PRI=system
|
|
|
+ ])
|
|
|
+ AC_ARG_WITH(qwt-lib,
|
|
|
+ [AS_HELP_STRING([--with-qwt-lib=<name>],
|
|
|
+ [specify installed libqwt library name])],
|
|
|
+ [
|
|
|
+ STARPU_QWT_LDFLAGS="${STARPU_QWT_LDFLAGS} -l$withval"
|
|
|
+ QWT_PRI=system
|
|
|
+ ])
|
|
|
+ AC_SUBST(STARPU_QWT_LDFLAGS)
|
|
|
+ AC_SUBST(QWT_PRI)
|
|
|
+ fi
|
|
|
fi
|
|
|
fi
|
|
|
|
