Mercurial > octave-nkf
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 7824:adb520646d7e | 7825:13871b7de124 |
|---|---|
| 988 TEMPLATE_AR='$(AR)' | 988 TEMPLATE_AR='$(AR)' |
| 989 TEMPLATE_ARFLAGS="$ARFLAGS" | 989 TEMPLATE_ARFLAGS="$ARFLAGS" |
| 990 CRUFT_DLL_DEFS= | 990 CRUFT_DLL_DEFS= |
| 991 OCTAVE_DLL_DEFS= | 991 OCTAVE_DLL_DEFS= |
| 992 OCTINTERP_DLL_DEFS= | 992 OCTINTERP_DLL_DEFS= |
| 993 OCTGRAPHICS_DLL_DEFS= | |
| 993 library_path_var=LD_LIBRARY_PATH | 994 library_path_var=LD_LIBRARY_PATH |
| 994 case "$canonical_host_type" in | 995 case "$canonical_host_type" in |
| 995 *-*-386bsd* | *-*-netbsd*) | 996 *-*-386bsd* | *-*-netbsd*) |
| 996 SH_LD=ld | 997 SH_LD=ld |
| 997 SH_LDFLAGS=-Bshareable | 998 SH_LDFLAGS=-Bshareable |
| 1061 NO_OCT_FILE_STRIP=true | 1062 NO_OCT_FILE_STRIP=true |
| 1062 ## Extra compilation flags. | 1063 ## Extra compilation flags. |
| 1063 CRUFT_DLL_DEFS="-DCRUFT_DLL" | 1064 CRUFT_DLL_DEFS="-DCRUFT_DLL" |
| 1064 OCTAVE_DLL_DEFS="-DOCTAVE_DLL" | 1065 OCTAVE_DLL_DEFS="-DOCTAVE_DLL" |
| 1065 OCTINTERP_DLL_DEFS="-DOCTINTERP_DLL" | 1066 OCTINTERP_DLL_DEFS="-DOCTINTERP_DLL" |
| 1067 OCTGRAPHICS_DLL_DEFS="-DOCTGRAPHICS_DLL" | |
| 1066 ;; | 1068 ;; |
| 1067 *-*-linux* | *-*-gnu*) | 1069 *-*-linux* | *-*-gnu*) |
| 1068 MKOCTFILE_DL_LDFLAGS="-shared -Wl,-Bsymbolic" | 1070 MKOCTFILE_DL_LDFLAGS="-shared -Wl,-Bsymbolic" |
| 1069 SONAME_FLAGS='-Wl,-soname -Wl,$@' | 1071 SONAME_FLAGS='-Wl,-soname -Wl,$@' |
| 1070 RLD_FLAG='-Wl,-rpath -Wl,$(octlibdir)' | 1072 RLD_FLAG='-Wl,-rpath -Wl,$(octlibdir)' |
| 1164 AC_MSG_NOTICE([defining TEMPLATE_AR to be $TEMPLATE_AR]) | 1166 AC_MSG_NOTICE([defining TEMPLATE_AR to be $TEMPLATE_AR]) |
| 1165 AC_MSG_NOTICE([defining TEMPLATE_ARFLAGS to be $TEMPLATE_ARFLAGS]) | 1167 AC_MSG_NOTICE([defining TEMPLATE_ARFLAGS to be $TEMPLATE_ARFLAGS]) |
| 1166 AC_MSG_NOTICE([defining CRUFT_DLL_DEFS to be $CRUFT_DLL_DEFS]) | 1168 AC_MSG_NOTICE([defining CRUFT_DLL_DEFS to be $CRUFT_DLL_DEFS]) |
| 1167 AC_MSG_NOTICE([defining OCTAVE_DLL_DEFS to be $OCTAVE_DLL_DEFS]) | 1169 AC_MSG_NOTICE([defining OCTAVE_DLL_DEFS to be $OCTAVE_DLL_DEFS]) |
| 1168 AC_MSG_NOTICE([defining OCTINTERP_DLL_DEFS to be $OCTINTERP_DLL_DEFS]) | 1170 AC_MSG_NOTICE([defining OCTINTERP_DLL_DEFS to be $OCTINTERP_DLL_DEFS]) |
| 1171 AC_MSG_NOTICE([defining OCTGRAPHICS_DLL_DEFS to be $OCTGRAPHICS_DLL_DEFS]) | |
| 1169 AC_MSG_NOTICE([defining library_path_var to be $library_path_var]) | 1172 AC_MSG_NOTICE([defining library_path_var to be $library_path_var]) |
| 1170 AC_SUBST(FPICFLAG) | 1173 AC_SUBST(FPICFLAG) |
| 1171 AC_SUBST(CPICFLAG) | 1174 AC_SUBST(CPICFLAG) |
| 1172 AC_SUBST(CXXPICFLAG) | 1175 AC_SUBST(CXXPICFLAG) |
| 1173 AC_SUBST(SHLEXT) | 1176 AC_SUBST(SHLEXT) |
| 1189 AC_SUBST(TEMPLATE_AR) | 1192 AC_SUBST(TEMPLATE_AR) |
| 1190 AC_SUBST(TEMPLATE_ARFLAGS) | 1193 AC_SUBST(TEMPLATE_ARFLAGS) |
| 1191 AC_SUBST(CRUFT_DLL_DEFS) | 1194 AC_SUBST(CRUFT_DLL_DEFS) |
| 1192 AC_SUBST(OCTAVE_DLL_DEFS) | 1195 AC_SUBST(OCTAVE_DLL_DEFS) |
| 1193 AC_SUBST(OCTINTERP_DLL_DEFS) | 1196 AC_SUBST(OCTINTERP_DLL_DEFS) |
| 1197 AC_SUBST(OCTGRAPHICS_DLL_DEFS) | |
| 1194 AC_SUBST(library_path_var) | 1198 AC_SUBST(library_path_var) |
| 1195 | 1199 |
| 1196 ### special checks for odd OS specific things. | 1200 ### special checks for odd OS specific things. |
| 1197 ### | 1201 ### |
| 1198 ### I am told that on some SCO systems, the only place to find some | 1202 ### I am told that on some SCO systems, the only place to find some |
| 1607 *-*-cygwin*) | 1611 *-*-cygwin*) |
| 1608 AC_DEFINE(RUSAGE_TIMES_ONLY, 1, [Define if your struct rusage only has time information.]) | 1612 AC_DEFINE(RUSAGE_TIMES_ONLY, 1, [Define if your struct rusage only has time information.]) |
| 1609 ;; | 1613 ;; |
| 1610 esac | 1614 esac |
| 1611 | 1615 |
| 1616 ## Graphics related stuffs | |
| 1617 | |
| 1618 GRAPHICS_OPENGL= | |
| 1619 OCTAVE_OPENGL | |
| 1620 if test "x$OPENGL_LIBS" != "x"; then | |
| 1621 GRAPHICS_OPENGL="opengl" | |
| 1622 fi | |
| 1623 AC_SUBST(GRAPHICS_OPENGL) | |
| 1624 | |
| 1612 ### Checks for other programs used for building, testing, installing, | 1625 ### Checks for other programs used for building, testing, installing, |
| 1613 ### and running Octave. | 1626 ### and running Octave. |
| 1614 | 1627 |
| 1615 AC_PROG_AWK | 1628 AC_PROG_AWK |
| 1616 OCTAVE_PROG_FIND | 1629 OCTAVE_PROG_FIND |
| 1861 libcruft/misc/Makefile libcruft/odepack/Makefile | 1874 libcruft/misc/Makefile libcruft/odepack/Makefile |
| 1862 libcruft/ordered-qz/Makefile libcruft/quadpack/Makefile | 1875 libcruft/ordered-qz/Makefile libcruft/quadpack/Makefile |
| 1863 libcruft/qrupdate/Makefile | 1876 libcruft/qrupdate/Makefile |
| 1864 libcruft/ranlib/Makefile libcruft/slatec-fn/Makefile | 1877 libcruft/ranlib/Makefile libcruft/slatec-fn/Makefile |
| 1865 libcruft/slatec-err/Makefile libcruft/villad/Makefile | 1878 libcruft/slatec-err/Makefile libcruft/villad/Makefile |
| 1866 libcruft/blas-xtra/Makefile libcruft/lapack-xtra/Makefile]) | 1879 libcruft/blas-xtra/Makefile libcruft/lapack-xtra/Makefile |
| 1880 src/graphics/Makefile src/graphics/Makerules | |
| 1881 src/graphics/opengl/Makefile]) | |
| 1867 AC_OUTPUT | 1882 AC_OUTPUT |
| 1868 | 1883 |
| 1869 AC_CONFIG_COMMANDS([default-1],[[chmod +x install-octave]],[[]]) | 1884 AC_CONFIG_COMMANDS([default-1],[[chmod +x install-octave]],[[]]) |
| 1870 | 1885 |
| 1871 ### Print a summary so that important information isn't missed. | 1886 ### Print a summary so that important information isn't missed. |