version 2.1.4, interface age 1.

Wed Dec 11 14:04:23 2002  Owen Taylor  <otaylor@redhat.com>

        * configure.in: version 2.1.4, interface age 1.

        * configure.in: Require GLib-2.1.4, so we will catch
        the need for the new AM_GLIB_DEFINE_LOCALEDIR() in
        an obvious way.

        * configure.in gtk/Makefile.am: Use AM_GLIB_DEFINE_LOCALEDIR()

diff --git a/ChangeLog b/ChangeLog
index 2f4a8218fea7897095ffd6ac53c03cf251b51217..240a2dd694a4ee2edb78e3f0134b046841cbc850 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Wed Dec 11 14:04:23 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in: version 2.1.4, interface age 1.
+       
+       * configure.in: Require GLib-2.1.4, so we will catch
+       the need for the new AM_GLIB_DEFINE_LOCALEDIR() in
+       an obvious way.
+
+       * configure.in gtk/Makefile.am: Use AM_GLIB_DEFINE_LOCALEDIR()
+
 Tue Dec 10 15:46:01 PST 2002  Manish Singh  <yosh@gimp.org>
 
        * gdk/x11/gdkwindow-x11.c (set_initial_hints): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2f4a8218fea7897095ffd6ac53c03cf251b51217..240a2dd694a4ee2edb78e3f0134b046841cbc850 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+Wed Dec 11 14:04:23 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in: version 2.1.4, interface age 1.
+       
+       * configure.in: Require GLib-2.1.4, so we will catch
+       the need for the new AM_GLIB_DEFINE_LOCALEDIR() in
+       an obvious way.
+
+       * configure.in gtk/Makefile.am: Use AM_GLIB_DEFINE_LOCALEDIR()
+
 Tue Dec 10 15:46:01 PST 2002  Manish Singh  <yosh@gimp.org>
 
        * gdk/x11/gdkwindow-x11.c (set_initial_hints): 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 2f4a8218fea7897095ffd6ac53c03cf251b51217..240a2dd694a4ee2edb78e3f0134b046841cbc850 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,13 @@
+Wed Dec 11 14:04:23 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in: version 2.1.4, interface age 1.
+       
+       * configure.in: Require GLib-2.1.4, so we will catch
+       the need for the new AM_GLIB_DEFINE_LOCALEDIR() in
+       an obvious way.
+
+       * configure.in gtk/Makefile.am: Use AM_GLIB_DEFINE_LOCALEDIR()
+
 Tue Dec 10 15:46:01 PST 2002  Manish Singh  <yosh@gimp.org>
 
        * gdk/x11/gdkwindow-x11.c (set_initial_hints): 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 2f4a8218fea7897095ffd6ac53c03cf251b51217..240a2dd694a4ee2edb78e3f0134b046841cbc850 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,13 @@
+Wed Dec 11 14:04:23 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in: version 2.1.4, interface age 1.
+       
+       * configure.in: Require GLib-2.1.4, so we will catch
+       the need for the new AM_GLIB_DEFINE_LOCALEDIR() in
+       an obvious way.
+
+       * configure.in gtk/Makefile.am: Use AM_GLIB_DEFINE_LOCALEDIR()
+
 Tue Dec 10 15:46:01 PST 2002  Manish Singh  <yosh@gimp.org>
 
        * gdk/x11/gdkwindow-x11.c (set_initial_hints): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2f4a8218fea7897095ffd6ac53c03cf251b51217..240a2dd694a4ee2edb78e3f0134b046841cbc850 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+Wed Dec 11 14:04:23 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in: version 2.1.4, interface age 1.
+       
+       * configure.in: Require GLib-2.1.4, so we will catch
+       the need for the new AM_GLIB_DEFINE_LOCALEDIR() in
+       an obvious way.
+
+       * configure.in gtk/Makefile.am: Use AM_GLIB_DEFINE_LOCALEDIR()
+
 Tue Dec 10 15:46:01 PST 2002  Manish Singh  <yosh@gimp.org>
 
        * gdk/x11/gdkwindow-x11.c (set_initial_hints): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2f4a8218fea7897095ffd6ac53c03cf251b51217..240a2dd694a4ee2edb78e3f0134b046841cbc850 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+Wed Dec 11 14:04:23 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in: version 2.1.4, interface age 1.
+       
+       * configure.in: Require GLib-2.1.4, so we will catch
+       the need for the new AM_GLIB_DEFINE_LOCALEDIR() in
+       an obvious way.
+
+       * configure.in gtk/Makefile.am: Use AM_GLIB_DEFINE_LOCALEDIR()
+
 Tue Dec 10 15:46:01 PST 2002  Manish Singh  <yosh@gimp.org>
 
        * gdk/x11/gdkwindow-x11.c (set_initial_hints): 

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index c4cc593d9eb34a34deb46302d89289536d8ade01..d5521d2004f105c4ff19c468e9dbe423d4e9bb6b 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -7,7 +7,6 @@ INCLUDES = @STRIP_BEGIN@ \
        -DGTK_LIBDIR=\"$(libdir)\"                      \
        -DGTK_DATA_PREFIX=\"$(prefix)\"                 \
        -DGTK_SYSCONFDIR=\"$(sysconfdir)\"              \
-       -DGTK_LOCALEDIR=\"$(gtklocaledir)\"             \
        -DGTK_VERSION=\"@GTK_VERSION@\"                 \
        -DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\"   \
        -DGTK_HOST=\"@host@\"                           \