aboutsummaryrefslogtreecommitdiffstats
path: root/macros/gnome-x-checks.m4
diff options
context:
space:
mode:
authorRaja R Harinath <harinath@src.gnome.org>1998-06-12 06:06:06 +0800
committerRaja R Harinath <harinath@src.gnome.org>1998-06-12 06:06:06 +0800
commit2ab162417f029ac1ee8b3e9f25263bfc2a8ab725 (patch)
treec0a35eb7ac593e1fc1a02b1864476ea18f435f4e /macros/gnome-x-checks.m4
parenta1fe3ac8ff504bfc3c301b9a287ce19f93f9e337 (diff)
downloadgsoc2013-evolution-2ab162417f029ac1ee8b3e9f25263bfc2a8ab725.tar.gz
gsoc2013-evolution-2ab162417f029ac1ee8b3e9f25263bfc2a8ab725.tar.zst
gsoc2013-evolution-2ab162417f029ac1ee8b3e9f25263bfc2a8ab725.zip
Use AC_EGREP_CPP rather than AC_CHECK_HEADER. AC_CHECK_HEADER is fooled by
* gnome-x-checks.m4 (USE_DEVGTK): Use AC_EGREP_CPP rather than AC_CHECK_HEADER. AC_CHECK_HEADER is fooled by warnings. svn path=/trunk/; revision=260
Diffstat (limited to 'macros/gnome-x-checks.m4')
-rw-r--r--macros/gnome-x-checks.m414
1 files changed, 12 insertions, 2 deletions
diff --git a/macros/gnome-x-checks.m4 b/macros/gnome-x-checks.m4
index 6ce101d6d8..0124c8cc65 100644
--- a/macros/gnome-x-checks.m4
+++ b/macros/gnome-x-checks.m4
@@ -34,6 +34,18 @@ 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_ACCEL_GROUP
+ answer_affirmatively
+ #endif
+ ], dev_gtk=yes, dev_gtk=no)
+ if test "$dev_gtk" = "yes"; then
+ USE_DEVGTK=true
+ fi
+ AC_MSG_RESULT("$dev_gtk")
+
GNOME_HAVE_SM=true
case "$GTK_LIBS" in
*-lSM*)
@@ -47,8 +59,6 @@ AC_DEFUN([GNOME_X_CHECKS],
;;
esac
- AC_CHECK_HEADER(gtk/gtkaccelgroup.h, USE_DEVGTK=true)
-
if test "$GNOME_HAVE_SM" = true; then
AC_CHECK_HEADERS(X11/SM/SMlib.h,,GNOME_HAVE_SM=false)
fi