/[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 3849 by capela, Thu Jan 7 16:18:02 2021 UTC revision 3873 by capela, Thu Apr 15 13:28:01 2021 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.9.1, rncbc@rncbc.org, qsampler)  AC_INIT(Qsampler, 0.9.3, 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 10  AC_CACHE_VAL([ac_cv_build_version], [ Line 10  AC_CACHE_VAL([ac_cv_build_version], [
10     ac_cv_build_version=$(git describe --tags --dirty --abbrev=6 2>/dev/null)     ac_cv_build_version=$(git describe --tags --dirty --abbrev=6 2>/dev/null)
11     if test -n "$ac_cv_build_version"; then     if test -n "$ac_cv_build_version"; then
12        ac_cv_build_version=$(echo $ac_cv_build_version | sed 's/^[[^0-9]]\+//')        ac_cv_build_version=$(echo $ac_cv_build_version | sed 's/^[[^0-9]]\+//')
13          ac_cv_build_version=$(echo $ac_cv_build_version | sed 's/^1_//')
14          ac_cv_build_version=$(echo $ac_cv_build_version | sed 's/^[[_vV]]\+//')
15        ac_cv_build_version=$(echo $ac_cv_build_version | sed 's/-g/git./')        ac_cv_build_version=$(echo $ac_cv_build_version | sed 's/-g/git./')
16        ac_cv_build_version=$(echo $ac_cv_build_version | sed 's/[[_|-]]\+/./g')        ac_cv_build_version=$(echo $ac_cv_build_version | sed 's/[[_|-]]/./g')
17        ac_cv_build_version_extra=$(git rev-parse --abbrev-ref HEAD 2>/dev/null)        ac_cv_build_version_extra=$(git rev-parse --abbrev-ref HEAD 2>/dev/null)
18        if test "x$ac_cv_build_version_extra" != "xmaster"; then        if test "x$ac_cv_build_version_extra" != "xmaster"; then
19           ac_cv_build_version="$ac_cv_build_version [[$ac_cv_build_version_extra]]"           ac_cv_build_version="$ac_cv_build_version [[$ac_cv_build_version_extra]]"
# Line 67  AC_ARG_ENABLE(debug, Line 69  AC_ARG_ENABLE(debug,
69    AS_HELP_STRING([--enable-debug], [enable debugging (default=no)]),    AS_HELP_STRING([--enable-debug], [enable debugging (default=no)]),
70    [ac_debug="$enableval"])    [ac_debug="$enableval"])
71    
72    # Enable Qt6 build preference.
73    AC_ARG_ENABLE(qt6,
74      AS_HELP_STRING([--enable-qt6], [enable Qt6 build (default=no)]),
75      [ac_qt6="$enableval"],
76      [ac_qt6="no"])
77    
78    
79  if test "x$ac_debug" = "xyes"; then  if test "x$ac_debug" = "xyes"; then
80     AC_DEFINE(CONFIG_DEBUG, 1, [Define if debugging is enabled.])     AC_DEFINE(CONFIG_DEBUG, 1, [Define if debugging is enabled.])
81     ac_stacktrace="yes"     ac_stacktrace="yes"
# Line 201  ac_errmsg="not found in current PATH. Ma Line 210  ac_errmsg="not found in current PATH. Ma
210  # Check for qtchooser availability.  # Check for qtchooser availability.
211  AC_PATH_TOOL(ac_qtchooser, qtchooser, [no], $ac_path)  AC_PATH_TOOL(ac_qtchooser, qtchooser, [no], $ac_path)
212  if test -x $ac_qtchooser; then  if test -x $ac_qtchooser; then
213     export QT_SELECT=5     if test "x$ac_qt6" = "xyes"; then
214          export QT_SELECT=6
215       else
216          export QT_SELECT=5
217       fi
218  fi  fi
219    
220  # Check for proper qmake path/version alternatives.  # Check for proper qmake path/version alternatives.
221  AC_PATH_TOOL(ac_qmake, qmake, [no], $ac_path)  AC_PATH_TOOL(ac_qmake, qmake, [no], $ac_path)
222  if test "x$ac_qmake" = "xno"; then  if test "x$ac_qmake" = "xno"; then
223     AC_PATH_TOOL(ac_cv_qmake, qmake-qt5, [no], $ac_path)     if test "x$ac_qt6" = "xyes"; then
224     ac_qmake=$ac_cv_qmake        AC_PATH_TOOL(ac_cv_qmake, qmake-qt6, [no], $ac_path)
225  fi        ac_qmake=$ac_cv_qmake
226  if test "x$ac_qmake" = "xno"; then     else
227     AC_PATH_TOOL(ac_cv_qmake, qmake-qt6, [no], $ac_path)        AC_PATH_TOOL(ac_cv_qmake, qmake-qt5, [no], $ac_path)
228     ac_qmake=$ac_cv_qmake        ac_qmake=$ac_cv_qmake
229       fi
230  fi  fi
231    
232  # Check for proper Qt major version.  # Check for proper Qt major version.
233  AC_CACHE_CHECK([for Qt major version], [ac_cv_qt_version_major], [  AC_CACHE_CHECK([for Qt major version], [ac_cv_qt_version_major], [
234     ac_cv_qt_version_major=$($ac_qmake -query QT_VERSION | cut -d'.' -f1)     ac_cv_qt_version=$($ac_qmake -query QT_VERSION)
235       ac_cv_qt_version_major=$(echo $ac_cv_qt_version | cut -d'.' -f1)
236     ac_cv_qt_version_major=$(($ac_cv_qt_version_major + 0))     ac_cv_qt_version_major=$(($ac_cv_qt_version_major + 0))
237  ])  ])
238    ac_qt_version=$ac_cv_qt_version
239  ac_qt_version_major=$ac_cv_qt_version_major  ac_qt_version_major=$ac_cv_qt_version_major
240  if test "x$ac_qmake" = "xno"; then  if test "x$ac_qmake" = "xno"; then
241     if test $ac_qt_version_major -lt 6; then     if test $ac_qt_version_major -lt 6; then
# Line 559  AC_OUTPUT Line 575  AC_OUTPUT
575  # Output summary message  # Output summary message
576    
577  echo  echo
578  echo "  $PACKAGE_NAME $ac_build_version"  echo "  $PACKAGE_NAME $ac_build_version (Qt $ac_qt_version)"
579  echo  echo
580  echo "  Build target . . . . . . . . . . . . . . . . . . .: $ac_debug"  echo "  Build target . . . . . . . . . . . . . . . . . . .: $ac_debug"
581  echo  echo
Legend:
Removed from v.3849  
changed lines
  Added in v.3873
  ViewVC Help
Powered by ViewVC