--- rpl/Attic/configure.in 2011/06/27 15:27:25 1.69 +++ rpl/Attic/configure.in 2011/08/09 10:30:27 1.75 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([rpl],[4.1.0]) +AC_INIT([rpl],[4.1.2]) AC_CANONICAL_TARGET AC_CANONICAL_TARGET AM_INIT_AUTOMAKE @@ -11,11 +11,11 @@ NCURSES=ncurses-5.9 READLINE=readline-6.2 UNITS=units-1.88 GSL=gsl-1.15 -GPP=gpp-2.24 +GPP=gpp-3.0 GNUPLOT=gnuplot-4.4.3 FILE=file-5.03 ICONV=libiconv-1.13.1 -SQLITE=sqlite-3.7.6.3 +SQLITE=sqlite-3.7.7.1 OPENSSL=openssl-1.0.0d GMP=gmp-5.0.1 @@ -23,7 +23,7 @@ MPFR=mpfr-3.0.1 NTL=ntl-5.5.2 COCOA=CoCoALib-0.9943 PARI=pari-2.3.5 -GIAC=giac-0.9.1 +GIAC=giac-0.9.3 dnl Checks for C compiler AC_PROG_CC(gcc) @@ -60,10 +60,30 @@ fi dnl Checks for C++ compiler AC_PROG_CXX(g++) -if test "$GXX" != yes; then +if test "$CXX" != "g++"; then AC_MSG_ERROR([Cannot find g++! You have to install it.]) fi +if test x"$CXX" != x""; then + GCC_VERSION_MAJEURE=`$CXX -v 2>&1 | awk '/^gcc/ { print $3; }' | \ + awk -F. '{ printf("%s", $1);}'` + GCC_VERSION_MINEURE=`$CXX -v 2>&1 | awk '/^gcc/ { print $3; }' | \ + awk -F. '{ printf("%s", $2);}'` + if test $GCC_VERSION_MAJEURE -ge 5; then + OPTIMISATION_GXX=-O3 + else + if test $GCC_VERSION_MAJEURE -ge 4 -a $GCC_VERSION_MINEURE -ge 4; then + OPTIMISATION_GXX=-O3 + else + if test $GCC_VERSION_MAJEURE -ge 3; then + OPTIMISATION_GXX=-O2 + else + AC_MSG_ERROR([Cannot find decent or recent g++ (g++-4.3 or better)!]) + fi + fi + fi +fi + dnl Checks for Fortran 77 compiler AC_PROG_F77(gfortran) @@ -115,35 +135,69 @@ if test "$ac_x_libraries" != "no"; then fi dnl 32 bits ABI -AC_ARG_WITH(32bits, +AC_ARG_WITH(32bits-abi, [ --with-32bits-abi force 32bits ABI (multilib)],[ if test "$with-32bits-abi" = "no"; then ABI= else ABI=-m32 fi],[ - ABI=-m32 + ABI= + ] +) + +if test x$ABI = x; then +AC_ARG_WITH(64bits-abi, +[ --with-64bits-abi force 64bits ABI (multilib)],[ +if test "$with-64bits-abi" = "no"; then + ABI= +else + ABI=-m64 +fi],[ + ABI= + ] +) +fi + +LDFLAGS="$LDFLAGS $ABI" + +dnl RPL/CAS support +AC_ARG_WITH(rplcas, +[ --with-rplcas compile rplcas (default=no)],[ +if test "$with-rplcas" = "no"; then + RPLCAS=-URPLCAS + LIBRPLCAS= +else + RPLCAS=-DRPLCAS + LIBRPLCAS=\$\(top_builddir\)/rplcas/lib/librplcas.a +fi],[ + RPLCAS=-URPLCAS + LIBRPLCAS= ] ) AC_SUBST(ABI) +AC_SUBST(RPLCAS) +AC_SUBST(LIBRPLCAS) dnl Options AC_ARG_ENABLE(optimization, [ --enable-optimization set compiler flags [[default=environment variables -O3]]], [ if test "$enableval" = "no"; then - CFLAGS= - FFLAGS= - CXXFLAGS= - FCFLAGS= -else - CFLAGS="$CFLAGS $enable_optimization" - FFLAGS="$FFLAGS $enable_optimization" - FCFLAGS="$FCFLAGS $enable_optimization" + CFLAGS=$ABI + FFLAGS=$ABI + CXXFLAGS=$ABI + FCFLAGS=$ABI +else + CFLAGS="$CFLAGS $ABI $enable_optimization" + FFLAGS="$FFLAGS $ABI $enable_optimization" + CXXFLAGS="$CXXFLAGS $ABI $enable_optimization" + FCFLAGS="$FCFLAGS $ABI $enable_optimization" fi],[ - CFLAGS="$CFLAGS $OPTIMISATION_C" - FFLAGS="$FFLAGS $OPTIMISATION_F" - FCFLAGS="$FCFLAGS $OPTIMISATION_F" + CFLAGS="$CFLAGS $ABI $OPTIMISATION_C" + FFLAGS="$FFLAGS $ABI $OPTIMISATION_F" + CXXFLAGS="$CXXFLAGS $ABI $OPTIMISATION_CXX" + FCFLAGS="$FCFLAGS $ABI $OPTIMISATION_F" ] ) @@ -911,7 +965,7 @@ if test $(uname) = "OS/2"; then bash -c "cd tools/$OPENSSL && os2/OS2-EMX.cmd" else if test "x$with_openssl_arch" = xnone; then - (cd tools/$OPENSSL && ./config) + (cd tools/$OPENSSL && ./config no-asm) elif test "x$with_openssl_arch" = xyes -o "x$with_openssl_arch" = xno; then (cd tools/$OPENSSL && ./Configure) AC_MSG_ERROR([OS/COMP informations are required!]) @@ -919,19 +973,10 @@ else (cd tools/$OPENSSL && ./Configure) AC_MSG_ERROR([Please specify OS and Architecture]) else - (cd tools/$OPENSSL && ./Configure $with_openssl_arch) + (cd tools/$OPENSSL && ./Configure no-asm $with_openssl_arch) fi fi -AC_CONFIG_SUBDIRS(tools/$NCURSES) -AC_CONFIG_SUBDIRS(tools/$READLINE) -AC_CONFIG_SUBDIRS(tools/$GSL) -AC_CONFIG_SUBDIRS(tools/$GPP) -AC_CONFIG_SUBDIRS(tools/$FILE) -AC_CONFIG_SUBDIRS(tools/$ICONV) -AC_CONFIG_SUBDIRS(tools/$SQLITE) -AC_CONFIG_SUBDIRS(tools/$UNITS) - if test "$MYGNUPLOT" = "yes"; then if test ! -d "$srcdir"/tools/$GNUPLOT; then gunzip -c "$srcdir"/tools/$GNUPLOT.tar.gz | \ @@ -945,6 +990,9 @@ fi AC_SUBST(GNUPLOT_COMPILATION) +HOST=$host +AC_SUBST(HOST) + case $host_cpu in i?86) @@ -1008,7 +1056,10 @@ case $OS in IPCS_SYSV=-UIPCS_SYSV CXXFLAGS="$CXXFLAGS -D_GLIBCXX_FULLY_DYNAMIC_STRING" ac_configure_args="$ac_configure_args --with-readline=builtin \ - --disable-shared --enable-static --enable-threads" + --disable-shared --enable-static --enable-threads \ + CFLAGS=\"$CFLAGS\" CXXFLAGS=\"$CXXFLAGS\" \ + FFLAGS=\"$FFLAGS\" FCFLAGS=\"$FCFLAGS\" \ + LDFLAGS=\"$LDFLAGS\"" C_STANDARD=-std=gnu99 break ;; @@ -1018,7 +1069,10 @@ case $OS in SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES IPCS_SYSV=-UIPCS_SYSV ac_configure_args="$ac_configure_args --with-readline=builtin \ - --disable-shared --enable-static --enable-threads" + --disable-shared --enable-static --enable-threads \ + CFLAGS=\"$CFLAGS\" CXXFLAGS=\"$CXXFLAGS\" \ + FFLAGS=\"$FFLAGS\" FCFLAGS=\"$FCFLAGS\" \ + LDFLAGS=\"$LDFLAGS\"" C_STANDARD=-std=gnu99 break ;; @@ -1028,7 +1082,10 @@ case $OS in SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES IPCS_SYSV=-UIPCS_SYSV ac_configure_args="$ac_configure_args --with-readline=builtin \ - --disable-shared --enable-static --enable-threads" + --disable-shared --enable-static --enable-threads \ + CFLAGS=\"$CFLAGS\" CXXFLAGS=\"$CXXFLAGS\" \ + FFLAGS=\"$FFLAGS\" FCFLAGS=\"$FCFLAGS\" \ + LDFLAGS=\"$LDFLAGS\"" C_STANDARD=-std=gnu99 break;; @@ -1038,7 +1095,10 @@ case $OS in SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES IPCS_SYSV=-UIPCS_SYSV ac_configure_args="$ac_configure_args --with-readline=builtin \ - --disable-shared --enable-static --enable-threads" + --disable-shared --enable-static --enable-threads \ + CFLAGS=\"$CFLAGS\" CXXFLAGS=\"$CXXFLAGS\" \ + FFLAGS=\"$FFLAGS\" FCFLAGS=\"$FCFLAGS\" \ + LDFLAGS=\"$LDFLAGS\"" C_STANDARD=-std=gnu99 break ;; @@ -1053,7 +1113,10 @@ case $OS in IPCS_SYSV=-DIPCS_SYSV ac_configure_args="$ac_configure_args --without-readline \ --without-cairo --disable-shared --enable-static \ - --enable-threads" + --enable-threads \ + CFLAGS=\"$CFLAGS\" CXXFLAGS=\"$CXXFLAGS\" \ + FFLAGS=\"$FFLAGS\" FCFLAGS=\"$FCFLAGS\" \ + LDFLAGS=\"$LDFLAGS\"" C_STANDARD= break;; @@ -1066,7 +1129,10 @@ case $OS in SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES IPCS_SYSV=-DIPCS_SYSV ac_configure_args="$ac_configure_args --with-readline=builtin \ - --disable-shared --enable-static --enable-threads" + --disable-shared --enable-static --enable-threads \ + CFLAGS=\"$CFLAGS\" CXXFLAGS=\"$CXXFLAGS\" \ + FFLAGS=\"$FFLAGS\" FCFLAGS=\"$FCFLAGS\" \ + LDFLAGS=\"$LDFLAGS\"" C_STANDARD=-std=gnu99 break;; @@ -1082,7 +1148,10 @@ case $OS in fi ac_configure_args="$ac_configure_args --with-readline=builtin \ - --disable-shared --enable-static --enable-threads" + --disable-shared --enable-static --enable-threads \ + CFLAGS=\"$CFLAGS\" CXXFLAGS=\"$CXXFLAGS\" \ + FFLAGS=\"$FFLAGS\" FCFLAGS=\"$FCFLAGS\" \ + LDFLAGS=\"$LDFLAGS\"" C_STANDARD=-std=gnu99 MALLOC=-lumem break ;; @@ -1099,7 +1168,10 @@ case $OS in fi ac_configure_args="$ac_configure_args --with-readline=builtin \ - --disable-shared --enable-static --enable-threads" + --disable-shared --enable-static --enable-threads \ + CFLAGS=\"$CFLAGS\" CXXFLAGS=\"$CXXFLAGS\" \ + FFLAGS=\"$FFLAGS\" FCFLAGS=\"$FCFLAGS\" \ + LDFLAGS=\"$LDFLAGS\"" C_STANDARD=-std=gnu99 break ;; @@ -1141,6 +1213,16 @@ AC_SUBST(CFLAGS) AC_SUBST(CXXFLAGS) AC_SUBST(FFLAGS) AC_SUBST(FCFLAGS) +AC_SUBST(LDFLAGS) + +AC_CONFIG_SUBDIRS(tools/$NCURSES) +AC_CONFIG_SUBDIRS(tools/$READLINE) +AC_CONFIG_SUBDIRS(tools/$GSL) +AC_CONFIG_SUBDIRS(tools/$GPP) +AC_CONFIG_SUBDIRS(tools/$FILE) +AC_CONFIG_SUBDIRS(tools/$ICONV) +AC_CONFIG_SUBDIRS(tools/$SQLITE) +AC_CONFIG_SUBDIRS(tools/$UNITS) AC_CONFIG_FILES(Makefile) AC_CONFIG_FILES(COPYING)