Mercurial > hg > octave-nkf

comparison configure.ac @ 10858:bf000a56a985

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure.ac: Change warning messages about freetype and fontconfig to reflect their requirement for native graphics. Bug #30594.
author Rik <octave@nomad.inbox5.com>
date Thu, 05 Aug 2010 11:01:52 -0700
parents c0ffe159ba1a
children 97b8d462ef11
comparison
equal deleted inserted replaced
10857:2224236440c0 10858:bf000a56a985
813 AC_SUBST(MAGICK_LDFLAGS) 813 AC_SUBST(MAGICK_LDFLAGS)
814 AC_SUBST(MAGICK_LIBS) 814 AC_SUBST(MAGICK_LIBS)
815 815
816 # --------------------------------------------------------------------- 816 # ---------------------------------------------------------------------
817 817
818 ## libraries needed for graphics 818 ## libraries needed for native graphics renderer
819 819
820 warn_freetype="" 820 warn_freetype=""
821 821
822 OCTAVE_OPENGL 822 OCTAVE_OPENGL
823 GRAPHICS_LIBS= 823 GRAPHICS_LIBS=
828 828
829 ## freetype 2 829 ## freetype 2
830 830
831 AC_CHECK_FT2([9.0.3], [AC_DEFINE(HAVE_FREETYPE, 1, [Define to 1 if you have Freetype library.]) 831 AC_CHECK_FT2([9.0.3], [AC_DEFINE(HAVE_FREETYPE, 1, [Define to 1 if you have Freetype library.])
832 XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FT2_CFLAGS"], 832 XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FT2_CFLAGS"],
833 [warn_freetype="FreeType library not found. Native renderer will not have on-screen text"]) 833 [warn_freetype="FreeType library not found. Native graphics will be disabled."])
834 834
835 ## fontconfig library 835 ## fontconfig library
836 836
837 warn_fontconfig="" 837 warn_fontconfig=""
838 if test -z "$warn_freetype"; then 838 if test -z "$warn_freetype"; then
840 have_fontconfig=yes 840 have_fontconfig=yes
841 OPENGL_LIBS="$FONTCONFIG_LIBS $OPENGL_LIBS" 841 OPENGL_LIBS="$FONTCONFIG_LIBS $OPENGL_LIBS"
842 XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FONTCONFIG_CFLAGS" 842 XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FONTCONFIG_CFLAGS"
843 AC_DEFINE(HAVE_FONTCONFIG, 1, [Define to 1 if fontconfig is present])], [ 843 AC_DEFINE(HAVE_FONTCONFIG, 1, [Define to 1 if fontconfig is present])], [
844 have_fontconfig=no 844 have_fontconfig=no
845 warn_fontconfig="Fontconfig not found. Native text rendering will use hard-coded font instead."]) 845 warn_fontconfig="Fontconfig library not found. Native graphics will be disabled."])
846 fi 846 fi
847 847
848 ## fltk (www.fltk.org) 848 ## fltk (www.fltk.org)
849 AC_ARG_WITH(fltk-prefix, 849 AC_ARG_WITH(fltk-prefix,
850 [ --with-fltk-prefix=PFX Prefix where FLTK is installed (optional)], 850 [ --with-fltk-prefix=PFX Prefix where FLTK is installed (optional)],