configure.in: require GLib 1.1.5

diff --git a/ChangeLog b/ChangeLog
index 0538dab3c6f96d6fc121446401db1375be3dcd4c..7e0001b44b80a1384c5c4cd9c8e84272c50bc515 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Nov 22 14:34:58 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * Released GTK+ 1.1.5
+
+       * configure.in: require GLib 1.1.5
+
 Mon Nov 23 03:21:17 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktext.c (gtk_text_destroy): disconnect hadj & vadj, not
@@ -14,8 +20,6 @@ Sat Nov 21 18:41:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
          gtk+.spec:
          docs/gtk-config.1: Version incremented to 1.1.5
 
-       * Released GTK+ 1.1.5
-
 Sun Nov 22 16:21:28 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkprogress.c: added args ::show_text, ::text_xalign,

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 0538dab3c6f96d6fc121446401db1375be3dcd4c..7e0001b44b80a1384c5c4cd9c8e84272c50bc515 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Sun Nov 22 14:34:58 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * Released GTK+ 1.1.5
+
+       * configure.in: require GLib 1.1.5
+
 Mon Nov 23 03:21:17 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktext.c (gtk_text_destroy): disconnect hadj & vadj, not
@@ -14,8 +20,6 @@ Sat Nov 21 18:41:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
          gtk+.spec:
          docs/gtk-config.1: Version incremented to 1.1.5
 
-       * Released GTK+ 1.1.5
-
 Sun Nov 22 16:21:28 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkprogress.c: added args ::show_text, ::text_xalign,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0538dab3c6f96d6fc121446401db1375be3dcd4c..7e0001b44b80a1384c5c4cd9c8e84272c50bc515 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sun Nov 22 14:34:58 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * Released GTK+ 1.1.5
+
+       * configure.in: require GLib 1.1.5
+
 Mon Nov 23 03:21:17 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktext.c (gtk_text_destroy): disconnect hadj & vadj, not
@@ -14,8 +20,6 @@ Sat Nov 21 18:41:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
          gtk+.spec:
          docs/gtk-config.1: Version incremented to 1.1.5
 
-       * Released GTK+ 1.1.5
-
 Sun Nov 22 16:21:28 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkprogress.c: added args ::show_text, ::text_xalign,

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0538dab3c6f96d6fc121446401db1375be3dcd4c..7e0001b44b80a1384c5c4cd9c8e84272c50bc515 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Sun Nov 22 14:34:58 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * Released GTK+ 1.1.5
+
+       * configure.in: require GLib 1.1.5
+
 Mon Nov 23 03:21:17 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktext.c (gtk_text_destroy): disconnect hadj & vadj, not
@@ -14,8 +20,6 @@ Sat Nov 21 18:41:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
          gtk+.spec:
          docs/gtk-config.1: Version incremented to 1.1.5
 
-       * Released GTK+ 1.1.5
-
 Sun Nov 22 16:21:28 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkprogress.c: added args ::show_text, ::text_xalign,

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0538dab3c6f96d6fc121446401db1375be3dcd4c..7e0001b44b80a1384c5c4cd9c8e84272c50bc515 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Sun Nov 22 14:34:58 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * Released GTK+ 1.1.5
+
+       * configure.in: require GLib 1.1.5
+
 Mon Nov 23 03:21:17 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktext.c (gtk_text_destroy): disconnect hadj & vadj, not
@@ -14,8 +20,6 @@ Sat Nov 21 18:41:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
          gtk+.spec:
          docs/gtk-config.1: Version incremented to 1.1.5
 
-       * Released GTK+ 1.1.5
-
 Sun Nov 22 16:21:28 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkprogress.c: added args ::show_text, ::text_xalign,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0538dab3c6f96d6fc121446401db1375be3dcd4c..7e0001b44b80a1384c5c4cd9c8e84272c50bc515 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sun Nov 22 14:34:58 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * Released GTK+ 1.1.5
+
+       * configure.in: require GLib 1.1.5
+
 Mon Nov 23 03:21:17 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktext.c (gtk_text_destroy): disconnect hadj & vadj, not
@@ -14,8 +20,6 @@ Sat Nov 21 18:41:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
          gtk+.spec:
          docs/gtk-config.1: Version incremented to 1.1.5
 
-       * Released GTK+ 1.1.5
-
 Sun Nov 22 16:21:28 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkprogress.c: added args ::show_text, ::text_xalign,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0538dab3c6f96d6fc121446401db1375be3dcd4c..7e0001b44b80a1384c5c4cd9c8e84272c50bc515 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sun Nov 22 14:34:58 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * Released GTK+ 1.1.5
+
+       * configure.in: require GLib 1.1.5
+
 Mon Nov 23 03:21:17 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktext.c (gtk_text_destroy): disconnect hadj & vadj, not
@@ -14,8 +20,6 @@ Sat Nov 21 18:41:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
          gtk+.spec:
          docs/gtk-config.1: Version incremented to 1.1.5
 
-       * Released GTK+ 1.1.5
-
 Sun Nov 22 16:21:28 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkprogress.c: added args ::show_text, ::text_xalign,

diff --git a/configure.in b/configure.in
index 54bf99cee5bd735eed96f3420d1ffa57b27bc587..18b6e73339aa33a40aa56647eb8da50fda6b73ee 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -175,9 +175,9 @@ fi
 if test x$with_glib = x ; then 
   # Look for separately installed glib
 
-  AM_PATH_GLIB(1.1.4,,
+  AM_PATH_GLIB(1.1.5,,
     AC_MSG_ERROR([
-*** GLIB 1.1.4 or better is required. The latest version of GLIB
+*** GLIB 1.1.5 or better is required. The latest version of GLIB
 *** is always available from ftp://ftp.gtk.org.]),
     gmodule)
 

diff --git a/sanity_check b/sanity_check
index 20b7f048f42324e13b442ab865b87e4187aac8f8..fabecb41a5d82a9162f61614afec21f9694c061c 100755 (executable)
--- a/sanity_check
+++ b/sanity_check
@@ -40,6 +40,14 @@ else
        exit 1
 fi
 
+echo -n "configure.in..."
+if [ "x`grep $VERSION gtk+-$VERSION/configure.in | wc -l | awk -F' ' '{print $1}'`" == "x2" ]; then 
+       echo "ok" 
+else
+       echo "failed."
+       exit 1
+fi
+
 
 echo ""
 echo "Number of lines in created documentation files:"