use either qmake or qmake-qt4

diff --git a/cmd/gvedit/Makefile.am b/cmd/gvedit/Makefile.am
index 0cbacd2a3e05beb4a81e64cb7d39194faace6295..a9438e2170d13fdaf08f1326df664669b93977bc 100644 (file)
--- 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 3eccb723fc1ed86d3eafefc1dd701b9eace7806d..9ea860165e5ca7625206709c197b775c14871326 100644 (file)
--- 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,