diff --git a/configure.ac b/configure.ac
index f0d9fed1d300fcceb72682108428968fe1f5615b..b4fba25aa787eb6120996d1ec2f6bbdfa9cdcda8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,6 +16,11 @@ AC_CONFIG_FILES([Makefile BLAS/Makefile ALBERT_UTIL/Makefile
 		 ALBERT/src/ALBERT22_0/Makefile ALBERT/src/ALBERT22_1/Makefile
 		 ALBERT/src/ALBERT23_0/Makefile ALBERT/src/ALBERT23_1/Makefile
 		 ALBERT/src/ALBERT33_0/Makefile ALBERT/src/ALBERT33_1/Makefile
+		 ALBERT/src/ALBERT11_01/Makefile ALBERT/src/ALBERT11_11/Makefile
+		 ALBERT/src/ALBERT12_01/Makefile ALBERT/src/ALBERT12_11/Makefile
+		 ALBERT/src/ALBERT22_01/Makefile ALBERT/src/ALBERT22_11/Makefile
+		 ALBERT/src/ALBERT23_01/Makefile ALBERT/src/ALBERT23_11/Makefile
+		 ALBERT/src/ALBERT33_01/Makefile ALBERT/src/ALBERT33_11/Makefile
 		 ALBERT/src/Common/Makefile ALBERT/src/Common/Makefile.albert])
 
 
@@ -120,7 +125,7 @@ AC_ARG_WITH(gltools,
 [if test -f $withval/gltools-2-3/libgltools.a; then
 	AC_MSG_RESULT([Found libgltools.a in specified directory $withval/gltools-2-3.])
 	gltools_include="-I$withval/gltools-2-3"
-	AC_DEFINE(HAVE_LIBGLTOOLS,,
+	AC_DEFINE(HAVE_LIBGLTOOLS,1,
 		  [Define to 1 if you have the `gltools-2-3' library (-lgltools)])
 	
 	LIBGLTOOLS_PRESENT=1
@@ -131,7 +136,7 @@ fi],
 [if test -f ./gltools-2-3/libgltools.a; then
 	AC_MSG_RESULT([Found libgltools.a in default directory ./gltools-2-3])
 	gltools_include="-I`pwd`/gltools-2-3"
-	AC_DEFINE(HAVE_LIBGLTOOLS,,
+	AC_DEFINE(HAVE_LIBGLTOOLS,1,
 		  [Define to 1 if you have the `gltools-2-3' library (-lgltools)])
 	LIBGLTOOLS_PRESENT=1
 	LIBS="-L`pwd`/gltools-2-3 -lgltools $LIBS"
@@ -139,10 +144,16 @@ else
 	AC_MSG_RESULT([*** No libgltools.a found in ./gltools-2-3])
 fi])
 
+ELINDEX=
+AC_ARG_ENABLE(el_index,
+[  --enable-el_index       also build a version of ALBERT libraries using EL_INDEX=1 (default is off)],
+[ELINDEX=1])
+
 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)
 AM_CONDITIONAL(USE_GLTOOLS, test x$LIBGLTOOLS_PRESENT = x1)
+AM_CONDITIONAL(USE_EL_INDEX, test x$ELINDEX = x1)
 
 AC_SUBST(gltools_include)
 AC_SUBST(make_own_blas_lib)