--- rpl/Attic/configure 2011/07/22 07:38:00 1.67 +++ rpl/Attic/configure 2011/08/09 11:31:27 1.73 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for rpl 4.1.1. +# Generated by GNU Autoconf 2.68 for rpl 4.1.3. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -557,8 +557,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='rpl' PACKAGE_TARNAME='rpl' -PACKAGE_VERSION='4.1.1' -PACKAGE_STRING='rpl 4.1.1' +PACKAGE_VERSION='4.1.3' +PACKAGE_STRING='rpl 4.1.3' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -634,6 +634,7 @@ NESTED_FUNCTIONS EXPORT_DYNAMIC C_STANDARD OS +HOST GNUPLOT_COMPILATION subdirs EGREP @@ -781,8 +782,8 @@ ac_user_opts=' enable_option_checking enable_dependency_tracking with_x -with_32bits -with_64bits +with_32bits_abi +with_64bits_abi with_rplcas enable_optimization enable_sysv_semaphores @@ -819,15 +820,15 @@ FC FCFLAGS XMKMF CPP' -ac_subdirs_all='tools/$NCURSES +ac_subdirs_all='tools/$GNUPLOT +tools/$NCURSES tools/$READLINE tools/$GSL tools/$GPP tools/$FILE tools/$ICONV tools/$SQLITE -tools/$UNITS -tools/$GNUPLOT' +tools/$UNITS' # Initialize some variables set by options. ac_init_help= @@ -1369,7 +1370,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures rpl 4.1.1 to adapt to many kinds of systems. +\`configure' configures rpl 4.1.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1444,7 +1445,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of rpl 4.1.1:";; + short | recursive ) echo "Configuration of rpl 4.1.3:";; esac cat <<\_ACEOF @@ -1563,7 +1564,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -rpl configure 4.1.1 +rpl configure 4.1.3 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2274,7 +2275,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by rpl $as_me 4.1.1, which was +It was created by rpl $as_me 4.1.3, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3200,7 +3201,7 @@ fi # Define the identity of the package. PACKAGE='rpl' - VERSION='4.1.1' + VERSION='4.1.3' cat >>confdefs.h <<_ACEOF @@ -3248,11 +3249,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 @@ -4589,10 +4590,30 @@ fi -if test "$GXX" != yes; then +if test "$CXX" != "g++"; then as_fn_error $? "Cannot find g++! You have to install it." "$LINENO" 5 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 + as_fn_error $? "Cannot find decent or recent g++ (g++-4.3 or better)!" "$LINENO" 5 + fi + fi + fi +fi + ac_ext=f ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5876,9 +5897,9 @@ if test "$ac_x_libraries" != "no"; then fi -# Check whether --with-32bits was given. -if test "${with_32bits+set}" = set; then : - withval=$with_32bits; +# Check whether --with-32bits-abi was given. +if test "${with_32bits_abi+set}" = set; then : + withval=$with_32bits_abi; if test "$with-32bits-abi" = "no"; then ABI= else @@ -5886,16 +5907,17 @@ else fi else - ABI=-m32 + ABI= fi +if test x$ABI = x; then -# Check whether --with-64bits was given. -if test "${with_64bits+set}" = set; then : - withval=$with_64bits; +# Check whether --with-64bits-abi was given. +if test "${with_64bits_abi+set}" = set; then : + withval=$with_64bits_abi; if test "$with-64bits-abi" = "no"; then ABI= else @@ -5903,11 +5925,14 @@ else fi else - ABI=-m64 + ABI= + +fi fi +LDFLAGS="$LDFLAGS $ABI" # Check whether --with-rplcas was given. @@ -5937,20 +5962,22 @@ fi if test "${enable_optimization+set}" = set; then : enableval=$enable_optimization; 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 else - 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" fi @@ -9193,31 +9220,14 @@ else fi fi - - -subdirs="$subdirs tools/$NCURSES" - -subdirs="$subdirs tools/$READLINE" - -subdirs="$subdirs tools/$GSL" - -subdirs="$subdirs tools/$GPP" - -subdirs="$subdirs tools/$FILE" - -subdirs="$subdirs tools/$ICONV" - -subdirs="$subdirs tools/$SQLITE" - -subdirs="$subdirs tools/$UNITS" - - if test "$MYGNUPLOT" = "yes"; then if test ! -d "$srcdir"/tools/$GNUPLOT; then gunzip -c "$srcdir"/tools/$GNUPLOT.tar.gz | \ (cd "$srcdir/tools" && tar -xf -) fi - subdirs="$subdirs tools/$GNUPLOT" + + +subdirs="$subdirs tools/$GNUPLOT" GNUPLOT_COMPILATION=$GNUPLOT else @@ -9226,6 +9236,9 @@ fi +HOST=$host + + case $host_cpu in i?86) @@ -9289,7 +9302,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 ;; @@ -9299,7 +9315,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 ;; @@ -9309,7 +9328,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;; @@ -9319,7 +9341,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 ;; @@ -9334,7 +9359,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;; @@ -9347,7 +9375,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;; @@ -9363,7 +9394,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 ;; @@ -9380,7 +9414,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 ;; @@ -9423,6 +9460,24 @@ esac + +subdirs="$subdirs tools/$NCURSES" + +subdirs="$subdirs tools/$READLINE" + +subdirs="$subdirs tools/$GSL" + +subdirs="$subdirs tools/$GPP" + +subdirs="$subdirs tools/$FILE" + +subdirs="$subdirs tools/$ICONV" + +subdirs="$subdirs tools/$SQLITE" + +subdirs="$subdirs tools/$UNITS" + + ac_config_files="$ac_config_files Makefile" ac_config_files="$ac_config_files COPYING" @@ -10019,7 +10074,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by rpl $as_me 4.1.1, which was +This file was extended by rpl $as_me 4.1.3, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -10085,7 +10140,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -rpl config.status 4.1.1 +rpl config.status 4.1.3 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\"