--- rpl/Attic/configure.in	2011/06/27 14:01:48	1.68
+++ rpl/Attic/configure.in	2011/09/14 14:34:26	1.80
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([rpl],[4.1.0])
+AC_INIT([rpl],[4.1.3])
 AC_CANONICAL_TARGET
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
@@ -11,19 +11,20 @@ NCURSES=ncurses-5.9
 READLINE=readline-6.2
 UNITS=units-1.88
 GSL=gsl-1.15
-GPP=gpp-2.24
+GPP=gpp-3.0
 GNUPLOT=gnuplot-4.4.3
 FILE=file-5.03
 ICONV=libiconv-1.13.1
-SQLITE=sqlite-3.7.6.3
-OPENSSL=openssl-1.0.0d
+SQLITE=sqlite-3.7.7.1
+OPENSSL=openssl-1.0.0e
+SIGSEGV=libsigsegv-2.6
 
-GMP=gmp-5.0.1
+GMP=gmp-5.0.2
 MPFR=mpfr-3.0.1
 NTL=ntl-5.5.2
 COCOA=CoCoALib-0.9943
-PARI=pari-2.3.5
-GIAC=giac-0.9.1
+PARI=pari-2.5.0
+GIAC=giac-0.9.3
 
 dnl Checks for C compiler
 AC_PROG_CC(gcc)
@@ -60,10 +61,30 @@ fi
 dnl Checks for C++ compiler
 AC_PROG_CXX(g++)
 
-if test "$GXX" != yes; then
+if test "$CXX" != "g++"; then
 	AC_MSG_ERROR([Cannot find g++! You have to install it.])
 fi
 
+if test x"$CXX" != x""; then
+	GCC_VERSION_MAJEURE=`$CXX -v 2>&1 | awk '/^gcc/ { print $3; }' | \
+			awk -F. '{ printf("%s", $1);}'`
+	GCC_VERSION_MINEURE=`$CXX -v 2>&1 | awk '/^gcc/ { print $3; }' | \
+			awk -F. '{ printf("%s", $2);}'`
+	if test $GCC_VERSION_MAJEURE -ge 5; then
+		OPTIMISATION_GXX=-O3
+	else
+		if test $GCC_VERSION_MAJEURE -ge 4 -a $GCC_VERSION_MINEURE -ge 4; then
+			OPTIMISATION_GXX=-O3
+		else
+			if test $GCC_VERSION_MAJEURE -ge 3; then
+				OPTIMISATION_GXX=-O2
+			else
+				AC_MSG_ERROR([Cannot find decent or recent g++ (g++-4.3 or better)!])
+			fi
+		fi
+	fi
+fi
+
 dnl Checks for Fortran 77 compiler
 AC_PROG_F77(gfortran)
 
@@ -115,34 +136,69 @@ if test "$ac_x_libraries" != "no"; then
 fi
 
 dnl 32 bits ABI
-AC_ARG_WITH(32bits,
+AC_ARG_WITH(32bits-abi,
 [  --with-32bits-abi       force 32bits ABI (multilib)],[
 if test "$with-32bits-abi" = "no"; then
+	ABI=
 else
 	ABI=-m32
 fi],[
-	ABI=-m32
+	ABI=
+	]
+)
+
+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
+	ABI=
+else
+	ABI=-m64
+fi],[
+	ABI=
+	]
+)
+fi
+
+LDFLAGS="$LDFLAGS $ABI"
+
+dnl RPL/CAS support
+AC_ARG_WITH(rplcas,
+[  --with-rplcas           compile rplcas (default=no)],[
+if test "$with-rplcas" = "no"; then
+	RPLCAS=-URPLCAS
+	LIBRPLCAS=
+else
+	RPLCAS=-DRPLCAS
+	LIBRPLCAS=\$\(top_builddir\)/rplcas/lib/librplcas.a
+fi],[
+	RPLCAS=-URPLCAS
+	LIBRPLCAS=
 	]
 )
 
-SUBST(ABI)
+AC_SUBST(ABI)
+AC_SUBST(RPLCAS)
+AC_SUBST(LIBRPLCAS)
 
 dnl Options
 AC_ARG_ENABLE(optimization,
 [  --enable-optimization   set compiler flags [[default=environment variables -O3]]], [
 if test "$enableval" = "no"; then
-	CFLAGS=
-	FFLAGS=
-	CXXFLAGS=
-	FCFLAGS=
-else
-	CFLAGS="$CFLAGS $enable_optimization"
-	FFLAGS="$FFLAGS $enable_optimization"
-	FCFLAGS="$FCFLAGS $enable_optimization"
+	CFLAGS=$ABI
+	FFLAGS=$ABI
+	CXXFLAGS=$ABI
+	FCFLAGS=$ABI
+else
+	CFLAGS="$CFLAGS $ABI $enable_optimization"
+	FFLAGS="$FFLAGS $ABI $enable_optimization"
+	CXXFLAGS="$CXXFLAGS $ABI $enable_optimization"
+	FCFLAGS="$FCFLAGS $ABI $enable_optimization"
 fi],[
-	CFLAGS="$CFLAGS $OPTIMISATION_C"
-	FFLAGS="$FFLAGS $OPTIMISATION_F"
-	FCFLAGS="$FCFLAGS $OPTIMISATION_F"
+	CFLAGS="$CFLAGS $ABI $OPTIMISATION_C"
+	FFLAGS="$FFLAGS $ABI $OPTIMISATION_F"
+	CXXFLAGS="$CXXFLAGS $ABI $OPTIMISATION_CXX"
+	FCFLAGS="$FCFLAGS $ABI $OPTIMISATION_F"
 	]
 )
 
@@ -317,6 +373,10 @@ if test ! -d "$srcdir"/tools/$SQLITE; th
 	gunzip -c "$srcdir"/tools/$SQLITE.tar.gz | \
 			(cd "$srcdir/tools" && tar -xf -)
 fi
+if test ! -d "$srcdir"/tools/$SIGSEGV; then
+	gunzip -c "$srcdir"/tools/$SIGSEGV.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 -)
@@ -879,22 +939,6 @@ AC_CACHE_CHECK([return type of signal ha
 AC_DEFINE_UNQUOTED([RETSIGTYPE],[$ac_cv_type_signal],[Define as the return type of signal handlers
 		    (`int' or `void').])
 
-dnl Checks for broken siginfo structure
-AC_MSG_CHECKING([for broken siginfo->si_pid])
-AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <unistd.h>
-#include <signal.h>
-int flag;
-void handler(int signal, siginfo_t *siginfo, void *context)
-{ flag = ((*siginfo).si_pid == getpid()) ? 0 : 1; }],
-[struct sigaction    action;
-action.sa_sigaction = handler;
-action.sa_flags = SA_SIGINFO;
-sigaction(SIGUSR1, &action, NULL);
-raise(SIGUSR1);
-return(flag);])],
-[BROKEN_SIGINFO=-U_BROKEN_SIGINFO; AC_MSG_RESULT(no)],
-[BROKEN_SIGINFO=-D_BROKEN_SIGINFO; AC_MSG_RESULT(yes)])
-
 AC_FUNC_STRCOLL
 AC_FUNC_STRFTIME
 AC_FUNC_VPRINTF
@@ -910,7 +954,7 @@ if test $(uname) = "OS/2"; then
 	bash -c "cd tools/$OPENSSL && os2/OS2-EMX.cmd"
 else
 	if test "x$with_openssl_arch" = xnone; then
-		(cd tools/$OPENSSL && ./config)
+		(cd tools/$OPENSSL && ./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!])
@@ -918,19 +962,10 @@ else
 		(cd tools/$OPENSSL && ./Configure)
 		AC_MSG_ERROR([Please specify OS and Architecture])
 	else
-		(cd tools/$OPENSSL && ./Configure $with_openssl_arch)
+		(cd tools/$OPENSSL && ./Configure no-asm $with_openssl_arch)
 	fi
 fi
 
-AC_CONFIG_SUBDIRS(tools/$NCURSES)
-AC_CONFIG_SUBDIRS(tools/$READLINE)
-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)
-AC_CONFIG_SUBDIRS(tools/$UNITS)
-
 if test "$MYGNUPLOT" = "yes"; then
 	if test ! -d "$srcdir"/tools/$GNUPLOT; then
 		gunzip -c "$srcdir"/tools/$GNUPLOT.tar.gz | \
@@ -944,6 +979,9 @@ fi
 
 AC_SUBST(GNUPLOT_COMPILATION)
 
+HOST=$host
+AC_SUBST(HOST)
+
 case $host_cpu in
 
     i?86)
@@ -1007,8 +1045,12 @@ case $OS in
 		IPCS_SYSV=-UIPCS_SYSV
 		CXXFLAGS="$CXXFLAGS -D_GLIBCXX_FULLY_DYNAMIC_STRING"
 		ac_configure_args="$ac_configure_args --with-readline=builtin \
-				--disable-shared --enable-static --enable-threads"
+				--disable-shared --enable-static --enable-threads \
+				CFLAGS=\"$CFLAGS\" CXXFLAGS=\"$CXXFLAGS\" \
+				FFLAGS=\"$FFLAGS\" FCFLAGS=\"$FCFLAGS\" \
+				LDFLAGS=\"$LDFLAGS\""
 		C_STANDARD=-std=gnu99
+		ELF=
 	break ;;
 
     Cygwin)
@@ -1017,8 +1059,12 @@ case $OS in
 		SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES
 		IPCS_SYSV=-UIPCS_SYSV
 		ac_configure_args="$ac_configure_args --with-readline=builtin \
-				--disable-shared --enable-static --enable-threads"
+				--disable-shared --enable-static --enable-threads \
+				CFLAGS=\"$CFLAGS\" CXXFLAGS=\"$CXXFLAGS\" \
+				FFLAGS=\"$FFLAGS\" FCFLAGS=\"$FCFLAGS\" \
+				LDFLAGS=\"$LDFLAGS\""
 		C_STANDARD=-std=gnu99
+		ELF=
 	break ;;
 
 	Interix)
@@ -1027,8 +1073,12 @@ case $OS in
 		SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES
 		IPCS_SYSV=-UIPCS_SYSV
 		ac_configure_args="$ac_configure_args --with-readline=builtin \
-				--disable-shared --enable-static --enable-threads"
+				--disable-shared --enable-static --enable-threads \
+				CFLAGS=\"$CFLAGS\" CXXFLAGS=\"$CXXFLAGS\" \
+				FFLAGS=\"$FFLAGS\" FCFLAGS=\"$FCFLAGS\" \
+				LDFLAGS=\"$LDFLAGS\""
 		C_STANDARD=-std=gnu99
+		ELF=
 	break;;
 
     AIX)
@@ -1037,8 +1087,12 @@ case $OS in
 		SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES
 		IPCS_SYSV=-UIPCS_SYSV
 		ac_configure_args="$ac_configure_args --with-readline=builtin \
-				--disable-shared --enable-static --enable-threads"
+				--disable-shared --enable-static --enable-threads \
+				CFLAGS=\"$CFLAGS\" CXXFLAGS=\"$CXXFLAGS\" \
+				FFLAGS=\"$FFLAGS\" FCFLAGS=\"$FCFLAGS\" \
+				LDFLAGS=\"$LDFLAGS\""
 		C_STANDARD=-std=gnu99
+		ELF=
 	break ;;
 
     OS/2)
@@ -1052,8 +1106,12 @@ case $OS in
 		IPCS_SYSV=-DIPCS_SYSV
 		ac_configure_args="$ac_configure_args --without-readline \
 				--without-cairo --disable-shared --enable-static \
-				--enable-threads"
+				--enable-threads \
+				CFLAGS=\"$CFLAGS\" CXXFLAGS=\"$CXXFLAGS\" \
+				FFLAGS=\"$FFLAGS\" FCFLAGS=\"$FCFLAGS\" \
+				LDFLAGS=\"$LDFLAGS\""
 		C_STANDARD=
+		ELF=
 	break;;
 
 	OpenBSD)
@@ -1065,8 +1123,12 @@ case $OS in
 		SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES
 		IPCS_SYSV=-DIPCS_SYSV
 		ac_configure_args="$ac_configure_args --with-readline=builtin \
-				--disable-shared --enable-static --enable-threads"
+				--disable-shared --enable-static --enable-threads \
+				CFLAGS=\"$CFLAGS\" CXXFLAGS=\"$CXXFLAGS\" \
+				FFLAGS=\"$FFLAGS\" FCFLAGS=\"$FCFLAGS\" \
+				LDFLAGS=\"$LDFLAGS\""
 		C_STANDARD=-std=gnu99
+		ELF=
 	break;;
 
     SunOS)
@@ -1081,9 +1143,35 @@ case $OS in
 		fi
 
 		ac_configure_args="$ac_configure_args --with-readline=builtin \
-				--disable-shared --enable-static --enable-threads"
+				--disable-shared --enable-static --enable-threads \
+				CFLAGS=\"$CFLAGS\" CXXFLAGS=\"$CXXFLAGS\" \
+				FFLAGS=\"$FFLAGS\" FCFLAGS=\"$FCFLAGS\" \
+				LDFLAGS=\"$LDFLAGS\""
 		C_STANDARD=-std=gnu99
 		MALLOC=-lumem
+		ELF=
+	break ;;
+
+    NetBSD)
+		EXPORT_DYNAMIC=-Wl,--export-dynamic
+		NESTED_FUNCTIONS=
+		SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES
+
+		if test $IPCS_SYSV = no; then
+			IPCS_SYSV=-UIPCS_SYSV
+		else
+			IPCS_SYSV=-DIPCS_SYSV
+		fi
+
+		ac_configure_args="$ac_configure_args --with-readline=builtin \
+				--disable-shared --enable-static --enable-threads \
+				CFLAGS=\"$CFLAGS\" CXXFLAGS=\"$CXXFLAGS\" \
+				FFLAGS=\"$FFLAGS\" FCFLAGS=\"$FCFLAGS\" \
+				LDFLAGS=\"$LDFLAGS\""
+		C_STANDARD=-std=gnu99
+		GCCBIN=`which gcc`
+		GCCLIB=`dirname $GCCBIN`/../lib
+		ELF="-Wl,-R/usr/pkg/lib -Wl,-R$GCCLIB"
 	break ;;
 
     *)
@@ -1098,8 +1186,12 @@ case $OS in
 		fi
 
 		ac_configure_args="$ac_configure_args --with-readline=builtin \
-				--disable-shared --enable-static --enable-threads"
+				--disable-shared --enable-static --enable-threads \
+				CFLAGS=\"$CFLAGS\" CXXFLAGS=\"$CXXFLAGS\" \
+				FFLAGS=\"$FFLAGS\" FCFLAGS=\"$FCFLAGS\" \
+				LDFLAGS=\"$LDFLAGS\""
 		C_STANDARD=-std=gnu99
+		ELF=
 	break ;;
 
 esac
@@ -1111,8 +1203,8 @@ AC_SUBST(SEMAPHORES_NOMMES)
 AC_SUBST(IPCS_SYSV)
 AC_SUBST(SEMUN)
 AC_SUBST(IPV6)
-AC_SUBST(BROKEN_SIGINFO)
 AC_SUBST(BSH_PATH)
+AC_SUBST(ELF)
 
 AC_SUBST(NCURSES)
 AC_SUBST(READLINE)
@@ -1124,6 +1216,7 @@ AC_SUBST(FILE)
 AC_SUBST(ICONV)
 AC_SUBST(SQLITE)
 AC_SUBST(OPENSSL)
+AC_SUBST(SIGSEGV)
 AC_SUBST(FINAL_ENCODING)
 AC_SUBST(DATE)
 AC_SUBST(DATE_FR)
@@ -1140,6 +1233,17 @@ AC_SUBST(CFLAGS)
 AC_SUBST(CXXFLAGS)
 AC_SUBST(FFLAGS)
 AC_SUBST(FCFLAGS)
+AC_SUBST(LDFLAGS)
+
+AC_CONFIG_SUBDIRS(tools/$NCURSES)
+AC_CONFIG_SUBDIRS(tools/$READLINE)
+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)
+AC_CONFIG_SUBDIRS(tools/$UNITS)
+AC_CONFIG_SUBDIRS(tools/$SIGSEGV)
 
 AC_CONFIG_FILES(Makefile)
 AC_CONFIG_FILES(COPYING)