/[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 2861 by capela, Wed Feb 24 16:30:27 2016 UTC revision 2980 by capela, Sat Aug 20 17:01:52 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.14, rncbc@rncbc.org, qsampler)  AC_INIT(Qsampler, 0.4.0.9, 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 36  AC_ARG_ENABLE(qt4, Line 36  AC_ARG_ENABLE(qt4,
36    [ac_qt4="$enableval"],    [ac_qt4="$enableval"],
37    [ac_qt4="no"])    [ac_qt4="no"])
38    
 AC_ARG_ENABLE(qt5,  
   AC_HELP_STRING([--enable-qt5], [enable Qt5 build (default=yes)]),  
   [ac_qt5="$enableval"],  
   [ac_qt5="yes"])  
   
   
39    
40  # Enable libgig availability.  # Enable libgig availability.
41  AC_ARG_ENABLE(libgig,  AC_ARG_ENABLE(libgig,
# Line 62  AC_ARG_ENABLE(stacktrace, Line 56  AC_ARG_ENABLE(stacktrace,
56    
57    
58  # Standard installation base dirs.  # Standard installation base dirs.
59  if test "$cross_compiling" = yes; then  ac_with_paths=""
   ac_with_paths=""  
 else  
   ac_with_paths="/usr /usr/local"  
 fi  
60    
61  # Set for alternate Qt4/5 installation dir.  # Set for alternate Qt4/5 installation dir.
62  AC_ARG_WITH(qt4,  AC_ARG_WITH(qt4,
# Line 84  fi Line 74  fi
74    
75  if test "x$ac_qt5_path" != "xno"; then  if test "x$ac_qt5_path" != "xno"; then
76     ac_with_paths="$ac_with_paths $ac_qt5_path"     ac_with_paths="$ac_with_paths $ac_qt5_path"
77     ac_qt5="yes"     ac_qt4="no"
 fi  
   
 if test "x$ac_qt5" = "xno"; then  
    ac_qt4="yes"  
 fi  
 if test "x$ac_qt4" = "xyes"; then  
    ac_qt5="no"  
78  fi  fi
79    
80  # Set for alternate liblscp installation dir.  # Set for alternate liblscp installation dir.
# Line 111  ac_ldflags=$LDFLAGS Line 94  ac_ldflags=$LDFLAGS
94    
95    
96  # Checks for programs.  # Checks for programs.
 AC_PROG_CC  
97  AC_PROG_CPP  AC_PROG_CPP
98  AC_PROG_CXX  AC_PROG_CXX
99  AC_PROG_CXXCPP  AC_PROG_CXXCPP
 AC_PROG_GCC_TRADITIONAL  
100    
101  # Checks for languages.  # Checks for languages.
 AC_LANG_C  
102  AC_LANG_CPLUSPLUS  AC_LANG_CPLUSPLUS
103    
104  PKG_PROG_PKG_CONFIG  PKG_PROG_PKG_CONFIG
# Line 161  ac_errmsg="not found in current PATH. Ma Line 141  ac_errmsg="not found in current PATH. Ma
141    
142  if test "x$ac_qt4" = "xyes"; then  if test "x$ac_qt4" = "xyes"; then
143     AC_PATH_PROG(ac_qmake, qmake-qt4, [no], $ac_path)     AC_PATH_PROG(ac_qmake, qmake-qt4, [no], $ac_path)
144  fi  else
 if test "x$ac_qt5" = "xyes"; then  
145     AC_PATH_PROG(ac_qmake, qmake-qt5, [no], $ac_path)     AC_PATH_PROG(ac_qmake, qmake-qt5, [no], $ac_path)
146  fi  fi
147  if test "x$ac_qmake" = "xno"; then  if test "x$ac_qmake" = "xno"; then
# Line 175  fi Line 154  fi
154    
155  # Check for proper Qt4/5 major version.  # Check for proper Qt4/5 major version.
156  ac_qt_version_major=`$ac_qmake -query QT_VERSION | cut -d. -f1`  ac_qt_version_major=`$ac_qmake -query QT_VERSION | cut -d. -f1`
157  if test "x$ac_qt4" = "xyes" -a "x$ac_qt_version_major" != "x4"; then  if test "x$ac_qt4" = "xyes"; then
158     AC_MSG_ERROR([qmake-qt4 $ac_errmsg (qt4-devel)])     if test "x$ac_qt_version_major" != "x4"; then
159  fi        AC_MSG_ERROR([qmake-qt4 $ac_errmsg (qt4-devel)])
160  if test "x$ac_qt5" = "xyes" -a "x$ac_qt_version_major" != "x5"; then     fi
161     AC_MSG_ERROR([qmake-qt5 $ac_errmsg (qt5-devel)])  else
162       if test "x$ac_qt_version_major" != "x5"; then
163          AC_MSG_ERROR([qmake-qt5 $ac_errmsg (qt5-devel)])
164       fi
165  fi  fi
166    
167  ac_qt_install_bins=`$ac_qmake -query QT_INSTALL_BINS`  ac_qt_install_bins=`$ac_qmake -query QT_INSTALL_BINS`
# Line 222  if test "x$ac_qt4" = "xyes"; then Line 204  if test "x$ac_qt4" = "xyes"; then
204           exit 1           exit 1
205        ])        ])
206     ])     ])
207  fi  else
   
 if test "x$ac_qt5" = "xyes"; then  
208     AC_CACHE_CHECK([for Qt library version >= 5.1],     AC_CACHE_CHECK([for Qt library version >= 5.1],
209        ac_cv_qtversion, [        ac_cv_qtversion, [
210        AC_TRY_COMPILE([#include "QtCore/qglobal.h"], [        AC_TRY_COMPILE([#include "QtCore/qglobal.h"], [
Legend:
Removed from v.2861  
changed lines
  Added in v.2980
  ViewVC Help
Powered by ViewVC