diff --git a/configure b/configure
index 439c1178f73ee27cd5ed3161e705dea30b92f345..9ae9d31f662e50af8303f63b0979607562bad791 100755
--- a/configure
+++ b/configure
@@ -4824,7 +4824,7 @@ _ACEOF
  		#define ac_bluegene_loaded so we don't load another bluegene conf
 		ac_bluegene_loaded=yes
 		ac_real_bluegene_loaded=yes
-  	fi
+	fi
 
 
 
@@ -5383,8 +5383,8 @@ $as_echo "$as_me: Running on a legitimate BG/Q system" >&6;}
  		#define ac_bluegene_loaded so we don't load another bluegene conf
 		ac_bluegene_loaded=yes
 		ac_real_bluegene_loaded=yes
- 		ac_bgq_loaded=yes
-  	fi
+		ac_bgq_loaded=yes
+	fi
 
 
 
diff --git a/src/smap/Makefile.am b/src/smap/Makefile.am
index 9bb86933a734c2e805533544d86d5882a43516c2..19a9387ad3304d74062a2209f797a252ea976d3a 100644
--- a/src/smap/Makefile.am
+++ b/src/smap/Makefile.am
@@ -29,7 +29,7 @@ else
 ba_lib_dir = $(bg_dir)/ba_bgq
 endif
 
-smap_LDADD += $(bg_dir)/bg_read_config.o $(bg_dir)/libba_common.la $(ba_lib_dir)/libblock_allocator.la
+smap_LDADD += $(bg_dir)/select_bluegene.la
 
 smap_SOURCES += configure_functions.c
 
diff --git a/src/smap/Makefile.in b/src/smap/Makefile.in
index 539bd53b0646015c32296ec177ccf4aa2cbf2c5f..d2cdb7f3218aeb9b454542172806cd0ddc805acc 100644
--- a/src/smap/Makefile.in
+++ b/src/smap/Makefile.in
@@ -43,7 +43,7 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 @HAVE_SOME_CURSES_TRUE@bin_PROGRAMS = smap$(EXEEXT)
-@BLUEGENE_LOADED_TRUE@@HAVE_SOME_CURSES_TRUE@am__append_1 = $(bg_dir)/bg_read_config.o $(bg_dir)/libba_common.la $(ba_lib_dir)/libblock_allocator.la
+@BLUEGENE_LOADED_TRUE@@HAVE_SOME_CURSES_TRUE@am__append_1 = $(bg_dir)/select_bluegene.la
 @BLUEGENE_LOADED_TRUE@@HAVE_SOME_CURSES_TRUE@am__append_2 = configure_functions.c
 subdir = src/smap
 DIST_COMMON = $(am__noinst_HEADERS_DIST) $(srcdir)/Makefile.am \