Browse Source

configure: Put configuration options summary back after everything completes

Luke Dashjr 12 years ago
parent
commit
e1787fa9f2
1 changed files with 36 additions and 39 deletions
  1. 36 39
      configure.ac

+ 36 - 39
configure.ac

@@ -1339,6 +1339,37 @@ AC_DEFINE_UNQUOTED([DIABLO_KERNNAME], ["diablo130302"], [Filename for diablo ker
 AC_DEFINE_UNQUOTED([SCRYPT_KERNNAME], ["scrypt130511"], [Filename for scrypt kernel])
 
 
+m4_define([BFG_PRINT_LIST],[
+	eval _mylist="\$$2"
+	_yeslist=
+	_nolist=
+	_enableactions=
+	for _opt in $_mylist; do
+		IFS=/ read _opt _var <<EOF
+$_opt
+EOF
+		test -n "$_var" || _var="$_opt"
+		eval "_val=\"\$${_var}\""
+		if test "x$_val" = "xno" || test "x$_val" = "xfalse"; then
+			_nolist="$_nolist $_opt"
+			eval "_enableaction=\"\$${_var}_enableaction\""
+			if test -n "$_enableaction"; then
+				_enableactions="${_enableactions}~    To enable ${_opt}, ${_enableaction}"
+			fi
+		else
+			_yeslist="$_yeslist $_opt"
+		fi
+	done
+	_yeslist=`echo "$_yeslist" | tr ' ' '\n' | sort | tr '\n' ' '`
+	_nolist=`echo "$_nolist" | tr ' ' '\n' | sort | tr '\n' ' '`
+	AC_DEFINE_UNQUOTED(AS_TR_CPP([BFG_$2]),["$_yeslist"],[List of drivers being built])
+	$2_print="  Enabled..$1..:${_yeslist}~  Disabled.$1..:${_nolist}${_enableactions}"
+])
+BFG_PRINT_LIST([Drivers...],[driverlist])
+BFG_PRINT_LIST([Algorithms],[algolist])
+BFG_PRINT_LIST([Options...],[optlist])
+
+
 AC_SUBST(AUTOSCAN_CPPFLAGS)
 AC_SUBST(AUTOSCAN_LIBS)
 AC_SUBST(PTHREAD_FLAGS)
@@ -1363,6 +1394,8 @@ AC_CONFIG_FILES([
 	lib/Makefile
 	])
 
+AC_OUTPUT
+
 
 echo
 echo
@@ -1374,43 +1407,9 @@ echo
 echo
 echo "Configuration Options Summary:"
 echo
-
-
-m4_define([BFG_PRINT_LIST],[
-	eval _mylist="\$$2"
-	_yeslist=
-	_nolist=
-	_enableactions=
-	for _opt in $_mylist; do
-		IFS=/ read _opt _var <<EOF
-$_opt
-EOF
-		test -n "$_var" || _var="$_opt"
-		eval "_val=\"\$${_var}\""
-		if test "x$_val" = "xno" || test "x$_val" = "xfalse"; then
-			_nolist="$_nolist $_opt"
-			eval "_enableaction=\"\$${_var}_enableaction\""
-			if test -n "$_enableaction"; then
-				_enableactions="${_enableactions}~    To enable ${_opt}, ${_enableaction}"
-			fi
-		else
-			_yeslist="$_yeslist $_opt"
-		fi
-	done
-	_yeslist=`echo "$_yeslist" | tr ' ' '\n' | sort | tr '\n' ' '`
-	_nolist=`echo "$_nolist" | tr ' ' '\n' | sort | tr '\n' ' '`
-	AC_DEFINE_UNQUOTED(AS_TR_CPP([BFG_$2]),["$_yeslist"],[List of drivers being built])
-	echo "  Enabled..$1..:$_yeslist"
-	echo "  Disabled.$1..:$_nolist"
-	if test -n "$_enableactions"; then
-		echo "${_enableactions:1}" | tr '~' '\n'
-	fi
-])
-BFG_PRINT_LIST([Drivers...],[driverlist])
-BFG_PRINT_LIST([Algorithms],[algolist])
-BFG_PRINT_LIST([Options...],[optlist])
-
-
+echo "${driverlist_print}" | tr '~' '\n'
+echo "${algolist_print}" | tr '~' '\n'
+echo "${optlist_print}" | tr '~' '\n'
 echo
 echo "Compilation............: make (or gmake)"
 echo "  CFLAGS...............: $CPPFLAGS $AUTOSCAN_CPPFLAGS $NCURSES_CPPFLAGS $PTHREAD_FLAGS $CFLAGS $LIBUSB_CFLAGS $JANSSON_CFLAGS $PTHREAD_FLAGS $libblkmaker_CFLAGS $hidapi_CFLAGS"
@@ -1419,5 +1418,3 @@ echo
 echo "Installation...........: make install$maybe_ldconfig #(as root if needed, with 'su' or 'sudo')"
 echo "  prefix...............: $prefix"
 echo
-
-AC_OUTPUT