Mercurial > octave-nkf
comparison configure.ac @ 12743:5d8f2a091b23 stable
maint: avoid warnings from autoconf
configure.ac: Use AC_LANG_SOURCE as needed. Properly quote
uses of AC_LANG_PROGRAM.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 14 Jun 2011 16:57:16 -0400 |
parents | 630068170ef0 |
children | 343eca0298d0 |
comparison
equal
deleted
inserted
replaced
12742:630068170ef0 | 12743:5d8f2a091b23 |
---|---|
78 *-*-msdosmsvc) | 78 *-*-msdosmsvc) |
79 have_msvc=yes | 79 have_msvc=yes |
80 ;; | 80 ;; |
81 *-*-mingw*) | 81 *-*-mingw*) |
82 AC_MSG_CHECKING([for MSVC compiler]) | 82 AC_MSG_CHECKING([for MSVC compiler]) |
83 AC_PREPROC_IFELSE([ | 83 AC_PREPROC_IFELSE([AC_LANG_SOURCE([ |
84 #ifndef _MSC_VER | 84 #ifndef _MSC_VER |
85 #error "Not MSVC compiler" | 85 #error "Not MSVC compiler" |
86 #endif], have_msvc=yes, have_msvc=no) | 86 #endif |
87 ])], have_msvc=yes, have_msvc=no) | |
87 AC_MSG_RESULT([$have_msvc]) | 88 AC_MSG_RESULT([$have_msvc]) |
88 ;; | 89 ;; |
89 esac | 90 esac |
90 | 91 |
91 ### Path separator. | 92 ### Path separator. |
897 | 898 |
898 AC_MSG_CHECKING([for OpenGL support in FLTK]) | 899 AC_MSG_CHECKING([for OpenGL support in FLTK]) |
899 save_CFLAGS="$CFLAGS" | 900 save_CFLAGS="$CFLAGS" |
900 CFLAGS="$CFLAGS $FLTK_CFLAGS" | 901 CFLAGS="$CFLAGS $FLTK_CFLAGS" |
901 AC_COMPILE_IFELSE( | 902 AC_COMPILE_IFELSE( |
902 AC_LANG_PROGRAM([[#include <FL/gl.h>]], [[int nothing = 0;]]), | 903 [AC_LANG_PROGRAM([[#include <FL/gl.h>]], [[int nothing = 0;]])], |
903 [ | 904 [ |
904 AC_MSG_RESULT([no]) | 905 AC_MSG_RESULT([no]) |
905 warn_fltk_opengl="FLTK does not have OpenGL support. Native graphics will be disabled." | 906 warn_fltk_opengl="FLTK does not have OpenGL support. Native graphics will be disabled." |
906 ],[ | 907 ],[ |
907 AC_DEFINE(HAVE_FLTK, 1, [Define if FLTK is available]) | 908 AC_DEFINE(HAVE_FLTK, 1, [Define if FLTK is available]) |
985 *-*-darwin*) | 986 *-*-darwin*) |
986 ## test if wrapper functions help | 987 ## test if wrapper functions help |
987 octave_blaswrap_save_CFLAGS="$CFLAGS" | 988 octave_blaswrap_save_CFLAGS="$CFLAGS" |
988 CFLAGS="$CFLAGS -DUSE_BLASWRAP" | 989 CFLAGS="$CFLAGS -DUSE_BLASWRAP" |
989 AC_LANG_PUSH(C) | 990 AC_LANG_PUSH(C) |
990 AC_COMPILE_IFELSE( | 991 AC_COMPILE_IFELSE([AC_LANG_SOURCE([ |
991 [#include "libcruft/misc/blaswrap.c"], | 992 #include "libcruft/misc/blaswrap.c" |
993 ])], | |
992 [mv conftest.$ac_objext blaswrap.$ac_objext | 994 [mv conftest.$ac_objext blaswrap.$ac_objext |
993 octave_blaswrap_save_BLAS_LIBS="$BLAS_LIBS" | 995 octave_blaswrap_save_BLAS_LIBS="$BLAS_LIBS" |
994 BLAS_LIBS="blaswrap.$ac_objext -framework vecLib" | 996 BLAS_LIBS="blaswrap.$ac_objext -framework vecLib" |
995 | 997 |
996 save_FFLAGS="$FFLAGS" | 998 save_FFLAGS="$FFLAGS" |
1640 OCTAVE_SMART_PUTENV | 1642 OCTAVE_SMART_PUTENV |
1641 | 1643 |
1642 case "$canonical_host_type" in | 1644 case "$canonical_host_type" in |
1643 *-*-msdosmsvc | *-*-mingw*) | 1645 *-*-msdosmsvc | *-*-mingw*) |
1644 AC_MSG_CHECKING([for required _WIN32_WINNT]) | 1646 AC_MSG_CHECKING([for required _WIN32_WINNT]) |
1645 AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[ | 1647 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
1646 #include <windows.h> | 1648 #include <windows.h> |
1647 #if _WIN32_WINNT < 0x0403 | 1649 #if _WIN32_WINNT < 0x0403 |
1648 #error "Wrong version" | 1650 #error "Wrong version" |
1649 #endif]], []), | 1651 #endif]], [])], |
1650 AC_MSG_RESULT([none]), [ | 1652 AC_MSG_RESULT([none]), [ |
1651 AC_DEFINE(_WIN32_WINNT, 0x0403, [Define to 0x0403 to access InitializeCriticalSectionAndSpinCount]) | 1653 AC_DEFINE(_WIN32_WINNT, 0x0403, [Define to 0x0403 to access InitializeCriticalSectionAndSpinCount]) |
1652 AC_MSG_RESULT([0x0403])]) | 1654 AC_MSG_RESULT([0x0403])]) |
1653 AC_MSG_CHECKING([whether _USE_MATH_DEFINES needs to be defined]) | 1655 AC_MSG_CHECKING([whether _USE_MATH_DEFINES needs to be defined]) |
1654 AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[#include <math.h>]], | 1656 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <math.h>]], |
1655 [[int x = M_LN2;]]), | 1657 [[int x = M_LN2;]])], |
1656 AC_MSG_RESULT([no]), [ | 1658 AC_MSG_RESULT([no]), [ |
1657 AC_DEFINE(_USE_MATH_DEFINES, 1, [Define if your system needs it to define math constants like M_LN2]) | 1659 AC_DEFINE(_USE_MATH_DEFINES, 1, [Define if your system needs it to define math constants like M_LN2]) |
1658 AC_MSG_RESULT([yes])]) | 1660 AC_MSG_RESULT([yes])]) |
1659 ;; | 1661 ;; |
1660 esac | 1662 esac |