diff --git a/configure.ac b/configure.ac
index fc7460e6c840d5ff3b05ecd86532792c6c7a4e8c..e5fbdb354d35d616fd72740c631a0aa77ddaeeab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,12 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.52)
-AC_INIT([alberta], [1.2-pre4], [dani@mathematik.uni-freiburg.de])
+AC_INIT([alberta], [1.2-pre4], [claus@mathematik.uni-freiburg.de])
 
 AC_CONFIG_SRCDIR([ALBERTA/src/Common/alberta.h])
 AM_MAINTAINER_MODE
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
 
 AC_CONFIG_FILES([Makefile ALBERTA_UTIL/Makefile
 		 gnu-compat/Makefile
@@ -60,6 +62,7 @@ dnl
 dnl now check for compilers
 dnl
 AC_PROG_CC
+AC_C_INLINE
 AC_PROG_F77
 dnl
 dnl Mmmh. Quite elaborated nowadays. This is not used, but left in to
@@ -166,27 +169,17 @@ AC_TYPE_SIGNAL
 # ******************************************************************************
 # These are our own tests
 # ******************************************************************************
-
-AC_CHECK_LIB(dl, main)
-
-plot_for_sun=true
-plot_for_ibm=false
-plot_for_tit=false
-
-case "$build_vendor" in
-*sgi*)	AC_MSG_RESULT([Building for SGI system, affects PLOT_Ansi...]);;
-*ibm*)	AC_MSG_RESULT([Building for IBM system, affects PLOT_Ansi...])
-       	plot_for_ibm=true
-       	plot_for_sun=false;;
-*sun*)	AC_MSG_RESULT([Building fo a SUN system, affects PLOT_Ansi and xdr-routines...])
-	AC_CHECK_LIB(nsl, main);;
+	
+case "$host_vendor" in
+  *sun*)  AC_MSG_RESULT([Building fo a SUN system, affects xdr-routines...])
+          AC_CHECK_LIB(nsl, main)
+	;;
 esac
 
-case "$build" in
-*titan*) AC_MSG_RESULT([Building for TITAN cpu/vendor/system?, affects PLOT_Ansi...])
-       plot_for_tit=true
-       plot_for_sun=false;;
-esac
+#
+# PLOT_ANSI stuff
+#
+ALBERTA_PLOT_ANSI_STUFF
 
 dnl
 dnl check for BLAS library. The BLAS may come under different names. We default
@@ -196,6 +189,7 @@ dnl
 dnl Let the user decide what it wants (handled by ALBERTA_CHECK_PACKAGE()
 dnl
 ALBERTA_CHECK_PACKAGE(blas, blas, , ${FLIBS},,,,required)
+MANGLE_F77_FUNCTIONS(dnrm2, dset, daxpy, dexpy, dmxpy, dcopy, ddot, dscal, dswap, dxpay)
 
 dnl
 dnl check for X11
@@ -216,32 +210,9 @@ dnl
 ALBERTA_CHECK_PACKAGE(gltools, gltools, , ${X_ALL_LIBS}, glmesh.h,,,optional)
 
 dnl
-dnl Some defines to enable building of alberta_movi. This is more
-dnl complicated than necessary so that it is easier to build a
-dnl stand-alone version of albert_movi.
-dnl
-ALBERTA_CHECK_PACKAGE(grape, gr, , ${OPENGL_LIB} ${X_ALL_LIBS}, grape.h,,, optional)
-AM_CONDITIONAL(GRAPE, test -n "${GRAPE_LIB}")
-ALBERTA_LIB_PATH=$prefix/lib
-ALBERTA_INCLUDE_PATH='$(top_srcdir)/ALBERTA/src/Common/ -I$(top_srcdir)/ALBERTA_UTIL'
-ALBERTA_LIBS_22='$(top_builddir)/ALBERTA/src/ALBERTA22_0/libALBERTA22_0.la $(top_builddir)/SOLVER/src/libcsolver.la $(top_builddir)/ALBERTA_UTIL/libalberta_util.la $(top_builddir)/PLOT_ANSI/src/libPLOTansi.la $(BLAS_ALL_LIB) $(GLTOOLS_ALL_LIB)'
-ALBERTA_LIBS_33='$(top_builddir)/ALBERTA/src/ALBERTA33_0/libALBERTA33_0.la $(top_builddir)/SOLVER/src/libcsolver.la $(top_builddir)/ALBERTA_UTIL/libalberta_util.la $(BLAS_ALL_LIB) $(GLTOOLS_ALL_LIB)'
-ALBERTA_DEBUG=
-AC_SUBST(ALBERTA_DEBUG)
-AC_SUBST(ALBERTA_LIB_PATH)
-AC_SUBST(ALBERTA_INCLUDE_PATH)
-AC_SUBST(ALBERTA_LIBS_22)
-AC_SUBST(ALBERTA_LIBS_33)
-dnl
-dnl end of alberta_movi
+dnl GRAPE interface stuff
 dnl
-
-#
-# PLOT_ANSI stuff
-#
-AM_CONDITIONAL(PLOT_FOR_SUN, test x$plot_for_sun = xtrue)
-AM_CONDITIONAL(PLOT_FOR_IBM, test x$plot_for_ibm = xtrue)
-AM_CONDITIONAL(PLOT_FOR_TIT, test x$plot_for_tit = xtrue)
+ALBERTA_GRAPE_STUFF
 
 #
 # EL_INDEX