Mercurial > octave-nkf
diff configure.in @ 7825:13871b7de124
Import sources for OpenGL-based renderer.
* * *
fixed some gcc warnings in gl-render code (casts & virtual destructor)
| author | Michael Goffioul <michael.goffioul@gmail.com> |
|---|---|
| date | Mon, 11 Feb 2008 16:42:14 +0100 |
| parents | 82be108cc558 |
| children | caab78e7e377 |
line wrap: on
line diff
--- a/configure.in Fri Feb 08 16:46:34 2008 +0100 +++ b/configure.in Mon Feb 11 16:42:14 2008 +0100 @@ -990,6 +990,7 @@ CRUFT_DLL_DEFS= OCTAVE_DLL_DEFS= OCTINTERP_DLL_DEFS= +OCTGRAPHICS_DLL_DEFS= library_path_var=LD_LIBRARY_PATH case "$canonical_host_type" in *-*-386bsd* | *-*-netbsd*) @@ -1063,6 +1064,7 @@ CRUFT_DLL_DEFS="-DCRUFT_DLL" OCTAVE_DLL_DEFS="-DOCTAVE_DLL" OCTINTERP_DLL_DEFS="-DOCTINTERP_DLL" + OCTGRAPHICS_DLL_DEFS="-DOCTGRAPHICS_DLL" ;; *-*-linux* | *-*-gnu*) MKOCTFILE_DL_LDFLAGS="-shared -Wl,-Bsymbolic" @@ -1166,6 +1168,7 @@ AC_MSG_NOTICE([defining CRUFT_DLL_DEFS to be $CRUFT_DLL_DEFS]) AC_MSG_NOTICE([defining OCTAVE_DLL_DEFS to be $OCTAVE_DLL_DEFS]) AC_MSG_NOTICE([defining OCTINTERP_DLL_DEFS to be $OCTINTERP_DLL_DEFS]) +AC_MSG_NOTICE([defining OCTGRAPHICS_DLL_DEFS to be $OCTGRAPHICS_DLL_DEFS]) AC_MSG_NOTICE([defining library_path_var to be $library_path_var]) AC_SUBST(FPICFLAG) AC_SUBST(CPICFLAG) @@ -1191,6 +1194,7 @@ AC_SUBST(CRUFT_DLL_DEFS) AC_SUBST(OCTAVE_DLL_DEFS) AC_SUBST(OCTINTERP_DLL_DEFS) +AC_SUBST(OCTGRAPHICS_DLL_DEFS) AC_SUBST(library_path_var) ### special checks for odd OS specific things. @@ -1609,6 +1613,15 @@ ;; esac +## Graphics related stuffs + +GRAPHICS_OPENGL= +OCTAVE_OPENGL +if test "x$OPENGL_LIBS" != "x"; then + GRAPHICS_OPENGL="opengl" +fi +AC_SUBST(GRAPHICS_OPENGL) + ### Checks for other programs used for building, testing, installing, ### and running Octave. @@ -1863,7 +1876,9 @@ libcruft/qrupdate/Makefile libcruft/ranlib/Makefile libcruft/slatec-fn/Makefile libcruft/slatec-err/Makefile libcruft/villad/Makefile - libcruft/blas-xtra/Makefile libcruft/lapack-xtra/Makefile]) + libcruft/blas-xtra/Makefile libcruft/lapack-xtra/Makefile + src/graphics/Makefile src/graphics/Makerules + src/graphics/opengl/Makefile]) AC_OUTPUT AC_CONFIG_COMMANDS([default-1],[[chmod +x install-octave]],[[]])