/[svn]/qsampler/trunk/configure.ac
ViewVC logotype

Diff of /qsampler/trunk/configure.ac

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2846 by capela, Thu Oct 1 15:43:03 2015 UTC revision 2874 by capela, Tue Apr 12 16:52:35 2016 UTC
# Line 1  Line 1 
1  # Process this file with autoconf to produce a configure script.  # Process this file with autoconf to produce a configure script.
2  AC_INIT(Qsampler, 0.3.1.7, rncbc@rncbc.org, qsampler)  AC_INIT(Qsampler, 0.4.0.1, rncbc@rncbc.org, qsampler)
3    
4  AC_CONFIG_SRCDIR(src/qsampler.cpp)  AC_CONFIG_SRCDIR(src/qsampler.cpp)
5  AC_CONFIG_HEADERS(src/config.h)  AC_CONFIG_HEADERS(src/config.h)
# Line 9  AC_CONFIG_FILES(Makefile qsampler.spec s Line 9  AC_CONFIG_FILES(Makefile qsampler.spec s
9  AC_PREFIX_DEFAULT(/usr/local)  AC_PREFIX_DEFAULT(/usr/local)
10  ac_prefix=$prefix  ac_prefix=$prefix
11  if test "x$ac_prefix" = "xNONE"; then  if test "x$ac_prefix" = "xNONE"; then
12      ac_prefix=$ac_default_prefix     ac_prefix=$ac_default_prefix
13  fi  fi
14  AC_SUBST(ac_prefix)  AC_SUBST(ac_prefix)
15  AC_DEFINE_UNQUOTED(CONFIG_PREFIX, ["$ac_prefix"], [Default installation prefix.])  AC_DEFINE_UNQUOTED(CONFIG_PREFIX, ["$ac_prefix"], [Default installation prefix.])
# Line 34  AC_SUBST(ac_debug) Line 34  AC_SUBST(ac_debug)
34  AC_ARG_ENABLE(qt4,  AC_ARG_ENABLE(qt4,
35    AC_HELP_STRING([--enable-qt4], [enable Qt4 build (default=no)]),    AC_HELP_STRING([--enable-qt4], [enable Qt4 build (default=no)]),
36    [ac_qt4="$enableval"],    [ac_qt4="$enableval"],
   [ac_qt4="no"])  
   
 AC_ARG_ENABLE(qt5,  
   AC_HELP_STRING([--enable-qt5], [enable Qt5 build (default=yes)]),  
   [ac_qt5="$enableval"],  
37    [ac_qt5="yes"])    [ac_qt5="yes"])
38    
39    
# Line 111  ac_ldflags=$LDFLAGS Line 106  ac_ldflags=$LDFLAGS
106    
107    
108  # Checks for programs.  # Checks for programs.
 AC_PROG_CC  
109  AC_PROG_CPP  AC_PROG_CPP
110  AC_PROG_CXX  AC_PROG_CXX
111  AC_PROG_CXXCPP  AC_PROG_CXXCPP
 AC_PROG_GCC_TRADITIONAL  
112    
113  # Checks for languages.  # Checks for languages.
 AC_LANG_C  
114  AC_LANG_CPLUSPLUS  AC_LANG_CPLUSPLUS
115    
116  PKG_PROG_PKG_CONFIG  PKG_PROG_PKG_CONFIG
# Line 213  fi Line 205  fi
205  if test "x$ac_qt4" = "xyes"; then  if test "x$ac_qt4" = "xyes"; then
206     AC_CACHE_CHECK([for Qt library version >= 4.4],     AC_CACHE_CHECK([for Qt library version >= 4.4],
207        ac_cv_qtversion, [        ac_cv_qtversion, [
208        AC_TRY_LINK([#include "QtCore/qglobal.h"], [        AC_TRY_COMPILE([#include "QtCore/qglobal.h"], [
209           #if QT_VERSION < 0x040400 || QT_VERSION >= 0x050000           #if QT_VERSION < 0x040400 || QT_VERSION >= 0x050000
210           #error Qt library 4.4 or greater required.           #error Qt library 4.4 or greater required.
211           #endif           #endif
# Line 227  fi Line 219  fi
219  if test "x$ac_qt5" = "xyes"; then  if test "x$ac_qt5" = "xyes"; then
220     AC_CACHE_CHECK([for Qt library version >= 5.1],     AC_CACHE_CHECK([for Qt library version >= 5.1],
221        ac_cv_qtversion, [        ac_cv_qtversion, [
222        AC_TRY_LINK([#include "QtCore/qglobal.h"], [        AC_TRY_COMPILE([#include "QtCore/qglobal.h"], [
223           #if QT_VERSION < 0x050100 || QT_VERSION >= 0x060000           #if QT_VERSION < 0x050100 || QT_VERSION >= 0x060000
224           #error Qt library 5.1 or greater required.           #error Qt library 5.1 or greater required.
225           #endif           #endif
Legend:
Removed from v.2846  
changed lines
  Added in v.2874
  ViewVC Help
Powered by ViewVC