--- rpl/configure.ac 2012/08/22 09:29:49 1.41 +++ rpl/configure.ac 2012/10/17 14:27:06 1.47 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([rpl],[4.1.9]) +AC_INIT([rpl],[4.1.11]) AC_CANONICAL_TARGET AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(silent-rules) @@ -16,7 +16,7 @@ GPP=gpp-3.0 GNUPLOT=gnuplot-4.6.0 FILE=file-5.11 ICONV=libiconv-1.13.1 -SQLITE=sqlite-3.7.13 +SQLITE=sqlite-3.7.14.1 OPENSSL=openssl-1.0.1c OPENMOTIF=openmotif-2.3.3 LIBXPM=libXpm-3.5.9 @@ -36,6 +36,10 @@ CC=gcc-$with_gcc_version CXX=g++-$with_gcc_version CF=gfortran-$with_gcc_version F77=gfortran-$with_gcc_version +AC_SUBST(CC) +AC_SUBST(CXX) +AC_SUBST(CF) +AC_SUBST(F77) ],[]) dnl Checks for Bash @@ -1187,6 +1191,7 @@ case $OS in OS/2) if test $FORCED_FINAL_ENCODING -eq 0; then \ FINAL_ENCODING=CP850; \ + FORCED_FINAL_ENCODING=1;\ fi; OS=OS2 NESTED_FUNCTIONS= @@ -1204,6 +1209,7 @@ case $OS in OpenBSD) if test $FORCED_FINAL_ENCODING -eq 0; then \ FINAL_ENCODING=UTF-8; \ + FORCED_FINAL_ENCODING=1;\ fi; EXPORT_DYNAMIC=-Wl,--export-dynamic NESTED_FUNCTIONS= @@ -1321,6 +1327,7 @@ AC_SUBST(OPENMOTIF) AC_SUBST(BUILD_OPENMOTIF) AC_SUBST(SIGSEGV) AC_SUBST(FINAL_ENCODING) +AC_SUBST(FORCED_FINAL_ENCODING) AC_SUBST(DATE) AC_SUBST(DATE_FR) AC_SUBST(EXT_SQL)