diff options
| -rw-r--r-- | macros/ChangeLog | 5 | ||||
| -rw-r--r-- | macros/gnome-x-checks.m4 | 13 |
2 files changed, 18 insertions, 0 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog index b76bbb0491..2d2db9ca2e 100644 --- a/macros/ChangeLog +++ b/macros/ChangeLog @@ -1,3 +1,8 @@ +1999-07-06 Tuomas J. Lukka <lukka@iki.fi> + + * gnome-x-checks.m4: forbid compiling with Gtk-1.3 for now. + gnome only works with 1.2 so far. + 1999-07-05 Raja R Harinath <harinath@cs.umn.edu> * gnome.m4: Make "extra library" message slightly easier to read. diff --git a/macros/gnome-x-checks.m4 b/macros/gnome-x-checks.m4 index 1e397ef8e3..df033d5a0c 100644 --- a/macros/gnome-x-checks.m4 +++ b/macros/gnome-x-checks.m4 @@ -33,6 +33,19 @@ AC_DEFUN([GNOME_X_CHECKS], LDFLAGS="$saved_ldflags $GTK_LIBS" +dnl Check that we *don't* get GTK 1.3.* yet + + AC_MSG_CHECKING([whether we have GTK > 1.2]) + AC_EGREP_CPP(answer_affirmatively, + [#include <gtk/gtk.h> + #if GTK_MINOR_VERSION > 2 + answer_affirmatively + #endif + ], [AC_MSG_ERROR([Aborting, the current versions + of gnome are not yet compatible with the unstable GTK 1.3 release. + Please use GTK 1.2.])]) + + dnl We are requiring GTK >= 1.1.1, which means this will be fine anyhow. USE_DEVGTK=true |