Add a --disable-starpu-top option. StarPU-Top is still built by default.

configure.ac

@@ -1050,46 +1050,63 @@ fi
 #                                                                             #
 ###############################################################################
 
-build_starpu_top=no
-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
-		PKG_CHECK_EXISTS([QtGui QtNetwork 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
-				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)
-		])
+AC_ARG_ENABLE([starpu-top],
+  [AS_HELP_STRING([--disable-starpu-top],
+    [build StarPU-Top])],
+  [enable_starpu_top="no"],
+  [enable_starpu_top="maybe"])
+
+# Check whether StarPU-Top can be built
+AC_MSG_CHECKING(for StarPU-Top)
+
+if test "x$enable_starpu_top" = "xmaybe" ; then
+	can_build_starpu_top=no
+	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
+			PKG_CHECK_EXISTS([QtGui QtNetwork 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
 	fi
 fi
 
+if test "x$enable_starpu_top" = "xmaybe" ; then
+  build_starpu_top=$can_build_starpu_top
+else
+  build_starpu_top=no
+fi
+
 AM_CONDITIONAL(BUILD_STARPU_TOP, test x$build_starpu_top = xyes)
 
 ###############################################################################
@@ -1580,4 +1597,5 @@ AC_MSG_NOTICE([
 	       GCC plug-in: $build_gcc_plugin
 	       GCC plug-in test suite: $run_gcc_plugin_test_suite
 	       SOCL enabled:  $build_socl
+               StarPU-Top enabled: $build_starpu_top
 ])