--- rpl/configure.ac	2011/09/23 12:36:15	1.1
+++ rpl/configure.ac	2011/10/02 14:14:29	1.2
@@ -15,7 +15,7 @@ GPP=gpp-3.0
 GNUPLOT=gnuplot-4.4.3
 FILE=file-5.03
 ICONV=libiconv-1.13.1
-SQLITE=sqlite-3.7.7.1
+SQLITE=sqlite-3.7.8
 OPENSSL=openssl-1.0.0e
 OPENMOTIF=openmotif-2.3.3
 LIBXPM=libXpm-3.5.9
@@ -63,7 +63,7 @@ fi
 dnl Checks for C++ compiler
 AC_PROG_CXX(g++)
 
-if test "$CXX" != "g++"; then
+if test "$GXX" != yes; then
 	AC_MSG_ERROR([Cannot find g++! You have to install it.])
 fi
 
@@ -204,7 +204,7 @@ fi],[
 	]
 )
 
-AC_ARG_ENABLE(sysv-semaphores,
+AC_ARG_ENABLE(sysv-ipcs,
 [  --enable-sysv-ipcs      use SystemV IPC functions [[default=guessed]]], [
 if test "$enableval" = "no"; then
 	IPCS_SYSV=no
@@ -615,7 +615,9 @@ AC_SUBST(DATE)
 
 dnl Checks for libraries
 AC_CHECK_LIB(m, main,, AC_MSG_ERROR([Can not find libm !]))
-AC_CHECK_LIB(pthread, main,, AC_MSG_ERROR([Can not find libpthread !]))
+AC_CHECK_LIB(c, pthread_mutex_init,,
+			 [AC_CHECK_LIB(pthread, main,,
+			 AC_MSG_ERROR([Can not find libpthread !]))])
 
 dnl Check for union semun
 AC_CHECK_TYPE([union semun], SEMUN=-DUNION_SEMUN, SEMUN=-UUNION_SEMUN, [[
@@ -1012,39 +1014,32 @@ AC_SUBST(GNUPLOT_COMPILATION)
 HOST=$host
 AC_SUBST(HOST)
 
-case $host_cpu in
+my_save_cflags="$CFLAGS"
+FPCFLAGS=""
 
-    i?86)
-	CFLAGS="$CFLAGS -malign-double -mieee-fp -Wall -funsigned-char \
-			-Wno-pointer-sign"
-	FFLAGS="$FFLAGS -malign-double -mieee-fp -Wall -fno-f2c"
-	FCFLAGS="$FCFLAGS -malign-double -mieee-fp -Wall -fno-f2c"
-	break ;;
-
-	x86_64*)
-	CFLAGS="$CFLAGS -malign-double -mieee-fp -Wall -funsigned-char \
-			-Wno-pointer-sign"
-	FFLAGS="$FFLAGS -malign-double -mieee-fp -Wall -fno-f2c"
-	FCFLAGS="$FCFLAGS -malign-double -mieee-fp -Wall -fno-f2c"
-	break ;;
-
-    alpha*)
-	CFLAGS="$CFLAGS -mieee -funsigned-char -Wall \
-			-Wno-pointer-sign"
-	FFLAGS="$FFLAGS -mieee -Wall"
-	FCFLAGS="$FCFLAGS -mieee -Wall"
-	break ;;
-
-    sparc*)
-	CFLAGS="$CFLAGS -Wall -funsigned-char \
-			-Wno-pointer-sign"
-	FFLAGS="$FFLAGS -Wall"
-	FCFLAGS="$FCFLAGS -Wall"
-	break ;;
+CFLAGS=-malign-double
+AC_MSG_CHECKING([whether CC supports -malign-double])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
+	[AC_MSG_RESULT([yes]); FPCFLAGS="$FPCFLAGS -malign-double"],
+	[AC_MSG_RESULT([no])])
+CFLAGS=-mieee-fp
+AC_MSG_CHECKING([whether CC supports -mieee-fp])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
+    [AC_MSG_RESULT([yes]); FPCFLAGS="$FPCFLAGS -mieee-fp"],
+	[AC_MSG_RESULT([no])])
+CFLAGS=-mieee
+AC_MSG_CHECKING([whether CC supports -mieee])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
+    [AC_MSG_RESULT([yes]); FPCFLAGS="$FPCFLAGS -mieee"],
+	[AC_MSG_RESULT([no])])
+CFLAGS=$my_save_cflags
+
+CFLAGS="$CFLAGS $FPCFLAGS -Wall -funsigned-char -Wno-pointer-sign"
+FFLAGS="$FFLAGS $FPCFLAGS -Wall -fno-f2c"
+FCFLAGS="$FCFLAGS $FPCFLAGS -Wall -fno-f2c"
+CXXFLAGS="$CXXFLAGS $FPCFLAGS -Wall -funsigned-char"
 
-esac
-
-case $host_os in
+case $target_os in
 
 	cygwin*)
 		OS=Cygwin