From ea25d3196d7d815c77213c7c25ea2e376ef44188 Mon Sep 17 00:00:00 2001 From: wolf Date: Sun, 30 Jan 2000 23:16:04 +0000 Subject: [PATCH] Various updates. git-svn-id: https://svn.dealii.org/trunk@2283 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/common/Make.global_options.in | 85 ++++----------------------- deal.II/configure | 22 +++---- deal.II/configure.in | 6 +- 3 files changed, 29 insertions(+), 84 deletions(-) diff --git a/deal.II/common/Make.global_options.in b/deal.II/common/Make.global_options.in index c23c2ebf62..3e3b9fba49 100644 --- a/deal.II/common/Make.global_options.in +++ b/deal.II/common/Make.global_options.in @@ -1,83 +1,19 @@ # $Id$ - ############################################################################### -# This file exports several make variables to other Makefiles which -# include it. You will want to include this file into the Makefiles of -# your project to use the same compiler flags and to access the pathes -# to libraries. The following symbols defined in this file may be of -# interest: -# -# -# General -# ------- -# CXX -- executable name of the C++ compiler -# CC -- executable name of the C compiler, which -# is used to generate shared libraries -# PERL -- executable name of the 'perl' program -# -# -# Paths to libraries -# ------------------- -# lib-path-base -- path to the library files of the /base library -# lib-path-lac -- same for the /lac library -# lib-path-deal2 -- same for the /deal.II library -# LIBPATH -- all the library pathes prefixed by -L, i.e. the -# flags needed by the compiler to find the libraries -# when they are linked in using -lbase -llac -ldeal_II_2d -# (for example). These -L paths are appended to what -# was in $(LIBPATH) before -# -# -# Paths and filenames of libraries -# -------------------------------- -# lib-base.o -- path and filename of the base library in optimized -# mode. depending on whether shared libraries were -# or were not enabled, the suffix of the value of this -# variable is either .so or .a -# lib-base.g -- same, for the library in debug mode -# -# lib-lac.o -- same for the lac libraries -# lib-lac.g -# -# lib-deal2-1d.o lib-deal2-1d.g -- same for the deal.II libraries in the various -# lib-deal2-2d.o lib-deal2-2d.g dimensions -# lib-deal2-3d.o lib-deal2-3d.g -# -# -# -# Pathes to include files -# ----------------------- -# include-path-base -- same as for lib-path-base, but contains the paths -# to the include files of the /base library -# include-path-lac -- same for the /lac library -# include-path-deal2 -- same for the /deal.II library -# INCLUDE -- all the include pathes prefixed by -I -# -# -# Compiler flags -# -------------- -# CXXFLAGS.g -- compiler flags for debug mode -# CXXFLAGS.o -- compiler flags for optimized mode -# -# -# -# If --with-multithreading was given to ./configure, $(INCLUDE) and -# $(LIBPATH) are augmented by the ACE include and library paths, and -# the following symbols are meaningful: -# -# ACE_ROOT -- path to the ACE library as given to ./configure -# with-multithreading-- this symbol is 'no' if the flag was not given -# to ./configure and not 'no' (it actually equals -# $(ACE_ROOT)) if -with-multithreading=... was -# given +## Please note: +## The ./configure script generates Make.global_options from +## Make.global_options.in, so if you want to change something, +## then do it in the latter file and re-run ./configure in the +## top level directory +## +## +## This file exports several variables. They are documented in +## the file doc/development/makefiles.html. ############################################################################### - - - ###################################################### # the following lines will be replaced by the output # of ./configure @@ -193,6 +129,9 @@ ifneq ($(with-multithreading),no) ACE_ROOT = $(with-multithreading) INCLUDE += -I$(ACE_ROOT) LIBPATH += -L$(ACE_ROOT)/ace + + lib-ACE = $(ACE_ROOT)/ace/libACE.so + CXXFLAGS.g += -DDEAL_II_USE_MT CXXFLAGS.o += -DDEAL_II_USE_MT diff --git a/deal.II/configure b/deal.II/configure index ca43cd6346..1a9ea10855 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -748,6 +748,7 @@ else fi fi +CC=`which $CC` for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl @@ -755,7 +756,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:759: checking for $ac_word" >&5 +echo "configure:760: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -787,7 +788,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:791: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:792: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -798,12 +799,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 802 "configure" +#line 803 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -829,12 +830,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:833: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:834: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:838: checking whether we are using GNU C++" >&5 +echo "configure:839: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -843,7 +844,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:847: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:848: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -862,7 +863,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:866: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:867: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -893,6 +894,7 @@ else fi fi +CXX=`which $CXX` if test $GXX = yes ; then # find out the right version GXX_VERSION_STRING=`($CXX -v 2>&1) | grep "gcc version"` @@ -924,7 +926,7 @@ OS=`uname` # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:928: checking for $ac_word" >&5 +echo "configure:930: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -979,7 +981,7 @@ fi if test $withmultithreading != no ; then echo $ac_n "checking checking for ACE""... $ac_c" 1>&6 -echo "configure:983: checking checking for ACE" >&5 +echo "configure:985: checking checking for ACE" >&5 if test -d $withmultithreading ; then echo "$ac_t""found" 1>&6 else diff --git a/deal.II/configure.in b/deal.II/configure.in index 74b8cbd505..6473df18f7 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -20,13 +20,17 @@ AC_SUBST(DEAL2_DIR) dnl Find a C compiler, which is used when building -dnl shared libaries. This modifies the variable CC +dnl shared libaries. This modifies the variable CC. +dnl In order to get the absolute path of the compiler, use the +dnl second line AC_PROG_CC +CC=`which $CC` dnl Find the right C++ compiler. This modifies the following dnl variables: CXX, GXX, CXXFLAGS AC_PROG_CXX +CXX=`which $CXX` if test $GXX = yes ; then # find out the right version GXX_VERSION_STRING=`($CXX -v 2>&1) | grep "gcc version"` -- 2.39.5