Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2009-06-08 20:26:32 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2009-06-08 20:26:32 (GMT) |
| commit | 5d2d0285a9819c3b1276e005299c86279419a0f0 (patch) | |
| tree | 386c6cb1b58402d3acc0c7e29cf71272a543d03a | |
| parent | cf9b391b40a9c59a620c8093d438370381949c60 (diff) | |
| download | swift-5d2d0285a9819c3b1276e005299c86279419a0f0.zip swift-5d2d0285a9819c3b1276e005299c86279419a0f0.tar.bz2 | |
Detect qmake in configure.
| -rw-r--r-- | Makefile.config.in | 3 | ||||
| -rw-r--r-- | autoconf/ax_qt.m4 | 27 | ||||
| -rw-r--r-- | configure.in | 7 |
3 files changed, 35 insertions, 2 deletions
diff --git a/Makefile.config.in b/Makefile.config.in index 54ed018..374bea5 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -16,5 +16,4 @@ HAVE_LIBXML=@CONFIG_HAVE_LIBXML@ HAVE_OPENSSL=@CONFIG_HAVE_OPENSSL@ WIN32=@CONFIG_WIN32@ MACOSX=@CONFIG_MACOSX@ -# FIXME -QMAKE=qmake +QMAKE=@QMAKE@ diff --git a/autoconf/ax_qt.m4 b/autoconf/ax_qt.m4 new file mode 100644 index 0000000..6b55c13 --- /dev/null +++ b/autoconf/ax_qt.m4 @@ -0,0 +1,27 @@ +# Author: Remko Tronçon + +AC_DEFUN([AX_QT], +[ + AC_ARG_WITH( + [qt], + AC_HELP_STRING([--with-qt=@<:@ARG@:>@],[Path to Qt installation]), + [ + WITH_QT="$withval" + if test "$withval" != "no" -a "$withval" != "yes"; then + QT_PATH="$withval/bin" + else + QT_PATH="$PATH" + fi + ], + [ + WITH_QT="yes" + QT_PATH="$PATH" + ]) + + if test "$WITH_QT" != "no"; then + AC_PATH_PROG(QMAKE, qmake, [], $QT_PATH) + if test "$QMAKE"; then + HAVE_QT=yes + fi + fi +]) diff --git a/configure.in b/configure.in index f1ee664..f703be9 100644 --- a/configure.in +++ b/configure.in @@ -126,6 +126,12 @@ if test -z "$MM"; then MM="$CC" fi +# Qt +AX_QT() +if test "$HAVE_QT" != yes; then + AC_MSG_ERROR([Could not find Qt]) +fi + # Expat AX_LIB_EXPAT() if test "$HAVE_EXPAT" = yes; then @@ -199,6 +205,7 @@ AC_SUBST(CONFIG_MACOSX) AC_SUBST(CONFIG_HAVE_OPENSSL) AC_SUBST(USE_BUNDLED_EXPAT) AC_SUBST(CONFIG_HAVE_LIBXML) +AC_SUBST(QMAKE) AC_CONFIG_FILES([Makefile.config]) AC_OUTPUT |