--- rpl/configure.ac	2012/04/02 09:50:39	1.22
+++ rpl/configure.ac	2012/04/07 16:39:05	1.23
@@ -14,7 +14,7 @@ UNITS=units-1.88
 GSL=gsl-1.15
 GPP=gpp-3.0
 GNUPLOT=gnuplot-4.6.0
-FILE=file-5.03
+FILE=file-5.11
 ICONV=libiconv-1.13.1
 SQLITE=sqlite-3.7.11
 OPENSSL=openssl-1.0.1
@@ -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,17 @@ 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=$with_sysroot/usr/include
+fi],[
+	SYSROOT=
+	]
+)
+
 AC_ARG_ENABLE(recursive,
 [  --enable-recursive      recursive configuration (default=yes)],[
 if test "$enableval" = "yes"; then
@@ -178,7 +189,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 +284,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 +308,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;
@@ -487,7 +498,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 | \
@@ -1068,8 +1080,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!])
@@ -1077,7 +1096,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
 
@@ -1349,6 +1369,7 @@ AC_SUBST(CXXFLAGS)
 AC_SUBST(FFLAGS)
 AC_SUBST(FCFLAGS)
 AC_SUBST(LDFLAGS)
+AC_SUBST(SYSROOT)
 
 AC_SUBST(DEBPQ)
 AC_SUBST(DEBMYSQL)