--- a/src/configure.ac
+++ b/src/configure.ac
@@ -235,25 +235,23 @@
export PATH
fi
-# MacosX stuff: we don't support this (the native search tool is more than
+if test X$QMAKE = X ; then
+ QMAKE=qmake
+fi
+
+AC_PATH_PROG([QMAKEPATH], $QMAKE, NOTFOUND)
+if test X$QMAKEPATH = XNOTFOUND ; then
+ AC_MSG_ERROR([Cannot find the qmake program. Maybe you need to install
+qt development files and tools and/or set the QTDIR environment variable?])
+fi
+QMAKE=$QMAKEPATH
+
+# MAC OS X: we don't support this (the native search tool is more than
# good enough), but we make things work just enough so that the program can
# be compiled and roughly installed (not as a .app, but to /usr/local),
# basically to enable using a Macbook for development
if test X$sys = XDarwin ; then
- # The defaults tends to be macx-xcode, which we cant use
- QMAKESPEC=macx-g++
- export QMAKESPEC
- #QMAKESPEC_SPEC="-spec max-g++"
- #AC_SUBST(QMAKESPEC_SPEC)
-fi
-
-AC_PATH_PROG([QMAKE], [qmake], NOTFOUND)
-if test X$QMAKE = XNOTFOUND ; then
- AC_MSG_ERROR([Cannot find the qmake program. Maybe you need to install
-qt development files and tools and/or set the QTDIR environment variable?])
-fi
-
-if test X$sys = XDarwin ; then
+ # The default is xcode
QMAKE="${QMAKE} -spec macx-g++"
fi