--- qsampler/trunk/configure.ac 2015/08/25 18:36:55 2839 +++ qsampler/trunk/configure.ac 2016/04/12 16:52:35 2874 @@ -1,5 +1,5 @@ # Process this file with autoconf to produce a configure script. -AC_INIT(Qsampler, 0.3.1.4, rncbc@rncbc.org, qsampler) +AC_INIT(Qsampler, 0.4.0.1, rncbc@rncbc.org, qsampler) AC_CONFIG_SRCDIR(src/qsampler.cpp) AC_CONFIG_HEADERS(src/config.h) @@ -9,7 +9,7 @@ AC_PREFIX_DEFAULT(/usr/local) ac_prefix=$prefix if test "x$ac_prefix" = "xNONE"; then - ac_prefix=$ac_default_prefix + ac_prefix=$ac_default_prefix fi AC_SUBST(ac_prefix) AC_DEFINE_UNQUOTED(CONFIG_PREFIX, ["$ac_prefix"], [Default installation prefix.]) @@ -34,11 +34,6 @@ AC_ARG_ENABLE(qt4, AC_HELP_STRING([--enable-qt4], [enable Qt4 build (default=no)]), [ac_qt4="$enableval"], - [ac_qt4="no"]) - -AC_ARG_ENABLE(qt5, - AC_HELP_STRING([--enable-qt5], [enable Qt5 build (default=yes)]), - [ac_qt5="$enableval"], [ac_qt5="yes"]) @@ -111,14 +106,11 @@ # Checks for programs. -AC_PROG_CC AC_PROG_CPP AC_PROG_CXX AC_PROG_CXXCPP -AC_PROG_GCC_TRADITIONAL # Checks for languages. -AC_LANG_C AC_LANG_CPLUSPLUS PKG_PROG_PKG_CONFIG @@ -213,7 +205,7 @@ if test "x$ac_qt4" = "xyes"; then AC_CACHE_CHECK([for Qt library version >= 4.4], ac_cv_qtversion, [ - AC_TRY_LINK([#include "QtCore/qglobal.h"], [ + AC_TRY_COMPILE([#include "QtCore/qglobal.h"], [ #if QT_VERSION < 0x040400 || QT_VERSION >= 0x050000 #error Qt library 4.4 or greater required. #endif @@ -227,7 +219,7 @@ if test "x$ac_qt5" = "xyes"; then AC_CACHE_CHECK([for Qt library version >= 5.1], ac_cv_qtversion, [ - AC_TRY_LINK([#include "QtCore/qglobal.h"], [ + AC_TRY_COMPILE([#include "QtCore/qglobal.h"], [ #if QT_VERSION < 0x050100 || QT_VERSION >= 0x060000 #error Qt library 5.1 or greater required. #endif