Mercurial > octave

comparison configure.ac @ 21381:e5d96f39a37d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure script fixes * configure.ac: Use AC_ARG_WITH for Qt. Adjust usage and error message for --without-qt option. Fix message for --without-opengl option. Fix error message for GraphicsMagick library. Don't perform GraphicsMagick library checks if --without-magick is specified. Avoid quoting problem in setting AM_CONDITIONAL for QScintilla. * acinclude.m4 (OCTAVE_CHECK_LIB): Provide separate error message if the --without-LIB option is used.
author John W. Eaton <jwe@octave.org>
date Tue, 01 Mar 2016 02:27:13 -0500
parents 172479a97e6c
children bd0fcc69e48a
comparison
equal deleted inserted replaced
21380:460943554233 21381:e5d96f39a37d
1013 1013
1014 check_sndfile=no 1014 check_sndfile=no
1015 AC_ARG_WITH([sndfile], 1015 AC_ARG_WITH([sndfile],
1016 [AS_HELP_STRING([--without-sndfile], 1016 [AS_HELP_STRING([--without-sndfile],
1017 [don't use sndfile library, disable audio file I/O])], 1017 [don't use sndfile library, disable audio file I/O])],
1018 [if test x"$withval" = x"no"; then 1018 [if test x"$withval" = xno; then
1019 warn_sndfile="--without-sndfile specified. The audioinfo, audioread, and audiowrite functions for reading and writing audio files will not be fully functional." 1019 warn_sndfile="--without-sndfile specified. The audioinfo, audioread, and audiowrite functions for reading and writing audio files will not be fully functional."
1020 else 1020 else
1021 check_sndfile=yes 1021 check_sndfile=yes
1022 fi], 1022 fi],
1023 [check_sndfile=yes]) 1023 [check_sndfile=yes])
1050 1050
1051 check_portaudio=no 1051 check_portaudio=no
1052 AC_ARG_WITH([portaudio], 1052 AC_ARG_WITH([portaudio],
1053 [AS_HELP_STRING([--without-portaudio], 1053 [AS_HELP_STRING([--without-portaudio],
1054 [don't use PortAudio library, disable audio playback and recording])], 1054 [don't use PortAudio library, disable audio playback and recording])],
1055 [if test x"$withval" = x"no"; then 1055 [if test x"$withval" = xno; then
1056 warn_portaudio="--without-portaudio specified. The audioplayer, audiorecorder classes, and audiodevinfo function for audio playback and recording will not be fully functional." 1056 warn_portaudio="--without-portaudio specified. The audioplayer, audiorecorder classes, and audiodevinfo function for audio playback and recording will not be fully functional."
1057 else 1057 else
1058 check_portaudio=yes 1058 check_portaudio=yes
1059 fi], 1059 fi],
1060 [check_portaudio=yes]) 1060 [check_portaudio=yes])
1080 AC_SUBST(PORTAUDIO_LDFLAGS) 1080 AC_SUBST(PORTAUDIO_LDFLAGS)
1081 AC_SUBST(PORTAUDIO_LIBS) 1081 AC_SUBST(PORTAUDIO_LIBS)
1082 1082
1083 ### Check for either of Graphics/ImageMagick++ libraries 1083 ### Check for either of Graphics/ImageMagick++ libraries
1084 1084
1085 check_magick=yes
1086 use_magick=no
1085 AC_ARG_WITH([magick], 1087 AC_ARG_WITH([magick],
1086 [AS_HELP_STRING([--with-magick=LIB], 1088 [AS_HELP_STRING([--with-magick=LIB],
1087 [select library to use for image I/O (options: GraphicsMagick(default) or ImageMagick)])], 1089 [select library to use for image I/O (options: GraphicsMagick(default) or ImageMagick)])],
1088 [magick="$withval"], 1090 [if test x"$withval" = xno; then
1089 [magick="GraphicsMagick"]) 1091 check_magick=no
1090 1092 warn_magick_disabled="--without-magick specified. The imread function for reading images will not be fully functional."
1091 warn_magick="$magick++ library not found. The imread function for reading image files will not be fully functional." 1093 OCTAVE_CONFIGURE_WARNING([warn_magick_disabled])
1092 1094 else
1093 MAGICK_CPPFLAGS= 1095 magick="$withval"
1094 MAGICK_LDFLAGS= 1096 fi], [magick="GraphicsMagick"])
1095 MAGICK_LIBS= 1097
1096 1098 if test $check_magick = yes; then
1097 PKG_CHECK_EXISTS([$magick++], [ 1099
1098 ## Make sure we only get -I, -L, and -l flags. Some Graphics/ImageMagick++ 1100 MAGICK_CPPFLAGS=
1099 ## packages add extra flags that are useful when building 1101 MAGICK_LDFLAGS=
1100 ## Graphics/ImageMagick++ extentions. These extra flags break the 1102 MAGICK_LIBS=
1101 ## Octave build. 1103
1102 MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags-only-I $magick++` 1104 PKG_CHECK_EXISTS([$magick++], [
1103 MAGICK_LDFLAGS=`$PKG_CONFIG --libs-only-L $magick++` 1105 ## Make sure we only get -I, -L, and -l flags. Some Graphics/ImageMagick++
1104 MAGICK_LIBS=`$PKG_CONFIG --libs-only-l $magick++` 1106 ## packages add extra flags that are useful when building
1105 1107 ## Graphics/ImageMagick++ extentions. These extra flags break the
1106 warn_magick="$magick++ library fails tests. The imread function for reading image files will not be fully functional." 1108 ## Octave build.
1107 1109 MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags-only-I $magick++`
1108 save_CPPFLAGS="$CPPFLAGS" 1110 MAGICK_LDFLAGS=`$PKG_CONFIG --libs-only-L $magick++`
1109 save_LIBS="$LIBS" 1111 MAGICK_LIBS=`$PKG_CONFIG --libs-only-l $magick++`
1110 CPPFLAGS="$MAGICK_CPPFLAGS $CPPFLAGS" 1112
1111 LIBS="$MAGICK_LDFLAGS $MAGICK_LIBS $LIBS" 1113 warn_magick="$magick++ library fails tests. The imread function for reading image files will not be fully functional."
1112 AC_LANG_PUSH(C++) 1114
1113 AC_CHECK_HEADER([Magick++.h], [ 1115 save_CPPFLAGS="$CPPFLAGS"
1114 AC_CACHE_CHECK([for Magick::ColorRGB in Magick++.h], 1116 save_LIBS="$LIBS"
1115 [octave_cv_func_magick_colorrgb], 1117 CPPFLAGS="$MAGICK_CPPFLAGS $CPPFLAGS"
1116 [AC_PREPROC_IFELSE([AC_LANG_SOURCE([[ 1118 LIBS="$MAGICK_LDFLAGS $MAGICK_LIBS $LIBS"
1117 #include <Magick++.h> 1119 AC_LANG_PUSH(C++)
1118 ]], [[ 1120 AC_CHECK_HEADER([Magick++.h], [
1119 Magick::ColorRGB c; 1121 AC_CACHE_CHECK([for Magick::ColorRGB in Magick++.h],
1120 ]])], 1122 [octave_cv_func_magick_colorrgb],
1121 octave_cv_func_magick_colorrgb=yes, 1123 [AC_PREPROC_IFELSE([AC_LANG_SOURCE([[
1122 octave_cv_func_magick_colorrgb=no) 1124 #include <Magick++.h>
1123 ]) 1125 ]], [[
1124 if test $octave_cv_func_magick_colorrgb = yes; then 1126 Magick::ColorRGB c;
1125 warn_magick= 1127 ]])],
1126 fi 1128 octave_cv_func_magick_colorrgb=yes,
1129 octave_cv_func_magick_colorrgb=no)
1130 ])
1131 if test $octave_cv_func_magick_colorrgb = yes; then
1132 use_magick=yes
1133 warn_magick=
1134 fi
1135 ])
1136 AC_LANG_POP(C++)
1137 CPPFLAGS="$save_CPPFLAGS"
1138 LIBS="$save_LIBS"
1139
1140 AC_CHECK_FUNCS([setlocale], [],
1141 [use_magick=no
1142 warn_magick="$magick++ requires setlocale function. The imread function for reading image files will not be fully functional."])
1127 ]) 1143 ])
1128 AC_LANG_POP(C++) 1144 fi
1129 CPPFLAGS="$save_CPPFLAGS" 1145
1130 LIBS="$save_LIBS" 1146 if test $use_magick = yes; then
1131
1132 AC_CHECK_FUNCS([setlocale], [],
1133 [warn_magick="$magick++ requires setlocale function. The imread function for reading image files will not be fully functional."])
1134 ])
1135
1136 if test -z "$warn_magick"; then
1137 AC_DEFINE(HAVE_MAGICK, 1, 1147 AC_DEFINE(HAVE_MAGICK, 1,
1138 [Define to 1 if Graphics/ImageMagick++ is available.]) 1148 [Define to 1 if Graphics/ImageMagick++ is available.])
1139 else 1149 else
1140 OCTAVE_CONFIGURE_WARNING([warn_magick]) 1150 if test -n "$warn_magick"; then
1151 OCTAVE_CONFIGURE_WARNING([warn_magick])
1152 fi
1141 MAGICK_CPPFLAGS= 1153 MAGICK_CPPFLAGS=
1142 MAGICK_LDFLAGS= 1154 MAGICK_LDFLAGS=
1143 MAGICK_LIBS= 1155 MAGICK_LIBS=
1144 fi 1156 fi
1145 AC_SUBST(MAGICK_CPPFLAGS) 1157 AC_SUBST(MAGICK_CPPFLAGS)
1182 1194
1183 check_opengl=yes 1195 check_opengl=yes
1184 AC_ARG_WITH([opengl], 1196 AC_ARG_WITH([opengl],
1185 [AS_HELP_STRING([--without-opengl], 1197 [AS_HELP_STRING([--without-opengl],
1186 [don't use OpenGL libraries, disable OpenGL graphics])], 1198 [don't use OpenGL libraries, disable OpenGL graphics])],
1187 [if test x"$withval" = x"no"; then 1199 [if test x"$withval" = xno; then
1188 check_opengl=no 1200 check_opengl=no
1189 warn_opengl="--without-opengl specified. OpenGL graphics will be disabled." 1201 warn_opengl_disabled="--without-opengl specified. OpenGL graphics will be disabled."
1190 OCTAVE_CONFIGURE_WARNING([warn_opengl_disabled]) 1202 OCTAVE_CONFIGURE_WARNING([warn_opengl_disabled])
1191 fi]) 1203 fi])
1192 1204
1193 ## Check for OpenGL library 1205 ## Check for OpenGL library
1194 if test $check_opengl = yes; then 1206 if test $check_opengl = yes; then
1273 1285
1274 QT_CPPFLAGS= 1286 QT_CPPFLAGS=
1275 QT_LDFLAGS= 1287 QT_LDFLAGS=
1276 QT_LIBS= 1288 QT_LIBS=
1277 1289
1278 win32_terminal=no
1279 check_qt=yes 1290 check_qt=yes
1280 build_qt_gui=no 1291 build_qt_gui=no
1281 build_qt_graphics=no 1292 build_qt_graphics=no
1282 1293 use_qscintilla=no
1283 AC_ARG_ENABLE([qt], 1294 win32_terminal=no
1295
1296 AC_ARG_WITH([qt],
1284 [AS_HELP_STRING([--without-qt], [don't use Qt libraries; disable Qt GUI])], 1297 [AS_HELP_STRING([--without-qt], [don't use Qt libraries; disable Qt GUI])],
1285 [if test "$enableval" = no; then check_qt=no; fi], []) 1298 [if test x"$withval" = xno; then
1299 check_qt=no;
1300 warn_qt_disabled="--without-qt specified. The Qt GUI will be disabled."
1301 OCTAVE_CONFIGURE_WARNING([warn_qt_disabled])
1302 fi])
1286 1303
1287 if test $check_qt = yes; then 1304 if test $check_qt = yes; then
1288 1305
1289 warn_qt_libraries="" 1306 warn_qt_libraries=""
1290 ## Check for Qt libraries 1307 ## Check for Qt libraries
1458 AC_LANG_POP(C++) 1475 AC_LANG_POP(C++)
1459 CPPFLAGS="$save_CPPFLAGS" 1476 CPPFLAGS="$save_CPPFLAGS"
1460 1477
1461 OCTAVE_CHECK_FUNC_SETPLACEHOLDERTEXT 1478 OCTAVE_CHECK_FUNC_SETPLACEHOLDERTEXT
1462 OCTAVE_CHECK_FUNC_QSCI_FINDSELECTION 1479 OCTAVE_CHECK_FUNC_QSCI_FINDSELECTION
1480 use_qscintilla=yes
1463 fi 1481 fi
1464 fi 1482 fi
1465 fi 1483 fi
1466 1484
1467 AC_SUBST(QT_CPPFLAGS) 1485 AC_SUBST(QT_CPPFLAGS)
1468 AC_SUBST(QT_LDFLAGS) 1486 AC_SUBST(QT_LDFLAGS)
1469 AC_SUBST(QT_LIBS) 1487 AC_SUBST(QT_LIBS)
1470 1488
1471 AM_CONDITIONAL([AMCOND_BUILD_QT_GUI], [test $build_qt_gui = yes]) 1489 AM_CONDITIONAL([AMCOND_BUILD_QT_GUI], [test $build_qt_gui = yes])
1472 AM_CONDITIONAL([AMCOND_BUILD_QT_GRAPHICS], [test $build_qt_graphics = yes]) 1490 AM_CONDITIONAL([AMCOND_BUILD_QT_GRAPHICS], [test $build_qt_graphics = yes])
1473 AM_CONDITIONAL([AMCOND_HAVE_QSCINTILLA], 1491 AM_CONDITIONAL([AMCOND_HAVE_QSCINTILLA], [test $use_qscintilla = yes])
1474 [test $octave_cv_lib_qscintilla = yes])
1475 AM_CONDITIONAL([WIN32_TERMINAL], [test $win32_terminal = yes]) 1492 AM_CONDITIONAL([WIN32_TERMINAL], [test $win32_terminal = yes])
1476 1493
1477 ## Check for FLTK (www.fltk.org) library 1494 ## Check for FLTK (www.fltk.org) library
1478 1495
1479 check_fltk=yes 1496 check_fltk=yes
1480 AC_ARG_WITH([fltk], 1497 AC_ARG_WITH([fltk],
1481 [AS_HELP_STRING([--without-fltk], 1498 [AS_HELP_STRING([--without-fltk],
1482 [don't use FLTK libraries, disable OpenGL graphics with FLTK widgets])], 1499 [don't use FLTK libraries, disable OpenGL graphics with FLTK widgets])],
1483 [if test x"$withval" = x"no"; then 1500 [if test x"$withval" = xno; then
1484 check_fltk=no 1501 check_fltk=no
1485 warn_fltk="--without-fltk specified. FLTK widgets will be disabled." 1502 warn_fltk="--without-fltk specified. FLTK widgets will be disabled."
1486 OCTAVE_CONFIGURE_WARNING([warn_fltk]) 1503 OCTAVE_CONFIGURE_WARNING([warn_fltk])
1487 fi]) 1504 fi])
1488 1505