--- rpl/Attic/configure.in 2010/03/06 18:29:05 1.10 +++ rpl/Attic/configure.in 2010/03/27 13:42:33 1.15 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([rpl],[4.0.12]) +AC_INIT([rpl],[4.0.13]) AC_CANONICAL_TARGET AC_CANONICAL_TARGET AM_INIT_AUTOMAKE @@ -119,12 +119,12 @@ AC_ARG_ENABLE(final-encoding, [ --enable-final-encoding force final encoding [[default=guessed]]], [ if test "$enableval" = "no"; then FINAL_ENCODING="\$(shell locale charmap | \ - awk '/=/ { print \$\$3;} !/=/ { print \$\$1;}')" + \$(AWK) '/\=/ { print \$\$3;} !/\=/ { print \$\$1;}')" else FINAL_ENCODING="$enable_final_encoding" fi], FINAL_ENCODING="\$(shell locale charmap | \ - awk '/=/ { print \$\$3;} !/=/ { print \$\$1;}')") + \$(AWK) '/\=/ { print \$\$3;} !/\=/ { print \$\$1;}')") AC_ARG_ENABLE(tex, [ --enable-tex provide the TeX support [[default=guessed]]], [ @@ -312,10 +312,10 @@ AC_PROG_LN_S AC_PROG_MAKE_SET AC_PROG_RANLIB -dnl Checks for awk -AC_CHECK_PROG(AWK, awk, yes, no) +dnl Checks for nawk +AC_CHECK_PROG(AWK, nawk, yes, no) if test "$AWK" = no; then - AC_MSG_ERROR([Can not find awk !]) + AC_MSG_ERROR([Can not find nawk !]) fi dnl Checks for sed @@ -770,7 +770,7 @@ AC_CONFIG_SUBDIRS(tools/$GPP) AC_CONFIG_SUBDIRS(tools/$FILE) AC_CONFIG_SUBDIRS(tools/$ICONV) AC_CONFIG_SUBDIRS(tools/$SQLITE) -tools/$OPENSSL/config +(cd tools/$OPENSSL && ./config) if test "$MYGNUPLOT" = "yes"; then if test ! -d "$srcdir"/tools/$GNUPLOT; then