From: bangerth Date: Tue, 6 Jan 2009 04:41:37 +0000 (+0000) Subject: Use XX="$abc" instead of XX=$abc to avoid problems when abc is a variable that contai... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=757cb7ce70877c17728f3e8bd6061feae02a143b;p=dealii-svn.git Use XX="$abc" instead of XX=$abc to avoid problems when abc is a variable that contains spaces. Also remove a left-over from the time when we used kdoc for documentation. git-svn-id: https://svn.dealii.org/trunk@18093 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index c38ac11016..0be5499666 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 by the deal.II authors +dnl Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by the deal.II authors dnl dnl $Id$ @@ -223,7 +223,7 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl dnl high... AC_MSG_RESULT(C++ compiler is IBM xlC) GXX_VERSION=ibm_xlc - GXX_VERSION_DETAILED=$GXX_VERSION + GXX_VERSION_DETAILED="$GXX_VERSION" else dnl Check whether we are dealing with the MIPSpro C++ compiler @@ -236,28 +236,28 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl AC_MSG_RESULT(C++ compiler is $mips_pro) AC_MSG_ERROR(This compiler is not supported) GXX_VERSION=MIPSpro7.3 - GXX_VERSION_DETAILED=$GXX_VERSION + GXX_VERSION_DETAILED="$GXX_VERSION" ;; *7.4) AC_MSG_RESULT(C++ compiler is MIPSpro compiler 7.4) AC_MSG_ERROR(This compiler is not supported. Use MIPSPro compiler 7.4x) GXX_VERSION=MIPSpro7.4 - GXX_VERSION_DETAILED=$GXX_VERSION + GXX_VERSION_DETAILED="$GXX_VERSION" ;; *7.41* | *7.42* | *7.43* | *7.44*) AC_MSG_RESULT(C++ compiler is MIPSpro compiler 7.4x) GXX_VERSION=MIPSpro7.4x - GXX_VERSION_DETAILED=$GXX_VERSION + GXX_VERSION_DETAILED="$GXX_VERSION" ;; *"7.5"*) AC_MSG_RESULT(C++ compiler is MIPSpro compiler 7.5) GXX_VERSION=MIPSpro7.5 - GXX_VERSION_DETAILED=$GXX_VERSION + GXX_VERSION_DETAILED="$GXX_VERSION" ;; *) AC_MSG_RESULT(C++ compiler is unknown version but accepted MIPSpro compiler version) GXX_VERSION=MIPSpro-other - GXX_VERSION_DETAILED=$GXX_VERSION + GXX_VERSION_DETAILED="$GXX_VERSION" ;; esac else @@ -303,7 +303,7 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl AC_MSG_RESULT(C++ compiler is icc) GXX_VERSION=intel_icc fi fi fi fi fi fi - GXX_VERSION_DETAILED=$GXX_VERSION + GXX_VERSION_DETAILED="$GXX_VERSION" else dnl Or DEC's cxx compiler? @@ -311,7 +311,7 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl if test "x$is_dec_cxx" != "x" ; then AC_MSG_RESULT(C++ compiler is Compaq-cxx) GXX_VERSION=compaq_cxx - GXX_VERSION_DETAILED=$GXX_VERSION + GXX_VERSION_DETAILED="$GXX_VERSION" else dnl Sun Workshop/Studio? @@ -320,7 +320,7 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl if test "x$is_sun_cc_1$is_sun_cc_2" != "x" ; then AC_MSG_RESULT(C++ compiler is Sun Workshop compiler) GXX_VERSION=sun_workshop - GXX_VERSION_DETAILED=$GXX_VERSION + GXX_VERSION_DETAILED="$GXX_VERSION" else dnl Sun Forte? @@ -328,7 +328,7 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl if test "x$is_sun_forte_cc" != "x" ; then AC_MSG_RESULT(C++ compiler is Sun Forte compiler) GXX_VERSION=sun_forte - GXX_VERSION_DETAILED=$GXX_VERSION + GXX_VERSION_DETAILED="$GXX_VERSION" else dnl Portland Group C++? @@ -336,7 +336,7 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl if test "x$is_pgcc" != "x" ; then AC_MSG_RESULT(C++ compiler is Portland Group C++) GXX_VERSION=portland_group - GXX_VERSION_DETAILED=$GXX_VERSION + GXX_VERSION_DETAILED="$GXX_VERSION" else dnl HP aCC? @@ -344,7 +344,7 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl if test "x$is_aCC" != "x" ; then AC_MSG_RESULT(C++ compiler is HP aCC) GXX_VERSION=hp_aCC - GXX_VERSION_DETAILED=$GXX_VERSION + GXX_VERSION_DETAILED="$GXX_VERSION" else dnl Borland C++ @@ -352,7 +352,7 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl if test "x$is_bcc" != "x" ; then AC_MSG_RESULT(C++ compiler is Borland C++) GXX_VERSION=borland_bcc - GXX_VERSION_DETAILED=$GXX_VERSION + GXX_VERSION_DETAILED="$GXX_VERSION" else dnl KAI C++? It seems as if the documented options @@ -369,7 +369,7 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl if test "x$is_kai_cc" != "x" ; then AC_MSG_RESULT(C++ compiler is KAI C++) GXX_VERSION=kai_cc - GXX_VERSION_DETAILED=$GXX_VERSION + GXX_VERSION_DETAILED="$GXX_VERSION" else dnl Maybe PathScale's compiler? @@ -377,12 +377,12 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl if test "x$is_pathscale" != "x" ; then AC_MSG_RESULT(C++ compiler is PathScale C++) GXX_VERSION=pathscale_cc - GXX_VERSION_DETAILED=$GXX_VERSION + GXX_VERSION_DETAILED="$GXX_VERSION" else dnl Aw, nothing suitable found... AC_MSG_RESULT(Unrecognized C++ compiler -- Try to go ahead and get help from dealii@dealii.org) GXX_VERSION=unknown_cc - GXX_VERSION_DETAILED=$GXX_VERSION + GXX_VERSION_DETAILED="$GXX_VERSION" fi fi fi @@ -1689,7 +1689,7 @@ dnl finds all libraries. dnl dnl ------------------------------------------------------------- AC_DEFUN(DEAL_II_CHECK_RPATH, -[ OLD_LDFLAGS=$LDFLAGS +[ OLD_LDFLAGS="$LDFLAGS" LDFLAGS="-Wl,-rpath,$DEAL_II_PATH/lib $LDFLAGS" AC_MSG_CHECKING([whether compiler understands option -Wl,-rpath]) AC_LINK_IFELSE( @@ -1698,7 +1698,7 @@ AC_DEFUN(DEAL_II_CHECK_RPATH, [ AC_MSG_RESULT(yes) LD_PATH_OPTION="-Wl,-rpath "], [ AC_MSG_RESULT(no) - LDFLAGS=$OLD_LDFLAGS + LDFLAGS="$OLD_LDFLAGS" LD_PATH_OPTION="no"]) ]) @@ -1714,7 +1714,7 @@ dnl ------------------------------------------------------------- AC_DEFUN(DEAL_II_CHECK_LINK_SONAME, [ dnl First try -soname - OLD_LDFLAGS=$LDFLAGS + OLD_LDFLAGS="$LDFLAGS" LDFLAGS="-Wl,-soname,libbase.so.6.2.1 $LDFLAGS $SHLIBFLAGS" AC_MSG_CHECKING([whether compiler understands option -Wl,-soname]) AC_LINK_IFELSE( @@ -1728,11 +1728,11 @@ AC_DEFUN(DEAL_II_CHECK_LINK_SONAME, DEAL_II_LD_UNDERSTANDS_SONAME="no" ] ) - LDFLAGS=$OLD_LDFLAGS + LDFLAGS="$OLD_LDFLAGS" AC_SUBST(DEAL_II_LD_UNDERSTANDS_SONAME) dnl Now try the -dylib_install_name thing - OLD_LDFLAGS=$LDFLAGS + OLD_LDFLAGS="$LDFLAGS" LDFLAGS="-Wl,-dynamic,-install_name -Wl,libbase.so.6.2.1 $LDFLAGS -shared" AC_MSG_CHECKING([whether compiler understands option -Wl,-dynamic,-install_name]) AC_LINK_IFELSE( @@ -1746,7 +1746,7 @@ AC_DEFUN(DEAL_II_CHECK_LINK_SONAME, DEAL_II_LD_UNDERSTANDS_DYLIB_INSTALL_NAME="no" ] ) - LDFLAGS=$OLD_LDFLAGS + LDFLAGS="$OLD_LDFLAGS" AC_SUBST(DEAL_II_LD_UNDERSTANDS_DYLIB_INSTALL_NAME) ]) @@ -1769,7 +1769,7 @@ AC_DEFUN(DEAL_II_CHECK_CPU_OPTIMIZATIONS, dnl [ --with-cpu=cpu Optimize specifically for the given CPU type, rather than just generating code for this processor family.], - withcpu=$withval, + withcpu="$withval", withcpu="") AC_MSG_CHECKING(for CPU to optimize for) case "$withcpu" in @@ -1886,7 +1886,7 @@ AC_DEFUN(DEAL_II_GET_THREAD_FLAGS, dnl CXXFLAGS="$CXXFLAGSG -$i" DEAL_II_TRY_COMPILER_FLAG( [ - thread_flag=$i + thread_flag="$i" CXXFLAGSG="$CXXFLAGSG -$i" CXXFLAGSO="$CXXFLAGSO -$i" LDFLAGS="$LDFLAGS -$i" @@ -1923,7 +1923,7 @@ AC_DEFUN(DEAL_II_CHECK_MULTITHREADING, dnl AC_ARG_ENABLE(multithreading, [ --enable-multithreading set compiler flags to allow for multithreaded programs], - enablemultithreading=$enableval, + enablemultithreading="$enableval", enablemultithreading=no) ]) @@ -2059,7 +2059,7 @@ AC_DEFUN(DEAL_II_CHECK_USE_MT, dnl AC_ARG_WITH(multithreading, [ --with-multithreading=name If name==posix, or no name given, then use POSIX threads.], - withmultithreading=$withval, + withmultithreading="$withval", withmultithreading=no) dnl Default (i.e. no arg) means POSIX @@ -2203,7 +2203,7 @@ AC_DEFUN(DEAL_II_CHECK_COMPAT_BLOCKER, dnl AC_ARG_ENABLE(compat-blocker, [ --enable-compat-blocker=mapping block functions that implicitely assume a Q1 mapping], - enable_compat_blocker=$enableval, + enable_compat_blocker="$enableval", enable_compat_blocker="") dnl Replace the comma-separated list by a space-separated one @@ -2408,7 +2408,7 @@ AC_DEFUN(DEAL_II_CHECK_ISNAN_FLAG, dnl [ AC_MSG_CHECKING(whether isnan is declared with $1 flags) AC_LANG(C++) - CXXFLAGS=$2 + CXXFLAGS="$2" deal_II_isnan_flag="" AC_TRY_COMPILE( [ @@ -2512,7 +2512,7 @@ AC_DEFUN(DEAL_II_CHECK_ISFINITE, dnl [ AC_MSG_CHECKING(for std::isfinite) AC_LANG(C++) - CXXFLAGS=$CXXFLAGSG + CXXFLAGS="$CXXFLAGSG" AC_TRY_COMPILE( [ #include @@ -2547,7 +2547,7 @@ AC_DEFUN(DEAL_II_CHECK_RAND_R, dnl [ AC_MSG_CHECKING(for rand_r) AC_LANG(C++) - CXXFLAGS=$CXXFLAGSG + CXXFLAGS="$CXXFLAGSG" AC_TRY_COMPILE( [ #include @@ -2585,7 +2585,7 @@ AC_DEFUN(DEAL_II_CHECK_ASSERT_THROW, dnl [ AC_MSG_CHECKING(whether AssertThrow works with $1 flags) AC_LANG(C++) - CXXFLAGS=$2 + CXXFLAGS="$2" AC_TRY_COMPILE( [ #include @@ -4925,44 +4925,6 @@ dnl ]) -dnl ------------------------------------------------------------- -dnl Check for KDOC. -dnl -dnl Usage: DEAL_II_CHECK_KDOC -dnl -dnl ------------------------------------------------------------- -AC_DEFUN(DEAL_II_CHECK_KDOC, dnl -[ - dnl Find the kdoc directory for documentation. kdoc2 is in - dnl the contrib directory, but you might want another one - AC_ARG_WITH(kdoc, - [ --with-kdoc=DIR use kdoc installed in DIR], - kdocdir=$withval, - kdocdir=${DEAL2_DIR}/contrib/kdoc/bin) - AC_MSG_CHECKING(for kdoc) - - dnl lets see whether the file exists if not the default was taken - if test "$kdocdir" != ${DEAL2_DIR}/contrib/kdoc/bin ; then - if test -r $kdocdir/kdoc ; then - AC_MSG_RESULT(found) - else - AC_MSG_RESULT(not found) - AC_MSG_ERROR(Invalid kdoc path $kdocdir/kdoc) - fi - - if test -r "$kdocdir/Version" ; then - kdocversion=`cat $kdocdir/Version` ; - else - kdocversion=1; - fi - else - kdocversion=`cat ${DEAL2_DIR}/contrib/kdoc/src/Version` - AC_MSG_RESULT(using default version $kdocversion) - fi -]) - - - dnl ------------------------------------------------------------- dnl Check for Doxygen. dnl @@ -4973,7 +4935,7 @@ AC_DEFUN(DEAL_II_CHECK_DOXYGEN, dnl [ AC_ARG_WITH(doxygen, [ --with-doxygen=filename use 'filename' for doxygen], - DOXYGEN=$withval, + DOXYGEN="$withval", DOXYGEN=) dnl lets see whether the file exists @@ -5089,7 +5051,7 @@ AC_DEFUN(DEAL_II_CONFIGURE_TECPLOT, dnl [ for i [ in $TECHOME $TEC100HOME $TEC90HOME $TEC80HOME ] ; do AC_CHECK_FILE($i/lib/tecio.a, - TECPLOT_LIB=$i/lib/tecio.a) + TECPLOT_LIB="$i/lib/tecio.a") AC_CHECK_FILE($i/include/TECIO.h, TECPLOT_INCLUDE_DIR=-I$i/include, TECPLOT_LIB="") @@ -5126,7 +5088,7 @@ AC_DEFUN(DEAL_II_CONFIGURE_NETCDF, dnl subdirs; use this if you want to override the NETCDF_DIR environment variable.], [ - DEAL_II_NETCDF_DIR=$withval + DEAL_II_NETCDF_DIR="$withval" ], [ dnl Take something from the environment variables, if it is there @@ -5142,7 +5104,7 @@ AC_DEFUN(DEAL_II_CONFIGURE_NETCDF, dnl use this if you want to override the NETCDF_INCLUDE_DIR environment variable.], [ - NETCDF_INCLUDE_DIR=$withval + NETCDF_INCLUDE_DIR="$withval" ]) AC_ARG_WITH(netcdf-libs, @@ -5150,7 +5112,7 @@ AC_DEFUN(DEAL_II_CONFIGURE_NETCDF, dnl use this if you want to override the NETCDF_LIBDIR environment variable.], [ - NETCDF_LIBDIR=$withval + NETCDF_LIBDIR="$withval" ]) @@ -5229,7 +5191,7 @@ AC_DEFUN(DEAL_II_CONFIGURE_PETSC, dnl USE_CONTRIB_PETSC=no else USE_CONTRIB_PETSC=yes - DEAL_II_PETSC_DIR=$withval + DEAL_II_PETSC_DIR="$withval" AC_MSG_RESULT($DEAL_II_PETSC_DIR) dnl Make sure that what was specified is actually correct @@ -5323,7 +5285,7 @@ AC_DEFUN(DEAL_II_CONFIGURE_PETSC_ARCH, dnl installation; use this if you want to override the PETSC_ARCH environment variable.], [ - DEAL_II_PETSC_ARCH=$withval + DEAL_II_PETSC_ARCH="$withval" AC_MSG_RESULT($DEAL_II_PETSC_ARCH) ], [ @@ -5417,13 +5379,13 @@ AC_DEFUN(DEAL_II_CONFIGURE_PETSC_MPIUNI_LIB, dnl AC_MSG_CHECKING(for PETSc libmpiuni library) if test -f $DEAL_II_PETSC_DIR/lib/libg_c++/$DEAL_II_PETSC_ARCH/libmpiuni.a ; then - DEAL_II_PETSC_MPIUNI_LIB=$DEAL_II_PETSC_DIR/lib/libg_c++/$DEAL_II_PETSC_ARCH/libmpiuni.a ; + DEAL_II_PETSC_MPIUNI_LIB="$DEAL_II_PETSC_DIR/lib/libg_c++/$DEAL_II_PETSC_ARCH/libmpiuni.a" ; else if test -f $DEAL_II_PETSC_DIR/lib/$DEAL_II_PETSC_ARCH/libmpiuni.a ; then - DEAL_II_PETSC_MPIUNI_LIB=$DEAL_II_PETSC_DIR/lib/$DEAL_II_PETSC_ARCH/libmpiuni.a ; + DEAL_II_PETSC_MPIUNI_LIB="$DEAL_II_PETSC_DIR/lib/$DEAL_II_PETSC_ARCH/libmpiuni.a" ; else if test -f $DEAL_II_PETSC_DIR/lib/libg_c++/$DEAL_II_PETSC_ARCH/libmpiuni.so ; then - DEAL_II_PETSC_MPIUNI_LIB=$DEAL_II_PETSC_DIR/lib/libg_c++/$DEAL_II_PETSC_ARCH/libmpiuni.so ; + DEAL_II_PETSC_MPIUNI_LIB="$DEAL_II_PETSC_DIR/lib/libg_c++/$DEAL_II_PETSC_ARCH/libmpiuni.so" ; else if test -f $DEAL_II_PETSC_DIR/lib/$DEAL_II_PETSC_ARCH/libmpiuni.so ; then - DEAL_II_PETSC_MPIUNI_LIB=$DEAL_II_PETSC_DIR/lib/$DEAL_II_PETSC_ARCH/libmpiuni.so ; + DEAL_II_PETSC_MPIUNI_LIB="$DEAL_II_PETSC_DIR/lib/$DEAL_II_PETSC_ARCH/libmpiuni.so" ; fi fi fi fi AC_MSG_RESULT($DEAL_II_PETSC_MPIUNI_LIB) @@ -5455,7 +5417,7 @@ AC_DEFUN(DEAL_II_CONFIGURE_SLEPC, dnl USE_CONTRIB_SLEPC=no else USE_CONTRIB_SLEPC=yes - DEAL_II_SLEPC_DIR=$withval + DEAL_II_SLEPC_DIR="$withval" AC_MSG_RESULT($DEAL_II_SLEPC_DIR) dnl Make sure that what was specified is actually correct @@ -5531,7 +5493,7 @@ AC_DEFUN(DEAL_II_CONFIGURE_SLEPC_ARCH, dnl installation; use this if you want to override the SLEPC_ARCH environment variable.], [ - DEAL_II_SLEPC_ARCH=$withval + DEAL_II_SLEPC_ARCH="$withval" AC_MSG_RESULT($DEAL_II_SLEPC_ARCH) ], [ @@ -5628,7 +5590,7 @@ AC_DEFUN(DEAL_II_CONFIGURE_TRILINOS, dnl USE_CONTRIB_TRILINOS=no else USE_CONTRIB_TRILINOS=yes - DEAL_II_TRILINOS_DIR=$withval + DEAL_II_TRILINOS_DIR="$withval" AC_MSG_RESULT($DEAL_II_TRILINOS_DIR) dnl Make sure that what was specified is actually correct @@ -5677,7 +5639,7 @@ AC_DEFUN(DEAL_II_CONFIGURE_TRILINOS, dnl USE_CONTRIB_TRILINOS=no else USE_CONTRIB_TRILINOS=yes - DEAL_II_TRILINOS_INCDIR=$withval + DEAL_II_TRILINOS_INCDIR="$withval" AC_MSG_RESULT($DEAL_II_TRILINOS_INCDIR) dnl Make sure that what was specified is actually correct @@ -5725,7 +5687,7 @@ AC_DEFUN(DEAL_II_CONFIGURE_TRILINOS, dnl USE_CONTRIB_TRILINOS=no else USE_CONTRIB_TRILINOS=yes - DEAL_II_TRILINOS_LIBDIR=$withval + DEAL_II_TRILINOS_LIBDIR="$withval" AC_MSG_RESULT($DEAL_II_TRILINOS_LIBDIR) dnl Make sure that what was specified is actually correct @@ -5993,7 +5955,7 @@ AC_DEFUN(DEAL_II_CONFIGURE_METIS, dnl the METIS_DIR environment variable.], [ USE_CONTRIB_METIS=yes - DEAL_II_METIS_DIR=$withval + DEAL_II_METIS_DIR="$withval" AC_MSG_RESULT($DEAL_II_METIS_DIR) dnl Make sure that what was specified is actually correct @@ -6031,7 +5993,7 @@ AC_DEFUN(DEAL_II_CONFIGURE_METIS, dnl use this if you want to override the METIS_INCLUDE_DIR environment variable.], [ - METIS_INCLUDE_DIR=$withval + METIS_INCLUDE_DIR="$withval" DEAL_II_METIS_INCDIR="$METIS_INCLUDE_DIR" ]) @@ -6041,7 +6003,7 @@ AC_DEFUN(DEAL_II_CONFIGURE_METIS, dnl METIS_LIBDIR environment variable.], [ USE_CONTRIB_METIS=yes - DEAL_II_METIS_LIBDIR=$withval + DEAL_II_METIS_LIBDIR="$withval" AC_MSG_RESULT($DEAL_II_METIS_LIBDIR) dnl Make sure that what was specified is actually correct @@ -6106,7 +6068,7 @@ AC_DEFUN(DEAL_II_WITH_UMFPACK, dnl AC_MSG_RESULT(using included version) DEAL_II_USE_INTERNAL_UMFPACK=yes else - UMFPACK_DIR=$withval + UMFPACK_DIR="$withval" UMFPACK_INCLUDE_DIR="-I$withval/Include" AC_MSG_RESULT(trying version at $withval) fi @@ -6120,7 +6082,7 @@ AC_DEFUN(DEAL_II_WITH_UMFPACK, dnl use this if you want to override the UMFPACK_INCDIR environment variable.], [ - UMFPACK_INCDIR=$withval + UMFPACK_INCDIR="$withval" acx_umfpack=yes ]) @@ -6129,7 +6091,7 @@ AC_DEFUN(DEAL_II_WITH_UMFPACK, dnl use this if you want to override the UMFPACK_LIBDIR environment variable.], [ - UMFPACK_LIBDIR=$withval + UMFPACK_LIBDIR="$withval" acx_umfpack=yes ]) diff --git a/deal.II/configure b/deal.II/configure index e43d6fea52..589a50c270 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 17758 . +# From configure.in Revision: 17948 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for deal.II 6.2.pre. # @@ -1936,7 +1936,7 @@ echo "${ECHO_T}Configuring deal.II version $PACKAGE_VERSION" >&6; } -DEAL2_DIR=$DEAL_II_PATH +DEAL2_DIR="$DEAL_II_PATH" # Make sure we can run config.sub. @@ -2083,7 +2083,7 @@ echo "${ECHO_T}" >&6; } { echo "$as_me:$LINENO: result: ---------------- configuring C/C++ compilers ----------------" >&5 echo "${ECHO_T}---------------- configuring C/C++ compilers ----------------" >&6; } -OLDCFLAGS=$CFLAGS +OLDCFLAGS="$CFLAGS" ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3003,7 +3003,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -CFLAGS=$OLDCFLAGS +CFLAGS="$OLDCFLAGS" # Extract the first word of "$CC", so it can be a program name with args. set dummy $CC; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -3621,7 +3621,7 @@ echo "${ECHO_T}C++ compiler is $GXX_VERSION (subversion $GXX_VERSION_DETAILED)" { echo "$as_me:$LINENO: result: C++ compiler is IBM xlC" >&5 echo "${ECHO_T}C++ compiler is IBM xlC" >&6; } GXX_VERSION=ibm_xlc - GXX_VERSION_DETAILED=$GXX_VERSION + GXX_VERSION_DETAILED="$GXX_VERSION" else mips_pro="`($CXX -version 2>&1) | grep MIPSpro`" @@ -3634,7 +3634,7 @@ echo "${ECHO_T}C++ compiler is $mips_pro" >&6; } echo "$as_me: error: This compiler is not supported" >&2;} { (exit 1); exit 1; }; } GXX_VERSION=MIPSpro7.3 - GXX_VERSION_DETAILED=$GXX_VERSION + GXX_VERSION_DETAILED="$GXX_VERSION" ;; *7.4) { echo "$as_me:$LINENO: result: C++ compiler is MIPSpro compiler 7.4" >&5 @@ -3643,25 +3643,25 @@ echo "${ECHO_T}C++ compiler is MIPSpro compiler 7.4" >&6; } echo "$as_me: error: This compiler is not supported. Use MIPSPro compiler 7.4x" >&2;} { (exit 1); exit 1; }; } GXX_VERSION=MIPSpro7.4 - GXX_VERSION_DETAILED=$GXX_VERSION + GXX_VERSION_DETAILED="$GXX_VERSION" ;; *7.41* | *7.42* | *7.43* | *7.44*) { echo "$as_me:$LINENO: result: C++ compiler is MIPSpro compiler 7.4x" >&5 echo "${ECHO_T}C++ compiler is MIPSpro compiler 7.4x" >&6; } GXX_VERSION=MIPSpro7.4x - GXX_VERSION_DETAILED=$GXX_VERSION + GXX_VERSION_DETAILED="$GXX_VERSION" ;; *"7.5"*) { echo "$as_me:$LINENO: result: C++ compiler is MIPSpro compiler 7.5" >&5 echo "${ECHO_T}C++ compiler is MIPSpro compiler 7.5" >&6; } GXX_VERSION=MIPSpro7.5 - GXX_VERSION_DETAILED=$GXX_VERSION + GXX_VERSION_DETAILED="$GXX_VERSION" ;; *) { echo "$as_me:$LINENO: result: C++ compiler is unknown version but accepted MIPSpro compiler version" >&5 echo "${ECHO_T}C++ compiler is unknown version but accepted MIPSpro compiler version" >&6; } GXX_VERSION=MIPSpro-other - GXX_VERSION_DETAILED=$GXX_VERSION + GXX_VERSION_DETAILED="$GXX_VERSION" ;; esac else @@ -3709,7 +3709,7 @@ echo "${ECHO_T}C++ compiler is icc-10" >&6; } echo "${ECHO_T}C++ compiler is icc" >&6; } GXX_VERSION=intel_icc fi fi fi fi fi fi - GXX_VERSION_DETAILED=$GXX_VERSION + GXX_VERSION_DETAILED="$GXX_VERSION" else is_dec_cxx="`($CXX -V 2>&1) | grep 'Compaq C++'`" @@ -3717,7 +3717,7 @@ echo "${ECHO_T}C++ compiler is icc" >&6; } { echo "$as_me:$LINENO: result: C++ compiler is Compaq-cxx" >&5 echo "${ECHO_T}C++ compiler is Compaq-cxx" >&6; } GXX_VERSION=compaq_cxx - GXX_VERSION_DETAILED=$GXX_VERSION + GXX_VERSION_DETAILED="$GXX_VERSION" else is_sun_cc_1="`($CXX -V 2>&1) | grep 'Sun WorkShop'`" @@ -3726,7 +3726,7 @@ echo "${ECHO_T}C++ compiler is Compaq-cxx" >&6; } { echo "$as_me:$LINENO: result: C++ compiler is Sun Workshop compiler" >&5 echo "${ECHO_T}C++ compiler is Sun Workshop compiler" >&6; } GXX_VERSION=sun_workshop - GXX_VERSION_DETAILED=$GXX_VERSION + GXX_VERSION_DETAILED="$GXX_VERSION" else is_sun_forte_cc="`($CXX -V 2>&1) | grep 'Forte'`" @@ -3734,7 +3734,7 @@ echo "${ECHO_T}C++ compiler is Sun Workshop compiler" >&6; } { echo "$as_me:$LINENO: result: C++ compiler is Sun Forte compiler" >&5 echo "${ECHO_T}C++ compiler is Sun Forte compiler" >&6; } GXX_VERSION=sun_forte - GXX_VERSION_DETAILED=$GXX_VERSION + GXX_VERSION_DETAILED="$GXX_VERSION" else is_pgcc="`($CXX -V 2>&1) | grep 'Portland Group'`" @@ -3742,7 +3742,7 @@ echo "${ECHO_T}C++ compiler is Sun Forte compiler" >&6; } { echo "$as_me:$LINENO: result: C++ compiler is Portland Group C++" >&5 echo "${ECHO_T}C++ compiler is Portland Group C++" >&6; } GXX_VERSION=portland_group - GXX_VERSION_DETAILED=$GXX_VERSION + GXX_VERSION_DETAILED="$GXX_VERSION" else is_aCC="`($CXX -V 2>&1) | grep 'aCC'`" @@ -3750,7 +3750,7 @@ echo "${ECHO_T}C++ compiler is Portland Group C++" >&6; } { echo "$as_me:$LINENO: result: C++ compiler is HP aCC" >&5 echo "${ECHO_T}C++ compiler is HP aCC" >&6; } GXX_VERSION=hp_aCC - GXX_VERSION_DETAILED=$GXX_VERSION + GXX_VERSION_DETAILED="$GXX_VERSION" else is_bcc="`($CXX -h 2>&1) | grep 'Borland'`" @@ -3758,7 +3758,7 @@ echo "${ECHO_T}C++ compiler is HP aCC" >&6; } { echo "$as_me:$LINENO: result: C++ compiler is Borland C++" >&5 echo "${ECHO_T}C++ compiler is Borland C++" >&6; } GXX_VERSION=borland_bcc - GXX_VERSION_DETAILED=$GXX_VERSION + GXX_VERSION_DETAILED="$GXX_VERSION" else is_kai_cc="`($CXX --version 2>&1) | grep 'KAI C++'`" @@ -3767,7 +3767,7 @@ echo "${ECHO_T}C++ compiler is Borland C++" >&6; } { echo "$as_me:$LINENO: result: C++ compiler is KAI C++" >&5 echo "${ECHO_T}C++ compiler is KAI C++" >&6; } GXX_VERSION=kai_cc - GXX_VERSION_DETAILED=$GXX_VERSION + GXX_VERSION_DETAILED="$GXX_VERSION" else is_pathscale="`($CXX -v 2>&1) | grep PathScale`" @@ -3775,12 +3775,12 @@ echo "${ECHO_T}C++ compiler is KAI C++" >&6; } { echo "$as_me:$LINENO: result: C++ compiler is PathScale C++" >&5 echo "${ECHO_T}C++ compiler is PathScale C++" >&6; } GXX_VERSION=pathscale_cc - GXX_VERSION_DETAILED=$GXX_VERSION + GXX_VERSION_DETAILED="$GXX_VERSION" else { echo "$as_me:$LINENO: result: Unrecognized C++ compiler -- Try to go ahead and get help from dealii@dealii.org" >&5 echo "${ECHO_T}Unrecognized C++ compiler -- Try to go ahead and get help from dealii@dealii.org" >&6; } GXX_VERSION=unknown_cc - GXX_VERSION_DETAILED=$GXX_VERSION + GXX_VERSION_DETAILED="$GXX_VERSION" fi fi fi @@ -5024,7 +5024,7 @@ echo "${ECHO_T}Unknown C compiler - using generic options" >&6; } - OLD_LDFLAGS=$LDFLAGS + OLD_LDFLAGS="$LDFLAGS" LDFLAGS="-Wl,-rpath,$DEAL_II_PATH/lib $LDFLAGS" { echo "$as_me:$LINENO: checking whether compiler understands option -Wl,-rpath" >&5 echo $ECHO_N "checking whether compiler understands option -Wl,-rpath... $ECHO_C" >&6; } @@ -5070,7 +5070,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } - LDFLAGS=$OLD_LDFLAGS + LDFLAGS="$OLD_LDFLAGS" LD_PATH_OPTION="no" fi @@ -5082,7 +5082,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ # Check whether --enable-multithreading was given. if test "${enable_multithreading+set}" = set; then - enableval=$enable_multithreading; enablemultithreading=$enableval + enableval=$enable_multithreading; enablemultithreading="$enableval" else enablemultithreading=no fi @@ -5115,7 +5115,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu rm -rf conftest* - thread_flag=$i + thread_flag="$i" CXXFLAGSG="$CXXFLAGSG -$i" CXXFLAGSO="$CXXFLAGSO -$i" LDFLAGS="$LDFLAGS -$i" @@ -5328,7 +5328,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Check whether --with-multithreading was given. if test "${with_multithreading+set}" = set; then - withval=$with_multithreading; withmultithreading=$withval + withval=$with_multithreading; withmultithreading="$withval" else withmultithreading=no fi @@ -5647,7 +5647,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - CXXFLAGS=$CXXFLAGSG + CXXFLAGS="$CXXFLAGSG" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -5778,7 +5778,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - CXXFLAGS=$CXXFLAGSO + CXXFLAGS="$CXXFLAGSO" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -8756,7 +8756,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - CXXFLAGS=$CXXFLAGSG + CXXFLAGS="$CXXFLAGSG" deal_II_isnan_flag="" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -8990,7 +8990,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - CXXFLAGS=$CXXFLAGSO + CXXFLAGS="$CXXFLAGSO" deal_II_isnan_flag="" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -9226,7 +9226,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - CXXFLAGS=$CXXFLAGSG + CXXFLAGS="$CXXFLAGSG" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -9294,7 +9294,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - CXXFLAGS=$CXXFLAGSG + CXXFLAGS="$CXXFLAGSG" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -11467,7 +11467,7 @@ echo "${ECHO_T}-------------- configuring shared/static libs ---------------" >& # Check whether --enable-shared was given. if test "${enable_shared+set}" = set; then - enableval=$enable_shared; enableshared=$enableval + enableval=$enable_shared; enableshared="$enableval" else enableshared=yes fi @@ -11514,7 +11514,7 @@ if test "x$enableshared" = "xyes" ; then esac - OLD_LDFLAGS=$LDFLAGS + OLD_LDFLAGS="$LDFLAGS" LDFLAGS="-Wl,-soname,libbase.so.6.2.1 $LDFLAGS $SHLIBFLAGS" { echo "$as_me:$LINENO: checking whether compiler understands option -Wl,-soname" >&5 echo $ECHO_N "checking whether compiler understands option -Wl,-soname... $ECHO_C" >&6; } @@ -11570,10 +11570,10 @@ fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$OLD_LDFLAGS + LDFLAGS="$OLD_LDFLAGS" - OLD_LDFLAGS=$LDFLAGS + OLD_LDFLAGS="$LDFLAGS" LDFLAGS="-Wl,-dynamic,-install_name -Wl,libbase.so.6.2.1 $LDFLAGS -shared" { echo "$as_me:$LINENO: checking whether compiler understands option -Wl,-dynamic,-install_name" >&5 echo $ECHO_N "checking whether compiler understands option -Wl,-dynamic,-install_name... $ECHO_C" >&6; } @@ -11629,7 +11629,7 @@ fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$OLD_LDFLAGS + LDFLAGS="$OLD_LDFLAGS" fi @@ -11860,7 +11860,7 @@ fi # Check whether --enable-parser was given. if test "${enable_parser+set}" = set; then - enableval=$enable_parser; enableparser=$enableval + enableval=$enable_parser; enableparser="$enableval" if test "x$enableval" = "xno" ; then { echo "$as_me:$LINENO: result: Function parser disabled" >&5 echo "${ECHO_T}Function parser disabled" >&6; } @@ -11885,7 +11885,7 @@ fi # Check whether --enable-compat-blocker was given. if test "${enable_compat_blocker+set}" = set; then - enableval=$enable_compat_blocker; enable_compat_blocker=$enableval + enableval=$enable_compat_blocker; enable_compat_blocker="$enableval" else enable_compat_blocker="" fi @@ -11957,7 +11957,7 @@ echo "${ECHO_T}explicitly disabled" >&6; } USE_CONTRIB_PETSC=no else USE_CONTRIB_PETSC=yes - DEAL_II_PETSC_DIR=$withval + DEAL_II_PETSC_DIR="$withval" { echo "$as_me:$LINENO: result: $DEAL_II_PETSC_DIR" >&5 echo "${ECHO_T}$DEAL_II_PETSC_DIR" >&6; } @@ -12041,7 +12041,7 @@ echo $ECHO_N "checking for PETSc library architecture... $ECHO_C" >&6; } # Check whether --with-petsc-arch was given. if test "${with_petsc_arch+set}" = set; then withval=$with_petsc_arch; - DEAL_II_PETSC_ARCH=$withval + DEAL_II_PETSC_ARCH="$withval" { echo "$as_me:$LINENO: result: $DEAL_II_PETSC_ARCH" >&5 echo "${ECHO_T}$DEAL_II_PETSC_ARCH" >&6; } @@ -12111,13 +12111,13 @@ echo "$as_me: error: Unknown PETSc version" >&2;} echo $ECHO_N "checking for PETSc libmpiuni library... $ECHO_C" >&6; } if test -f $DEAL_II_PETSC_DIR/lib/libg_c++/$DEAL_II_PETSC_ARCH/libmpiuni.a ; then - DEAL_II_PETSC_MPIUNI_LIB=$DEAL_II_PETSC_DIR/lib/libg_c++/$DEAL_II_PETSC_ARCH/libmpiuni.a ; + DEAL_II_PETSC_MPIUNI_LIB="$DEAL_II_PETSC_DIR/lib/libg_c++/$DEAL_II_PETSC_ARCH/libmpiuni.a" ; else if test -f $DEAL_II_PETSC_DIR/lib/$DEAL_II_PETSC_ARCH/libmpiuni.a ; then - DEAL_II_PETSC_MPIUNI_LIB=$DEAL_II_PETSC_DIR/lib/$DEAL_II_PETSC_ARCH/libmpiuni.a ; + DEAL_II_PETSC_MPIUNI_LIB="$DEAL_II_PETSC_DIR/lib/$DEAL_II_PETSC_ARCH/libmpiuni.a" ; else if test -f $DEAL_II_PETSC_DIR/lib/libg_c++/$DEAL_II_PETSC_ARCH/libmpiuni.so ; then - DEAL_II_PETSC_MPIUNI_LIB=$DEAL_II_PETSC_DIR/lib/libg_c++/$DEAL_II_PETSC_ARCH/libmpiuni.so ; + DEAL_II_PETSC_MPIUNI_LIB="$DEAL_II_PETSC_DIR/lib/libg_c++/$DEAL_II_PETSC_ARCH/libmpiuni.so" ; else if test -f $DEAL_II_PETSC_DIR/lib/$DEAL_II_PETSC_ARCH/libmpiuni.so ; then - DEAL_II_PETSC_MPIUNI_LIB=$DEAL_II_PETSC_DIR/lib/$DEAL_II_PETSC_ARCH/libmpiuni.so ; + DEAL_II_PETSC_MPIUNI_LIB="$DEAL_II_PETSC_DIR/lib/$DEAL_II_PETSC_ARCH/libmpiuni.so" ; fi fi fi fi { echo "$as_me:$LINENO: result: $DEAL_II_PETSC_MPIUNI_LIB" >&5 @@ -12158,7 +12158,7 @@ echo "${ECHO_T}explicitly disabled" >&6; } USE_CONTRIB_SLEPC=no else USE_CONTRIB_SLEPC=yes - DEAL_II_SLEPC_DIR=$withval + DEAL_II_SLEPC_DIR="$withval" { echo "$as_me:$LINENO: result: $DEAL_II_SLEPC_DIR" >&5 echo "${ECHO_T}$DEAL_II_SLEPC_DIR" >&6; } @@ -12247,7 +12247,7 @@ echo $ECHO_N "checking for SLEPc library architecture... $ECHO_C" >&6; } # Check whether --with-slepc-arch was given. if test "${with_slepc_arch+set}" = set; then withval=$with_slepc_arch; - DEAL_II_SLEPC_ARCH=$withval + DEAL_II_SLEPC_ARCH="$withval" { echo "$as_me:$LINENO: result: $DEAL_II_SLEPC_ARCH" >&5 echo "${ECHO_T}$DEAL_II_SLEPC_ARCH" >&6; } @@ -12321,7 +12321,7 @@ echo "${ECHO_T}explicitly disabled" >&6; } USE_CONTRIB_TRILINOS=no else USE_CONTRIB_TRILINOS=yes - DEAL_II_TRILINOS_DIR=$withval + DEAL_II_TRILINOS_DIR="$withval" { echo "$as_me:$LINENO: result: $DEAL_II_TRILINOS_DIR" >&5 echo "${ECHO_T}$DEAL_II_TRILINOS_DIR" >&6; } @@ -12380,7 +12380,7 @@ echo "${ECHO_T}explicitly disabled" >&6; } USE_CONTRIB_TRILINOS=no else USE_CONTRIB_TRILINOS=yes - DEAL_II_TRILINOS_INCDIR=$withval + DEAL_II_TRILINOS_INCDIR="$withval" { echo "$as_me:$LINENO: result: $DEAL_II_TRILINOS_INCDIR" >&5 echo "${ECHO_T}$DEAL_II_TRILINOS_INCDIR" >&6; } @@ -12435,7 +12435,7 @@ echo "${ECHO_T}explicitly disabled" >&6; } USE_CONTRIB_TRILINOS=no else USE_CONTRIB_TRILINOS=yes - DEAL_II_TRILINOS_LIBDIR=$withval + DEAL_II_TRILINOS_LIBDIR="$withval" { echo "$as_me:$LINENO: result: $DEAL_II_TRILINOS_LIBDIR" >&5 echo "${ECHO_T}$DEAL_II_TRILINOS_LIBDIR" >&6; } @@ -13536,7 +13536,7 @@ ac_res=`eval echo '${'$as_ac_File'}'` { echo "$as_me:$LINENO: result: $ac_res" >&5 echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_File'}'` = yes; then - TECPLOT_LIB=$i/lib/tecio.a + TECPLOT_LIB="$i/lib/tecio.a" fi as_ac_File=`echo "ac_cv_file_$i/include/TECIO.h" | $as_tr_sh` @@ -13587,7 +13587,7 @@ _ACEOF # Check whether --with-netcdf was given. if test "${with_netcdf+set}" = set; then withval=$with_netcdf; - DEAL_II_NETCDF_DIR=$withval + DEAL_II_NETCDF_DIR="$withval" else @@ -13604,7 +13604,7 @@ fi # Check whether --with-netcdf-include was given. if test "${with_netcdf_include+set}" = set; then withval=$with_netcdf_include; - NETCDF_INCLUDE_DIR=$withval + NETCDF_INCLUDE_DIR="$withval" fi @@ -13613,7 +13613,7 @@ fi # Check whether --with-netcdf-libs was given. if test "${with_netcdf_libs+set}" = set; then withval=$with_netcdf_libs; - NETCDF_LIBDIR=$withval + NETCDF_LIBDIR="$withval" fi @@ -13918,7 +13918,7 @@ fi if test "${with_metis+set}" = set; then withval=$with_metis; USE_CONTRIB_METIS=yes - DEAL_II_METIS_DIR=$withval + DEAL_II_METIS_DIR="$withval" { echo "$as_me:$LINENO: result: $DEAL_II_METIS_DIR" >&5 echo "${ECHO_T}$DEAL_II_METIS_DIR" >&6; } @@ -13964,7 +13964,7 @@ fi # Check whether --with-metis-include was given. if test "${with_metis_include+set}" = set; then withval=$with_metis_include; - METIS_INCLUDE_DIR=$withval + METIS_INCLUDE_DIR="$withval" DEAL_II_METIS_INCDIR="$METIS_INCLUDE_DIR" fi @@ -13975,7 +13975,7 @@ fi if test "${with_metis_libs+set}" = set; then withval=$with_metis_libs; USE_CONTRIB_METIS=yes - DEAL_II_METIS_LIBDIR=$withval + DEAL_II_METIS_LIBDIR="$withval" { echo "$as_me:$LINENO: result: $DEAL_II_METIS_LIBDIR" >&5 echo "${ECHO_T}$DEAL_II_METIS_LIBDIR" >&6; } @@ -14043,7 +14043,7 @@ echo $ECHO_N "checking UMFPACK library... $ECHO_C" >&6; } echo "${ECHO_T}using included version" >&6; } DEAL_II_USE_INTERNAL_UMFPACK=yes else - UMFPACK_DIR=$withval + UMFPACK_DIR="$withval" UMFPACK_INCLUDE_DIR="-I$withval/Include" { echo "$as_me:$LINENO: result: trying version at $withval" >&5 echo "${ECHO_T}trying version at $withval" >&6; } @@ -14063,7 +14063,7 @@ fi # Check whether --with-umfpack-include was given. if test "${with_umfpack_include+set}" = set; then withval=$with_umfpack_include; - UMFPACK_INCDIR=$withval + UMFPACK_INCDIR="$withval" acx_umfpack=yes fi @@ -14073,7 +14073,7 @@ fi # Check whether --with-umfpack-libs was given. if test "${with_umfpack_libs+set}" = set; then withval=$with_umfpack_libs; - UMFPACK_LIBDIR=$withval + UMFPACK_LIBDIR="$withval" acx_umfpack=yes fi @@ -15710,7 +15710,7 @@ echo "${ECHO_T}------------------ checking compiler flags ------------------" >& # Check whether --with-cpu was given. if test "${with_cpu+set}" = set; then - withval=$with_cpu; withcpu=$withval + withval=$with_cpu; withcpu="$withval" else withcpu="" fi @@ -15888,7 +15888,7 @@ echo "${ECHO_T}---------------- configuring other programs -----------------" >& # Check whether --with-doxygen was given. if test "${with_doxygen+set}" = set; then - withval=$with_doxygen; DOXYGEN=$withval + withval=$with_doxygen; DOXYGEN="$withval" else DOXYGEN= fi diff --git a/deal.II/configure.in b/deal.II/configure.in index 0c4751572f..3802d11f60 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -62,7 +62,7 @@ AC_SUBST(DEAL_II_MINOR) AC_SUBST(DEAL_II_PATH) dnl For backward compatibility, also have DEAL2_DIR alias DEAL_II_PATH -DEAL2_DIR=$DEAL_II_PATH +DEAL2_DIR="$DEAL_II_PATH" AC_SUBST(DEAL2_DIR) dnl Check for machine type operating system @@ -94,9 +94,9 @@ dnl dnl Note that on MIPS systems, the AC_PROG_CXX call erroneously sets dnl -g in CXXFLAGS, which is not exactly what we want, so we store dnl the old value temporarily -OLDCFLAGS=$CFLAGS +OLDCFLAGS="$CFLAGS" AC_PROG_CC -CFLAGS=$OLDCFLAGS +CFLAGS="$OLDCFLAGS" AC_PATH_PROG(CC,$CC) OLDCXXFLAGS="$CXXFLAGS" @@ -270,7 +270,7 @@ AC_MSG_RESULT(-------------- configuring shared/static libs ---------------) AC_ARG_ENABLE(shared, [ --enable-shared set compiler flags to generate shared libraries], - enableshared=$enableval, + enableshared="$enableval", enableshared=yes) dnl On AIX 4.x and alpha, shared libs don't work for us at present, so @@ -350,7 +350,7 @@ AC_ARG_ENABLE(parser, AS_HELP_STRING([--enable-parser],[While switched on by default, this option allows to switch off support for the function parser in the contrib directory.]), - [ enableparser=$enableval + [ enableparser="$enableval" if test "x$enableval" = "xno" ; then AC_MSG_RESULT(Function parser disabled) AC_DEFINE(DEAL_II_DISABLE_PARSER, 1,