5.5 merge

BUILD/FINISH.sh

@@ -27,6 +27,11 @@ then
   configure="$configure --print"
 fi
 
+if test "$AM_EXTRA_MAKEFLAGS" = "VERBOSE=1" -o "$verbose_make" = "1"
+then
+  configure="$configure --verbose"
+fi
+
 commands="\
 /bin/rm -rf configure;
 /bin/rm -rf CMakeCache.txt CMakeFiles/
@@ -45,7 +50,7 @@ if [ -z "$just_configure" -a -z "$just_clean" ]
 then
   commands="$commands
 
-$make $AM_MAKEFLAGS $AM_EXTRA_MAKEFLAGS $EXTRA_MAKEFLAGS"
+$make $AM_MAKEFLAGS $AM_EXTRA_MAKEFLAGS"
 
   if [ "x$strip" = "xyes" ]
   then

BUILD/SETUP.sh

@@ -30,6 +30,11 @@ Usage: $0 [-h|-n] [configure-options]
   -h, --help              Show this help message.
   -n, --just-print        Don't actually run any commands; just print them.
   -c, --just-configure    Stop after running configure.
+  --extra-configs=xxx     Add this to configure options
+  --extra-flags=xxx       Add this C and CXX flags
+  --extra-cflags=xxx      Add this to C flags
+  --extra-cxxflags=xxx    Add this to CXX flags
+  --verbose               Print out full compile lines
   --with-debug=full       Build with full debug(no optimizations, keep call stack).
   --warning-mode=[old|pedantic|maintainer]
                           Influences the debug flags. Old is default.
@@ -64,6 +69,8 @@ parse_options()
       just_configure=1;;
     -n | --just-print | --print)
       just_print=1;;
+    --verbose)
+      verbose_make=1;;
     -h | --help)
       usage
       exit 0;;
@@ -89,6 +96,7 @@ just_configure=
 warning_mode=
 maintainer_mode=
 full_debug=
+verbose_make=
 
 parse_options "$@"