From: ellson <devnull@localhost>
Date: Mon, 4 Apr 2011 18:37:24 +0000 (+0000)
Subject: use either qmake or qmake-qt4
X-Git-Tag: LAST_LIBGRAPH~32^2~865
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=784d515aab8df5a072145f29000efa66f0d2929d;p=graphviz

use either qmake or qmake-qt4
---

diff --git a/cmd/gvedit/Makefile.am b/cmd/gvedit/Makefile.am
index 0cbacd2a3..a9438e217 100644
--- a/cmd/gvedit/Makefile.am
+++ b/cmd/gvedit/Makefile.am
@@ -15,7 +15,7 @@ gvedit_SOURCES = main.cpp csettings.cpp mainwindow.cpp imageviewer.cpp mdichild.
 noinst_HEADERS = csettings.h imageviewer.h mainwindow.h mdichild.h ui_settings.h 
 
 qMakefile: gvedit.pro
-	qmake-qt4 -o qMakefile gvedit.pro
+	$(QMAKE) -o qMakefile gvedit.pro
 
 gvedit: main.cpp csettings.cpp mainwindow.cpp imageviewer.cpp mdichild.cpp qMakefile
 	$(MAKE) -f qMakefile prefix=${prefix} exec_prefix=${exec_prefix} top_builddir=$(top_builddir)
diff --git a/configure.ac b/configure.ac
index 3eccb723f..9ea860165 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2420,6 +2420,9 @@ AC_ARG_WITH(qt,
 if test "x$with_qt" != "xyes"; then
   use_qt="No (disabled)"
 else
+
+  AC_CHECK_PROGS(QMAKE,qmake qmake-qt4,false)
+
   PKG_CHECK_MODULES(QT, [QtCore],[
     use_qt="Yes"
     AC_DEFINE_UNQUOTED(HAVE_QT,1,