/[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 3086 by capela, Fri Jan 13 16:35:41 2017 UTC revision 3401 by capela, Tue Dec 12 17:47:43 2017 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.4.2, rncbc@rncbc.org, qsampler)  AC_INIT(Qsampler, 0.5.0, 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)
6  AC_CONFIG_FILES(Makefile qsampler.spec src/src.pri src/qsampler.desktop)  AC_CONFIG_FILES(Makefile qsampler.spec src/src.pri)
7    
8  # Build version string.  # Build version string.
9  AC_CACHE_VAL([ac_cv_build_version], [  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 -r 's/^[[^_]]+_//')        ac_cv_build_version=$(echo $ac_cv_build_version | sed 's/^[[^_]]*[[_v]]//i')
13        ac_cv_build_version=$(echo $ac_cv_build_version | sed -r 's/-g/git./')        ac_cv_build_version=$(echo $ac_cv_build_version | sed 's/-g/git./')
14        ac_cv_build_version=$(echo $ac_cv_build_version | sed -r 's/[[_|-]]+/./g')        ac_cv_build_version=$(echo $ac_cv_build_version | sed 's/[[_|-]]\+/./g')
15          ac_cv_build_version_extra=$(git rev-parse --abbrev-ref HEAD 2>/dev/null)
16          if test "x$ac_cv_build_version_extra" != "xmaster"; then
17             ac_cv_build_version="$ac_cv_build_version [[$ac_cv_build_version_extra]]"
18          fi
19     else     else
20        ac_cv_build_version=$PACKAGE_VERSION        ac_cv_build_version=$PACKAGE_VERSION
21     fi     fi
# Line 21  AC_DEFINE_UNQUOTED(CONFIG_BUILD_VERSION, Line 25  AC_DEFINE_UNQUOTED(CONFIG_BUILD_VERSION,
25    
26  # Sanitized version string.  # Sanitized version string.
27  AC_CACHE_VAL([ac_cv_version], [  AC_CACHE_VAL([ac_cv_version], [
28     ac_cv_version=$(echo $ac_cv_build_version | sed -r 's/^([[0-9|\.]]+).*$/\1/')     ac_cv_version=$(echo $PACKAGE_VERSION | sed -r 's/^([[0-9|\.]]+).*$/\1/')
29  ])  ])
30  ac_version="$ac_cv_version"  ac_version="$ac_cv_version"
31  AC_DEFINE_UNQUOTED(CONFIG_VERSION, ["$ac_version"], [Version string.])  AC_DEFINE_UNQUOTED(CONFIG_VERSION, ["$ac_version"], [Version string.])
# Line 157  AC_CACHE_CHECK([for g++ major version], Line 161  AC_CACHE_CHECK([for g++ major version],
161     ac_gxx_version_major=$(($ac_cv_gxx_version_major + 0))     ac_gxx_version_major=$(($ac_cv_gxx_version_major + 0))
162  ])  ])
163  ac_gxx_version_major=$ac_cv_gxx_version_major  ac_gxx_version_major=$ac_cv_gxx_version_major
164  if test $ac_gxx_version_major -gt 4 -a $ac_gxx_version_major -lt 6; then  if test $ac_gxx_version_major -ge 4 -a $ac_gxx_version_major -lt 6; then
165     CXXFLAGS="-std=c++11 $CXXFLAGS"     CXXFLAGS="-std=c++11 $CXXFLAGS"
166  fi  fi
167    
Legend:
Removed from v.3086  
changed lines
  Added in v.3401
  ViewVC Help
Powered by ViewVC