Index: configure
===================================================================
--- configure	(revision 5d6ce1f8d18a9bbca45f06868ceb938bf0812bfb)
+++ configure	(revision 7e91d4f2638e9105eae4f6c7cddb260260f31b04)
@@ -2863,5 +2863,5 @@
 
 
-		# do not follow GNU standard
+
 
 ac_config_headers="$ac_config_headers config.h"
@@ -6937,4 +6937,5 @@
 fi
 
+
 # Final text
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: Cforall configuraton completed. Type \"make -j 8 install\"." >&5
Index: configure.ac
===================================================================
--- configure.ac	(revision 5d6ce1f8d18a9bbca45f06868ceb938bf0812bfb)
+++ configure.ac	(revision 7e91d4f2638e9105eae4f6c7cddb260260f31b04)
@@ -4,5 +4,5 @@
 AC_PREREQ([2.68])
 AC_INIT(cfa-cc, 1.0.0, cforall@plg.uwaterloo.ca)
-AM_INIT_AUTOMAKE([foreign])		# do not follow GNU standard
+AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([src/main.cc])
 AC_CONFIG_HEADERS([config.h])
@@ -104,4 +104,5 @@
 
 AC_OUTPUT
+
 # Final text
 AC_MSG_RESULT(Cforall configuraton completed. Type "make -j 8 install".)
Index: nfigure.in
===================================================================
--- configure.in	(revision 5d6ce1f8d18a9bbca45f06868ceb938bf0812bfb)
+++ 	(revision )
@@ -1,107 +1,0 @@
-AC_INIT(cfa-cc, 1.0, cforall@plg.uwaterloo.ca)
-AC_CONFIG_SRCDIR([src/main.cc])
-
-AM_INIT_AUTOMAKE([foreign])		# do not follow GNU standard
-AM_CONFIG_HEADER(config.h)
-
-dnl This comes from `autoscan'
-dnl Checks for programs.
-AC_PROG_YACC
-AC_PROG_CXX
-AC_PROG_CC # ???
-AM_PROG_LEX
-AC_PROG_MAKE_SET
-AC_PROG_INSTALL
-
-dnl Checks for header libraries.
-
-dnl Checks for header files.
-AC_CHECK_HEADERS([malloc.h unistd.h])
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_C_INLINE
-AC_STRUCT_TM
-
-test "${prefix}" != "NONE" || prefix=$ac_default_prefix
-
-preludedir=${prefix}/share/cfa
-AC_ARG_WITH(preludedir, 
-            [  --with-preludedir=DIR      DIR that contains prelude.cf and other necessary files ], 
-            preludedir=$withval )
-AC_SUBST(preludedir)
-
-AC_ARG_WITH(backend-compiler, 
-            [  --with-backend-compiler=PROGRAM     PROGRAM that performs the final code compilation (must be gcc-compatible) ], 
-            backcompiler=$withval, backcompiler="")
-  if test x$backcompiler != x; then
-     AC_DEFINE_UNQUOTED(GCC_PATH, "${backcompiler}")
-     BACKEND_CC=${backcompiler}
-  else
-     AC_PATH_PROG(GCC_PATH, gcc, N/A)
-     if test "$GCC_PATH" = "N/A"; then
-        AC_MSG_ERROR(some version of gcc is needed. Get it at ftp://ftp.gnu.org)
-        exit 1
-     fi
-     AC_DEFINE_UNQUOTED(GCC_PATH, "${GCC_PATH}", [Path/name of C compiler.])
-     BACKEND_CC=${GCC_PATH}
-  fi
-AC_SUBST(BACKEND_CC)
-
-AC_PATH_PROG(CPP_PATH, cpp, N/A)
-if test "$CPP_PATH" = "N/A"; then
-   AC_MSG_ERROR(cpp not found)
-   exit 1
-fi
-AC_DEFINE_UNQUOTED(CPP_PATH, "${CPP_PATH}", [Path/name of cpp preprocessor.])
-
-# Purify instrumenting
-dnl AC_ARG_WITH(enablepurify, 
-dnl             [  --with-purify     Enable Purify ], 
-
-dnl Installation paths
-CFA_PREFIX=
-if test "x$prefix" = "xNONE"; then
- 	cfa_prefix=${ac_default_prefix}
-else
- 	cfa_prefix=${prefix}
-fi 
-AC_DEFINE_UNQUOTED(CFA_PREFIX, "${cfa_prefix}", [Location of cfa files.])
-CFA_PREFIX=${cfa_prefix}
-AC_SUBST(CFA_PREFIX)
-
-CFA_INCDIR=
-if test "$includedir" = '${prefix}/include'; then
- 	cfa_incdir="${cfa_prefix}/include"
-else
- 	cfa_incdir=${$includedir}
-fi 
-AC_DEFINE_UNQUOTED(CFA_INCDIR, "${cfa_incdir}", [Location of include files.])
-CFA_INCDIR=${cfa_incdir}
-AC_SUBST(CFA_INCDIR)
-
-CFA_BINDIR=
-if test "$bindir" = '${exec_prefix}/bin'; then
- 	cfa_bindir="${cfa_prefix}/bin"
-else
- 	cfa_bindir=${bindir}
-fi 
-AC_DEFINE_UNQUOTED(CFA_BINDIR, "${cfa_bindir}", [Location of cfa command.])
-CFA_BINDIR=${cfa_bindir}
-AC_SUBST(CFA_BINDIR)
-
-CFA_LIBDIR=
-if test "$libdir" = '${exec_prefix}/lib'; then
- 	cfa_libdir=${cfa_prefix}/lib
-else
- 	cfa_libdir=${libdir}
-fi 
-AC_DEFINE_UNQUOTED(CFA_LIBDIR, "${cfa_libdir}", [Location of cc1 and cfa-cpp commands.])
-CFA_LIBDIR=${cfa_libdir}
-AC_SUBST(CFA_LIBDIR)
-
-AC_OUTPUT([ Makefile src/Makefile driver/Makefile libcfa/Makefile src/examples/Makefile ])
-
-dnl Final text
-
-AC_MSG_RESULT(Cforall configuraton completed. Type "make install".)