sync from upstream up to 22:14a375563e2b

This includes the following commits:

changeset:   22:14a375563e2b
summary:     chang "while" command to "type -P" in bash based configure

changeset:   21:c4bf7c0f33d2
summary:     updated codec paper for RS01 life cycle

changeset:   20:dbcaad8128aa
summary:     replaced build count with mercurial changeset

changeset:   19:fba258a6acfa
summary:     Added tag 0.79.10 for changeset 49950be5a2ef

changeset:   18:49950be5a2ef
summary:     merged some debian patches

changeset:   17:815be3929c41
summary:     merged "easy" patches from Stéphane Lesimple's version

changeset:   16:7d15f8a958cb
summary:     Made printf format strings 32/64bit safe as suggested by Stéphane;

changeset:   15:1055a53b8d6d
summary:     reorganized code for --with-gui=[yes|no] option

changeset:   14:fbe2ae12a32c
summary:     Added tag 0.79.9 for changeset f2fdd6d3a1f5

changeset:   13:f2fdd6d3a1f5
summary:     updated TODO and CHANGELOG

And other changes that were needed to resolve the (many) conflicts.

scripts/bash-based-configure

@@ -18,6 +18,7 @@
 #  along with Bash based configure. If not, see <http://www.gnu.org/licenses/>.
 #/
 
+
 # Command overview:
 # 
 # PACKAGE               Define package name and version
@@ -69,7 +70,7 @@
 # WITH_OPTION name default  adds -DWITH_OPTION_VALUE for -with-option=value args
 #			    to CFG_WITH_OPTIONS
 
-CONFIGURE_VERSION="0.59"
+CONFIGURE_VERSION="0.60"
 
 echo "Bash based configure V$CONFIGURE_VERSION"
 echo
@@ -282,7 +283,7 @@ fi
 
 # Find out where bash resides
 
-echo "SHELL = `which bash`" >>Makefile.config
+echo "SHELL = `type -P bash`" >>Makefile.config
 
 # Setup the log file
 
@@ -332,13 +333,13 @@ function REQUIRE_GMAKE()
 
    if (gmake -v 2>&1 | grep "GNU Make") > /dev/null 2>&1 ;
      then echo "yes"
-	  echo "MAKE = `which gmake`" >>Makefile.config
+	  echo "MAKE = `type -P gmake`" >>Makefile.config
 	  return 0
    fi;
 
    if (make -v 2>&1 | grep "GNU Make") > /dev/null 2>&1 ;
      then echo "yes"
-	  echo "MAKE = `which make`" >>Makefile.config
+	  echo "MAKE = `type -P make`" >>Makefile.config
 	  return 0
    fi;
 
@@ -358,11 +359,11 @@ function REQUIRE_GCC()
    # Try $CC first
 
    if test -n "$CC" && $CC -v >/dev/null 2>&1; then
-     if ($CC -v 2>&1 | grep "gcc") > /dev/null 2>&1 ;
-       then CC=`which $CC`
-       	    echo "yes ($CC)"
-	    echo "CC = `which $CC`" >>Makefile.config
-     	    return 0
+     if ($CC -v 2>&1 | grep "gcc") > /dev/null 2>&1 ; then
+       CC=`type -P $CC`
+       echo "yes ($CC)"
+       echo "CC = $CC" >>Makefile.config
+       return 0
      fi	   
    fi
 
@@ -370,11 +371,11 @@ function REQUIRE_GCC()
 
    CC=gcc
    if test -n "$CC" && $CC -v >/dev/null 2>&1; then
-     if ($CC -v 2>&1 | grep "gcc") > /dev/null 2>&1 ;
-       then CC=`which $CC`
-	    echo "yes ($CC)"
-	    echo "CC = $CC" >>Makefile.config
-     	    return 0
+     if ($CC -v 2>&1 | grep "gcc") > /dev/null 2>&1 ; then
+       CC=`type -P $CC`
+       echo "yes ($CC)"
+       echo "CC = $CC" >>Makefile.config
+       return 0
      fi	   
    fi
 
@@ -383,11 +384,11 @@ function REQUIRE_GCC()
    if test "$cfg_uname" == "FreeBSD"; then
      CC=$(ls /usr/local/bin | grep -E "^gcc[0-9]*$" | sort -n -r | head -n 1)
      if test -n "$CC" && $CC -v >/dev/null 2>&1; then
-     	if ($CC -v 2>&1 | grep "gcc") > /dev/null 2>&1 ;
-       	then CC=`which $CC`
-	     echo "yes ($CC)"
-	     echo "CC = $CC" >>Makefile.config
-     	     return 0
+     	if ($CC -v 2>&1 | grep "gcc") > /dev/null 2>&1 ; then
+       	  CC=`type -P $CC`
+	  echo "yes ($CC)"
+	  echo "CC = $CC" >>Makefile.config
+     	  return 0
 	fi 
      fi	   
    fi
@@ -470,7 +471,7 @@ function PACKAGE()
    echo "CFG_VERSION = $VERSION" >> Makefile.config
 }
 
-# Add -D$1="$2" to CFG_OTHER_OPTIONS
+# Add -D$1=$2 to CFG_OTHER_OPTIONS
 
 function DEFINE_STRING()
 {  
@@ -1490,7 +1491,7 @@ EOF
    CFG_GTK2_CFLAGS=`pkg-config --cflags gtk+-2.0`
    CFG_GTK2_LIBS=`pkg-config $threads --libs gtk+-2.0`
 
-   CFG_GTK2_BINDIR=`which pkg-config`
+   CFG_GTK2_BINDIR=`type -P pkg-config`
    CFG_GTK2_BINDIR=`echo $CFG_GTK2_BINDIR | sed -e 's/.exe//' | sed -e 's/\/pkg-config//'`
 
    CFG_CFLAGS="$CFG_CFLAGS $CFG_GTK2_CFLAGS"
@@ -2124,7 +2125,7 @@ function CHECK_PROGRAM()
      return 0
    fi
 
-   if (which $name) > /dev/null 2>&1; 
+   if (type -P $name) > /dev/null 2>&1; 
    then
      echo " $name: yes"
      return 0

scripts/time-stamper.bash

@@ -2,10 +2,10 @@
 build=$(grep BUILDNUM $1 2>/dev/null | cut -d\  -f3)
 build=$((build+1))
 cat >$1 <<EOF
-#ifdef WITH_CLI_ONLY_YES
-#define FLAVOR NOGUI
-#else
+#ifdef WITH_GUI_YES
 #define FLAVOR GUI
+#else
+#define FLAVOR NOGUI
 #endif
 #define STRINGIFY(x) #x
 #define TOSTRING(x) STRINGIFY(x)