3 files changed, 10 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 70fc325d..aaf43bcc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-14  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* config/open-axiom.m4: Remove --enable-locbfd from
+	oa_gcl_bfd_option.
+	(oa_gcl_emacs): Remove.
+
 2011-06-11  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* TODO: Update.
diff --git a/config/open-axiom.m4 b/config/open-axiom.m4
index a1306e70..f4ae8d05 100644
--- a/config/open-axiom.m4
+++ b/config/open-axiom.m4
@@ -264,7 +264,7 @@ if test x"$oa_include_gcl" = xyes; then
 	&& test x"$oa_host_has_libbfd" = xyes; then
 	oa_gcl_bfd_option="--disable-dynsysbfd"
     else
-	oa_gcl_bfd_option="--disable-statsysbfd --enable-locbfd"
+	oa_gcl_bfd_option="--disable-statsysbfd"
     fi
 fi
 
@@ -279,13 +279,7 @@ esac
 ## We don't need GCL to build support for X Window system or TCL/TK:
 oa_gcl_x_option="--disable-tkconfig --disable-x --disable-xgcl --disable-tcltk"
 
-## Under some unusual circumstances, GLC's configure will
-## fail to properly detect usable Emacs directories, and the
-## build will mysteriously fail later.  We temporarily work
-## around that bug as follows:
-oa_gcl_emacs="--enable-emacs=correct"
-
-GCLOPTS="$oa_gcl_emacs $oa_gcl_bfd_option $oa_gcl_mm_option $oa_gcl_x_option"
+GCLOPTS="$oa_gcl_bfd_option $oa_gcl_mm_option $oa_gcl_x_option"
 AC_SUBST(GCLOPTS)
 ])
 
diff --git a/configure b/configure
index 8151d77c..45fbd693 100755
--- a/configure
+++ b/configure
@@ -20844,7 +20844,7 @@ ac_cv_lib_bfd=ac_cv_lib_bfd_main
 	&& test x"$oa_host_has_libbfd" = xyes; then
 	oa_gcl_bfd_option="--disable-dynsysbfd"
     else
-	oa_gcl_bfd_option="--disable-statsysbfd --enable-locbfd"
+	oa_gcl_bfd_option="--disable-statsysbfd"
     fi
 fi
 
@@ -20859,13 +20859,7 @@ esac
 ## We don't need GCL to build support for X Window system or TCL/TK:
 oa_gcl_x_option="--disable-tkconfig --disable-x --disable-xgcl --disable-tcltk"
 
-## Under some unusual circumstances, GLC's configure will
-## fail to properly detect usable Emacs directories, and the
-## build will mysteriously fail later.  We temporarily work
-## around that bug as follows:
-oa_gcl_emacs="--enable-emacs=correct"
-
-GCLOPTS="$oa_gcl_emacs $oa_gcl_bfd_option $oa_gcl_mm_option $oa_gcl_x_option"
+GCLOPTS="$oa_gcl_bfd_option $oa_gcl_mm_option $oa_gcl_x_option"