dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure.ac: Replace deprecated AC_TRY_COMPILE macro

This commit is contained in:
Javier Jardón 2011-10-17 01:22:21 +01:00
parent 464966dbaa
commit 75476493f4
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
configure.ac
View File

@ -558,9 +558,12 @@ AC_MSG_RESULT($have_pango_1_32)
CFLAGS="$PANGOCAIRO_CFLAGS $CFLAGS"
AC_MSG_CHECKING([if Pango is built with a recent fontconfig])
AC_TRY_COMPILE([#include <fontconfig/fontconfig.h>],
[FcObjectSet *os; os = FcObjectSetBuild (FC_FAMILY, FC_WIDTH);],
fontconfig_ok=yes, fontconfig_ok=no)
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[[#include <fontconfig/fontconfig.h>]],
[[FcObjectSet *os; os = FcObjectSetBuild (FC_FAMILY, FC_WIDTH);]])],
[fontconfig_ok=yes],
[fontconfig_ok=no])
AC_MSG_RESULT($fontconfig_ok)
CFLAGS=$gimp_save_CFLAGS
@ -905,8 +908,12 @@ AC_SUBST(SYMPREFIX)
if test "x$os_win32" != xyes; then
AC_MSG_CHECKING([fd_set and sys/select])
AC_TRY_COMPILE([#include <sys/types.h>],
[fd_set readMask, writeMask;], gimp_ok=yes, gimp_ok=no)
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[[#include <sys/types.h>]],
[[fd_set readMask, writeMask;]])],
[gimp_ok=yes],
[gimp_ok=no])
if test "x$gimp_ok" = xno; then
AC_EGREP_HEADER(fd_mask, sys/select.h, gimp_ok=yes)
if test "x$gimp_ok" = xyes; then