[med-svn] [cnrun] 05/10: tweaks to autotools files

[andrei zavada]

This is an automated email from the git hooks/post-receive script.

hmmr-guest pushed a commit to branch master
in repository cnrun.

commit 25bb9b846605e1dddd1aae087fc02c2e9a9a6c97
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Sun Sep 22 14:59:46 2013 +0300

    tweaks to autotools files
---
 upstream/autogen.sh   |    1 -
 upstream/configure.ac |    7 +++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/upstream/autogen.sh b/upstream/autogen.sh
index 2415c4e..23dab8d 100755
--- a/upstream/autogen.sh
+++ b/upstream/autogen.sh
@@ -7,4 +7,3 @@ aclocal $AUTOCONF_ARCHIVE
 autoheader
 automake --gnu --add-missing --copy
 autoconf
-# or just use autoreconf?
diff --git a/upstream/configure.ac b/upstream/configure.ac
index aac8789..117fc14 100644
--- a/upstream/configure.ac
+++ b/upstream/configure.ac
@@ -15,6 +15,7 @@ AM_DISABLE_STATIC()
 LT_INIT()
 
 AC_PROG_CXX([$CXX])
+AC_LANG([C++])
 
 AC_DEFUN([AC_CXX_STDCPP0X_FEATURES],
 [AC_CACHE_CHECK(whether $CXX has all required c++0x features,
@@ -47,6 +48,7 @@ ac_cv_cxx_cpp0x_features,
 AC_CXX_STDCPP0X_FEATURES()
 test $ac_cv_cxx_cpp0x_features = no && \
    AC_MSG_ERROR([g++ version >= 4.6.2 is required to build $PACKAGE as we use -std=c++0x your g++ doesn't seem to support], 1)
+cxx_version=`$CXX --version | head -n1`
 
 AC_OPENMP()
 
@@ -77,9 +79,6 @@ dnl defaulting to no to enable make dist-check
 AM_CONDITIONAL(DO_PCH, test x$do_pch = xyes)
 
 
-dnl AC_DEFINE( [FAFA], [printf( __FILE__ ":%d (%s): fafa\n", __LINE__, __FUNCTION__);], [FAFA])
-dnl AC_DEFINE( [FABUF], [printf( __FILE__ ":%d (%s): %s\n", __LINE__, __FUNCTION__, __buf__);], [FABUF])
-
 AC_SUBST(build_date, [`date +"%F"`])
 AC_SUBST(build_datetime, [`date`])
 AC_SUBST(docdir, [${prefix}/share/doc/${PACKAGE_TARNAME}])
@@ -101,7 +100,7 @@ AC_MSG_RESULT([
 
    PREFIX:              $prefix
 
-   CXX:			$CXX
+   CXX:			$CXX (${cxx_version})
    CXXFLAGS:            $CXXFLAGS
    LDFLAGS:             $LDFLAGS
 

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/cnrun.git