Mercurial > hg > octave-nkf

comparison configure.in @ 7954:3ffc34caec65

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure fixes
author John W. Eaton <jwe@octave.org>
date Mon, 21 Jul 2008 11:47:30 -0400
parents efabe34cce70
children 0da8455b31c1
comparison
equal deleted inserted replaced
7953:efabe34cce70 7954:3ffc34caec65
650 ## libraries needed for graphics 650 ## libraries needed for graphics
651 651
652 warn_freetype="" 652 warn_freetype=""
653 warn_ftgl="" 653 warn_ftgl=""
654 654
655 GL_RENDER_SRC=
656 GRAPHICS_OPENGL= 655 GRAPHICS_OPENGL=
657 OCTAVE_OPENGL 656 OCTAVE_OPENGL
658 if test -n "$OPENGL_LIBS"; then 657 if test -n "$OPENGL_LIBS"; then
659 GRAPHICS_OPENGL="opengl" 658 GRAPHICS_OPENGL="opengl"
660 GL_RENDER_SRC="gl-render.cc" 659 AC_DEFINE(HAVE_OPENGL, 1, [Define if OpenGL is available])
661 660
662 ## ftgl (needs freetype 2) 661 ## ftgl (needs freetype 2)
663 AC_CHECK_FT2([9.0.3],[], 662 AC_CHECK_FT2([9.0.3],[],
664 [warn_freetype="FreeType library not found. Native renderer will not have on-screen text"]) 663 [warn_freetype="FreeType library not found. Native renderer will not have on-screen text"])
665 if test -z "$warn_freetype"; then 664 if test -z "$warn_freetype"; then
708 fi 707 fi
709 fi 708 fi
710 709
711 GRAPHICS_LIBS= 710 GRAPHICS_LIBS=
712 GRAPHICS_CFLAGS= 711 GRAPHICS_CFLAGS=
713 FLTK_BACKEND_SRC=
714 712
715 ## fltk (www.fltk.org) 713 ## fltk (www.fltk.org)
716 AC_ARG_WITH(fltk-prefix, 714 AC_ARG_WITH(fltk-prefix,
717 [ --with-fltk-prefix=PFX Prefix where FLTK is installed (optional)], 715 [ --with-fltk-prefix=PFX Prefix where FLTK is installed (optional)],
718 fltk_prefix="$withval", 716 fltk_prefix="$withval",
755 $CXX $CXXFLAGS $FLTK_CFLAGS -c conftest.cc || \ 753 $CXX $CXXFLAGS $FLTK_CFLAGS -c conftest.cc || \
756 warn_fltk_opengl="FLTK does not have OpenGL support. Native graphics will be disabled." 754 warn_fltk_opengl="FLTK does not have OpenGL support. Native graphics will be disabled."
757 755
758 if test -z "$warn_fltk_opengl"; then 756 if test -z "$warn_fltk_opengl"; then
759 AC_MSG_RESULT(yes) 757 AC_MSG_RESULT(yes)
758 AC_DEFINE(HAVE_FLTK, 1, [Define if FLTK is available])
760 GRAPHICS_CFLAGS="$FLTK_CFLAGS" 759 GRAPHICS_CFLAGS="$FLTK_CFLAGS"
761 GRAPHICS_LIBS="$FLTK_LDFLAGS" 760 GRAPHICS_LIBS="$FLTK_LDFLAGS"
762 GRAPHICS_OPENGL="$GRAPHICS_OPENGL fltk_backend" 761 GRAPHICS_OPENGL="$GRAPHICS_OPENGL fltk_backend"
763 FLTK_BACKEND_SRC="fltk_backend.cc"
764 else 762 else
765 AC_MSG_RESULT(no) 763 AC_MSG_RESULT(no)
766 fi 764 fi
767 fi 765 fi
768 766
769 AC_SUBST(GRAPHICS_CFLAGS) 767 AC_SUBST(GRAPHICS_CFLAGS)
770 AC_SUBST(GRAPHICS_LIBS) 768 AC_SUBST(GRAPHICS_LIBS)
771 AC_SUBST(GRAPHICS_OPENGL) 769 AC_SUBST(GRAPHICS_OPENGL)
772 AC_SUBST(GL_RENDER_SRC)
773 AC_SUBST(FLTK_BACKEND_SRC)
774 770
775 OCTAVE_IEEE754_DATA_FORMAT 771 OCTAVE_IEEE754_DATA_FORMAT
776 772
777 # ---------------------------------------------------------------------- 773 # ----------------------------------------------------------------------
778 774