gnomemm r1378 - libgdamm/trunk

[murrayc svn gnome org]

Author: murrayc
Date: Sat Mar  1 19:23:10 2008
New Revision: 1378
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1378&view=rev

Log:
2.9.82:

2008-03-01  Murray Cumming  <murrayc murrayc com>

* configure.in: Use tar-ustar with AM_INIT_AUTOMAKE() so we can 
dist the long filenames generated by doxygen. This is based on what 
we do in gtkmm.


Modified:
   libgdamm/trunk/ChangeLog
   libgdamm/trunk/NEWS
   libgdamm/trunk/configure.in

Modified: libgdamm/trunk/NEWS
==============================================================================
--- libgdamm/trunk/NEWS	(original)
+++ libgdamm/trunk/NEWS	Sat Mar  1 19:23:10 2008
@@ -1,3 +1,10 @@
+2.9.82:
+
+* .so name change to please Ubuntu.
+  (Stefan Potyra. Launchpad bug 190744.)
+* Windows build fixes.
+  (Armin Burgmeier)
+
 2.9.81
 
 * DataModel: describe_column(): Use refreturn to avoid 

Modified: libgdamm/trunk/configure.in
==============================================================================
--- libgdamm/trunk/configure.in	(original)
+++ libgdamm/trunk/configure.in	Sat Mar  1 19:23:10 2008
@@ -10,14 +10,20 @@
 #  Copyright 1999 gtkmm Development Team
 #  Copyright 1998 Stephan Kulow 
 #
-AC_INIT(libgda/libgdammconfig.h.in)
 
 #########################################################################
 #  Version and initialization
 #########################################################################
-LIBGDAMM_MAJOR_VERSION=2
-LIBGDAMM_MINOR_VERSION=9
-LIBGDAMM_MICRO_VERSION=82
+#We use pushdef here because we can't use shell variables before AC_INIT, but we want to use a variable with AC_INIT:
+pushdef([LIBGDAMM_MAJOR_VERSION],     [2])
+pushdef([LIBGDAMM_MINOR_VERSION],     [9])
+pushdef([LIBGDAMM_MICRO_VERSION],     [82])
+pushdef([LIBGDAMM_EXTRA_VERSION],     [])
+pushdef([LIBGDAMM_VERSION], LIBGDAMM_MAJOR_VERSION.LIBGDAMM_MINOR_VERSION.LIBGDAMM_MICRO_VERSION[]LIBGDAMM_EXTRA_VERSION)
+AC_INIT([libgdamm], LIBGDAMM_VERSION, [gtkmm-list gnome org])
+AC_CONFIG_SRCDIR([libgda/libgdammconfig.h.in])
+#AC_PREREQ(2.59)
+
 
 #
 # +1 : ? : +1  == new interface that does not break old one
@@ -28,12 +34,6 @@
 # CURRENT : REVISION : AGE
 LIBGDAMM_SO_VERSION=9:0:0
 
-LIBGDAMM_VERSION=$LIBGDAMM_MAJOR_VERSION.$LIBGDAMM_MINOR_VERSION.$LIBGDAMM_MICRO_VERSION
-LIBGDAMM_RELEASE=$LIBGDAMM_MAJOR_VERSION.$LIBGDAMM_MINOR_VERSION
-AC_DEFINE_UNQUOTED(LIBGDAMM_MAJOR_VERSION, $LIBGDAMM_MAJOR_VERSION)
-AC_DEFINE_UNQUOTED(LIBGDAMM_MINOR_VERSION, $LIBGDAMM_MINOR_VERSION)
-AC_DEFINE_UNQUOTED(LIBGDAMM_MICRO_VERSION, $LIBGDAMM_MICRO_VERSION)
-AC_DEFINE_UNQUOTED(LIBGDAMM_VERSION, "$LIBGDAMM_VERSION")
 AC_SUBST(LIBGDAMM_VERSION)
 AC_SUBST(LIBGDAMM_RELEASE)
 AC_SUBST(LIBGDAMM_SO_VERSION)
@@ -45,7 +45,9 @@
 PACKAGE=libgdamm
 
 dnl Initialize automake stuff
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+# Initialize automake stuff
+# tar-ustar asks it to use a sensible tar format that can handle long filenames.
+AM_INIT_AUTOMAKE([1.9 tar-ustar])
 
 dnl Specify a configuration file (no autoheader)
 AM_CONFIG_HEADER(libgda/libgdammconfig.h)