--- rpl/Attic/configure 2010/04/17 18:57:33 1.17 +++ rpl/Attic/configure 2010/08/06 15:32:16 1.32 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for rpl 4.0.14. +# Generated by GNU Autoconf 2.65 for rpl 4.0.18. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -549,8 +549,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='rpl' PACKAGE_TARNAME='rpl' -PACKAGE_VERSION='4.0.14' -PACKAGE_STRING='rpl 4.0.14' +PACKAGE_VERSION='4.0.18' +PACKAGE_STRING='rpl 4.0.18' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -596,6 +596,8 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +EXT_SQL +MALLOC DATE_FR FINAL_ENCODING OPENSSL @@ -611,7 +613,6 @@ NCURSES SEMAPHORES_NOMMES NESTED_FUNCTIONS EXPORT_DYNAMIC -LIBMTMALLOC OS GNUPLOT_COMPILATION subdirs @@ -758,6 +759,7 @@ enable_option_checking enable_dependency_tracking with_x enable_optimization +enable_full_static enable_final_encoding enable_tex enable_vim @@ -1338,7 +1340,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.0.14 to adapt to many kinds of systems. +\`configure' configures rpl 4.0.18 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1413,7 +1415,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of rpl 4.0.14:";; + short | recursive ) echo "Configuration of rpl 4.0.18:";; esac cat <<\_ACEOF @@ -1424,6 +1426,7 @@ Optional Features: --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --enable-optimization set compiler flags [default=environment variables -O3] + --enable-full-static build static RPL/2 engine [default=shared] --enable-final-encoding force final encoding [default=guessed] --enable-tex provide the TeX support [default=guessed] --enable-vim provide the vim support [default=guessed] @@ -1526,7 +1529,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -rpl configure 4.0.14 +rpl configure 4.0.18 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2237,7 +2240,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.0.14, which was +It was created by rpl $as_me 4.0.18, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -3156,7 +3159,7 @@ fi # Define the identity of the package. PACKAGE='rpl' - VERSION='4.0.14' + VERSION='4.0.18' cat >>confdefs.h <<_ACEOF @@ -3200,16 +3203,16 @@ am__tar='${AMTAR} chof - "$$tardir"'; am ac_config_headers="$ac_config_headers rplconfig.h" -NCURSES=ncurses-5.7-20100206 +NCURSES=ncurses-5.7-20100619 READLINE=readline-6.1 -UNITS=units-1.87 +UNITS=units-1.88 GSL=gsl-1.14 GPP=gpp-2.24 GNUPLOT=gnuplot-4.4.0 FILE=file-5.03 ICONV=libiconv-1.13.1 -SQLITE=sqlite-3.6.23.1 -OPENSSL=openssl-1.0.0 +SQLITE=sqlite-3.7.0.1 +OPENSSL=openssl-1.0.0a ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3217,7 +3220,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in gcc-4.4 gcc + for ac_prog in gcc do # 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 @@ -3261,7 +3264,7 @@ fi fi if test -z "$CC"; then ac_ct_CC=$CC - for ac_prog in gcc-4.4 gcc + for ac_prog in gcc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -4000,18 +4003,25 @@ fi +EXT_SQL= + 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 + as_fn_error "Cannot find decent or recent gcc (gcc-4.2 or better)!" "$LINENO" 5 + fi fi fi fi @@ -4157,7 +4167,7 @@ if test -z "$CXX"; then CXX=$CCC else if test -n "$ac_tool_prefix"; then - for ac_prog in g++-4.4 g++ + for ac_prog in g++ do # 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 @@ -4201,7 +4211,7 @@ fi fi if test -z "$CXX"; then ac_ct_CXX=$CXX - for ac_prog in g++-4.4 g++ + for ac_prog in g++ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -4541,7 +4551,7 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_f77_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in gfortran-4.4 gfortran + for ac_prog in gfortran do # 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 @@ -4585,7 +4595,7 @@ fi fi if test -z "$F77"; then ac_ct_F77=$F77 - for ac_prog in gfortran-4.4 gfortran + for ac_prog in gfortran do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -4757,7 +4767,7 @@ 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_compiler_gnu=$ac_cv_fc_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in gfortran-4.4 gfortran + for ac_prog in gfortran do # 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 @@ -4801,7 +4811,7 @@ fi fi if test -z "$FC"; then ac_ct_FC=$FC - for ac_prog in gfortran-4.4 gfortran + for ac_prog in gfortran do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -4968,13 +4978,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 + as_fn_error "Cannot find decent or recent gfortran (gfortran-4.3 or better)!" "$LINENO" 5 + fi fi fi fi @@ -5837,6 +5851,19 @@ else fi +# Check whether --enable-full-static was given. +if test "${enable_full_static+set}" = set; then : + enableval=$enable_full_static; +if test "$enableval" = "no"; then + STATIC=no +else + STATIC=yes +fi +else + STATIC=no +fi + + # Check whether --enable-final-encoding was given. if test "${enable_final_encoding+set}" = set; then : enableval=$enable_final_encoding; @@ -5994,12 +6021,15 @@ fi if test "${enable_debug+set}" = set; then : enableval=$enable_debug; if test "$enableval" = "no"; then - DEBUG="" + DEBUG="-UDEBUG_MEMOIRE -UDEBUG_ERREURS" + MALLOC="\$(top_builddir)/ptmalloc3/libptmalloc3.a" else - DEBUG="-DDEBUG_MEMOIRE" + DEBUG="-DDEBUG_MEMOIRE -UDEBUG_ERREURS" + MALLOC="" fi else - DEBUG="" + DEBUG="-UDEBUG_MEMOIRE -UDEBUG_ERREURS" + MALLOC="\$(top_builddir)/ptmalloc3/libptmalloc3.a" fi @@ -6053,6 +6083,7 @@ fi if test ! -d "$srcdir"/tools/$SQLITE; then gunzip -c "$srcdir"/tools/$SQLITE.tar.gz | \ (cd "$srcdir/tools" && tar -xf -) + (cd "$srcdir/tools"/$SQLITE && gunzip -c ../$SQLITE.diff.gz | patch -p1) fi if test ! -d tools/$OPENSSL; then gunzip -c "$srcdir"/tools/$OPENSSL.tar.gz | \ @@ -7018,12 +7049,12 @@ fi if test "x$with_mysql" = xcheck -o "x$with_mysql" = yes; then libMySQLinc="-I/usr/include" - libMySQLlib="-L/usr/lib" + libMySQLlib="/usr/lib" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libmysql includes in /usr/include" >&5 $as_echo_n "checking for libmysql includes in /usr/include... " >&6; } saved_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $libMySQLinc" + CFLAGS="$CFLAGS -L/$libMySQLinc" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include "mysql.h" @@ -7137,7 +7168,7 @@ rm -f core conftest.err conftest.$ac_obj else if test "x$with_mysql" != xno; then libMySQLinc="-I$with_mysql/include" - libMySQLlib="-L$with_mysql/lib" + libMySQLlib="$with_mysql/lib" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libmysql includes in $with_mysql" >&5 $as_echo_n "checking for libmysql includes in $with_mysql... " >&6; } @@ -7205,7 +7236,11 @@ if test "$MYSQL_SUPPORT" = "-DMYSQL_SUPP { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libmysql libraries in $libMySQLlib" >&5 $as_echo_n "checking for libmysql libraries in $libMySQLlib... " >&6; } saved_LIBS="$LIBS" - LIBS="$LIBS $libMySQLlib $libMySQLinc -lmysqlclient_r" + if test $STATIC = no; then + LIBS="$LIBS -L/$libMySQLlib -lmysqlclient_r $libMySQLinc" + else + LIBS="$LIBS $libMySQLlib/libmysqlclient_r.a -lz $libMySQLinc" + fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include "mysql.h" @@ -7227,7 +7262,12 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$saved_LIBS; - libMySQLlib="$libMySQLlib -lmysqlclient_r" + if test $STATIC = no; then + libMySQLlib="-L/$libMySQLlib -lmysqlclient_r" + else + libMySQLlib="$libMySQLlib/libmysqlclient_r.a" + EXT_SQL="$EXT_SQL $libMySQLlib" + fi fi if test $MYSQL_LIB = no; then @@ -7259,7 +7299,7 @@ fi if test "x$with_postgresql" = xcheck -o "x$with_postgresql" = xyes; then libPgSQLinc="-I/usr/include" - libPgSQLlib="-L/usr/lib" + libPgSQLlib="/usr/lib" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpq includes in /usr/include" >&5 $as_echo_n "checking for libpq includes in /usr/include... " >&6; } @@ -7441,7 +7481,7 @@ rm -f core conftest.err conftest.$ac_obj else if test "x$with_postgresql" != xno; then libPgSQLinc="-I$with_postgresql/include" - libPgSQLlib="-L$with_postgresql/lib" + libPgSQLlib="$with_postgresql/lib" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpq includes in $libPgSQLinc" >&5 $as_echo_n "checking for libpq includes in $libPgSQLinc... " >&6; } @@ -7541,7 +7581,11 @@ if test "$POSTGRESQL_SUPPORT" = "-DPOSTG { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpq libraries in $libPgSQLlib" >&5 $as_echo_n "checking for libpq libraries in $libPgSQLlib... " >&6; } saved_LIBS="$LIBS" - LIBS="$LIBS $libPgSQLlib $libPgSQLinc -lpq" + if test $STATIC = no; then + LIBS="$LIBS -L/$libPgSQLlib $libPgSQLinc -lpq" + else + LIBS="$LIBS $libPgSQLlib/libpq.a $libPgSQLinc" + fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include "libpq-fe.h" @@ -7564,7 +7608,12 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$saved_LIBS; - libPgSQLlib="$libPgSQLlib -lpq" + if test $STATIC = no; then + libPgSQLlib="-L/$libPgSQLlib -lpq" + else + libPgSQLlib="$libPgSQLlib/libpq.a" + EXT_SQL="$EXT_SQL $libPgSQLlib" + fi fi fi @@ -8837,8 +8886,6 @@ fi done -ac_configure_args="$ac_configure_args --with-readline=builtin --disable-shared" - subdirs="$subdirs tools/$NCURSES" @@ -8867,16 +8914,20 @@ else fi -if test "x$with_openssl_arch" = xnone; then - (cd tools/$OPENSSL && ./config) -elif test "x$with_openssl_arch" = xyes -o "x$with_openssl_arch" = xno; then - (cd tools/$OPENSSL && ./Configure) - as_fn_error "OS/COMP informations are required!" "$LINENO" 5 -elif test "x$with_openssl_arch" = xlist; then - (cd tools/$OPENSSL && ./Configure) - as_fn_error "Please specify OS and Architecture" "$LINENO" 5 +if test $(uname) = "OS/2"; then + (cd tools/$OPENSSL && os2/OS2-EMX.cmd) else - (cd tools/$OPENSSL && ./Configure $with_openssl_arch) + if test "x$with_openssl_arch" = xnone; then + (cd tools/$OPENSSL && ./config) + elif test "x$with_openssl_arch" = xyes -o "x$with_openssl_arch" = xno; then + (cd tools/$OPENSSL && ./Configure) + as_fn_error "OS/COMP informations are required!" "$LINENO" 5 + elif test "x$with_openssl_arch" = xlist; then + (cd tools/$OPENSSL && ./Configure) + as_fn_error "Please specify OS and Architecture" "$LINENO" 5 + else + (cd tools/$OPENSSL && ./Configure $with_openssl_arch) + fi fi if test "$MYGNUPLOT" = "yes"; then @@ -8946,30 +8997,50 @@ esac DATE_FR=$(env LC_ALL=fr_FR date +'%A %x, %X %Z') DATE=$(env LC_ALL=C date +'%A %x, %X %Z') -if test $(uname) = "SunOS"; then - LIBMTMALLOC=-lmtmalloc -else - LIBMTMALLOC= -fi - -case $(OS) in +case $OS in Darwin) - EXPORT_DYNAMIC=-flat_namespace + EXPORT_DYNAMIC=-Wl,-flat_namespace NESTED_FUNCTIONS=-fnested-functions SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES + CXXFLAGS="$CXXFLAGS -D_GLIBCXX_FULLY_DYNAMIC_STRING" + ac_configure_args="$ac_configure_args --with-readline=builtin \ + --disable-shared --enable-static" break ;; - Cygwin) - EXPORT_DYNAMIC=--export-all-symbols + Cygwin) + EXPORT_DYNAMIC=-Wl,--export-all-symbols NESTED_FUNCTIONS= SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES + ac_configure_args="$ac_configure_args --with-readline=builtin \ + --disable-shared --enable-static" break ;; + AIX) + EXPORT_DYNAMIC=-Wl,--export-dynamic + NESTED_FUNCTIONS= + SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES + ac_configure_args="$ac_configure_args --with-readline=builtin \ + --disable-shared --enable-static" + break ;; + + OS/2) + MALLOC= + OS=OS2 + FINAL_ENCODING=UTF-8 + NESTED_FUNCTIONS= + EXPORT_DYNAMIC=-Zmap + SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES + ac_configure_args="$ac_configure_args --without-readline \ + --without-cairo --disable-shared --enable-static" + break;; + *) - EXPORT_DYNAMIC=--export-dynamic + EXPORT_DYNAMIC=-Wl,--export-dynamic NESTED_FUNCTIONS= SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES + ac_configure_args="$ac_configure_args --with-readline=builtin \ + --disable-shared --enable-static" break ;; esac @@ -8998,6 +9069,7 @@ esac + ac_config_files="$ac_config_files Makefile" ac_config_files="$ac_config_files COPYING" @@ -9030,6 +9102,8 @@ ac_config_files="$ac_config_files lapack ac_config_files="$ac_config_files lapack/blas/Makefile" +ac_config_files="$ac_config_files ptmalloc3/Makefile" + ac_config_files="$ac_config_files man/rpl.1" @@ -9577,7 +9651,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.0.14, which was +This file was extended by rpl $as_me 4.0.18, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9643,7 +9717,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.0.14 +rpl config.status 4.0.18 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" @@ -9784,6 +9858,7 @@ do "rplsums/Makefile") CONFIG_FILES="$CONFIG_FILES rplsums/Makefile" ;; "lapack/lapack/Makefile") CONFIG_FILES="$CONFIG_FILES lapack/lapack/Makefile" ;; "lapack/blas/Makefile") CONFIG_FILES="$CONFIG_FILES lapack/blas/Makefile" ;; + "ptmalloc3/Makefile") CONFIG_FILES="$CONFIG_FILES ptmalloc3/Makefile" ;; "man/rpl.1") CONFIG_FILES="$CONFIG_FILES man/rpl.1" ;; "man/rplcc.1") CONFIG_FILES="$CONFIG_FILES man/rplcc.1" ;; "man/rpllink.1") CONFIG_FILES="$CONFIG_FILES man/rpllink.1" ;;