/[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 3128 by capela, Thu Apr 27 11:09:16 2017 UTC revision 3281 by capela, Wed Jun 7 10:22:50 2017 UTC
# Line 9  AC_CONFIG_FILES(Makefile qsampler.spec s Line 9  AC_CONFIG_FILES(Makefile qsampler.spec s
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/^[^_]*[_v]//i')        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)        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        if test "x$ac_cv_build_version_extra" != "xmaster"; then
17           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 161  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.3128  
changed lines
  Added in v.3281
  ViewVC Help
Powered by ViewVC