File ghpsdr3-alex-qmake-qt5.diff of Package ghpsdr3-alex
diff --git a/trunk/src/QtRadio/build-aux/autotroll.m4 b/trunk/src/QtRadio/build-aux/autotroll.m4
index 52ec84b..8a49112 100644
--- a/trunk/src/QtRadio/build-aux/autotroll.m4
+++ b/trunk/src/QtRadio/build-aux/autotroll.m4
@@ -1,7 +1,9 @@
# Build Qt apps with the autotools (Autoconf/Automake).
# M4 macros.
+#
# This file is part of AutoTroll.
-# Copyright (C) 2006 Benoit Sigoure <benoit.sigoure@lrde.epita.fr>
+#
+# Copyright (C) 2006-2013 Benoit Sigoure <benoit.sigoure@lrde.epita.fr>
#
# AutoTroll is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -38,30 +40,49 @@
# DOCUMENTATION #
# ------------- #
-# Disclaimer: Never tested with anything else than Qt 4.2! Feedback welcome.
+# Disclaimer: Tested with Qt 4.2 and 4.8 only. Feedback welcome.
# Simply invoke AT_WITH_QT in your configure.ac. AT_WITH_QT can take
# arguments which are documented in depth below. The default arguments are
# equivalent to the default .pro file generated by qmake.
#
# Invoking AT_WITH_QT will do the following:
-# - Add a --with-qt option to your configure
-# - Find qmake, moc and uic and save them in the make variables $(QMAKE),
-# $(MOC), $(UIC).
-# - Save the path to Qt in $(QT_PATH)
-# - Find the flags to use Qt, that is:
+#
+# - Add option `--with-qt[=ARG]' to your configure script. Possible
+# values for ARG are `yes' (which is the default) and `no' to
+# enable and disable Qt support, respectively, or a path to the
+# directory which contains the Qt binaries in case you have a
+# non-stardard location.
+# - Add option `--without-qt', which is equivalent to `--with-qt=no'.
+# - If Qt support is enabled, define C preprocessor macro HAVE_QT.
+# - Find the programs `qmake', `moc', `uic', and `rcc' and save them
+# in the make variables $(QMAKE), $(MOC), $(UIC), and $(RCC).
+# - Save the path to Qt binaries in $(QT_PATH).
+# - Find the flags necessary to compile and link Qt, that is:
# * $(QT_DEFINES): -D's defined by qmake.
# * $(QT_CFLAGS): CFLAGS as defined by qmake (C?!)
# * $(QT_CXXFLAGS): CXXFLAGS as defined by qmake.
# * $(QT_INCPATH): -I's defined by qmake.
-# * $(QT_CPPFLAGS): Same as $(QT_DEFINES) + $(QT_INCPATH)
+# * $(QT_CPPFLAGS): Same as $(QT_DEFINES) + $(QT_INCPATH).
# * $(QT_LFLAGS): LFLAGS defined by qmake.
# * $(QT_LDFLAGS): Same thing as $(QT_LFLAGS).
# * $(QT_LIBS): LIBS defined by qmake.
+# - Provide @QT_STATIC_PLUGINS@, which holds some additional C++
+# declarations necessary for linking with static Qt plugins (for
+# dynamic Qt builds it contains a dummy typedef declaration
+# instead). Use this substitution in a `foo.cpp.in' C++ template
+# file or something similar, which must be registered in
+# configure.ac's call to AC_CONFIG_FILES so that a proper `foo.cpp'
+# file gets created. Then compile and link `foo.cpp' with your
+# program in the usual automake way. NOTE: It is not possible to
+# automatically detect whether a Qt release earlier than version 5
+# is built as a static library! For this reason,
+# @QT_STATIC_PLUGINS@ always contains the dummy typedef declaration
+# if not using Qt5.
#
-# You *MUST* invoke $(MOC) and/or $(UIC) where necessary. AutoTroll provides
-# you with Makerules to ease this, here is a sample Makefile.am to use with
-# AutoTroll which builds the code given in the chapter 7 of the Qt Tutorial:
-# http://doc.trolltech.com/4.2/tutorial-t7.html
+# You *MUST* invoke $(MOC) and/or $(UIC) by yourself where necessary. AutoTroll provides
+# you with Makerules to ease this; here is a sample Makefile.am to use with
+# AutoTroll which builds the code given in chapter 7 of the Qt Tutorial
+# (http://doc.trolltech.com/4.2/tutorial-t7.html).
#
# -------------------------------------------------------------------------
# include $(top_srcdir)/build-aux/autotroll.mk
@@ -78,13 +99,13 @@
# BUILT_SOURCES = lcdrange.moc.cpp
# -------------------------------------------------------------------------
#
-# Note that your MOC, UIC and QRC files *MUST* be listed manually in
+# Note that your MOC, UIC, and RCC files *MUST* be listed explicitly in
# BUILT_SOURCES. If you name them properly (eg: .moc.cc, .qrc.cc, .ui.cc -- of
# course you can use .cpp or .cxx or .C rather than .cc) AutoTroll will build
# them automagically for you (using implicit rules defined in autotroll.mk).
m4_define([_AUTOTROLL_SERIAL], [m4_translit([
-# serial 5
+# serial 13
], [#
], [])])
@@ -92,11 +113,25 @@ m4_define([_AUTOTROLL_SERIAL], [m4_translit([
m4_ifdef([AX_INSTEAD_IF], [],
[AC_DEFUN([AX_INSTEAD_IF],
[m4_ifval([$1],
- [AC_MSG_WARN([$2]); [$1]],
+ [AC_MSG_WARN([$2])
+ [$1]],
[AC_MSG_ERROR([$2])])])])
-m4_pattern_forbid([^AT_])dnl
-m4_pattern_forbid([^_AT_])dnl
+
+# AX_PATH_TOOLS(VARIABLE, PROGS-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND], [PATH])
+# -------------------------------------------------------------------------
+AC_DEFUN([AX_PATH_TOOLS],
+[for ax_tool in $2; do
+ AC_PATH_TOOL([$1], [$ax_tool], [], [$4])
+ test -n "$$1" && break
+done
+m4_ifval([$3], [test -n "$$1" || $1="$3"])
+])
+
+
+m4_pattern_forbid([^AT_])
+m4_pattern_forbid([^_AT_])
+
# AT_WITH_QT([QT_modules], [QT_config], [QT_misc], [RUN-IF-FAILED], [RUN-IF-OK])
# ------------------------------------------------------------------------------
@@ -121,80 +156,87 @@ m4_pattern_forbid([^_AT_])dnl
# The last argument, QT_misc (also optional) will be copied as-is the .pro
# file used to guess how to compile Qt apps. You may use it to further tweak
# the build process of Qt apps if tweaking the QT or CONFIG variables isn't
-# enough for you.
+# enough for you (for example, to control which static plugins get used).
+
#
# RUN-IF-FAILED is arbitrary code to execute if Qt cannot be found or if any
# problem happens. If this argument is omitted, then AC_MSG_ERROR will be
# called. RUN-IF-OK is arbitrary code to execute if Qt was successfully found.
AC_DEFUN([AT_WITH_QT],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_CXX])dnl
+[AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([AC_CANONICAL_BUILD])
+AC_REQUIRE([AC_PROG_CXX])
echo "$as_me: this is autotroll.m4[]_AUTOTROLL_SERIAL" >&AS_MESSAGE_LOG_FD
test x"$TROLL" != x && echo 'ViM rox emacs.'
+ # This is a hack to get decent flow control with 'break'.
+ for _qt_ignored in once; do
+
dnl Memo: AC_ARG_WITH(package, help-string, [if-given], [if-not-given])
AC_ARG_WITH([qt],
- [AS_HELP_STRING([--with-qt],
- [Path to Qt @<:@Look in PATH and /usr/local/Trolltech@:>@])],
- [QT_PATH=$withval])
+ AS_HELP_STRING([--with-qt@<:@=ARG@:>@],
+ [Qt support. ARG can be `yes' (the default), `no',
+ or a path to Qt binaries; if `yes' or empty,
+ use PATH and some default directories to find Qt binaries]))
- # this is a hack to get decent flow control with 'break'
- for _qt_ignored in once; do
+ if test x"$with_qt" = x"no"; then
+ break
+ else
+ AC_DEFINE([HAVE_QT],[1],
+ [Define if the Qt framework is available.])
+ fi
- # Find Qt.
- AC_ARG_VAR([QT_PATH], [Path to the Qt installation])
- if test -d /usr/local/Trolltech; then
- # Try to find the latest version.
- tmp_qt_paths=`echo /usr/local/Trolltech/*/bin | tr ' ' '\n' | sort -nr \
- | xargs | sed 's/ */:/g'`
+ if test x"$with_qt" = x"yes"; then
+ QT_PATH=
+ else
+ QT_PATH=$with_qt
fi
- # Path to which recent MacPorts (~v1.7) install Qt4.
- test -d /opt/local/libexec/qt4-mac/bin \
- && tmp_qt_paths="$tmp_qt_paths:/opt/local/libexec/qt4-mac/bin"
+
+ # Find Qt.
+ AC_ARG_VAR([QT_PATH], [path to Qt binaries])
# Find qmake.
AC_ARG_VAR([QMAKE], [Qt Makefile generator command])
- AC_PATH_PROGS([QMAKE], [qmake qmake-qt4 qmake], [missing],
- [$QT_DIR:$QT_PATH:$PATH:$tmp_qt_paths])
+ AX_PATH_TOOLS([QMAKE], [qmake qmake-qt5 qmake-qt4 qmake-qt3], [missing],
+ [$QT_PATH:$PATH])
if test x"$QMAKE" = xmissing; then
- AX_INSTEAD_IF([$4], [Cannot find qmake in your PATH. Try using --with-qt.])
+ AX_INSTEAD_IF([$4], [Cannot find qmake. Try --with-qt=PATH.])
break
fi
# Find moc (Meta Object Compiler).
AC_ARG_VAR([MOC], [Qt Meta Object Compiler command])
- AC_PATH_PROGS([MOC], [moc moc-qt4 moc], [missing],
- [$QT_PATH:$PATH:$tmp_qt_paths])
+ AX_PATH_TOOLS([MOC], [moc moc-qt5 moc-qt4 moc-qt3], [missing],
+ [$QT_PATH:$PATH])
if test x"$MOC" = xmissing; then
AX_INSTEAD_IF([$4],
- [Cannot find moc (Meta Object Compiler) in your PATH. Try using --with-qt.])
+ [Cannot find moc (Meta Object Compiler). Try --with-qt=PATH.])
break
fi
# Find uic (User Interface Compiler).
AC_ARG_VAR([UIC], [Qt User Interface Compiler command])
- AC_PATH_PROGS([UIC], [uic uic-qt4 uic], [missing],
- [$QT_PATH:$PATH:$tmp_qt_paths])
+ AX_PATH_TOOLS([UIC], [uic uic-qt5 uic-qt4 uic-qt3 uic3], [missing],
+ [$QT_PATH:$PATH])
if test x"$UIC" = xmissing; then
AX_INSTEAD_IF([$4],
-[Cannot find uic (User Interface Compiler) in your PATH. Try using --with-qt.])
+[Cannot find uic (User Interface Compiler). Try --with-qt=PATH.])
break
fi
# Find rcc (Qt Resource Compiler).
AC_ARG_VAR([RCC], [Qt Resource Compiler command])
- AC_PATH_PROGS([RCC], [rcc], [false], [$QT_PATH:$PATH:$tmp_qt_paths])
- if test x"$UIC" = xfalse; then
- AC_MSG_WARN([Cannot find rcc (Qt Resource Compiler) in your PATH.\
- Try using --with-qt.])
+ AX_PATH_TOOLS([RCC], [rcc rcc-qt5], [missing], [$QT_PATH:$PATH])
+ if test x"$RCC" = xmissing; then
+ AC_MSG_WARN([Cannot find rcc (Qt Resource Compiler). Try --with-qt=PATH.])
fi
AC_MSG_CHECKING([whether host operating system is Darwin])
at_darwin=no
at_qmake_args=
case $host_os in
+ dnl (
darwin*)
at_darwin=yes
at_qmake_args='-spec macx-g++'
@@ -208,11 +250,12 @@ dnl Memo: AC_ARG_WITH(package, help-string, [if-given], [if-not-given])
fi
if test x"$QT_PATH" = x; then
AX_INSTEAD_IF([$4],
- [Cannot find the path to your Qt install. Use --with-qt.])
+ [Cannot find your Qt installation. Try --with-qt=PATH.])
break
fi
AC_SUBST([QT_PATH])
+
#
# Check for Ubuntu non standard installation
#
@@ -229,7 +272,7 @@ dnl Memo: AC_ARG_WITH(package, help-string, [if-given], [if-not-given])
#
# detecting major version
- qmake_version_sed=['/^.*\([0-9]\)\.[0-9]\.[0-9].*$/!d;s//\1/']
+ qmake_version_sed=['/^.*\([0-9]\+\.[0-9]\+\.[0-9]\+\).*$/!d;s//\1/']
QT_VM=`$QMAKE --version 2>&1 | sed "$qmake_version_sed"`
# default for standard QtSDK and binary packages before U11.04
@@ -239,7 +282,7 @@ dnl Memo: AC_ARG_WITH(package, help-string, [if-given], [if-not-given])
QT_ADDITIONAL_LDFLAG="-lQt5Multimedia"
echo "QT version 5 detected (via qmake): adding Qt5Multimedia library"
else
- QT_ADDITIONAL_LDFLAG="-lQtMultimedia"
+ QT_ADDITIONAL_LDFLAG="-lQt5Multimedia"
fi
#
@@ -270,6 +313,7 @@ dnl Memo: AC_ARG_WITH(package, help-string, [if-given], [if-not-given])
AC_SUBST([QT_ADDITIONAL_LDFLAG])
+
# Get ready to build a test-app with Qt.
if mkdir conftest.dir && cd conftest.dir; then :; else
AX_INSTEAD_IF([$4], [Cannot mkdir conftest.dir or cd to that directory.])
@@ -318,21 +362,24 @@ _ASEOF
fi
# Find the .pro file generated by qmake.
- pro_file='conftest.dir.pro'
+ pro_file=conftest.dir.pro
test -f $pro_file || pro_file=`echo *.pro`
if test -f "$pro_file"; then :; else
AX_INSTEAD_IF([$4], [Can't find the .pro file generated by Qmake.])
break
fi
-dnl Tweak the value of QT in the .pro if have been the 1st arg.
+dnl This is for Qt5; for Qt4 it does nothing special.
+_AT_TWEAK_PRO_FILE([QT], [+widgets])
+
+dnl Tweak the value of QT in the .pro file if we have a first argument.
m4_ifval([$1], [_AT_TWEAK_PRO_FILE([QT], [$1])])
-dnl Tweak the value of CONFIG in the .pro if have been given a 2nd arg.
+dnl Tweak the value of CONFIG in the .pro file if we have a second argument.
m4_ifval([$2], [_AT_TWEAK_PRO_FILE([CONFIG], [$2])])
m4_ifval([$3],
-[ # Add the extra-settings the user wants to set in the .pro
+[ # Add the extra-settings the user wants to set in the .pro file.
echo "$3" >>"$pro_file"
])
@@ -350,7 +397,7 @@ m4_ifval([$3],
# -I../../usr/include/Qt from that Makefile, the flag is invalid as soon
# as we use it in another (sub) directory. So what this perl pass does is
# that it rewrite all relative paths to absolute paths. Another problem
- # when building on Cygwin is that QMake mixes paths with blackslashes and
+ # when building on Cygwin is that QMake mixes paths with backslashes and
# forward slashes and paths must be handled with extra care because of the
# stupid Windows drive letters.
echo "$as_me:$LINENO: fixing the Makefiles:" Makefile* >&AS_MESSAGE_LOG_FD
@@ -358,9 +405,9 @@ m4_ifval([$3],
[use strict;
use Cwd qw(cwd abs_path);
# This variable is useful on Cygwin for the following reason: Say that you are
-# in `/' (that is, in fact you are in C:/cygwin, or something like that) if you
+# in `/' (that is, in fact you are in C:/cygwin, or something like that). If you
# `cd ..' then obviously you remain in `/' (that is in C:/cygwin). QMake
-# generates paths that are relative to C:/ (or another driver letter, whatever)
+# generates paths that are relative to C:/ (or another drive letter, whatever)
# so the trick to get the `..' resolved properly is to prepend the absolute
# path of the current working directory in a Windows-style. C:/cygwin/../ will
# properly become C:/.
@@ -434,12 +481,12 @@ EOF
rm -f fixmk.pl
# Try to compile a simple Qt app.
- AC_CACHE_CHECK([whether we can build a simple Qt app], [at_cv_qt_build],
+ AC_CACHE_CHECK([whether we can build a simple Qt application], [at_cv_qt_build],
[at_cv_qt_build=ko
: ${MAKE=make}
if $MAKE >&AS_MESSAGE_LOG_FD 2>&1; then
- at_cv_qt_build='ok, looks like Qt 4'
+ at_cv_qt_build='ok, looks like Qt 4 or Qt 5'
else
echo "$as_me:$LINENO: Build failed, trying to #include <qobject.h> \
instead" >&AS_MESSAGE_LOG_FD
@@ -457,7 +504,7 @@ instead" >&AS_MESSAGE_LOG_FD
sed 's/<qobject.h>/<QObject>/' conftest.h > tmp.h && mv tmp.h conftest.h
if $MAKE >&AS_MESSAGE_LOG_FD 2>&1; then
- at_cv_qt_build='ok, looks like Qt 4, release mode forced'
+ at_cv_qt_build='ok, looks like Qt 4 or Qt 5, release mode forced'
else
echo "$as_me:$LINENO: Build failed, trying to #include <qobject.h> \
instead" >&AS_MESSAGE_LOG_FD
@@ -471,9 +518,9 @@ instead" >&AS_MESSAGE_LOG_FD
echo "$as_me:$LINENO: failed program was:" >&AS_MESSAGE_LOG_FD
sed 's/^/| /' conftest.cpp >&AS_MESSAGE_LOG_FD
fi # if make with Qt3-style #include and release mode forced.
- fi # if make with Qt4-style #include and release mode forced.
+ fi # if make with Qt4/5-style #include and release mode forced.
fi # if make with Qt3-style #include.
- fi # if make with Qt4-style #include.
+ fi # if make with Qt4/5-style #include.
])dnl end: AC_CACHE_CHECK(at_cv_qt_build)
if test x"$at_cv_qt_build" = xko; then
@@ -484,8 +531,8 @@ instead" >&AS_MESSAGE_LOG_FD
QT_VERSION_MAJOR=`echo "$at_cv_qt_build" | sed 's/[[^0-9]]*//g'`
AC_SUBST([QT_VERSION_MAJOR])
- # This sed filter is applied after an expression of the form: /^FOO.*=/!d;
- # It starts by removing the beginning of the line, removing references to
+ # This sed filter is applied after an expression of the form /^FOO.*=/!d;
+ # it starts by removing the beginning of the line, removing references to
# SUBLIBS, removing unnecessary whitespaces at the beginning, and prefixes
# all variable uses by QT_.
qt_sed_filter='s///;
@@ -494,8 +541,8 @@ instead" >&AS_MESSAGE_LOG_FD
s/\$(\(@<:@A-Z_@:>@@<:@A-Z_@:>@*\))/$(QT_\1)/g'
# Find the Makefile (qmake happens to generate a fake Makefile which invokes
- # a Makefile.Debug or Makefile.Release). We we have both, we'll pick the
- # Makefile.Release. The reason is that the main difference is that release
+ # a Makefile.Debug or Makefile.Release). If we have both, we'll pick the
+ # Makefile.Release. The reason is that this release
# uses -Os and debug -g. We can override -Os by passing another -O but we
# usually don't override -g.
if test -f Makefile.Release; then
@@ -514,7 +561,7 @@ instead" >&AS_MESSAGE_LOG_FD
[at_cv_env_QT_DEFINES=`sed "/^DEFINES@<:@^A-Z=@:>@*=/!d;$qt_sed_filter" $at_mfile`])
AC_SUBST([QT_DEFINES], [$at_cv_env_QT_DEFINES])
- # Find the CFLAGS of Qt (We can use Qt in C?!)
+ # Find the CFLAGS of Qt. (We can use Qt in C?!)
AC_CACHE_CHECK([for the CFLAGS to use with Qt], [at_cv_env_QT_CFLAGS],
[at_cv_env_QT_CFLAGS=`sed "/^CFLAGS@<:@^A-Z=@:>@*=/!d;$qt_sed_filter" $at_mfile`])
AC_SUBST([QT_CFLAGS], [$at_cv_env_QT_CFLAGS])
@@ -531,7 +578,7 @@ instead" >&AS_MESSAGE_LOG_FD
AC_SUBST([QT_CPPFLAGS], ["$at_cv_env_QT_DEFINES $at_cv_env_QT_INCPATH"])
- # Find the LFLAGS of Qt (Should have been named LDFLAGS)
+ # Find the LFLAGS of Qt (should have been named LDFLAGS).
AC_CACHE_CHECK([for the LDFLAGS to use with Qt], [at_cv_env_QT_LDFLAGS],
[at_cv_env_QT_LDFLAGS=`sed "/^LFLAGS@<:@^A-Z=@:>@*=/!d;$qt_sed_filter" $at_mfile`])
AC_SUBST([QT_LFLAGS], [$at_cv_env_QT_LDFLAGS])
@@ -550,27 +597,51 @@ instead" >&AS_MESSAGE_LOG_FD
])
AC_SUBST([QT_LIBS], [$at_cv_env_QT_LIBS])
+ # We can't use AC_CACHE_CHECK for data that contains newlines.
+ AC_MSG_CHECKING([for necessary static plugin code])
+ # find static plugin data generated by qmake
+ if test -f conftest.dir_plugin_import.cpp; then
+ QT_STATIC_PLUGINS=`cat conftest.dir_plugin_import.cpp`
+ else
+ QT_STATIC_PLUGINS="\
+// We have Qt earlier than version 5 or a dynamic build.
+// Provide dummy typedef to avoid empty source code.
+typedef int _qt_not_a_static_build;"
+ fi
+ AC_SUBST([QT_STATIC_PLUGINS])
+ AM_SUBST_NOTMAKE([QT_STATIC_PLUGINS])
+ AC_MSG_RESULT([$QT_STATIC_PLUGINS])
+
cd .. && rm -rf conftest.dir
# Run the user code
$5
- done # end hack (useless for to be able to use break)
+ done # end hack (useless FOR to be able to use break)
])
-# AT_REQUIRE_QT_VERSION(QT_version, RUN-IF-FAILED, RUN-IF-OK)
-# -----------------------------------------------------------
+# AT_REQUIRE_QT_VERSION(QT_version, [RUN-IF-FAILED], [RUN-IF-OK])
+# ---------------------------------------------------------------
# Check (using qmake) that Qt's version "matches" QT_version.
-# Must be run AFTER AT_WITH_QT. Requires autoconf 2.60.
+# Must be run *AFTER* AT_WITH_QT. Requires autoconf 2.60.
+#
+# This macro is ignored if Qt support has been disabled (using
+# `--with-qt=no' or `--without-qt').
#
# RUN-IF-FAILED is arbitrary code to execute if Qt cannot be found or if any
# problem happens. If this argument is omitted, then AC_MSG_ERROR will be
# called. RUN-IF-OK is arbitrary code to execute if Qt was successfully found.
+#
+# This macro provides the Qt version in $(QT_VERSION).
AC_DEFUN([AT_REQUIRE_QT_VERSION],
[ AC_PREREQ([2.60])
- # this is a hack to get decent flow control with 'break'
+ # This is a hack to get decent flow control with 'break'.
for _qt_ignored in once; do
+ if test x"$with_qt" = x"no"; then
+ break
+ fi
+
if test x"$QMAKE" = x; then
AX_INSTEAD_IF([$2],
[\$QMAKE is empty.\
@@ -580,7 +651,7 @@ AC_DEFUN([AT_REQUIRE_QT_VERSION],
AC_CACHE_CHECK([for Qt's version], [at_cv_QT_VERSION],
[echo "$as_me:$LINENO: Running $QMAKE --version:" >&AS_MESSAGE_LOG_FD
$QMAKE --version >&AS_MESSAGE_LOG_FD 2>&1
- qmake_version_sed=['/^.*\([0-9]\.[0-9]\.[0-9]\).*$/!d;s//\1/']
+ qmake_version_sed=['/^.*\([0-9]\+\.[0-9]\+\.[0-9]\+\).*$/!d;s//\1/']
at_cv_QT_VERSION=`$QMAKE --version 2>&1 | sed "$qmake_version_sed"`])
if test x"$at_cv_QT_VERSION" = x; then
AX_INSTEAD_IF([$2], [Cannot detect Qt's version.])
@@ -588,18 +659,20 @@ AC_DEFUN([AT_REQUIRE_QT_VERSION],
fi
AC_SUBST([QT_VERSION], [$at_cv_QT_VERSION])
AS_VERSION_COMPARE([$QT_VERSION], [$1],
- [AX_INSTEAD_IF([$2; break;], [This package requires Qt $1 or above.])])
+ [AX_INSTEAD_IF([$2], [This package requires Qt $1 or above.])
+ break
+ ])
# Run the user code
$3
- done # end hack (useless for to be able to use break)
+ done # end hack (useless FOR to be able to use break)
])
# _AT_TWEAK_PRO_FILE(QT_VAR, VALUE)
-# ---------------------------
-# @internal. Tweak the variable QT_VAR in the .pro.
-# VALUE is an IFS-separated list of value and each value is rewritten
+# ---------------------------------
+# @internal. Tweak the variable QT_VAR in the .pro file.
+# VALUE is an IFS-separated list of values, and each value is rewritten
# as follows:
# +value => QT_VAR += value
# -value => QT_VAR -= value
