--- rpl/configure.ac 2012/04/07 16:39:05 1.23 +++ rpl/configure.ac 2012/05/14 13:27:05 1.28 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([rpl],[4.1.7]) +AC_INIT([rpl],[4.1.8]) AC_CANONICAL_TARGET AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(silent-rules) @@ -17,17 +17,17 @@ GNUPLOT=gnuplot-4.6.0 FILE=file-5.11 ICONV=libiconv-1.13.1 SQLITE=sqlite-3.7.11 -OPENSSL=openssl-1.0.1 +OPENSSL=openssl-1.0.1c OPENMOTIF=openmotif-2.3.3 LIBXPM=libXpm-3.5.9 SIGSEGV=libsigsegv-2.6 -GMP=gmp-5.0.2 -MPFR=mpfr-3.0.1 +GMP=gmp-5.0.5 +MPFR=mpfr-3.1.0 NTL=ntl-5.5.2 COCOA=CoCoALib-0.9943 PARI=pari-2.5.0 -GIAC=giac-0.9.5 +GIAC=giac-0.9.6 dnl Checks for C compiler AC_PROG_CC(gcc) @@ -170,9 +170,11 @@ AC_ARG_WITH(sysroot, if test "$with_sysroot" = "no" -o "$with_rpltools" = "yes"; then AC_MSG_ERROR([You have to specify sysroot path !]) else - SYSROOT=$with_sysroot/usr/include + SYSROOT="-I$with_sysroot/usr/include" + SYSROOT2=$with_sysroot fi],[ SYSROOT= + SYSROOT2= ] ) @@ -467,10 +469,10 @@ if test ! -d "$srcdir"/tools/$NCURSES; t do TMP=$i; gunzip -c $i > ${TMP%.*}; done; for i in ../$NCURSES*.sh; - do chmod 775 $i && ./$i; + do echo Applying script $i && chmod 775 $i && ./$i; done; for i in ../$NCURSES*.patch.gz; - do gunzip -c $i | patch -p1; + do echo Applying patch $i && gunzip -c $i | patch -p1; done); fi if test ! -d "$srcdir"/tools/$READLINE; then @@ -807,7 +809,6 @@ fi if test "$MYSQL_SUPPORT" = "-DMYSQL_SUPPORT"; then MYSQL_LIB=no - if test $MYSQL_LIB = no; then AC_MSG_CHECKING(for libmysql libraries in $libMySQLlib) saved_LIBS="$LIBS" @@ -1120,6 +1121,8 @@ AC_SUBST(GNUPLOT_COMPILATION) HOST=$target AC_SUBST(HOST) +BUILD=$build +AC_SUBST(BUILD) my_save_cflags="$CFLAGS" FPCFLAGS="" @@ -1316,6 +1319,10 @@ case $HOST in ARCH=i386 break ;; + arm-unknown-linux-gnueabi) + ARCH=armel + break;; + *) ARCH=unknown break ;; @@ -1370,6 +1377,7 @@ AC_SUBST(FFLAGS) AC_SUBST(FCFLAGS) AC_SUBST(LDFLAGS) AC_SUBST(SYSROOT) +AC_SUBST(SYSROOT2) AC_SUBST(DEBPQ) AC_SUBST(DEBMYSQL) @@ -1387,6 +1395,14 @@ if test $RECURSIVE = yes; then AC_CONFIG_SUBDIRS(tools/$SIGSEGV) fi +if test $MYSQL_LIB = "yes" -o $POSTGRESQL_LIB = "yes"; then + ZLIB=-lz +else + ZLIB= +fi + +AC_SUBST(ZLIB) + AC_CONFIG_FILES(Makefile) AC_CONFIG_FILES(COPYING) AC_CONFIG_FILES(tools/Makefile)