--- rpl/Attic/configure.in	2010/03/09 10:18:41	1.11
+++ rpl/Attic/configure.in	2010/06/24 10:10:39	1.29
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([rpl],[4.0.13])
+AC_INIT([rpl],[4.0.17])
 AC_CANONICAL_TARGET
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
@@ -7,32 +7,37 @@ AC_SUBST(target_cpu)
 AC_CONFIG_HEADERS([rplconfig.h])
 
 dnl Libraries
-NCURSES=ncurses-5.7-20100206
+NCURSES=ncurses-5.7-20100619
 READLINE=readline-6.1
 UNITS=units-1.87
-GSL=gsl-1.13
+GSL=gsl-1.14
 GPP=gpp-2.24
-GNUPLOT=gnuplot-4.2.6
+GNUPLOT=gnuplot-4.4.0
 FILE=file-5.03
 ICONV=libiconv-1.13.1
-SQLITE=sqlite-3.6.22
-OPENSSL=openssl-0.9.8m
+SQLITE=sqlite-3.6.23.1
+OPENSSL=openssl-1.0.0a
 
 dnl Checks for C compiler
-AC_PROG_CC(gcc-4.4 gcc)
+AC_PROG_CC(gcc)
 
 if test x"$CC" != x""; then
 	GCC_VERSION_MAJEURE=`$CC -v 2>&1 | awk '/^gcc/ { print $3; }' | \
 			awk -F. '{ printf("%s", $1);}'`
 	GCC_VERSION_MINEURE=`$CC -v 2>&1 | awk '/^gcc/ { print $3; }' | \
 			awk -F. '{ printf("%s", $2);}'`
-	if test $GCC_VERSION_MAJEURE -ge 4 -a $GCC_VERSION_MINEURE -ge 4; then
+	if test $GCC_VERSION_MAJEURE -ge 5; then
 		OPTIMISATION_C=-O3
 	else
-		if test $GCC_VERSION_MAJEURE -ge 5; then
+		if test $GCC_VERSION_MAJEURE -ge 4 -a $GCC_VERSION_MINEURE -ge 4; \
+				then
 			OPTIMISATION_C=-O3
 		else
-			OPTIMISATION_C=-O2
+			if test $GCC_VERSION_MAJEURE -ge 2; then
+				OPTIMISATION_C=-O2
+			else
+				AC_MSG_ERROR([Cannot find decent or recent gcc (gcc-4.2 or better)!])
+			fi
 		fi
 	fi
 fi
@@ -44,21 +49,21 @@ if test "$GCC" != yes; then
 fi
 
 dnl Checks for C++ compiler
-AC_PROG_CXX(g++-4.4 g++)
+AC_PROG_CXX(g++)
 
 if test "$GXX" != yes; then
 	AC_MSG_ERROR([Cannot find g++! You have to install it.])
 fi
 
 dnl Checks for Fortran 77 compiler
-AC_PROG_F77(gfortran-4.4 gfortran)
+AC_PROG_F77(gfortran)
 
 if test "$F77" != gfortran -a "$F77" != gfortran-4.4; then
 	AC_MSG_ERROR([Cannot find gfortran! You have to install it.])
 fi
 
 dnl Check for Fortran 9* compiler
-AC_PROG_FC(gfortran-4.4 gfortran)
+AC_PROG_FC(gfortran)
 
 if test "$FC" != gfortran -a "$FC" != gfortran-4.4; then
 	AC_MSG_ERROR([Cannot find gfortran! You have to install it.])
@@ -69,13 +74,17 @@ if test x"$FC" != x""; then
 			awk -F. '{ printf("%s", $1);}'`
 	GCC_VERSION_MINEURE=`$FC -v 2>&1 | awk '/^gcc/ { print $3; }' | \
 			awk -F. '{ printf("%s", $2);}'`
-	if test $GCC_VERSION_MAJEURE -ge 4 -a $GCC_VERSION_MINEURE -ge 4; then
+	if test $GCC_VERSION_MAJEURE -ge 5; then
 		OPTIMISATION_F=-O3
 	else
-		if test $GCC_VERSION_MAJEURE -ge 5; then
+		if test $GCC_VERSION_MAJEURE -ge 4 -a $GCC_VERSION_MINEURE -ge 4; then
 			OPTIMISATION_F=-O3
 		else
-			OPTIMISATION_F=-O2
+			if test $GCC_VERSION_MAJEURE -ge 3; then
+				OPTIMISATION_F=-O2
+			else
+				AC_MSG_ERROR([Cannot find decent or recent gfortran (gfortran-4.3 or better)!])
+			fi
 		fi
 	fi
 fi
@@ -119,12 +128,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]]], [
@@ -204,10 +213,13 @@ EXPERIMENTAL_CODE="-UEXPERIMENTAL_CODE")
 AC_ARG_ENABLE(debug,
 [  --enable-debug          enable debug code [[default=no]]], [
 if test "$enableval" = "no"; then
-	DEBUG=""
+	DEBUG="-UDEBUG_MEMOIRE -UDEBUG_ERREURS"
+	MALLOC="\$(top_builddir)/ptmalloc3/libptmalloc3.a"
 else
-	DEBUG="-DDEBUG_MEMOIRE"
-fi], [DEBUG=""])
+	DEBUG="-DDEBUG_MEMOIRE -UDEBUG_ERREURS"
+	MALLOC=""
+fi], [DEBUG="-UDEBUG_MEMOIRE -UDEBUG_ERREURS"
+	MALLOC="\$(top_builddir)/ptmalloc3/libptmalloc3.a"])
 
 AC_ARG_ENABLE(profile,
 [  --enable-profile        enable profile code [[default=no]]], [
@@ -245,16 +257,7 @@ 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 > $TMP
-	sed 's/^bin_PROGRAMS = file/bin_PROGRAMS = rplfile/g' $TMP | \
-		sed 's/^file_/rplfile_/g' > \
-		"$srcdir"/tools/$FILE/src/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
 if test ! -d "$srcdir"/tools/$ICONV; then
 	gunzip -c "$srcdir"/tools/$ICONV.tar.gz | \
@@ -269,26 +272,6 @@ if test ! -d tools/$OPENSSL; then
 			(cd tools && tar -xf -)
 fi
 
-AC_CHECK_PROG(LIBTOOLIZE, libtoolize, yes, no)
-if test "$LIBTOOLIZE" = "no"; then
-	AC_MSG_ERROR([Cannot find libtoolize! You have to install it.])
-fi
-
-AC_CHECK_PROG(ACLOCAL, aclocal, yes, no)
-if test "$ACLOCAL" = "no"; then
-	AC_MSG_ERROR([Cannot find aclocal! You have to install it.])
-fi
-
-AC_CHECK_PROG(AUTOMAKE, automake, yes, no)
-if test "$AUTOMAKE" = "no"; then
-	AC_MSG_ERROR([Cannot find automake! You have to install it.])
-fi
-
-AC_CHECK_PROG(AUTOCONF, autoconf, yes, no)
-if test "$AUTOCONF" = "no"; then
-	AC_MSG_ERROR([Cannot find autoconf! You have to install it.])
-fi
-
 dnl Default installation directory
 AC_PREFIX_DEFAULT(/usr/local)
 
@@ -312,10 +295,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
@@ -762,15 +745,33 @@ AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(ftime getcwd putenv select strcspn strdup \
 		strerror strspn strstr strtod)
 
+ac_configure_args="$ac_configure_args --with-readline=builtin --disable-shared --enable-static"
+
 AC_CONFIG_SUBDIRS(tools/$NCURSES)
 AC_CONFIG_SUBDIRS(tools/$READLINE)
-AC_CONFIG_SUBDIRS(tools/$UNITS)
 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)
-tools/$OPENSSL/config
+AC_CONFIG_SUBDIRS(tools/$UNITS)
+
+dnl Check for OpenSSL os/comp
+AC_ARG_WITH(openssl_arch,
+[  --with-openssl-arch=ARCH  specify os and compiler for openssl (ARCH or list)],
+[], [with_openssl_arch=none])
+
+if test "x$with_openssl_arch" = xnone; then
+	(cd tools/$OPENSSL && ./config)
+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!])
+elif test "x$with_openssl_arch" = xlist; then
+	(cd tools/$OPENSSL && ./Configure)
+	AC_MSG_ERROR([Please specify OS and Architecture])
+else
+	(cd tools/$OPENSSL && ./Configure $with_openssl_arch)
+fi
 
 if test "$MYGNUPLOT" = "yes"; then
 	if test ! -d "$srcdir"/tools/$GNUPLOT; then
@@ -838,13 +839,38 @@ 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')
 
-if test $(uname) = "SunOS"; then
-	LIBMTMALLOC=-lmtmalloc
-else
-	LIBMTMALLOC=
-fi
+case $OS in
+
+    Darwin)
+		EXPORT_DYNAMIC=-flat_namespace
+		NESTED_FUNCTIONS=-fnested-functions
+		SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES
+		CXXFLAGS="$CXXFLAGS -D_GLIBCXX_FULLY_DYNAMIC_STRING"
+	break ;;
+
+	Cygwin)
+		EXPORT_DYNAMIC=--export-all-symbols
+		NESTED_FUNCTIONS=
+		SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES
+	break ;;
+
+	AIX)
+		EXPORT_DYNAMIC=--export-dynamic
+		NESTED_FUNCTIONS=
+		SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES
+	break ;;
+
+    *)
+		EXPORT_DYNAMIC=--export-dynamic
+		NESTED_FUNCTIONS=
+		SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES
+	break ;;
+
+esac
 
-AC_SUBST(LIBMTMALLOC)
+AC_SUBST(EXPORT_DYNAMIC)
+AC_SUBST(NESTED_FUNCTIONS)
+AC_SUBST(SEMAPHORES_NOMMES)
 
 AC_SUBST(NCURSES)
 AC_SUBST(READLINE)
@@ -859,6 +885,7 @@ AC_SUBST(OPENSSL)
 AC_SUBST(FINAL_ENCODING)
 AC_SUBST(DATE)
 AC_SUBST(DATE_FR)
+AC_SUBST(MALLOC)
 
 AC_SUBST(CFLAGS)
 AC_SUBST(CXXFLAGS)
@@ -881,6 +908,7 @@ AC_CONFIG_FILES(rpliconv/Makefile)
 AC_CONFIG_FILES(rplsums/Makefile)
 AC_CONFIG_FILES(lapack/lapack/Makefile)
 AC_CONFIG_FILES(lapack/blas/Makefile)
+AC_CONFIG_FILES(ptmalloc3/Makefile)
 
 AC_CONFIG_FILES(man/rpl.1)
 AC_CONFIG_FILES(man/rplcc.1)