/[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 3433 by capela, Fri Aug 17 18:54:38 2018 UTC revision 3434 by capela, Thu Nov 8 08:02:37 2018 UTC
# Line 78  fi Line 78  fi
78  AC_SUBST(ac_debug)  AC_SUBST(ac_debug)
79    
80    
 # Enable Qt4/5 availability.  
 AC_ARG_ENABLE(qt4,  
   AS_HELP_STRING([--enable-qt4], [enable Qt4 build (default=no)]),  
   [ac_qt4="$enableval"],  
   [ac_qt4="no"])  
   
   
81  # Enable libgig availability.  # Enable libgig availability.
82  AC_ARG_ENABLE(libgig,  AC_ARG_ENABLE(libgig,
83    AS_HELP_STRING([--enable-libgig], [enable libgig interface (default=yes)]),    AS_HELP_STRING([--enable-libgig], [enable libgig interface (default=yes)]),
# Line 107  AC_ARG_ENABLE(stacktrace, Line 100  AC_ARG_ENABLE(stacktrace,
100  ac_path=$PATH  ac_path=$PATH
101  ac_with_paths=""  ac_with_paths=""
102    
103  # Set for alternate Qt4/5 installation dir.  # Set for alternate Qt installation dir.
104  AC_ARG_WITH(qt,  AC_ARG_WITH(qt,
105    AS_HELP_STRING([--with-qt=PATH], [use alternate Qt install path]),    AS_HELP_STRING([--with-qt=PATH], [use alternate Qt install path]),
106    [ac_qt_path="$withval"], [ac_qt_path="no"])    [ac_qt_path="$withval"], [ac_qt_path="no"])
107    
 AC_ARG_WITH(qt4,  
   AS_HELP_STRING([--with-qt4=PATH], [use alternate Qt4 install path]),  
   [ac_qt4_path="$withval"], [ac_qt4_path="no"])  
   
 AC_ARG_WITH(qt5,  
   AS_HELP_STRING([--with-qt5=PATH], [use alternate Qt5 install path]),  
   [ac_qt5_path="$withval"], [ac_qt5_path="no"])  
   
108  if test "x$ac_qt_path" != "xno"; then  if test "x$ac_qt_path" != "xno"; then
109     ac_path="$ac_qt_path/bin:$ac_path"     ac_path="$ac_qt_path/bin:$ac_path"
110  fi  fi
111    
 if test "x$ac_qt4_path" != "xno"; then  
    ac_path="$ac_qt4_path/bin:$ac_path"  
    ac_qt4="yes"  
 fi  
   
 if test "x$ac_qt5_path" != "xno"; then  
    ac_path="$ac_qt5_path/bin:$ac_path"  
    ac_qt4="no"  
 fi  
   
112  # Set for alternate liblscp installation dir.  # Set for alternate liblscp installation dir.
113  AC_ARG_WITH(liblscp,  AC_ARG_WITH(liblscp,
114    AS_HELP_STRING([--with-liblscp=PATH], [use alternate liblscp install path]),    AS_HELP_STRING([--with-liblscp=PATH], [use alternate liblscp install path]),
# Line 210  ac_errmsg="not found in current PATH. Ma Line 185  ac_errmsg="not found in current PATH. Ma
185    
186  # Check for proper qmake path/version alternatives.  # Check for proper qmake path/version alternatives.
187  AC_PATH_TOOL(ac_qmake, qmake, [no], $ac_path)  AC_PATH_TOOL(ac_qmake, qmake, [no], $ac_path)
   
188  if test "x$ac_qmake" = "xno"; then  if test "x$ac_qmake" = "xno"; then
189     if test "x$ac_qt4" = "xyes"; then     AC_PATH_TOOL(ac_cv_qmake, qmake-qt5, [no], $ac_path)
190        AC_PATH_TOOL(ac_cv_qmake, qmake-qt4, [no], $ac_path)     ac_qmake=$ac_cv_qmake
       ac_qmake=$ac_cv_qmake  
    else  
       AC_PATH_TOOL(ac_cv_qmake, qmake-qt5, [no], $ac_path)  
       ac_qmake=$ac_cv_qmake  
    fi  
191  fi  fi
192    
193  # Check for proper Qt major version.  # Check for proper Qt major version.
# Line 227  AC_CACHE_CHECK([for Qt major version], [ Line 196  AC_CACHE_CHECK([for Qt major version], [
196     ac_cv_qt_version_major=$(($ac_cv_qt_version_major + 0))     ac_cv_qt_version_major=$(($ac_cv_qt_version_major + 0))
197  ])  ])
198  ac_qt_version_major=$ac_cv_qt_version_major  ac_qt_version_major=$ac_cv_qt_version_major
199  if test "x$ac_qt4" = "xyes"; then  if test $ac_qt_version_major -ne 5; then
200     if test $ac_qt_version_major -ne 4; then          AC_PATH_TOOL(ac_cv_qmake, qmake-qt5, [no], $ac_path)
201        AC_PATH_TOOL(ac_cv_qmake, qmake-qt4, [no], $ac_path)          ac_qmake=$ac_cv_qmake
       ac_qmake=$ac_cv_qmake  
    fi  
 else  
    if test $ac_qt_version_major -ne 5; then  
       AC_PATH_TOOL(ac_cv_qmake, qmake-qt5, [no], $ac_path)  
       ac_qmake=$ac_cv_qmake  
    fi  
202  fi  fi
203    
204  if test "x$ac_qmake" = "xno"; then  if test "x$ac_qmake" = "xno"; then
205     if test "x$ac_qt4" = "xyes"; then     AC_MSG_ERROR([qmake-qt5 $ac_errmsg (qt5-devel)])
       AC_MSG_ERROR([qmake-qt4 $ac_errmsg (qt4-devel)])  
    else  
       AC_MSG_ERROR([qmake-qt5 $ac_errmsg (qt5-devel)])  
    fi  
206  fi  fi
207    
208  # Check for proper Qt install path.  # Check for proper Qt install path.
# Line 284  if test -d $ac_qt_install_libs; then Line 242  if test -d $ac_qt_install_libs; then
242     ac_libs="-L$ac_qt_install_libs $ac_libs"     ac_libs="-L$ac_qt_install_libs $ac_libs"
243  fi  fi
244    
245  # Finally, check for proper Qt4/5 version.  # Finally, check for proper Qt version.
246  if test "x$ac_qt4" = "xyes"; then  AC_CACHE_CHECK([for Qt library version >= 5.1],
247     AC_CACHE_CHECK([for Qt library version >= 4.4],     ac_cv_qtversion, [
248        ac_cv_qtversion, [     AC_TRY_COMPILE([#include "QtCore/qglobal.h"], [
249        AC_TRY_COMPILE([#include "QtCore/qglobal.h"], [        #if QT_VERSION < 0x050100
250           #if QT_VERSION < 0x040400 || QT_VERSION >= 0x050000        #error Qt library 5.1 or greater required.
251           #error Qt library 4.4 or greater required.        #endif
252           #endif     ], ac_cv_qtversion="yes", [
253        ], ac_cv_qtversion="yes", [        echo "no; Qt 5.1 or greater is required"
254           echo "no; Qt 4.4 or greater is required"        exit 1
          exit 1  
       ])  
    ])  
 else  
    AC_CACHE_CHECK([for Qt library version >= 5.1],  
       ac_cv_qtversion, [  
       AC_TRY_COMPILE([#include "QtCore/qglobal.h"], [  
          #if QT_VERSION < 0x050100 || QT_VERSION >= 0x060000  
          #error Qt library 5.1 or greater required.  
          #endif  
       ], ac_cv_qtversion="yes", [  
          echo "no; Qt 5.1 or greater is required"  
          exit 1  
       ])  
255     ])     ])
256  fi  ])
257    
258  # Check for Qt moc utility.  # Check for Qt moc utility.
259  AC_PATH_TOOL(ac_moc, moc, [no], $ac_path)  AC_PATH_TOOL(ac_moc, moc, [no], $ac_path)
# Line 521  if test "x$ac_libgig" = "xyes"; then Line 465  if test "x$ac_libgig" = "xyes"; then
465  fi  fi
466    
467  # Check for X11 unique/single instance.  # Check for X11 unique/single instance.
468  if test "x$ac_xunique" = "xyes" -a "x$ac_qt4" = "xno"; then  if test "x$ac_xunique" = "xyes"; then
469     PKG_CHECK_MODULES([QT5X11EXTRAS], [Qt5X11Extras], [ac_xunique="yes"], [ac_xunique="no"])     PKG_CHECK_MODULES([QT5X11EXTRAS], [Qt5X11Extras], [ac_xunique="yes"], [ac_xunique="no"])
470  fi  fi
471  if test "x$ac_xunique" = "xyes"; then  if test "x$ac_xunique" = "xyes"; then
472     AC_DEFINE(CONFIG_XUNIQUE, 1, [Define if X11 unique/single instance is enabled.])     AC_DEFINE(CONFIG_XUNIQUE, 1, [Define if X11 unique/single instance is enabled.])
473     if test "x$ac_qt4" = "xno"; then     ac_qx11extras="x11extras"
       ac_qx11extras="x11extras"  
    fi  
474     # Some recent distros (eg. fedora, debian) require this.     # Some recent distros (eg. fedora, debian) require this.
475     if test "x$ac_cv_lib_X11_main" = "xyes"; then     if test "x$ac_cv_lib_X11_main" = "xyes"; then
476        ac_libs="$ac_libs -lX11"        ac_libs="$ac_libs -lX11"
Legend:
Removed from v.3433  
changed lines
  Added in v.3434
  ViewVC Help
Powered by ViewVC