Mercurial > hg > octave-lyh

comparison configure.ac @ 11208:a44ba1cdfbb5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
handle --without-opengl configure option
author John W. Eaton <jwe@octave.org>
date Mon, 08 Nov 2010 22:28:06 -0500
parents d3eaaa7c6762
children 94d9d412a2a0
comparison
equal deleted inserted replaced
11207:51e6ac3e5afc 11208:a44ba1cdfbb5
824 824
825 ## libraries needed for native graphics renderer 825 ## libraries needed for native graphics renderer
826 826
827 warn_freetype="" 827 warn_freetype=""
828 828
829 OCTAVE_OPENGL 829 check_opengl=false
830 AC_ARG_WITH([opengl],
831 [AS_HELP_STRING([--with-opengl=yes], [use opengl library for graphics])],
832 [if test "x$withval" = xno; then
833 warn_opengl="--without-opengl specified. Native graphics will be disabled."
834 AC_MSG_WARN([$warn_opengl])
835 else
836 check_opengl=true
837 fi],
838 [check_opengl=true])
839
840 if $check_opengl; then
841 OCTAVE_OPENGL
842 fi
843
830 GRAPHICS_LIBS= 844 GRAPHICS_LIBS=
831 GRAPHICS_CFLAGS= 845 GRAPHICS_CFLAGS=
832 846
833 if test -n "$OPENGL_LIBS"; then 847 if test -n "$OPENGL_LIBS"; then
834 AC_DEFINE(HAVE_OPENGL, 1, [Define if OpenGL is available]) 848 AC_DEFINE(HAVE_OPENGL, 1, [Define if OpenGL is available])
2375 AC_MSG_WARN([]) 2389 AC_MSG_WARN([])
2376 warn_msg_printed=true 2390 warn_msg_printed=true
2377 fi 2391 fi
2378 2392
2379 native_graphics=true 2393 native_graphics=true
2394 if test -n "warn_opengl"; then
2395 AC_MSG_WARN([$warn_opengl])
2396 native_graphics=false
2397 warn_msg_printed=true
2398 fi
2399
2380 if test -n "$warn_freetype"; then 2400 if test -n "$warn_freetype"; then
2381 AC_MSG_WARN([$warn_freetype]) 2401 AC_MSG_WARN([$warn_freetype])
2382 native_graphics=false 2402 native_graphics=false
2383 warn_msg_printed=true 2403 warn_msg_printed=true
2384 fi 2404 fi