--- rpl/Attic/configure.in 2010/09/07 12:54:03 1.41 +++ rpl/Attic/configure.in 2010/12/09 11:01:46 1.49 @@ -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,11 +12,11 @@ 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.2 FILE=file-5.03 ICONV=libiconv-1.13.1 -SQLITE=sqlite-3.7.2 -OPENSSL=openssl-1.0.0a +SQLITE=sqlite-3.7.4 +OPENSSL=openssl-1.0.0c dnl Checks for C compiler AC_PROG_CC(gcc) @@ -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]]], [ @@ -761,6 +758,37 @@ AC_SUBST(POSTGRESQL_SUPPORT) AC_SUBST(libPgSQLinc) AC_SUBST(libPgSQLlib) +# with_postgresql : check [pas défini], yes [uniquement --with], +# no [--without], valeur [--with=valeur]. +AC_ARG_WITH(bourne_shell, +[ --with-bourne-shell=PATH specify path for OS/2 bourne shell], +[], [with_bourne_shell=no]) + +if test "x$with_bourne_shell" = xyes; then + AC_MSG_ERROR([You have to specify a valide shell path !]) +fi + +if test "x$with_bourne_shell" = xno; then + if test $(uname) = "OS/2"; then + AC_MSG_ERROR([With OS/2 or eComstation, you have to specify a valide shell path !]) + fi + + BSH_PATH= +else + if test ! -x $with_bourne_shell; then + AC_MSG_ERROR([$with_bourne_shell is not executable !]) + fi + + if test $(uname) = "OS/2"; then + 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= + fi +fi + dnl Checks for sizes AC_CHECK_SIZEOF(void *, 4) AC_CHECK_SIZEOF(char, 1) @@ -963,7 +991,6 @@ case $OS in break ;; OS/2) - MALLOC= if test $FORCED_FINAL_ENCODING -eq 0; then \ FINAL_ENCODING=CP850; \ fi; @@ -1016,6 +1043,7 @@ AC_SUBST(IPCS_SYSV) AC_SUBST(SEMUN) AC_SUBST(IPV6) AC_SUBST(BROKEN_SIGINFO) +AC_SUBST(BSH_PATH) AC_SUBST(NCURSES) AC_SUBST(READLINE) @@ -1030,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) @@ -1055,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)