|
a/src/configure.ac |
|
b/src/configure.ac |
|
... |
|
... |
| 233 |
if test X$QTDIR != X ; then
|
233 |
if test X$QTDIR != X ; then
|
| 234 |
PATH=$QTDIR/bin:$PATH
|
234 |
PATH=$QTDIR/bin:$PATH
|
| 235 |
export PATH
|
235 |
export PATH
|
| 236 |
fi
|
236 |
fi
|
| 237 |
|
237 |
|
|
|
238 |
if test X$QMAKE = X ; then
|
|
|
239 |
QMAKE=qmake
|
|
|
240 |
fi
|
|
|
241 |
|
|
|
242 |
AC_PATH_PROG([QMAKEPATH], $QMAKE, NOTFOUND)
|
|
|
243 |
if test X$QMAKEPATH = XNOTFOUND ; then
|
|
|
244 |
AC_MSG_ERROR([Cannot find the qmake program. Maybe you need to install
|
|
|
245 |
qt development files and tools and/or set the QTDIR environment variable?])
|
|
|
246 |
fi
|
|
|
247 |
QMAKE=$QMAKEPATH
|
|
|
248 |
|
| 238 |
# MacosX stuff: we don't support this (the native search tool is more than
|
249 |
# MAC OS X: we don't support this (the native search tool is more than
|
| 239 |
# good enough), but we make things work just enough so that the program can
|
250 |
# good enough), but we make things work just enough so that the program can
|
| 240 |
# be compiled and roughly installed (not as a .app, but to /usr/local),
|
251 |
# be compiled and roughly installed (not as a .app, but to /usr/local),
|
| 241 |
# basically to enable using a Macbook for development
|
252 |
# basically to enable using a Macbook for development
|
| 242 |
if test X$sys = XDarwin ; then
|
253 |
if test X$sys = XDarwin ; then
|
| 243 |
# The defaults tends to be macx-xcode, which we cant use
|
254 |
# The default is xcode
|
| 244 |
QMAKESPEC=macx-g++
|
|
|
| 245 |
export QMAKESPEC
|
|
|
| 246 |
#QMAKESPEC_SPEC="-spec max-g++"
|
|
|
| 247 |
#AC_SUBST(QMAKESPEC_SPEC)
|
|
|
| 248 |
fi
|
|
|
| 249 |
|
|
|
| 250 |
AC_PATH_PROG([QMAKE], [qmake], NOTFOUND)
|
|
|
| 251 |
if test X$QMAKE = XNOTFOUND ; then
|
|
|
| 252 |
AC_MSG_ERROR([Cannot find the qmake program. Maybe you need to install
|
|
|
| 253 |
qt development files and tools and/or set the QTDIR environment variable?])
|
|
|
| 254 |
fi
|
|
|
| 255 |
|
|
|
| 256 |
if test X$sys = XDarwin ; then
|
|
|
| 257 |
QMAKE="${QMAKE} -spec macx-g++"
|
255 |
QMAKE="${QMAKE} -spec macx-g++"
|
| 258 |
fi
|
256 |
fi
|
| 259 |
|
257 |
|
| 260 |
# Discriminate qt3/4. Qt3 qmake prints its version on stderr but we don't
|
258 |
# Discriminate qt3/4. Qt3 qmake prints its version on stderr but we don't
|
| 261 |
# depend on this. We try to detect the qt 4 version string instead.
|
259 |
# depend on this. We try to detect the qt 4 version string instead.
|