[med-svn] [cnrun] 03/25: update configure.ac
andrei zavada
hmmr-guest at moszumanska.debian.org
Thu Nov 6 22:08:29 UTC 2014
This is an automated email from the git hooks/post-receive script.
hmmr-guest pushed a commit to branch WIP
in repository cnrun.
commit 0a9166c58f33b474c1757e611814e957073f8fd0
Author: Andrei Zavada <johnhommer at gmail.com>
Date: Sat Mar 22 21:57:18 2014 +0200
update configure.ac
---
upstream/configure.ac | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/upstream/configure.ac b/upstream/configure.ac
index f37a665..0b038b1 100644
--- a/upstream/configure.ac
+++ b/upstream/configure.ac
@@ -1,11 +1,11 @@
-AC_COPYRIGHT([Copyright (c) 2008-12 Andrei Zavada <johnhommer at gmail.com>])
+AC_COPYRIGHT([Copyright (c) 2008-14 Andrei Zavada <johnhommer at gmail.com>])
-AC_INIT([cnrun], [1.1.14], [johnhommer at gmail.com])
+AC_INIT([cnrun], [1.1.15_rc], [johnhommer at gmail.com])
AC_CONFIG_SRCDIR([src/runner-main.cc])
AC_CONFIG_MACRO_DIR([m4])
AC_PREREQ(2.61)
-AM_INIT_AUTOMAKE([-Wno-portability, silent-rules])
+AM_INIT_AUTOMAKE([-Wno-portability silent-rules subdir-objects])
dnl AM_SILENT_RULES([yes])
AC_CONFIG_HEADERS([config.h])
@@ -17,11 +17,11 @@ 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,
-ac_cv_cxx_cpp0x_features,
-[AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
+dnl Check for c++11 features
+AC_DEFUN([AC_CXX_STDCPP11_FEATURES],
+[AC_CACHE_CHECK(whether $CXX has all required c++11 features,
+ac_cv_cxx_cpp11_features,
+[AC_LANG([C++])
old_CXX=$CXX
CXX="$CXX -std=c++0x"
AC_TRY_RUN([
@@ -29,6 +29,7 @@ ac_cv_cxx_cpp0x_features,
#include <algorithm>
using namespace std;
enum class fafa : int { ke, pi };
+ class C { C(int) {} C(int x, int) : C(x) {} };
int main (int , char **)
{
void* p = nullptr;
@@ -39,15 +40,14 @@ ac_cv_cxx_cpp0x_features,
return 0;
}
],
- ac_cv_cxx_cpp0x_features=yes, ac_cv_cxx_cpp0x_features=no,
- ac_cv_cxx_cpp0x_features=yes)
- AC_LANG_RESTORE
+ ac_cv_cxx_cpp11_features=yes, ac_cv_cxx_cpp11_features=no,
+ ac_cv_cxx_cpp11_features=yes)
CXX=$old_CXX
])
])
-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)
+AC_CXX_STDCPP11_FEATURES()
+test $ac_cv_cxx_cpp11_features = no && \
+ AC_MSG_ERROR([g++ >= 4.7 is required to build $PACKAGE as we must use -std=c++11 features your compiler doesn't seem to support], 1)
cxx_version=`$CXX --version | head -n1`
AC_OPENMP()
@@ -79,8 +79,7 @@ dnl defaulting to no to enable make dist-check
AM_CONDITIONAL(DO_PCH, test x$do_pch = xyes)
-AC_SUBST(build_date, [`date +"%F"`])
-AC_SUBST(build_datetime, [`date`])
+AC_SUBST(user, [`whoami`@`hostname`])
AC_SUBST(docdir, [${prefix}/share/doc/${PACKAGE_TARNAME}])
@@ -107,4 +106,5 @@ AC_MSG_RESULT([
build tools: ${do_tools}
+ precompile headers: $do_pch
])
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/cnrun.git
More information about the debian-med-commit
mailing list