--- rpl/Attic/configure.in 2010/09/07 20:59:04 1.42 +++ rpl/Attic/configure.in 2010/09/23 15:27:33 1.46 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([rpl],[4.0.19]) +AC_INIT([rpl],[4.0.20]) AC_CANONICAL_TARGET AC_CANONICAL_TARGET AM_INIT_AUTOMAKE @@ -12,7 +12,7 @@ READLINE=readline-6.1 UNITS=units-1.88 GSL=gsl-1.14 GPP=gpp-2.24 -GNUPLOT=gnuplot-4.4.0 +GNUPLOT=gnuplot-4.4.1 FILE=file-5.03 ICONV=libiconv-1.13.1 SQLITE=sqlite-3.7.2 @@ -237,12 +237,9 @@ AC_ARG_ENABLE(debug, [ --enable-debug enable debug code [[default=no]]], [ if test "$enableval" = "no"; then DEBUG="-UDEBUG_MEMOIRE -UDEBUG_ERREURS" - MALLOC="\$(top_builddir)/ptmalloc3/libptmalloc3.a" else DEBUG="-DDEBUG_MEMOIRE -UDEBUG_ERREURS" - MALLOC="" -fi], [DEBUG="-UDEBUG_MEMOIRE -UDEBUG_ERREURS" - MALLOC="\$(top_builddir)/ptmalloc3/libptmalloc3.a"]) +fi], [DEBUG="-UDEBUG_MEMOIRE -UDEBUG_ERREURS"]) AC_ARG_ENABLE(profile, [ --enable-profile enable profile code [[default=no]]], [ @@ -783,7 +780,9 @@ else fi if test $(uname) = "OS/2"; then - BSH_PATH=-DBOURNE_SHELL=\"\\\"$with_bourne_shell\\\"\" + with_os2_bourne_shell=$(echo $with_bourne_shell | \ + sed -e '1,$s/\//\\\\\\\\/g') + BSH_PATH=-DBOURNE_SHELL=\"\\\"$with_os2_bourne_shell\\\"\" else AC_MSG_WARN([--with-bourne-shell ignored]) BSH_PATH= @@ -992,7 +991,6 @@ case $OS in break ;; OS/2) - MALLOC= if test $FORCED_FINAL_ENCODING -eq 0; then \ FINAL_ENCODING=CP850; \ fi; @@ -1060,7 +1058,6 @@ AC_SUBST(OPENSSL) AC_SUBST(FINAL_ENCODING) AC_SUBST(DATE) AC_SUBST(DATE_FR) -AC_SUBST(MALLOC) AC_SUBST(EXT_SQL) AC_SUBST(CFLAGS) @@ -1085,7 +1082,6 @@ AC_CONFIG_FILES(rplsums/Makefile) AC_CONFIG_FILES(rplawk/Makefile) AC_CONFIG_FILES(lapack/lapack/Makefile) AC_CONFIG_FILES(lapack/blas/Makefile) -AC_CONFIG_FILES(ptmalloc3/Makefile) AC_CONFIG_FILES(man/rpl.1) AC_CONFIG_FILES(man/rplcc.1)