[rygel: 3/3] Merge commit 'origin/git-version'

[Zeeshan Ali Khattak <zeeshanak src gnome org>]

commit 8294883a5ecf6f6c7748c44acec64d95c8896ab8
Merge: c258936... 6de63b7...
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Tue May 5 00:03:48 2009 +0300

    Merge commit 'origin/git-version'

 Makefile.am               |    9 +++
 autogen.sh                |    1 +
 build-aux/git-version-gen |  154 +++++++++++++++++++++++++++++++++++++++++++++
 configure.ac              |   24 ++++++-
 4 files changed, 184 insertions(+), 4 deletions(-)

diff --cc Makefile.am
index fddc3e7,5d7e7a7..99334bd
--- a/Makefile.am
+++ b/Makefile.am
@@@ -1,11 -1,13 +1,20 @@@
  SUBDIRS = src data
  
 +pkgconfig_DATA= rygel-1.0.pc
 +pkgconfigdir = $(libdir)/pkgconfig
 +
 +EXTRA_DIST = rygel-1.0.pc.in
 +
 +DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 +
  # Extra clean files so that maintainer-clean removes *everything*
  MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing config.h.in
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
+ # see build-aux/git-version-get for details
+ BUILT_SOURCES = $(top_srcdir)/.version
+ $(top_srcdir)/.version:
+ 	echo $(VERSION) > $ -t && mv $ -t $@
+ dist-hook:
+ 	echo $(VERSION) > $(distdir)/.tarball-version
diff --cc configure.ac
index ee30b82,5244bed..a0e6c9d
--- a/configure.ac
+++ b/configure.ac
@@@ -206,5 -153,16 +210,17 @@@ src/plugins/tracker/Makefil
  src/plugins/test/Makefile
  data/Makefile
  data/xml/Makefile
 +rygel-1.0.pc
  ])
+ 
+ echo "
+ 
+                     ${PACKAGE} ${VERSION}
+                     ============
+ 
+ 
+ 	Prefix:                 ${prefix}
+         Source code location:   ${srcdir}
+         Compiler:               ${CC}
+         CFLAGS:                 ${CFLAGS}
+ "