# HG changeset patch
# User renatofilho
# Date 1178140623 -3600
# Node ID 1bf45de64bd5ca359585c5d75b1a9e0053d88037
# Parent  bc9827e02466fddb12564edf2843d160ec2ac4ad
[svn r627] fixed build

diff -r bc9827e02466 -r 1bf45de64bd5 libgnomevfs2-mythtv/autogen.sh
--- a/libgnomevfs2-mythtv/autogen.sh	Wed May 02 21:38:04 2007 +0100
+++ b/libgnomevfs2-mythtv/autogen.sh	Wed May 02 22:17:03 2007 +0100
@@ -1,99 +1,20 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
-DIE=0
-package=libgnomevfs2-mythtv
-srcfile=configure.ac
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
 
-# a quick cvs co if necessary to alleviate the pain - may remove this
-# when developers get a clue ;)
-if test ! -d common; 
-then 
-  echo "+ getting common/ from cvs"
-  cvs co common 
-fi
+PKG_NAME="gmemcoder"
 
-# source helper functions
-if test ! -f common/autogen-helper.sh;
-then
-  echo There is something wrong with your source tree.
-  echo You are missing common/autogen-helper.sh
-  exit 1
-fi
-. common/autogen-helper.sh
-
-CONFIGURE_DEF_OPT='--enable-maintainer-mode'
-
-autogen_options $*
-
-echo -n "+ check for build tools"
-if test ! -z "$NOCHECK"; then echo " skipped"; else  echo; fi
-version_check "autoconf" "$AUTOCONF autoconf autoconf-2.54 autoconf-2.53" \
-              "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 53 || DIE=1
-version_check "automake" "$AUTOMAKE automake automake-1.9 automake-1.8 automake-1.7 automake-1.6" \
-              "ftp://ftp.gnu.org/pub/gnu/automake/" 1 6 || DIE=1
-version_check "libtoolize" "$LIBTOOLIZE libtoolize" \
-              "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 5 0 || DIE=1
-version_check "pkg-config" "" \
-              "http://www.freedesktop.org/software/pkgconfig" 0 8 0 || DIE=1
-
-die_check $DIE
-
-aclocal_check || DIE=1
-autoheader_check || DIE=1
-
-die_check $DIE
-
-# if no arguments specified then this will be printed
-if test -z "$*"; then
-  echo "+ checking for autogen.sh options"
-  echo "  This autogen script will automatically run ./configure as:"
-  echo "  ./configure $CONFIGURE_DEF_OPT"
-  echo "  To pass any additional options, please specify them on the $0"
-  echo "  command line."
-fi
-
-toplevel_check $srcfile
-
-tool_run "$aclocal" "-I m4 $ACLOCAL_FLAGS"
-tool_run "$libtoolize" "--copy --force"
-tool_run "$autoheader"
-
-# touch the stamp-h.in build stamp so we don't re-run autoheader in maintainer mode -- wingo
-echo timestamp > stamp-h.in 2> /dev/null
-
-tool_run "$autoconf"
-tool_run "$automake" "-a -c"
-
-# if enable exists, add an -enable option for each of the lines in that file
-if test -f enable; then
-  for a in `cat enable`; do
-    CONFIGURE_FILE_OPT="--enable-$a"
-  done
-fi
-
-# if disable exists, add an -disable option for each of the lines in that file
-if test -f disable; then
-  for a in `cat disable`; do
-    CONFIGURE_FILE_OPT="$CONFIGURE_FILE_OPT --disable-$a"
-  done
-fi
-
-test -n "$NOCONFIGURE" && {
-  echo "+ skipping configure stage for package $package, as requested."
-  echo "+ autogen.sh done."
-  exit 0
+(test -f $srcdir/configure.ac) || {
+    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+    echo " top-level $PKG_NAME directory"
+    exit 1
 }
 
-echo "+ running configure ... "
-test ! -z "$CONFIGURE_DEF_OPT" && echo "  ./configure default flags: $CONFIGURE_DEF_OPT"
-test ! -z "$CONFIGURE_EXT_OPT" && echo "  ./configure external flags: $CONFIGURE_EXT_OPT"
-test ! -z "$CONFIGURE_FILE_OPT" && echo "  ./configure enable/disable flags: $CONFIGURE_FILE_OPT"
-echo
-
-./configure $CONFIGURE_DEF_OPT $CONFIGURE_EXT_OPT $CONFIGURE_FILE_OPT || {
-        echo "  configure failed"
-        exit 1
+which gnome-autogen.sh || {
+    echo "You need to install gnome-common from the GNOME CVS"
+    exit 1
 }
-
-echo "Now type 'make' to compile $package."
+ACLOCAL_FLAGS=$ACLOCAL_FLAGS -I ./m4
+REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh
diff -r bc9827e02466 -r 1bf45de64bd5 libgnomevfs2-mythtv/common/Makefile.am
--- a/libgnomevfs2-mythtv/common/Makefile.am	Wed May 02 21:38:04 2007 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-EXTRA_DIST = autogen-helper.sh
diff -r bc9827e02466 -r 1bf45de64bd5 libgnomevfs2-mythtv/common/autogen-helper.sh
--- a/libgnomevfs2-mythtv/common/autogen-helper.sh	Wed May 02 21:38:04 2007 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,302 +0,0 @@
-# a silly hack that generates autoregen.sh but it's handy
-echo "#!/bin/sh" > autoregen.sh
-echo "./autogen.sh $@ \$@" >> autoregen.sh
-chmod +x autoregen.sh
-
-# helper functions for autogen.sh
-
-debug ()
-# print out a debug message if DEBUG is a defined variable
-{
-  if test ! -z "$DEBUG"
-  then
-    echo "DEBUG: $1"
-  fi
-}
-
-version_check ()
-# check the version of a package
-# first argument : package name (executable)
-# second argument : optional path where to look for it instead
-# third argument : source download url
-# rest of arguments : major, minor, micro version
-# all consecutive ones : suggestions for binaries to use
-# (if not specified in second argument)
-{
-  PACKAGE=$1
-  PKG_PATH=$2
-  URL=$3
-  MAJOR=$4
-  MINOR=$5
-  MICRO=$6
-
-  # for backwards compatibility, we let PKG_PATH=PACKAGE when PKG_PATH null
-  if test -z "$PKG_PATH"; then PKG_PATH=$PACKAGE; fi
-  debug "major $MAJOR minor $MINOR micro $MICRO"
-  VERSION=$MAJOR
-  if test ! -z "$MINOR"; then VERSION=$VERSION.$MINOR; else MINOR=0; fi
-  if test ! -z "$MICRO"; then VERSION=$VERSION.$MICRO; else MICRO=0; fi
-
-  debug "major $MAJOR minor $MINOR micro $MICRO"
-  
-  for SUGGESTION in $PKG_PATH; do 
-    COMMAND="$SUGGESTION"
-
-    # don't check if asked not to
-    test -z "$NOCHECK" && {
-      echo -n "  checking for $COMMAND >= $VERSION ... "
-    } || {
-      # we set a var with the same name as the package, but stripped of
-      # unwanted chars
-      VAR=`echo $PACKAGE | sed 's/-//g'`
-      debug "setting $VAR"
-      eval $VAR="$COMMAND"
-      return 0
-    }
-
-    debug "checking version with $COMMAND"
-    ($COMMAND --version) < /dev/null > /dev/null 2>&1 || 
-    {
-      echo "not found."
-      continue
-    }
-    # strip everything that's not a digit, then use cut to get the first field
-    pkg_version=`$COMMAND --version|head -n 1|sed 's/^[^0-9]*//'|cut -d' ' -f1`
-    debug "pkg_version $pkg_version"
-    # remove any non-digit characters from the version numbers to permit numeric
-    # comparison
-    pkg_major=`echo $pkg_version | cut -d. -f1 | sed s/[a-zA-Z\-].*//g`
-    pkg_minor=`echo $pkg_version | cut -d. -f2 | sed s/[a-zA-Z\-].*//g`
-    pkg_micro=`echo $pkg_version | cut -d. -f3 | sed s/[a-zA-Z\-].*//g`
-    test -z "$pkg_major" && pkg_major=0
-    test -z "$pkg_minor" && pkg_minor=0
-    test -z "$pkg_micro" && pkg_micro=0
-    debug "found major $pkg_major minor $pkg_minor micro $pkg_micro"
-
-    #start checking the version
-    debug "version check"
-
-    # reset check
-    WRONG=
-
-    if [ ! "$pkg_major" -gt "$MAJOR" ]; then
-      debug "major: $pkg_major <= $MAJOR"
-      if [ "$pkg_major" -lt "$MAJOR" ]; then
-        debug "major: $pkg_major < $MAJOR"
-        WRONG=1
-      elif [ ! "$pkg_minor" -gt "$MINOR" ]; then
-        debug "minor: $pkg_minor <= $MINOR"
-        if [ "$pkg_minor" -lt "$MINOR" ]; then
-          debug "minor: $pkg_minor < $MINOR"
-          WRONG=1
-        elif [ "$pkg_micro" -lt "$MICRO" ]; then
-          debug "micro: $pkg_micro < $MICRO"
-	  WRONG=1
-        fi
-      fi
-    fi
-
-    if test ! -z "$WRONG"; then
-      echo "found $pkg_version, not ok !"
-      continue
-    else
-      echo "found $pkg_version, ok."
-      # we set a var with the same name as the package, but stripped of
-      # unwanted chars
-      VAR=`echo $PACKAGE | sed 's/-//g'`
-      debug "setting $VAR"
-      eval $VAR="$COMMAND"
-      return 0
-    fi
-  done
-
-  echo "not found !"
-  echo "You must have $PACKAGE installed to compile $package."
-  echo "Download the appropriate package for your distribution,"
-  echo "or get the source tarball at $URL"
-  return 1;
-}
-
-aclocal_check ()
-{
-  # normally aclocal is part of automake
-  # so we expect it to be in the same place as automake
-  # so if a different automake is supplied, we need to adapt as well
-  # so how's about replacing automake with aclocal in the set var,
-  # and saving that in $aclocal ?
-  # note, this will fail if the actual automake isn't called automake*
-  # or if part of the path before it contains it
-  if [ -z "$automake" ]; then
-    echo "Error: no automake variable set !"
-    return 1
-  else
-    aclocal=`echo $automake | sed s/automake/aclocal/`
-    debug "aclocal: $aclocal"
-    if [ "$aclocal" != "aclocal" ];
-    then
-      CONFIGURE_DEF_OPT="$CONFIGURE_DEF_OPT --with-aclocal=$aclocal"
-    fi
-    if [ ! -x `which $aclocal` ]; then
-      echo "Error: cannot execute $aclocal !"
-      return 1
-    fi
-  fi
-}
-
-autoheader_check ()
-{
-  # same here - autoheader is part of autoconf
-  # use the same voodoo
-  if [ -z "$autoconf" ]; then
-    echo "Error: no autoconf variable set !"
-    return 1
-  else
-    autoheader=`echo $autoconf | sed s/autoconf/autoheader/`
-    debug "autoheader: $autoheader"
-    if [ "$autoheader" != "autoheader" ];
-    then
-      CONFIGURE_DEF_OPT="$CONFIGURE_DEF_OPT --with-autoheader=$autoheader"
-    fi
-    if [ ! -x `which $autoheader` ]; then
-      echo "Error: cannot execute $autoheader !"
-      return 1
-    fi
-  fi
-
-}
-
-autoconf_2_52d_check ()
-{
-  # autoconf 2.52d has a weird issue involving a yes:no error
-  # so don't allow it's use
-  test -z "$NOCHECK" && {
-    ac_version=`$autoconf --version|head -n 1|sed 's/^[a-zA-Z\.\ ()]*//;s/ .*$//'`
-    if test "$ac_version" = "2.52d"; then
-      echo "autoconf 2.52d has an issue with our current build."
-      echo "We don't know who's to blame however.  So until we do, get a"
-      echo "regular version.  RPM's of a working version are on the gstreamer site."
-      exit 1
-    fi
-  }
-  return 0
-}
-
-die_check ()
-{
-  # call with $DIE
-  # if set to 1, we need to print something helpful then die
-  DIE=$1
-  if test "x$DIE" = "x1";
-  then
-    echo
-    echo "- Please get the right tools before proceeding."
-    echo "- Alternatively, if you're sure we're wrong, run with --nocheck."
-    exit 1
-  fi
-}
-
-autogen_options ()
-{
-  if test "x$1" = "x"; then
-    return 0
-  fi
-
-  while test "x$1" != "x" ; do
-    optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    case "$1" in
-      --noconfigure)
-          NOCONFIGURE=defined
-	  AUTOGEN_EXT_OPT="$AUTOGEN_EXT_OPT --noconfigure"
-          echo "+ configure run disabled"
-          shift
-          ;;
-      --nocheck)
-	  AUTOGEN_EXT_OPT="$AUTOGEN_EXT_OPT --nocheck"
-          NOCHECK=defined
-          echo "+ autotools version check disabled"
-          shift
-          ;;
-      --debug)
-          DEBUG=defined
-	  AUTOGEN_EXT_OPT="$AUTOGEN_EXT_OPT --debug"
-          echo "+ debug output enabled"
-          shift
-          ;;
-      --prefix=*)
-	  CONFIGURE_EXT_OPT="$CONFIGURE_EXT_OPT --prefix=$optarg"
-	  echo "+ passing --prefix=$optarg to configure"
-          shift
-          ;;
-      --prefix)
-	  shift
-	  echo "DEBUG: $1"
-	  CONFIGURE_EXT_OPT="$CONFIGURE_EXT_OPT --prefix=$1"
-	  echo "+ passing --prefix=$1 to configure"
-          shift
-          ;;
-      -h|--help)
-          echo "autogen.sh (autogen options) -- (configure options)"
-          echo "autogen.sh help options: "
-          echo " --noconfigure            don't run the configure script"
-          echo " --nocheck                don't do version checks"
-          echo " --debug                  debug the autogen process"
-	  echo " --prefix		  will be passed on to configure"
-          echo
-          echo " --with-autoconf PATH     use autoconf in PATH"
-          echo " --with-automake PATH     use automake in PATH"
-          echo
-          echo "to pass options to configure, put them as arguments after -- "
-	  exit 1
-          ;;
-      --with-automake=*)
-          AUTOMAKE=$optarg
-          echo "+ using alternate automake in $optarg"
-	  CONFIGURE_DEF_OPT="$CONFIGURE_DEF_OPT --with-automake=$AUTOMAKE"
-          shift
-          ;;
-      --with-autoconf=*)
-          AUTOCONF=$optarg
-          echo "+ using alternate autoconf in $optarg"
-	  CONFIGURE_DEF_OPT="$CONFIGURE_DEF_OPT --with-autoconf=$AUTOCONF"
-          shift
-          ;;
-      --disable*|--enable*|--with*)
-          echo "+ passing option $1 to configure"
-	  CONFIGURE_EXT_OPT="$CONFIGURE_EXT_OPT $1"
-          shift
-          ;;
-       --) shift ; break ;;
-      *) echo "- ignoring unknown autogen.sh argument $1"; shift ;;
-    esac
-  done
-
-  for arg do CONFIGURE_EXT_OPT="$CONFIGURE_EXT_OPT $arg"; done
-  if test ! -z "$CONFIGURE_EXT_OPT"
-  then
-    echo "+ options passed to configure: $CONFIGURE_EXT_OPT"
-  fi
-}
-
-toplevel_check ()
-{
-  srcfile=$1
-  test -f $srcfile || {
-        echo "You must run this script in the top-level $package directory"
-        exit 1
-  }
-}
-
-
-tool_run ()
-{
-  tool=$1
-  options=$2
-  run_if_fail=$3
-  echo "+ running $tool $options..."
-  $tool $options || {
-    echo
-    echo $tool failed
-    eval $run_if_fail
-    exit 1
-  }
-}
diff -r bc9827e02466 -r 1bf45de64bd5 libgnomevfs2-mythtv/configure.ac
--- a/libgnomevfs2-mythtv/configure.ac	Wed May 02 21:38:04 2007 +0100
+++ b/libgnomevfs2-mythtv/configure.ac	Wed May 02 22:17:03 2007 +0100
@@ -1,4 +1,16 @@
-AC_INIT(libgnomevfs2-mythtv, 0.1)
+dnl fill in your package name and version here
+dnl autoconf configuration files for gst-plugins-dspbin
+AC_INIT
+AC_CANONICAL_TARGET
+
+AC_CONFIG_MACRO_DIR([m4])
+dnl We disable static building for development, for time savings
+dnl this goes before AS_LIBTOOL to appease autoconf
+dnl *NOTE*: dnl this line before release, so release does static too
+AM_DISABLE_STATIC
+
+dnl AM_MAINTAINER_MODE only provides the option to configure to enable it
+AM_MAINTAINER_MODE
 
 dnl when going to/from release please set the nano (fourth number) right !
 dnl releases only do Wall, cvs and prerelease does Werror too
@@ -6,48 +18,45 @@
 
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
 
+AM_PROG_LIBTOOL
+
 AM_CONFIG_HEADER(config.h)
 
-AM_DISABLE_STATIC
-
-dnl AM_MAINTAINER_MODE provides the option to enable maintainer mode
-AM_MAINTAINER_MODE
 dnl make aclocal work in maintainer mode
 AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
 
 dnl check for tools
-dnl Make sure CFLAGS is defined to stop AC_PROC_CC adding -g
-CFLAGS="$CFLAGS "
 AC_PROG_CC
-AC_PROG_CPP
-AM_PROG_CC_STDC
-AC_HEADER_STDC
-AC_PROG_LIBTOOL
-
-dnl Test if --enable-debug given
-AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug],[enable debugging mode])])
-if test "x$enable_debug" = "xyes" ; then
-      CFLAGS="$CFLAGS -g"
-fi          
-
-dnl optimisation flag
-CFLAGS="$CFLAGS -O2"
+AC_PROG_CC_STDC
+AM_PROG_AS
 
 dnl decide on error flags
-AS_COMPILER_FLAG(-Wall, LIBGNOMEVFS2_MYTHTV_WALL="yes", LIBGNOMEVFS2_MYTHTV_WALL="no")
+AS_COMPILER_FLAG(-Wall, GST_WALL="yes", GST_WALL="no")
 
-if test "x$LIBGNOMEVFS2_MYTHTV_WALL" = "xyes"; then
-    CFLAGS="$CFLAGS -Wall"
+if test "x$GST_WALL" = "xyes"; then
+  ERROR_CFLAGS="$GST_ERROR -Wall"
 
-    if test "x$LIBGNOMEVFS2_MYTHTV_CVS" = "xyes"; then
-       AS_COMPILER_FLAG(-Werror,CFLAGS="$CFLAGS -Werror",)
-    fi
+  if test "x$GST_CVS" = "xyes"; then
+    AS_COMPILER_FLAG(-Werror,ERROR_CFLAGS="$ERROR_CFLAGS -Werror",ERROR_CFLAGS="$ERROR_CFLAGS")
+  fi
 fi
-                  
-dnl Now check required packages
 
-dnl Check for pkgconfig
+AC_SUBST(ERROR_CFLAGS)
+
+dnl determine c++ compiler
+AC_PROG_CXX
+dnl determine if c++ is available on this system
+AC_CHECK_PROG(HAVE_CXX, $CXX, yes, no)
+dnl determine c++ preprocessor
+AC_PROG_CXXCPP
+AC_ISC_POSIX
+
+AC_HEADER_STDC([])
+AC_C_INLINE
+
+dnl Check for pkgconfig first
 AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
+
 dnl Give error and exit if we don't have pkgconfig
 if test "x$HAVE_PKGCONFIG" = "xno"; then
   AC_MSG_ERROR(you need to have pkgconfig installed !)
@@ -81,6 +90,7 @@
 AC_SUBST(GOBJECT_CFLAGS)
 AC_SUBST(GOBJECT_LIBS)
 
+
 GNOME_VFS_REQS=2.7.4
 PKG_CHECK_MODULES(GNOME_VFS, 
   gnome-vfs-2.0 >= $GNOME_VFS_REQS gnome-vfs-module-2.0 >= $GNOME_VFS_REQS,
@@ -94,23 +104,17 @@
 AC_SUBST(GNOME_VFS_CFLAGS)
 AC_SUBST(GNOME_VFS_LIBS)
 
-dnl Check for gmyth
-GMYTH_REQS=0.2
-PKG_CHECK_MODULES(LIBGMYTH,
-  gmyth >= $GMYTH_REQS,
-  have_libgmyth=yes,
-  have_libgmyth=no)
 
-if test x"$have_libgmyth" = "xno"; then
-  AC_MSG_ERROR(gmyth-0.1 not found)        
+PKG_CHECK_MODULES(LIBGMYTH, gmyth >= 0.3, HAVE_LIBGMYTH=yes,HAVE_LIBGMYTH=no)
+if test "x$HAVE_LIBGMYTH" = "xno"; then
+  AC_MSG_ERROR(you need gmyth >= 0.3 installed)
 fi
-
 AC_SUBST(LIBGMYTH_CFLAGS)
 AC_SUBST(LIBGMYTH_LIBS)
 
-AC_OUTPUT([
-Makefile
-modules/Makefile
-common/Makefile
-m4/Makefile
-])
+
+AC_OUTPUT( \
+    Makefile \
+    modules/Makefile
+)
+
diff -r bc9827e02466 -r 1bf45de64bd5 libgnomevfs2-mythtv/m4/Makefile.am
--- a/libgnomevfs2-mythtv/m4/Makefile.am	Wed May 02 21:38:04 2007 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-EXTRA_DIST = 			\
-	as-compiler-flag.m4 \
-	as-expand.m4 		\
-	as-version.m4
diff -r bc9827e02466 -r 1bf45de64bd5 libgnomevfs2-mythtv/m4/as-compiler-flag.m4
--- a/libgnomevfs2-mythtv/m4/as-compiler-flag.m4	Wed May 02 21:38:04 2007 +0100
+++ b/libgnomevfs2-mythtv/m4/as-compiler-flag.m4	Wed May 02 22:17:03 2007 +0100
@@ -4,7 +4,7 @@
 
 dnl David Schleef <ds@schleef.org>
 
-dnl $Id: as-compiler-flag.m4,v 1.1.1.1 2005/08/26 00:42:44 andrunko Exp $
+dnl $Id: as-compiler-flag.m4,v 1.1 2005/06/18 18:02:46 burgerman Exp $
 
 dnl AS_COMPILER_FLAG(CFLAGS, ACTION-IF-ACCEPTED, [ACTION-IF-NOT-ACCEPTED])
 dnl Tries to compile with the given CFLAGS.
@@ -30,4 +30,3 @@
   fi
   AC_MSG_RESULT([$flag_ok])
 ])
-
diff -r bc9827e02466 -r 1bf45de64bd5 libgnomevfs2-mythtv/m4/as-version.m4
--- a/libgnomevfs2-mythtv/m4/as-version.m4	Wed May 02 21:38:04 2007 +0100
+++ b/libgnomevfs2-mythtv/m4/as-version.m4	Wed May 02 22:17:03 2007 +0100
@@ -1,12 +1,18 @@
-dnl version.m4 0.0.5
+dnl as-version.m4 0.1.0
+
 dnl autostars m4 macro for versioning
-dnl thomas@apestaart.org
-dnl
-dnl AS_VERSION(PACKAGE, PREFIX, MAJOR, MINOR, MICRO, NANO, ACTION_IF_NO_NANO, ACTION_IF_NANO)
+
+dnl Thomas Vander Stichele <thomas at apestaart dot org>
+
+dnl $Id: as-version.m4,v 1.1 2005/06/18 18:02:46 burgerman Exp $
+
+dnl AS_VERSION(PACKAGE, PREFIX, MAJOR, MINOR, MICRO, NANO,
+dnl            ACTION-IF-NO-NANO, [ACTION-IF-NANO])
+
 dnl example
 dnl AS_VERSION(gstreamer, GST_VERSION, 0, 3, 2,)
 dnl for a 0.3.2 release version
-dnl
+
 dnl this macro
 dnl - defines [$PREFIX]_MAJOR, MINOR and MICRO
 dnl - if NANO is empty, then we're in release mode, else in cvs/dev mode
@@ -18,15 +24,16 @@
 dnl   maintainer mode from running ok
 dnl
 dnl don't forget to put #undef [$2] and [$2]_RELEASE in acconfig.h
+dnl if you use acconfig.h
 
 AC_DEFUN([AS_VERSION],
 [
   PACKAGE=[$1]
-  [$2]_MAJOR_VERSION=[$3]
-  [$2]_MINOR_VERSION=[$4]
-  [$2]_MICRO_VERSION=[$5]
+  [$2]_MAJOR=[$3]
+  [$2]_MINOR=[$4]
+  [$2]_MICRO=[$5]
   NANO=[$6]
-  [$2]_NANO_VERSION=$NANO
+  [$2]_NANO=$NANO
   if test "x$NANO" = "x" || test "x$NANO" = "x0";
   then
       AC_MSG_NOTICE(configuring [$1] for release)
@@ -37,23 +44,24 @@
   else
       AC_MSG_NOTICE(configuring [$1] for development with nano $NANO)
       VERSION=[$3].[$4].[$5].$NANO
-      [$2]_RELEASE=`date +%Y%m%d_%H%M%S`
+      [$2]_RELEASE=0.`date +%Y%m%d.%H%M%S`
       dnl execute action
       ifelse([$8], , :, [$8])
   fi
 
-  [$2]_VERSION=$VERSION
-  AC_DEFINE_UNQUOTED([$2]_VERSION, "$[$2]_VERSION", [Define the version])
-  AC_SUBST([$2]_VERSION)
-  
+  [$2]=$VERSION
+  AC_DEFINE_UNQUOTED([$2], "$[$2]", [Define the version])
+  AC_SUBST([$2])
+  AC_DEFINE_UNQUOTED([$2]_RELEASE, "$[$2]_RELEASE", [Define the release version])
   AC_SUBST([$2]_RELEASE)
 
-  AC_SUBST([$2]_MAJOR_VERSION)
-  AC_SUBST([$2]_MINOR_VERSION)
-  AC_SUBST([$2]_MICRO_VERSION)
-  AC_SUBST([$2]_NANO_VERSION)
+  AC_SUBST([$2]_MAJOR)
+  AC_SUBST([$2]_MINOR)
+  AC_SUBST([$2]_MICRO)
+  AC_SUBST([$2]_NANO)
   AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Define the package name])
   AC_SUBST(PACKAGE)
   AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Define the version])
   AC_SUBST(VERSION)
 ])
+