equal
deleted
inserted
replaced
479 |
479 |
480 # Try to compile it |
480 # Try to compile it |
481 AC_MSG_CHECKING([if we can compile and link with freetype]) |
481 AC_MSG_CHECKING([if we can compile and link with freetype]) |
482 AC_LANG_PUSH(C++) |
482 AC_LANG_PUSH(C++) |
483 PREV_CXXCFLAGS="$CXXFLAGS" |
483 PREV_CXXCFLAGS="$CXXFLAGS" |
484 PREV_LDFLAGS="$LDFLAGS" |
484 PREV_LIBS="$LIBS" |
485 PREV_CXX="$CXX" |
485 PREV_CXX="$CXX" |
486 CXXFLAGS="$CXXFLAGS $FREETYPE_CFLAGS" |
486 CXXFLAGS="$CXXFLAGS $FREETYPE_CFLAGS" |
487 LDFLAGS="$LDFLAGS $FREETYPE_LIBS" |
487 LIBS="$LIBS $FREETYPE_LIBS" |
488 CXX="$FIXPATH $CXX" |
488 CXX="$FIXPATH $CXX" |
489 AC_LINK_IFELSE([AC_LANG_SOURCE([[ |
489 AC_LINK_IFELSE([AC_LANG_SOURCE([[ |
490 #include<ft2build.h> |
490 #include<ft2build.h> |
491 #include FT_FREETYPE_H |
491 #include FT_FREETYPE_H |
492 int main () { |
492 int main () { |
506 |
506 |
507 AC_MSG_ERROR([Can not continue without freetype. $HELP_MSG]) |
507 AC_MSG_ERROR([Can not continue without freetype. $HELP_MSG]) |
508 ] |
508 ] |
509 ) |
509 ) |
510 CXXCFLAGS="$PREV_CXXFLAGS" |
510 CXXCFLAGS="$PREV_CXXFLAGS" |
511 LDFLAGS="$PREV_LDFLAGS" |
511 LIBS="$PREV_LIBS" |
512 CXX="$PREV_CXX" |
512 CXX="$PREV_CXX" |
513 AC_LANG_POP(C++) |
513 AC_LANG_POP(C++) |
514 |
514 |
515 AC_MSG_CHECKING([if we should bundle freetype]) |
515 AC_MSG_CHECKING([if we should bundle freetype]) |
516 if test "x$BUNDLE_FREETYPE" = xyes; then |
516 if test "x$BUNDLE_FREETYPE" = xyes; then |