diff options
| author | Raja R Harinath <harinath@src.gnome.org> | 1998-06-11 22:06:06 +0000 |
|---|---|---|
| committer | Raja R Harinath <harinath@src.gnome.org> | 1998-06-11 22:06:06 +0000 |
| commit | 80baf29e12687c5e3637c6d69c19a7174cb950ce (patch) | |
| tree | 571dd4ecae6658cc4f5ad251f1580d9f03f48019 /macros/gnome-x-checks.m4 | |
| parent | d7385edf56cb9cbfd943c33891b4b3902349f986 (diff) | |
| download | shared-mime-info-80baf29e12687c5e3637c6d69c19a7174cb950ce.tar.gz | |
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=252
Diffstat (limited to 'macros/gnome-x-checks.m4')
| -rw-r--r-- | macros/gnome-x-checks.m4 | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/macros/gnome-x-checks.m4 b/macros/gnome-x-checks.m4 index 6ce101d6..0124c8cc 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 |