1 files changed, 2 insertions, 8 deletions
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"