Branch: Tag:

2002-08-27

2002-08-27 14:42:45 by Xavier Beaudouin <kiwi@oav.net>

Added some more place to look for libs/programs/include (solaris with software compagnon and gnome 1.4).
Moved the FreeBSD include check for _Image_TTF to there also.

Rev: src/configure.in:1.612
Rev: src/modules/_Image_TTF/configure.in:1.11
Rev: src/modules/_Image_TTF/image_ttf.c:1.44

1:   # - # $Id: configure.in,v 1.10 2002/08/05 18:32:29 kiwi Exp $ + # $Id: configure.in,v 1.11 2002/08/27 14:42:45 kiwi Exp $   #   AC_INIT(image_ttf.c)   AC_CONFIG_HEADER(config.h)
12:   if test x$with_ttflib = xyes ; then    PIKE_FEATURE_NODEP(Image.TTF)    -  AC_CHECK_HEADERS(freetype.h ftxkern.h freetype/freetype.h freetype/ftxkern.h freetype1/freetype/freetype.h freetype1/freetype/ftxkern.h) +  AC_CHECK_HEADERS(freetype.h ftxkern.h freetype/freetype.h freetype/ftxkern.h)       parent="$ac_cv_header_ftxkern_h$ac_cv_header_freetype_h"    subdir="$ac_cv_header_freetype_ftxkern_h$ac_cv_header_freetype_freetype_h" -  subsubdir="$ac_cv_header_freetype1_freetype_ftxkern_h$ac_cv_header_freetype1_freetype_freetype_h" +     freetype_h="$ac_cv_header_freetype_h$ac_cv_header_freetype_freetype_h"    -  if test "$parent" = "yesyes" -o "$subdir" = "yesyes" -o "$subsubdir" = "yesyes"; then +  if test "$parent" = "yesyes" -o "$subdir" = "yesyes" ; then    AC_CHECK_LIB(ttf, TT_Open_Collection, [    AC_DEFINE(HAVE_LIBTTF)    LIBS="${LIBS-} -lttf"
28:    AC_MSG_CHECKING([if TT_Horizontal_Header has the member Reserved0])    AC_CACHE_VAL(pike_cv_tt_hh_reserved0, [    AC_TRY_COMPILE([ - #ifdef HAVE_FREETYPE1_FREETYPE_FREETYPE_H - #include <freetype1/freetype/freetype.h> - #else +    #ifdef HAVE_FREETYPE_FREETYPE_H   #include <freetype/freetype.h>   #else   #include <freetype.h>   #endif - #endif +     ],[    extern TT_Horizontal_Header *horiz;