Merge branch 'master' of https://github.com/OpenModelica/OMPlot

OpenModelica · Nov 17, 2015 · 847989d · 847989d
2 parents 47b15cf + 57c8c57
commit 847989d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/common b/common
diff --git a/configure.ac b/configure.ac
@@ -28,8 +28,14 @@ AC_PROG_CXX
 host_short=$host_cpu-$host_os
 
 m4_include([common/m4/qmake.m4])
-m4_include([common/m4/omhome.m4])
 
+if test -z "$QMAKE"; then
+  AC_MSG_ERROR([Could not find qmake (QT4)])
+elif test -z "$LRELEASE"; then
+  AC_MSG_ERROR([Could not find lrelease (QT4)])
+fi
+
+m4_include([common/m4/omhome.m4])
 FIND_OPENMODELICAHOME()
 
 AC_OUTPUT(Makefile qwt/Makefile.unix OMPlot/OMPlotGUI/Makefile.unix OMPlot/OMPlotGUI/OMPlotGUI.config qwt/qwt.config)