--- rpl/Attic/configure.in 2010/03/01 14:48:13 1.8 +++ 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.11]) +AC_INIT([rpl],[4.0.13]) AC_CANONICAL_TARGET AC_CANONICAL_TARGET AM_INIT_AUTOMAKE @@ -15,6 +15,8 @@ GPP=gpp-2.24 GNUPLOT=gnuplot-4.2.6 FILE=file-5.03 ICONV=libiconv-1.13.1 +SQLITE=sqlite-3.6.22 +OPENSSL=openssl-0.9.8m dnl Checks for C compiler AC_PROG_CC(gcc-4.4 gcc) @@ -117,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]]], [ @@ -243,18 +245,14 @@ fi if test ! -d "$srcdir"/tools/$FILE; then gunzip -c "$srcdir"/tools/$FILE.tar.gz | \ (cd "$srcdir/tools" && tar -xf - ) + TMP=$(mktemp) (cd "$srcdir/tools"/$FILE && gunzip -c ../$FILE.diff.gz | patch -p1) - sed 's/libmagic/librplfile/g' "$srcdir"/tools/$FILE/src/Makefile.am > \ - "$srcdir"/tools/$FILE/src/Makefile.am2 - sed 's/^bin_PROGRAMS = file/bin_PROGRAMS = rplfile/g' \ - "$srcdir"/tools/$FILE/src/Makefile.am2 | \ + sed 's/libmagic/librplfile/g' "$srcdir"/tools/$FILE/src/Makefile.am > $TMP + sed 's/^bin_PROGRAMS = file/bin_PROGRAMS = rplfile/g' $TMP | \ sed 's/^file_/rplfile_/g' > \ "$srcdir"/tools/$FILE/src/Makefile.am - \rm -f "$srcdir"/tools/$FILE/src/Makefile.am2 - sed 's/file$/rplfile/g' "$srcdir"/tools/$FILE/magic/Makefile.am > \ - "$srcdir"/tools/$FILE/magic/Makefile.am2 - \mv -f "$srcdir"/tools/$FILE/magic/Makefile.am2 \ - "$srcdir"/tools/$FILE/magic/Makefile.am + sed 's/file$/rplfile/g' "$srcdir"/tools/$FILE/magic/Makefile.am > $TMP + \mv -f $TMP "$srcdir"/tools/$FILE/magic/Makefile.am (cd "$srcdir"/tools/$FILE && libtoolize --copy --force \ && aclocal && automake -af && autoconf); fi @@ -262,6 +260,14 @@ if test ! -d "$srcdir"/tools/$ICONV; the gunzip -c "$srcdir"/tools/$ICONV.tar.gz | \ (cd "$srcdir/tools" && tar -xf -) fi +if test ! -d "$srcdir"/tools/$SQLITE; then + gunzip -c "$srcdir"/tools/$SQLITE.tar.gz | \ + (cd "$srcdir/tools" && tar -xf -) +fi +if test ! -d tools/$OPENSSL; then + gunzip -c "$srcdir"/tools/$OPENSSL.tar.gz | \ + (cd tools && tar -xf -) +fi AC_CHECK_PROG(LIBTOOLIZE, libtoolize, yes, no) if test "$LIBTOOLIZE" = "no"; then @@ -306,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 @@ -763,6 +769,8 @@ AC_CONFIG_SUBDIRS(tools/$GSL) AC_CONFIG_SUBDIRS(tools/$GPP) AC_CONFIG_SUBDIRS(tools/$FILE) AC_CONFIG_SUBDIRS(tools/$ICONV) +AC_CONFIG_SUBDIRS(tools/$SQLITE) +(cd tools/$OPENSSL && ./config) if test "$MYGNUPLOT" = "yes"; then if test ! -d "$srcdir"/tools/$GNUPLOT; then @@ -809,6 +817,24 @@ case $host_cpu in esac +case $host_os in + + cygwin*) + OS=Cygwin + break ;; + + interix*) + OS=Interix + break ;; + + *) + OS=$(uname) + break ;; + +esac + +AC_SUBST(OS) + DATE_FR=$(env LC_ALL=fr_FR date +'%A %x, %X %Z') DATE=$(env LC_ALL=C date +'%A %x, %X %Z') @@ -828,6 +854,8 @@ AC_SUBST(GPP) AC_SUBST(GNUPLOT) AC_SUBST(FILE) AC_SUBST(ICONV) +AC_SUBST(SQLITE) +AC_SUBST(OPENSSL) AC_SUBST(FINAL_ENCODING) AC_SUBST(DATE) AC_SUBST(DATE_FR) @@ -850,6 +878,7 @@ AC_CONFIG_FILES(scripts/rplcc) AC_CONFIG_FILES(scripts/rpllink) AC_CONFIG_FILES(rpltags/Makefile) AC_CONFIG_FILES(rpliconv/Makefile) +AC_CONFIG_FILES(rplsums/Makefile) AC_CONFIG_FILES(lapack/lapack/Makefile) AC_CONFIG_FILES(lapack/blas/Makefile)