Define version numbers for GDK_PIXBUF_*, as they get substituted into a

Wed Jun 21 23:04:17 2000  Owen Taylor  <otaylor@redhat.com>

	* configure.in (GDK_PIXBUF_MAJOR): Define version
	numbers for GDK_PIXBUF_*, as they get substituted
	into a header file. Need to consider versioning
	for gdk-pixbuf more carefully later.

diff --git a/ChangeLog b/ChangeLog
index bd1ae85702bfa0b975ccdef95f270750255778a2..996c752197b495753440c749b32e881a4fe62ba6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jun 21 23:04:17 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in (GDK_PIXBUF_MAJOR): Define version
+       numbers for GDK_PIXBUF_*, as they get substituted
+       into a header file. Need to consider versioning
+       for gdk-pixbuf more carefully later.
+
 2000-06-21  Raja R Harinath  <harinath@cs.umn.edu>
 
        Work with srcdir != builddir.   

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index bd1ae85702bfa0b975ccdef95f270750255778a2..996c752197b495753440c749b32e881a4fe62ba6 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Wed Jun 21 23:04:17 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in (GDK_PIXBUF_MAJOR): Define version
+       numbers for GDK_PIXBUF_*, as they get substituted
+       into a header file. Need to consider versioning
+       for gdk-pixbuf more carefully later.
+
 2000-06-21  Raja R Harinath  <harinath@cs.umn.edu>
 
        Work with srcdir != builddir.   

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bd1ae85702bfa0b975ccdef95f270750255778a2..996c752197b495753440c749b32e881a4fe62ba6 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Wed Jun 21 23:04:17 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in (GDK_PIXBUF_MAJOR): Define version
+       numbers for GDK_PIXBUF_*, as they get substituted
+       into a header file. Need to consider versioning
+       for gdk-pixbuf more carefully later.
+
 2000-06-21  Raja R Harinath  <harinath@cs.umn.edu>
 
        Work with srcdir != builddir.   

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index bd1ae85702bfa0b975ccdef95f270750255778a2..996c752197b495753440c749b32e881a4fe62ba6 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Wed Jun 21 23:04:17 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in (GDK_PIXBUF_MAJOR): Define version
+       numbers for GDK_PIXBUF_*, as they get substituted
+       into a header file. Need to consider versioning
+       for gdk-pixbuf more carefully later.
+
 2000-06-21  Raja R Harinath  <harinath@cs.umn.edu>
 
        Work with srcdir != builddir.   

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index bd1ae85702bfa0b975ccdef95f270750255778a2..996c752197b495753440c749b32e881a4fe62ba6 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Wed Jun 21 23:04:17 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in (GDK_PIXBUF_MAJOR): Define version
+       numbers for GDK_PIXBUF_*, as they get substituted
+       into a header file. Need to consider versioning
+       for gdk-pixbuf more carefully later.
+
 2000-06-21  Raja R Harinath  <harinath@cs.umn.edu>
 
        Work with srcdir != builddir.   

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index bd1ae85702bfa0b975ccdef95f270750255778a2..996c752197b495753440c749b32e881a4fe62ba6 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Wed Jun 21 23:04:17 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in (GDK_PIXBUF_MAJOR): Define version
+       numbers for GDK_PIXBUF_*, as they get substituted
+       into a header file. Need to consider versioning
+       for gdk-pixbuf more carefully later.
+
 2000-06-21  Raja R Harinath  <harinath@cs.umn.edu>
 
        Work with srcdir != builddir.   

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index bd1ae85702bfa0b975ccdef95f270750255778a2..996c752197b495753440c749b32e881a4fe62ba6 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Wed Jun 21 23:04:17 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in (GDK_PIXBUF_MAJOR): Define version
+       numbers for GDK_PIXBUF_*, as they get substituted
+       into a header file. Need to consider versioning
+       for gdk-pixbuf more carefully later.
+
 2000-06-21  Raja R Harinath  <harinath@cs.umn.edu>
 
        Work with srcdir != builddir.   

diff --git a/configure.in b/configure.in
index a7db57dccc2516af6177a9f85d250ac01b7a3493..401a115f85f3443b48a29dab5e92a118ff034423 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -53,6 +53,19 @@ AC_SUBST(LT_CURRENT)
 AC_SUBST(LT_REVISION)
 AC_SUBST(LT_AGE)
 
+#
+# gdk-pixbuf gets versioned separately, and for now, using standard
+# libtool versioning, not GTK+-style versioning
+#
+GDK_PIXBUF_MAJOR=0
+GDK_PIXBUF_MINOR=8
+GDK_PIXBUF_MICRO=0
+GDK_PIXBUF_VERSION="${GDK_PIXBUF_MAJOR}.${GDK_PIXBUF_MINOR}.${GDK_PIXBUF_MICRO}"
+AC_SUBST(GDK_PIXBUF_MAJOR)
+AC_SUBST(GDK_PIXBUF_MINOR)
+AC_SUBST(GDK_PIXBUF_MICRO)
+AC_SUBST(GDK_PIXBUF_VERSION)
+
 # For automake.
 VERSION=$GTK_VERSION
 PACKAGE=gtk+