/[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 3868 by capela, Tue Mar 30 23:31:09 2021 UTC revision 3869 by capela, Thu Apr 1 21:49:01 2021 UTC
# Line 67  AC_ARG_ENABLE(debug, Line 67  AC_ARG_ENABLE(debug,
67    AS_HELP_STRING([--enable-debug], [enable debugging (default=no)]),    AS_HELP_STRING([--enable-debug], [enable debugging (default=no)]),
68    [ac_debug="$enableval"])    [ac_debug="$enableval"])
69    
70    # Enable Qt6 build preference.
71    AC_ARG_ENABLE(qt6,
72      AS_HELP_STRING([--enable-qt6], [enable Qt6 build (default=no)]),
73      [ac_qt6="$enableval"],
74      [ac_qt6="no"])
75    
76    
77  if test "x$ac_debug" = "xyes"; then  if test "x$ac_debug" = "xyes"; then
78     AC_DEFINE(CONFIG_DEBUG, 1, [Define if debugging is enabled.])     AC_DEFINE(CONFIG_DEBUG, 1, [Define if debugging is enabled.])
79     ac_stacktrace="yes"     ac_stacktrace="yes"
# Line 201  ac_errmsg="not found in current PATH. Ma Line 208  ac_errmsg="not found in current PATH. Ma
208  # Check for qtchooser availability.  # Check for qtchooser availability.
209  AC_PATH_TOOL(ac_qtchooser, qtchooser, [no], $ac_path)  AC_PATH_TOOL(ac_qtchooser, qtchooser, [no], $ac_path)
210  if test -x $ac_qtchooser; then  if test -x $ac_qtchooser; then
211     export QT_SELECT=5     if test "x$ac_qt6" = "xyes"; then
212          export QT_SELECT=6
213       else
214          export QT_SELECT=5
215       fi
216  fi  fi
217    
218  # Check for proper qmake path/version alternatives.  # Check for proper qmake path/version alternatives.
219  AC_PATH_TOOL(ac_qmake, qmake, [no], $ac_path)  AC_PATH_TOOL(ac_qmake, qmake, [no], $ac_path)
220  if test "x$ac_qmake" = "xno"; then  if test "x$ac_qmake" = "xno"; then
221     AC_PATH_TOOL(ac_cv_qmake, qmake-qt5, [no], $ac_path)     if test "x$ac_qt6" = "xyes"; then
222     ac_qmake=$ac_cv_qmake        AC_PATH_TOOL(ac_cv_qmake, qmake-qt6, [no], $ac_path)
223  fi        ac_qmake=$ac_cv_qmake
224  if test "x$ac_qmake" = "xno"; then     else
225     AC_PATH_TOOL(ac_cv_qmake, qmake-qt6, [no], $ac_path)        AC_PATH_TOOL(ac_cv_qmake, qmake-qt5, [no], $ac_path)
226     ac_qmake=$ac_cv_qmake        ac_qmake=$ac_cv_qmake
227       fi
228  fi  fi
229    
230  # Check for proper Qt major version.  # Check for proper Qt major version.

Legend:
Removed from v.3868  
changed lines
  Added in v.3869

  ViewVC Help
Powered by ViewVC