From: bangerth Date: Mon, 10 Jan 2011 14:43:42 +0000 (+0000) Subject: Take over patch 23158 from mainline. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f38253c28081c7438cc3e09cdec0804c582e816;p=dealii-svn.git Take over patch 23158 from mainline. git-svn-id: https://svn.dealii.org/branches/releases/Branch-7-0@23162 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index f7575ecd0c..1e94413e9c 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -9,7 +9,7 @@ dnl In doc/Makefile some information on the kind of documentation dnl is stored. dnl dnl -dnl Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by the deal.II authors +dnl Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 by the deal.II authors dnl dnl $Id$ @@ -176,7 +176,7 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl dnl sure we're not confused is_pgi="`($CXX -V 2>&1) | grep 'Portland'`" - if test "x$is_intel_icc" != "x" -a "x$is_pgi" == "x" ; then + if test "x$is_intel_icc" != "x" -a "x$is_pgi" = "x" ; then GXX_BRAND=Intel version_string="`($CXX -V 2>&1) | grep 'Version'` `($CXX -help 2>&1) | grep 'Version'`" version5="`echo $version_string | grep 'Version 5'`" @@ -1188,7 +1188,7 @@ AC_DEFUN(DEAL_II_DETERMINE_CC_BRAND, dnl dnl sure we're not confused is_pgi="`($CXX -V 2>&1) | grep 'Portland'`" - if test "x$is_intel_icc" != "x" -a "x$is_pgi" == "x"; then + if test "x$is_intel_icc" != "x" -a "x$is_pgi" = "x"; then version_string="`($CC -V 2>&1) | grep 'Version'` `($CC -help 2>&1) | grep 'Version'`" version5="`echo $version_string | grep 'Version 5'`" version6="`echo $version_string | grep 'Version 6'`" @@ -6778,7 +6778,7 @@ AC_DEFUN(DEAL_II_WITH_UMFPACK, dnl AC_DEFINE(HAVE_LIBUMFPACK,1,[UMFPACK is $1]) fi - if test "x$UMFPACK_DIR" != "x" -a "x$acx_umfpack" == "xno" ; then + if test "x$UMFPACK_DIR" != "x" -a "x$acx_umfpack" = "xno" ; then dnl A pathname has been given to --with-umfpack but nothing dnl has been specified through the other two flags diff --git a/deal.II/configure b/deal.II/configure index 1b061b7275..c7cf28d4f6 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 23045 . +# From configure.in Revision: 23147 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.65 for deal.II 7.0.0. # @@ -3828,7 +3828,7 @@ $as_echo "C++ compiler is unknown version but accepted MIPSpro compiler version" is_pgi="`($CXX -V 2>&1) | grep 'Portland'`" - if test "x$is_intel_icc" != "x" -a "x$is_pgi" == "x" ; then + if test "x$is_intel_icc" != "x" -a "x$is_pgi" = "x" ; then GXX_BRAND=Intel version_string="`($CXX -V 2>&1) | grep 'Version'` `($CXX -help 2>&1) | grep 'Version'`" version5="`echo $version_string | grep 'Version 5'`" @@ -4928,7 +4928,7 @@ $as_echo "C compiler is unknown version but accepted MIPSpro compiler version" > is_pgi="`($CXX -V 2>&1) | grep 'Portland'`" - if test "x$is_intel_icc" != "x" -a "x$is_pgi" == "x"; then + if test "x$is_intel_icc" != "x" -a "x$is_pgi" = "x"; then version_string="`($CC -V 2>&1) | grep 'Version'` `($CC -help 2>&1) | grep 'Version'`" version5="`echo $version_string | grep 'Version 5'`" version6="`echo $version_string | grep 'Version 6'`" @@ -11843,7 +11843,7 @@ $as_echo "#define HAVE_LIBUMFPACK 1" >>confdefs.h fi - if test "x$UMFPACK_DIR" != "x" -a "x$acx_umfpack" == "xno" ; then + if test "x$UMFPACK_DIR" != "x" -a "x$acx_umfpack" = "xno" ; then if test "x$DEAL_II_USE_INTERNAL_UMFPACK" != "xyes" ; then OLD_LDFLAGS="$LDFLAGS"