--- rpl/configure.ac	2012/01/17 13:12:03	1.13
+++ rpl/configure.ac	2012/05/21 17:25:40	1.30
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([rpl],[4.1.5])
+AC_INIT([rpl],[4.1.9])
 AC_CANONICAL_TARGET
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE(silent-rules)
@@ -13,21 +13,21 @@ READLINE=readline-6.2
 UNITS=units-1.88
 GSL=gsl-1.15
 GPP=gpp-3.0
-GNUPLOT=gnuplot-4.4.3
-FILE=file-5.03
+GNUPLOT=gnuplot-4.6.0
+FILE=file-5.11
 ICONV=libiconv-1.13.1
-SQLITE=sqlite-3.7.10
-OPENSSL=openssl-1.0.0f
+SQLITE=sqlite-3.7.11
+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
+COCOA=CoCoALib-0.9950
+PARI=pari-2.5.1
+GIAC=giac-0.9.6
 
 dnl Checks for C compiler
 AC_PROG_CC(gcc)
@@ -141,7 +141,7 @@ fi
 dnl 32 bits ABI
 AC_ARG_WITH(32bits-abi,
 [  --with-32bits-abi       force 32bits ABI (multilib)],[
-if test "$with-32bits-abi" = "no"; then
+if test "$with_32bits_abi" = "no"; then
 	ABI=
 else
 	ABI=-m32
@@ -153,7 +153,7 @@ fi],[
 if test x$ABI = x; then
 AC_ARG_WITH(64bits-abi,
 [  --with-64bits-abi       force 64bits ABI (multilib)],[
-if test "$with-64bits-abi" = "no"; then
+if test "$with_64bits_abi" = "no"; then
 	ABI=
 else
 	ABI=-m64
@@ -165,6 +165,19 @@ fi
 
 LDFLAGS="$LDFLAGS $ABI"
 
+AC_ARG_WITH(sysroot,
+[  --with-sysroot          sysroot for cross compilation],[
+if test "$with_sysroot" = "no" -o "$with_rpltools" = "yes"; then
+	AC_MSG_ERROR([You have to specify sysroot path !])
+else
+	SYSROOT="-I$with_sysroot/usr/include"
+	SYSROOT2=$with_sysroot
+fi],[
+	SYSROOT=
+	SYSROOT2=
+	]
+)
+
 AC_ARG_ENABLE(recursive,
 [  --enable-recursive      recursive configuration (default=yes)],[
 if test "$enableval" = "yes"; then
@@ -178,7 +191,7 @@ fi],[
 
 AC_ARG_WITH(rpltools,
 [  --with-rpltools         specify rpltools path used for cross compilation],[
-if test "$with_rpltools" = "no" -o "$with_rpltools" = yes; then
+if test "$with_rpltools" = "no" -o "$with_rpltools" = "yes"; then
 	AC_MSG_ERROR([You have to specify rpltools path !])
 else
 	RPLTOOLS=$with_rpltools
@@ -273,7 +286,7 @@ REG=$LDFLAGS
 POSIX_IPCS=guessed
 LDFLAGS=-lrt
 [AC_MSG_CHECKING([for POSIX semaphores and shared objects])
-AC_RUN_IFELSE(
+AC_LINK_IFELSE(
 [AC_LANG_PROGRAM([#include <sys/mman.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -297,7 +310,7 @@ if test "$IPCS_SYSV" = "-UIPCS_SYSV" -a
 REG=$LDFLAGS
 LDFLAGS=-pthread
 AC_MSG_CHECKING([for POSIX anonymous semaphores])
-AC_RUN_IFELSE(
+AC_LINK_IFELSE(
 [AC_LANG_PROGRAM([#include <semaphore.h>
  ],
 [ sem_t sem;
@@ -350,8 +363,10 @@ AC_ARG_ENABLE(vim,
 [  --enable-vim            provide the vim support [[default=guessed]]], [
 if test "$enableval" = "no"; then
 	VIM_SUPPORT=no
+	DEBVIM=
 else
 	VIM_SUPPORT=yes
+	DEBVIM=", vim"
 fi],
 VIM_SUPPORT=guessed)
 
@@ -402,7 +417,7 @@ else
 fi)
 
 if test "$MOTIF_SUPPORT" = "-DMOTIF_SUPPORT"; then
-	libX="$X_LIBS -lXt -lX11"
+	libX="$X_LIBS -lXt -lX11 -lXext"
 	LIBMOTIF="\$(top_builddir)/tools/$OPENMOTIF/lib/Xm/.libs/libXm.a \
 			\$(top_builddir)/tools/$LIBXPM/src/.libs/libXpm.a"
 	INCMOTIF="-I\$(top_srcdir)/tools/$OPENMOTIF/lib \
@@ -451,13 +466,13 @@ if test ! -d "$srcdir"/tools/$NCURSES; t
 			(cd "$srcdir/tools" && tar -xf -)
 	(cd "$srcdir/tools/"$NCURSES && \
 	 		for i in ../$NCURSES*.sh.gz;
-			do gunzip $i;
+			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
@@ -485,7 +500,8 @@ fi
 if test ! -d "$srcdir"/tools/$FILE; then
 	gunzip -c "$srcdir"/tools/$FILE.tar.gz | \
 			(cd "$srcdir/tools" && tar -xf - )
-	(cd "$srcdir/tools"/$FILE && gunzip -c ../$FILE.diff.gz | patch -p1)
+	(cd "$srcdir/tools"/$FILE && gunzip -c ../$FILE.diff.gz | patch -p1 && \
+	 		autoreconf)
 fi
 if test ! -d "$srcdir"/tools/$ICONV; then
 	gunzip -c "$srcdir"/tools/$ICONV.tar.gz | \
@@ -655,14 +671,18 @@ if test "$VIM_SUPPORT" = guessed; then
 Download at http://www.vim.org/
 ])
 		VIM_SUPPORT="-UVIM_SUPPORT"
+		DEBVIM=
 	else
 		VIM_SUPPORT="-DVIM_SUPPORT"
+		DEBVIM=", vim"
 	fi
 else
 	if test "$VIM_SUPPORT" = no; then
 		VIM_SUPPORT="-UVIM_SUPPORT"
+		DEBVIM=
 	else
 		VIM_SUPPORT="-DVIM_SUPPORT"
+		DEBVIM=", vim"
 	fi
 fi
 
@@ -812,9 +832,13 @@ if test "$MYSQL_SUPPORT" = "-DMYSQL_SUPP
 	fi
 fi
 
+DEBMYSQL=
+
 if test "$MYSQL_SUPPORT" != "-DMYSQL_SUPPORT"; then
 	libMySQLinc=
 	libMySQLlib=
+else
+	DEBMYSQL=", libmysqlclient18"
 fi
 
 AC_SUBST(MYSQL_SUPPORT)
@@ -958,9 +982,13 @@ if test "$POSTGRESQL_SUPPORT" = "-DPOSTG
 	fi
 fi
 
+DEBPQ=
+
 if test "$POSTGRESQL_SUPPORT" != "-DPOSTGRESQL_SUPPORT"; then
 	libPgSQLinc=
 	libPgSQLlib=
+else
+	DEBPQ=", libpq5"
 fi
 
 AC_SUBST(POSTGRESQL_SUPPORT)
@@ -1053,8 +1081,15 @@ AC_ARG_WITH(openssl_arch,
 if test $(uname) = "OS/2"; then
 	bash -c "cd tools/$OPENSSL && os2/OS2-EMX.cmd"
 else
+	if test $build = $host; then
+		OPENSSL_CROSS=
+	else
+		OPENSSL_CROSS="AR=$host-ar RANLIB=$host-ranlib CC=$host-gcc NM=$host-nm"
+	fi
+	echo $build $host
+	echo $OPENSSL_CROSS
 	if test "x$with_openssl_arch" = xnone; then
-		(cd tools/$OPENSSL && ./config no-asm)
+		(cd tools/$OPENSSL && sh -c "$OPENSSL_CROSS ./config no-asm")
 	elif test "x$with_openssl_arch" = xyes -o "x$with_openssl_arch" = xno; then
 		(cd tools/$OPENSSL && ./Configure)
 		AC_MSG_ERROR([OS/COMP informations are required!])
@@ -1062,7 +1097,8 @@ else
 		(cd tools/$OPENSSL && ./Configure)
 		AC_MSG_ERROR([Please specify OS and Architecture])
 	else
-		(cd tools/$OPENSSL && ./Configure no-asm $with_openssl_arch)
+		(cd tools/$OPENSSL && sh -c "$OPENSSL_CROSS ./Configure no-asm \
+				$with_openssl_arch")
 	fi
 fi
 
@@ -1085,6 +1121,8 @@ AC_SUBST(GNUPLOT_COMPILATION)
 
 HOST=$target
 AC_SUBST(HOST)
+BUILD=$build
+AC_SUBST(BUILD)
 
 my_save_cflags="$CFLAGS"
 FPCFLAGS=""
@@ -1281,6 +1319,10 @@ case $HOST in
 		ARCH=i386
 	break ;;
 
+	arm-unknown-linux-gnueabi)
+		ARCH=armel
+	break;;
+
 	*)
 		ARCH=unknown
 	break ;;
@@ -1334,6 +1376,12 @@ AC_SUBST(CXXFLAGS)
 AC_SUBST(FFLAGS)
 AC_SUBST(FCFLAGS)
 AC_SUBST(LDFLAGS)
+AC_SUBST(SYSROOT)
+AC_SUBST(SYSROOT2)
+
+AC_SUBST(DEBPQ)
+AC_SUBST(DEBMYSQL)
+AC_SUBST(DEBVIM)
 
 if test $RECURSIVE = yes; then
 	AC_CONFIG_SUBDIRS(tools/$NCURSES)
@@ -1347,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)