Mercurial > hg > octave-nkf
comparison configure.in @ 4626:1ba089061bfe
[project @ 2003-11-16 00:33:07 by jwe]
author | jwe |
---|---|
date | Sun, 16 Nov 2003 00:33:07 +0000 |
parents | eb84ffc19e44 |
children | bd2067547b40 |
comparison
equal
deleted
inserted
replaced
4625:87c01a296263 | 4626:1ba089061bfe |
---|---|
27 | 27 |
28 EXTERN_CFLAGS="$CFLAGS" | 28 EXTERN_CFLAGS="$CFLAGS" |
29 EXTERN_CXXFLAGS="$CXXFLAGS" | 29 EXTERN_CXXFLAGS="$CXXFLAGS" |
30 | 30 |
31 AC_INIT | 31 AC_INIT |
32 AC_REVISION($Revision: 1.439 $) | 32 AC_REVISION($Revision: 1.440 $) |
33 AC_PREREQ(2.57) | 33 AC_PREREQ(2.57) |
34 AC_CONFIG_SRCDIR([src/octave.cc]) | 34 AC_CONFIG_SRCDIR([src/octave.cc]) |
35 AC_CONFIG_HEADER(config.h) | 35 AC_CONFIG_HEADER(config.h) |
36 | 36 |
37 AC_DEFINE(OCTAVE_SOURCE, 1, [Define if this is Octave.]) | 37 AC_DEFINE(OCTAVE_SOURCE, 1, [Define if this is Octave.]) |
1284 | 1284 |
1285 ### Maybe add -Wall and -Wshadow to compiler flags now that we're | 1285 ### Maybe add -Wall and -Wshadow to compiler flags now that we're |
1286 ### done feature testing. | 1286 ### done feature testing. |
1287 | 1287 |
1288 if test -z "$EXTERN_CFLAGS"; then | 1288 if test -z "$EXTERN_CFLAGS"; then |
1289 OCTAVE_CC_FLAG(-Wall) | 1289 OCTAVE_CC_FLAG(-Wall, [ |
1290 OCTAVE_CC_FLAG(-Wshadow) | 1290 WARN_CFLAGS="$WARN_CFLAGS -Wall"; |
1291 AC_MSG_RESULT([adding -Wall to WARN_CFLAGS])]) | |
1292 OCTAVE_CC_FLAG(-Wshadow, [ | |
1293 WARN_CFLAGS="$WARN_CFLAGS -Wshadow"; | |
1294 AC_MSG_RESULT([adding -Wshadow to WARN_CFLAGS])]) | |
1291 fi | 1295 fi |
1292 | 1296 |
1293 if test -z "$EXTERN_CXXFLAGS"; then | 1297 if test -z "$EXTERN_CXXFLAGS"; then |
1294 OCTAVE_CXX_FLAG(-Wall) | 1298 OCTAVE_CXX_FLAG(-Wall, [ |
1295 OCTAVE_CXX_FLAG(-Wshadow) | 1299 WARN_CXXFLAGS="$WARN_CXXFLAGS -Wall"; |
1300 AC_MSG_RESULT([adding -Wall to WARN_CXXFLAGS])]) | |
1301 OCTAVE_CXX_FLAG(-Wshadow, [ | |
1302 WARN_CXXFLAGS="$WARN_CXXFLAGS -Wshadow"; | |
1303 AC_MSG_RESULT([adding -Wshadow to WARN_CXXFLAGS])]) | |
1296 fi | 1304 fi |
1297 | 1305 |
1298 ### Someday, maybe include -ansi and even -pedantic in this list... | 1306 ### Someday, maybe include -ansi and even -pedantic in this list... |
1299 | 1307 |
1300 GCC_PICKY_FLAGS="-Wcast-align -Wcast-qual -Wid-clash-31 \ | 1308 GCC_PICKY_FLAGS="-Wcast-align -Wcast-qual -Wid-clash-31 \ |
1308 [if test "$enableval" = no; then | 1316 [if test "$enableval" = no; then |
1309 true | 1317 true |
1310 elif test "$enableval" = yes; then | 1318 elif test "$enableval" = yes; then |
1311 if test -z "$EXTERN_CFLAGS"; then | 1319 if test -z "$EXTERN_CFLAGS"; then |
1312 for flag in $GCC_PICKY_FLAGS; do | 1320 for flag in $GCC_PICKY_FLAGS; do |
1313 OCTAVE_CC_FLAG($flag) | 1321 OCTAVE_CC_FLAG($flag, [ |
1322 WARN_CFLAGS="$WARN_CFLAGS $flag"; | |
1323 AC_MSG_RESULT([adding $flag to WARN_CFLAGS])]) | |
1314 done | 1324 done |
1315 fi | 1325 fi |
1316 if test -z "$EXTERN_CXXFLAGS"; then | 1326 if test -z "$EXTERN_CXXFLAGS"; then |
1317 for flag in $GXX_PICKY_FLAGS; do | 1327 for flag in $GXX_PICKY_FLAGS; do |
1318 OCTAVE_CXX_FLAG($flag) | 1328 OCTAVE_CXX_FLAG($flag, [ |
1329 WARN_CXXFLAGS="$WARN_CXXFLAGS $flag"; | |
1330 AC_MSG_RESULT([adding $flag to WARN_CXXFLAGS])]) | |
1319 done | 1331 done |
1320 fi | 1332 fi |
1321 fi], []) | 1333 fi], []) |
1334 | |
1335 AC_SUBST(WARN_CFLAGS) | |
1336 AC_SUBST(WARN_CXXFLAGS) | |
1322 | 1337 |
1323 ### Run configure in subdirectories. | 1338 ### Run configure in subdirectories. |
1324 | 1339 |
1325 export CC | 1340 export CC |
1326 export CXX | 1341 export CXX |
1464 | 1479 |
1465 Octave is now configured for $canonical_host_type | 1480 Octave is now configured for $canonical_host_type |
1466 | 1481 |
1467 Source directory: $srcdir | 1482 Source directory: $srcdir |
1468 Installation prefix: $prefix | 1483 Installation prefix: $prefix |
1469 C compiler: $CC $XTRA_CFLAGS $CFLAGS | 1484 C compiler: $CC $XTRA_CFLAGS $WARN_CFLAGS $CFLAGS |
1470 C++ compiler: $CXX $XTRA_CXXFLAGS $CXXFLAGS | 1485 C++ compiler: $CXX $XTRA_CXXFLAGS $WARN_CXXFLAGS $CXXFLAGS |
1471 Fortran compiler: $FORT | 1486 Fortran compiler: $FORT |
1472 Fortran libraries: $FLIBS | 1487 Fortran libraries: $FLIBS |
1473 BLAS libraries: $BLAS_LIBS | 1488 BLAS libraries: $BLAS_LIBS |
1474 FFTW libraries: $FFTW_LIBS | 1489 FFTW libraries: $FFTW_LIBS |
1475 HDF5 libraries: $HDF5_LIBS | 1490 HDF5 libraries: $HDF5_LIBS |