callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use AC_EGREP_CPP rather than AC_CHECK_HEADER. AC_CHECK_HEADER is fooled by

Browse Source 
* 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
This commit is contained in:
Raja R Harinath
1998-06-11 22:06:06 +00:00
parent a1fe3ac8ff
commit 2ab162417f
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
macros/ChangeLog
View File

@ -1,12 +1,15 @@
1998-06-11 Raja R Harinath <harinath@cs.umn.edu> 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. * gnome-support.m4 (AC_PROG_AWK): Look for awk.
(CROSS_COMPILING): Remove conditional. (CROSS_COMPILING): Remove conditional.
Wed Jun 10 14:19:39 EDT 1998 Gregory McLean <gregm@comstar.net> 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 * gnome-x-checks.m4: More tweeks to make building against gtk 1.0
gtk1.1 less painful. and gtk1.1 less painful.
1998-06-08 Martin Baulig <martin@home-of-linux.org> 1998-06-08 Martin Baulig <martin@home-of-linux.org>

14
macros/gnome-x-checks.m4
View File

@ -34,6 +34,18 @@ AC_DEFUN([GNOME_X_CHECKS],
LDFLAGS="$saved_ldflags $GTK_LIBS" 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 GNOME_HAVE_SM=true
case "$GTK_LIBS" in case "$GTK_LIBS" in
*-lSM*) *-lSM*)
@ -47,8 +59,6 @@ AC_DEFUN([GNOME_X_CHECKS],
;; ;;
esac esac
AC_CHECK_HEADER(gtk/gtkaccelgroup.h, USE_DEVGTK=true)
if test "$GNOME_HAVE_SM" = true; then if test "$GNOME_HAVE_SM" = true; then
AC_CHECK_HEADERS(X11/SM/SMlib.h,,GNOME_HAVE_SM=false) AC_CHECK_HEADERS(X11/SM/SMlib.h,,GNOME_HAVE_SM=false)
fi fi