--- rpl/Attic/configure.in 2010/05/07 09:17:52 1.23 +++ rpl/Attic/configure.in 2010/05/09 15:43:37 1.24 @@ -7,7 +7,7 @@ AC_SUBST(target_cpu) AC_CONFIG_HEADERS([rplconfig.h]) dnl Libraries -NCURSES=ncurses-5.7-20100206 +NCURSES=ncurses-5.7-20100501 READLINE=readline-6.1 UNITS=units-1.87 GSL=gsl-1.14 @@ -19,20 +19,25 @@ SQLITE=sqlite-3.6.23.1 OPENSSL=openssl-1.0.0 dnl Checks for C compiler -AC_PROG_CC(gcc-4.4 gcc) +AC_PROG_CC(gcc) if test x"$CC" != x""; then GCC_VERSION_MAJEURE=`$CC -v 2>&1 | awk '/^gcc/ { print $3; }' | \ awk -F. '{ printf("%s", $1);}'` GCC_VERSION_MINEURE=`$CC -v 2>&1 | awk '/^gcc/ { print $3; }' | \ 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 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 else - OPTIMISATION_C=-O2 + if test $GCC_VERSION_MAJEURE -ge 2; then + OPTIMISATION_C=-O2 + else + AC_MSG_ERROR([Cannot find decent or recent gcc (gcc-4.2 or better)!]) + fi fi fi fi @@ -44,21 +49,21 @@ if test "$GCC" != yes; then fi dnl Checks for C++ compiler -AC_PROG_CXX(g++-4.4 g++) +AC_PROG_CXX(g++) if test "$GXX" != yes; then AC_MSG_ERROR([Cannot find g++! You have to install it.]) fi dnl Checks for Fortran 77 compiler -AC_PROG_F77(gfortran-4.4 gfortran) +AC_PROG_F77(gfortran) if test "$F77" != gfortran -a "$F77" != gfortran-4.4; then AC_MSG_ERROR([Cannot find gfortran! You have to install it.]) fi dnl Check for Fortran 9* compiler -AC_PROG_FC(gfortran-4.4 gfortran) +AC_PROG_FC(gfortran) if test "$FC" != gfortran -a "$FC" != gfortran-4.4; then AC_MSG_ERROR([Cannot find gfortran! You have to install it.]) @@ -69,13 +74,17 @@ if test x"$FC" != x""; then awk -F. '{ printf("%s", $1);}'` GCC_VERSION_MINEURE=`$FC -v 2>&1 | awk '/^gcc/ { print $3; }' | \ 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 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 else - OPTIMISATION_F=-O2 + if test $GCC_VERSION_MAJEURE -ge 3; then + OPTIMISATION_F=-O2 + else + AC_MSG_ERROR([Cannot find decent or recent gfortran (gfortran-4.3 or better)!]) + fi fi fi fi @@ -833,6 +842,7 @@ case $OS in EXPORT_DYNAMIC=-flat_namespace NESTED_FUNCTIONS=-fnested-functions SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES + CXXFLAGS="$CXXFLAGS -D_GLIBCXX_FULLY_DYNAMIC_STRING" break ;; Cygwin)