diff options
| -rw-r--r-- | macros/ChangeLog | 7 | ||||
| -rw-r--r-- | macros/gnome-x-checks.m4 | 14 |
2 files changed, 17 insertions, 4 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog index 707055b9c4..73a2c9a85f 100644 --- a/macros/ChangeLog +++ b/macros/ChangeLog @@ -1,12 +1,15 @@ 1998-06-11 Raja R Harinath <harinath@cs.umn.edu> + * gnome-x-checks.m4 (USE_DEVGTK): Use AC_EGREP_CPP rather than + AC_CHECK_HEADER. AC_CHECK_HEADER is fooled by warnings. + * gnome-support.m4 (AC_PROG_AWK): Look for awk. (CROSS_COMPILING): Remove conditional. Wed Jun 10 14:19:39 EDT 1998 Gregory McLean <gregm@comstar.net> - * gnome-x-checks.m4: more tweeks to make building against gtk 1.0 and - gtk1.1 less painful. + * gnome-x-checks.m4: More tweeks to make building against gtk 1.0 + and gtk1.1 less painful. 1998-06-08 Martin Baulig <martin@home-of-linux.org> 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 |