Mercurial > octave-nkf

comparison configure.ac @ 9804:6fcc4179c178

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure.ac: remove check for ftgl
author Shai Ayal <shaiay@users.sourceforge.net>
date Wed, 11 Nov 2009 13:17:34 -0500
parents f5126ea721e2
children 932b0efeb81b
comparison
equal deleted inserted replaced
9803:f5126ea721e2 9804:6fcc4179c178
739 # --------------------------------------------------------------------- 739 # ---------------------------------------------------------------------
740 740
741 ## libraries needed for graphics 741 ## libraries needed for graphics
742 742
743 warn_freetype="" 743 warn_freetype=""
744 warn_ftgl=""
745 744
746 OCTAVE_OPENGL 745 OCTAVE_OPENGL
747 if test -n "$OPENGL_LIBS"; then 746 if test -n "$OPENGL_LIBS"; then
748 AC_DEFINE(HAVE_OPENGL, 1, [Define if OpenGL is available]) 747 AC_DEFINE(HAVE_OPENGL, 1, [Define if OpenGL is available])
749 748
750 ## ftgl (needs freetype 2) 749 ## freetype 2
751 AC_CHECK_FT2([9.0.3],[AC_DEFINE(HAVE_FREETYPE, 1, [Define to 1 if you have Freetype library.])], 750 AC_CHECK_FT2([9.0.3],[AC_DEFINE(HAVE_FREETYPE, 1, [Define to 1 if you have Freetype library.])],
752 [warn_freetype="FreeType library not found. Native renderer will not have on-screen text"]) 751 [warn_freetype="FreeType library not found. Native renderer will not have on-screen text"])
753 if test -z "$warn_freetype"; then 752 if test -z "$warn_freetype"; then
754 AC_LANG_PUSH(C++) 753 AC_LANG_PUSH(C++)
755 save_LIBS="$LIBS" 754 save_LIBS="$LIBS"
756 save_CXXFLAGS="$CXXFLAGS" 755 save_CXXFLAGS="$CXXFLAGS"
757 save_CPPFLAGS="$CPPFLAGS" 756 save_CPPFLAGS="$CPPFLAGS"
758 LIBS="$LIBS $FT2_LIBS $OPENGL_LIBS" 757 LIBS="$LIBS $FT2_LIBS $OPENGL_LIBS"
759 CXXFLAGS="$CXXFLAGS $FT2_CFLAGS" 758 CXXFLAGS="$CXXFLAGS $FT2_CFLAGS"
760 CPPFLAGS="$CPPFLAGS $FT2_CFLAGS" 759 CPPFLAGS="$CPPFLAGS $FT2_CFLAGS"
761 has_ftgl_h=yes
762 AC_CHECK_HEADERS([FTGL/ftgl.h ftgl.h], break, [
763 AC_CHECK_HEADERS([FTGL/FTGL.h FTGL.h], [
764 AC_DEFINE(HAVE_FTGL_UPPERCASE, 1, [Define to 1 if you have FTGL.h or FTGL/FTGL.h])
765 break
766 ], has_ftgl_h=no)])
767 if test "$has_ftgl_h" = yes; then
768 AC_MSG_CHECKING([for FTGLTextureFont in -lftgl])
769 LIBS="$save_LIBS -lftgl $FT2_LIBS $OPENGL_LIBS"
770 AC_TRY_LINK([
771 #ifdef HAVE_FTGL_FTGL_H
772 #ifdef HAVE_FTGL_UPPERCASE
773 #include <FTGL/FTGL.h>
774 #else
775 #include <FTGL/ftgl.h>
776 #endif
777 #include <FTGL/FTGLTextureFont.h>
778 #elif HAVE_FTGL_H
779 #ifdef HAVE_FTGL_UPPERCASE
780 #include <FTGL.h>
781 #else
782 #include <ftgl.h>
783 #endif
784 #include <FTGLTextureFont.h>
785 #endif], [
786 FTGLTextureFont font("");], [
787 OPENGL_LIBS="-lftgl $FT2_LIBS $OPENGL_LIBS"
788 LIBS="$save_LIBS"
789 CPPFLAGS="$save_CPPFLAGS"
790 AC_DEFINE(HAVE_FTGL, 1, [Define to 1 if FTGL is present])
791 AC_MSG_RESULT(yes)
792 XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FT2_CFLAGS"], [
793 AC_MSG_RESULT(no)
794 warn_ftgl="FTGL library not found. Native renderer will not have on-screen text"
795 ])
796 LIBS="$save_LIBS"
797 CXXFLAGS="$save_CXXFLAGS"
798 CPPFLAGS="$save_CPPFLAGS"
799 else
800 warn_ftgl="FTGL headers not found. Native renderer will not have on-screen text"
801 fi
802 AC_LANG_POP(C++)
803 fi 760 fi
804 fi 761 fi
805 762
806 # fontconfig library 763 # fontconfig library
807 764
2498 AC_MSG_WARN("$warn_fontconfig") 2455 AC_MSG_WARN("$warn_fontconfig")
2499 native_graphics=false 2456 native_graphics=false
2500 warn_msg_printed=true 2457 warn_msg_printed=true
2501 fi 2458 fi
2502 2459
2503 if test -n "$warn_ftgl"; then
2504 AC_MSG_WARN("$warn_ftgl")
2505 native_graphics=false
2506 warn_msg_printed=true
2507 fi
2508
2509 if test -n "$warn_fltk_config"; then 2460 if test -n "$warn_fltk_config"; then
2510 AC_MSG_WARN("$warn_fltk_config") 2461 AC_MSG_WARN("$warn_fltk_config")
2511 native_graphics=false 2462 native_graphics=false
2512 warn_msg_printed=true 2463 warn_msg_printed=true
2513 fi 2464 fi