aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStuart Parmenter <pavlov@innerx.net>1998-08-05 07:44:57 +0800
committerStuart Parmenter <pavlov@src.gnome.org>1998-08-05 07:44:57 +0800
commit473fe5d0fcc9f1b042b2fbfe574f75452ef3a647 (patch)
tree1bee423c325320a8cd81eebfe4edb8ffcacb7fd4
parent8aac6667d9f0604ba923896937c3d8f91c26d983 (diff)
downloadgsoc2013-evolution-473fe5d0fcc9f1b042b2fbfe574f75452ef3a647.tar
gsoc2013-evolution-473fe5d0fcc9f1b042b2fbfe574f75452ef3a647.tar.gz
gsoc2013-evolution-473fe5d0fcc9f1b042b2fbfe574f75452ef3a647.tar.bz2
gsoc2013-evolution-473fe5d0fcc9f1b042b2fbfe574f75452ef3a647.tar.lz
gsoc2013-evolution-473fe5d0fcc9f1b042b2fbfe574f75452ef3a647.tar.xz
gsoc2013-evolution-473fe5d0fcc9f1b042b2fbfe574f75452ef3a647.tar.zst
gsoc2013-evolution-473fe5d0fcc9f1b042b2fbfe574f75452ef3a647.zip
make it require GTK >= 1.1.1 dnl'd the dev_gtk since they will have to
1998-08-04 Stuart Parmenter <pavlov@innerx.net> * gnome-x-checks.m4: (AM_PATH_GTK) make it require GTK >= 1.1.1 dnl'd the dev_gtk since they will have to anyways. svn path=/trunk/; revision=298
-rw-r--r--macros/ChangeLog5
-rw-r--r--macros/gnome-x-checks.m426
2 files changed, 19 insertions, 12 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog
index f737deeaf4..4ba49339e7 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,3 +1,8 @@
+1998-08-04 Stuart Parmenter <pavlov@innerx.net>
+
+ * gnome-x-checks.m4: (AM_PATH_GTK) make it require GTK >= 1.1.1
+ dnl'd the dev_gtk since they will have to anyways.
+
1998-08-04 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gnome.m4: (GNOME_INIT_HOOK): Call $1 also, if `gnome-config' is
diff --git a/macros/gnome-x-checks.m4 b/macros/gnome-x-checks.m4
index 149d557030..eb1d157f1a 100644
--- a/macros/gnome-x-checks.m4
+++ b/macros/gnome-x-checks.m4
@@ -15,7 +15,7 @@ dnl gnome_cv_passdown_{x_libs,X_LIBS,X_CFLAGS}
dnl
AC_DEFUN([GNOME_X_CHECKS],
[
- AM_PATH_GTK(1.0.1,,AC_MSG_ERROR(GTK not installed, or gtk-config not in path))
+ AM_PATH_GTK(1.1.1,,AC_MSG_ERROR(GTK not installed, or gtk-config not in path))
dnl Hope that GTK_CFLAGS have only -I and -D. Otherwise, we could
dnl test -z "$x_includes" || CPPFLAGS="$CPPFLAGS -I$x_includes"
@@ -34,17 +34,19 @@ AC_DEFUN([GNOME_X_CHECKS],
LDFLAGS="$saved_ldflags $GTK_LIBS"
- AC_MSG_CHECKING([whether to use features from (unstable) GTK+ 1.1.x])
- AC_EGREP_CPP(answer_affirmatively,
- [#include <gtk/gtkfeatures.h>
- #ifdef GTK_HAVE_FEATURES_1_1_0
- answer_affirmatively
- #endif
- ], dev_gtk=yes, dev_gtk=no)
- if test "$dev_gtk" = "yes"; then
- USE_DEVGTK=true
- fi
- AC_MSG_RESULT("$dev_gtk")
+dnl We are requiring GTK >= 1.1.1, which means this will be fine anyhow.
+
+dnl AC_MSG_CHECKING([whether to use features from (unstable) GTK+ 1.1.x])
+dnl AC_EGREP_CPP(answer_affirmatively,
+dnl [#include <gtk/gtkfeatures.h>
+dnl #ifdef GTK_HAVE_FEATURES_1_1_0
+dnl answer_affirmatively
+dnl #endif
+dnl ], dev_gtk=yes, dev_gtk=no)
+dnl if test "$dev_gtk" = "yes"; then
+dnl USE_DEVGTK=true
+dnl fi
+dnl AC_MSG_RESULT("$dev_gtk")
GNOME_HAVE_SM=true
case "$GTK_LIBS" in