version 1.22, 2010/05/07 09:17:52
|
version 1.23, 2010/05/09 15:43:36
|
Line 3199 am__tar='${AMTAR} chof - "$$tardir"'; am
|
Line 3199 am__tar='${AMTAR} chof - "$$tardir"'; am
|
ac_config_headers="$ac_config_headers rplconfig.h" |
ac_config_headers="$ac_config_headers rplconfig.h" |
|
|
|
|
NCURSES=ncurses-5.7-20100206 |
NCURSES=ncurses-5.7-20100501 |
READLINE=readline-6.1 |
READLINE=readline-6.1 |
UNITS=units-1.87 |
UNITS=units-1.87 |
GSL=gsl-1.14 |
GSL=gsl-1.14 |
Line 3216 ac_compile='$CC -c $CFLAGS $CPPFLAGS con
|
Line 3216 ac_compile='$CC -c $CFLAGS $CPPFLAGS con
|
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
ac_compiler_gnu=$ac_cv_c_compiler_gnu |
ac_compiler_gnu=$ac_cv_c_compiler_gnu |
if test -n "$ac_tool_prefix"; then |
if test -n "$ac_tool_prefix"; then |
for ac_prog in gcc-4.4 gcc |
for ac_prog in gcc |
do |
do |
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
Line 3260 fi
|
Line 3260 fi
|
fi |
fi |
if test -z "$CC"; then |
if test -z "$CC"; then |
ac_ct_CC=$CC |
ac_ct_CC=$CC |
for ac_prog in gcc-4.4 gcc |
for ac_prog in gcc |
do |
do |
# Extract the first word of "$ac_prog", so it can be a program name with args. |
# Extract the first word of "$ac_prog", so it can be a program name with args. |
set dummy $ac_prog; ac_word=$2 |
set dummy $ac_prog; ac_word=$2 |
Line 4004 if test x"$CC" != x""; then
|
Line 4004 if test x"$CC" != x""; then
|
awk -F. '{ printf("%s", $1);}'` |
awk -F. '{ printf("%s", $1);}'` |
GCC_VERSION_MINEURE=`$CC -v 2>&1 | awk '/^gcc/ { print $3; }' | \ |
GCC_VERSION_MINEURE=`$CC -v 2>&1 | awk '/^gcc/ { print $3; }' | \ |
awk -F. '{ printf("%s", $2);}'` |
awk -F. '{ printf("%s", $2);}'` |
if test $GCC_VERSION_MAJEURE -ge 4 -a $GCC_VERSION_MINEURE -ge 4; then |
if test $GCC_VERSION_MAJEURE -ge 5; then |
OPTIMISATION_C=-O3 |
OPTIMISATION_C=-O3 |
else |
else |
if test $GCC_VERSION_MAJEURE -ge 5; then |
if test $GCC_VERSION_MAJEURE -ge 4 -a $GCC_VERSION_MINEURE -ge 4; \ |
|
then |
OPTIMISATION_C=-O3 |
OPTIMISATION_C=-O3 |
else |
else |
OPTIMISATION_C=-O2 |
if test $GCC_VERSION_MAJEURE -ge 2; then |
|
OPTIMISATION_C=-O2 |
|
else |
|
as_fn_error "Cannot find decent or recent gcc (gcc-4.2 or better)!" "$LINENO" 5 |
|
fi |
fi |
fi |
fi |
fi |
fi |
fi |
Line 4156 if test -z "$CXX"; then
|
Line 4161 if test -z "$CXX"; then
|
CXX=$CCC |
CXX=$CCC |
else |
else |
if test -n "$ac_tool_prefix"; then |
if test -n "$ac_tool_prefix"; then |
for ac_prog in g++-4.4 g++ |
for ac_prog in g++ |
do |
do |
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
Line 4200 fi
|
Line 4205 fi
|
fi |
fi |
if test -z "$CXX"; then |
if test -z "$CXX"; then |
ac_ct_CXX=$CXX |
ac_ct_CXX=$CXX |
for ac_prog in g++-4.4 g++ |
for ac_prog in g++ |
do |
do |
# Extract the first word of "$ac_prog", so it can be a program name with args. |
# Extract the first word of "$ac_prog", so it can be a program name with args. |
set dummy $ac_prog; ac_word=$2 |
set dummy $ac_prog; ac_word=$2 |
Line 4540 ac_compile='$F77 -c $FFLAGS conftest.$ac
|
Line 4545 ac_compile='$F77 -c $FFLAGS conftest.$ac
|
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
ac_compiler_gnu=$ac_cv_f77_compiler_gnu |
ac_compiler_gnu=$ac_cv_f77_compiler_gnu |
if test -n "$ac_tool_prefix"; then |
if test -n "$ac_tool_prefix"; then |
for ac_prog in gfortran-4.4 gfortran |
for ac_prog in gfortran |
do |
do |
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
Line 4584 fi
|
Line 4589 fi
|
fi |
fi |
if test -z "$F77"; then |
if test -z "$F77"; then |
ac_ct_F77=$F77 |
ac_ct_F77=$F77 |
for ac_prog in gfortran-4.4 gfortran |
for ac_prog in gfortran |
do |
do |
# Extract the first word of "$ac_prog", so it can be a program name with args. |
# Extract the first word of "$ac_prog", so it can be a program name with args. |
set dummy $ac_prog; ac_word=$2 |
set dummy $ac_prog; ac_word=$2 |
Line 4756 ac_compile='$FC -c $FCFLAGS $ac_fcflags_
|
Line 4761 ac_compile='$FC -c $FCFLAGS $ac_fcflags_
|
ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5' |
ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5' |
ac_compiler_gnu=$ac_cv_fc_compiler_gnu |
ac_compiler_gnu=$ac_cv_fc_compiler_gnu |
if test -n "$ac_tool_prefix"; then |
if test -n "$ac_tool_prefix"; then |
for ac_prog in gfortran-4.4 gfortran |
for ac_prog in gfortran |
do |
do |
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
Line 4800 fi
|
Line 4805 fi
|
fi |
fi |
if test -z "$FC"; then |
if test -z "$FC"; then |
ac_ct_FC=$FC |
ac_ct_FC=$FC |
for ac_prog in gfortran-4.4 gfortran |
for ac_prog in gfortran |
do |
do |
# Extract the first word of "$ac_prog", so it can be a program name with args. |
# Extract the first word of "$ac_prog", so it can be a program name with args. |
set dummy $ac_prog; ac_word=$2 |
set dummy $ac_prog; ac_word=$2 |
Line 4967 if test x"$FC" != x""; then
|
Line 4972 if test x"$FC" != x""; then
|
awk -F. '{ printf("%s", $1);}'` |
awk -F. '{ printf("%s", $1);}'` |
GCC_VERSION_MINEURE=`$FC -v 2>&1 | awk '/^gcc/ { print $3; }' | \ |
GCC_VERSION_MINEURE=`$FC -v 2>&1 | awk '/^gcc/ { print $3; }' | \ |
awk -F. '{ printf("%s", $2);}'` |
awk -F. '{ printf("%s", $2);}'` |
if test $GCC_VERSION_MAJEURE -ge 4 -a $GCC_VERSION_MINEURE -ge 4; then |
if test $GCC_VERSION_MAJEURE -ge 5; then |
OPTIMISATION_F=-O3 |
OPTIMISATION_F=-O3 |
else |
else |
if test $GCC_VERSION_MAJEURE -ge 5; then |
if test $GCC_VERSION_MAJEURE -ge 4 -a $GCC_VERSION_MINEURE -ge 4; then |
OPTIMISATION_F=-O3 |
OPTIMISATION_F=-O3 |
else |
else |
OPTIMISATION_F=-O2 |
if test $GCC_VERSION_MAJEURE -ge 3; then |
|
OPTIMISATION_F=-O2 |
|
else |
|
as_fn_error "Cannot find decent or recent gfortran (gfortran-4.3 or better)!" "$LINENO" 5 |
|
fi |
fi |
fi |
fi |
fi |
fi |
fi |
Line 8951 case $OS in
|
Line 8960 case $OS in
|
EXPORT_DYNAMIC=-flat_namespace |
EXPORT_DYNAMIC=-flat_namespace |
NESTED_FUNCTIONS=-fnested-functions |
NESTED_FUNCTIONS=-fnested-functions |
SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES |
SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES |
|
CXXFLAGS="$CXXFLAGS -D_GLIBCXX_FULLY_DYNAMIC_STRING" |
break ;; |
break ;; |
|
|
Cygwin) |
Cygwin) |