comparison configure.in @ 7905:bcacdcc726f7

Allow octave compilation without FLTK/OpenGL
author John W. Eaton <jwe@octave.org>
date Wed, 09 Jul 2008 11:00:21 -0400
parents 627b10572d82
children e998e81224b5
comparison
equal deleted inserted replaced
7904:1fddd9b8e862 7905:bcacdcc726f7
640 640
641 ## libraries needed for graphics 641 ## libraries needed for graphics
642 642
643 warn_graphics="" 643 warn_graphics=""
644 644
645 GL_RENDER_SRC=
645 GRAPHICS_OPENGL= 646 GRAPHICS_OPENGL=
646 OCTAVE_OPENGL 647 OCTAVE_OPENGL
647 if test "x$OPENGL_LIBS" != "x"; then 648 if test "x$OPENGL_LIBS" != "x"; then
648 GRAPHICS_OPENGL="opengl" 649 GRAPHICS_OPENGL="opengl"
650 GL_RENDER_SRC="gl-render.cc"
649 651
650 ## ftgl (needs freetype 2) 652 ## ftgl (needs freetype 2)
651 AC_CHECK_FT2([9.0.3],[], 653 AC_CHECK_FT2([9.0.3],[],
652 [warn_graphics="FreeType library not found. Native renderer will not have on-screen text"]) 654 [warn_graphics="FreeType library not found. Native renderer will not have on-screen text"])
653 if test "x$warn_graphics" = "x" ; then 655 if test "x$warn_graphics" = "x" ; then
675 fi 677 fi
676 fi 678 fi
677 679
678 GRAPHICS_LIBS= 680 GRAPHICS_LIBS=
679 GRAPHICS_CFLAGS= 681 GRAPHICS_CFLAGS=
682 FLTK_BACKEND_SRC=
680 683
681 ## fltk (www.fltk.org) 684 ## fltk (www.fltk.org)
682 AC_ARG_WITH(fltk-prefix, 685 AC_ARG_WITH(fltk-prefix,
683 [ --with-fltk-prefix=PFX Prefix where FLTK is installed (optional)], 686 [ --with-fltk-prefix=PFX Prefix where FLTK is installed (optional)],
684 fltk_prefix="$withval", 687 fltk_prefix="$withval",
721 if test "x$warn_graphics" = "x" ; then 724 if test "x$warn_graphics" = "x" ; then
722 AC_MSG_RESULT(yes) 725 AC_MSG_RESULT(yes)
723 GRAPHICS_CFLAGS="$FLTK_CFLAGS" 726 GRAPHICS_CFLAGS="$FLTK_CFLAGS"
724 GRAPHICS_LIBS="$FLTK_LDFLAGS" 727 GRAPHICS_LIBS="$FLTK_LDFLAGS"
725 GRAPHICS_OPENGL="$GRAPHICS_OPENGL fltk_backend" 728 GRAPHICS_OPENGL="$GRAPHICS_OPENGL fltk_backend"
729 FLTK_BACKEND_SRC="fltk_backend.cc"
726 else 730 else
727 AC_MSG_RESULT(no) 731 AC_MSG_RESULT(no)
728 fi 732 fi
729 fi 733 fi
730 734
731 AC_SUBST(GRAPHICS_CFLAGS) 735 AC_SUBST(GRAPHICS_CFLAGS)
732 AC_SUBST(GRAPHICS_LIBS) 736 AC_SUBST(GRAPHICS_LIBS)
733 AC_SUBST(GRAPHICS_OPENGL) 737 AC_SUBST(GRAPHICS_OPENGL)
738 AC_SUBST(GL_RENDER_SRC)
739 AC_SUBST(FLTK_BACKEND_SRC)
734 740
735 OCTAVE_IEEE754_DATA_FORMAT 741 OCTAVE_IEEE754_DATA_FORMAT
736 742
737 # ---------------------------------------------------------------------- 743 # ----------------------------------------------------------------------
738 744