Mercurial > octave
comparison configure.ac @ 18227:1af5ee5f3076
maint: Periodic merge of gui-release to default.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 06 Jan 2014 14:34:56 -0500 |
parents | 775e7874b38d e54cfaae830b |
children | 3cad99b56fa7 |
comparison
equal
deleted
inserted
replaced
18213:cda4bd2fd0c0 | 18227:1af5ee5f3076 |
---|---|
1 dnl Process this file with autoconf to produce a configure script. | 1 dnl Process this file with autoconf to produce a configure script. |
2 dnl | 2 dnl |
3 dnl Copyright (C) 1993-2013 John W. Eaton | 3 dnl Copyright (C) 1993-2013 John W. Eaton |
4 ### | 4 ### |
5 ### This file is part of Octave. | 5 ### This file is part of Octave. |
6 ### | 6 ### |
7 ### Octave is free software; you can redistribute it and/or modify it | 7 ### Octave is free software; you can redistribute it and/or modify it |
8 ### under the terms of the GNU General Public License as published by the | 8 ### under the terms of the GNU General Public License as published by the |
9 ### Free Software Foundation; either version 3 of the License, or (at | 9 ### Free Software Foundation; either version 3 of the License, or (at |
10 ### your option) any later version. | 10 ### your option) any later version. |
11 ### | 11 ### |
12 ### Octave is distributed in the hope that it will be useful, but WITHOUT | 12 ### Octave is distributed in the hope that it will be useful, but WITHOUT |
13 ### ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | 13 ### ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
14 ### FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | 14 ### FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
15 ### for more details. | 15 ### for more details. |
16 ### | 16 ### |
17 ### You should have received a copy of the GNU General Public License | 17 ### You should have received a copy of the GNU General Public License |
18 ### along with Octave; see the file COPYING. If not, see | 18 ### along with Octave; see the file COPYING. If not, see |
19 ### <http://www.gnu.org/licenses/>. | 19 ### <http://www.gnu.org/licenses/>. |
20 | 20 |
21 AC_PREREQ([2.62]) | 21 AC_PREREQ([2.62]) |
48 AM_SILENT_RULES | 48 AM_SILENT_RULES |
49 | 49 |
50 OCTAVE_CANONICAL_HOST | 50 OCTAVE_CANONICAL_HOST |
51 | 51 |
52 AC_DEFINE(OCTAVE_SOURCE, 1, [Define to 1 if this is Octave.]) | 52 AC_DEFINE(OCTAVE_SOURCE, 1, [Define to 1 if this is Octave.]) |
53 | 53 |
54 AC_USE_SYSTEM_EXTENSIONS | 54 AC_USE_SYSTEM_EXTENSIONS |
55 | 55 |
56 ### Make configure args available for other uses. | 56 ### Make configure args available for other uses. |
57 | 57 |
58 config_opts=$ac_configure_args | 58 config_opts=$ac_configure_args |
448 *) | 448 *) |
449 ac_float_truncate= | 449 ac_float_truncate= |
450 ;; | 450 ;; |
451 esac]) | 451 esac]) |
452 | 452 |
453 AC_DEFINE_UNQUOTED(FLOAT_TRUNCATE, [$ac_float_truncate], | 453 AC_DEFINE_UNQUOTED(FLOAT_TRUNCATE, [$ac_float_truncate], |
454 [Define to volatile if you need to truncate intermediate FP results.]) | 454 [Define to volatile if you need to truncate intermediate FP results.]) |
455 | 455 |
456 ### Determine extra CFLAGS that may be necessary for Octave. | 456 ### Determine extra CFLAGS that may be necessary for Octave. |
457 | 457 |
458 ## On Intel systems with gcc, we may need to compile with -mieee-fp | 458 ## On Intel systems with gcc, we may need to compile with -mieee-fp |
988 | 988 |
989 PKG_CHECK_EXISTS([$magick++], [ | 989 PKG_CHECK_EXISTS([$magick++], [ |
990 ## Make sure we only get -I, -L, and -l flags. Some Graphics/ImageMagick++ | 990 ## Make sure we only get -I, -L, and -l flags. Some Graphics/ImageMagick++ |
991 ## packages add extra flags that are useful when building | 991 ## packages add extra flags that are useful when building |
992 ## Graphics/ImageMagick++ extentions. These extra flags break the | 992 ## Graphics/ImageMagick++ extentions. These extra flags break the |
993 ## Octave build. | 993 ## Octave build. |
994 MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags-only-I $magick++` | 994 MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags-only-I $magick++` |
995 MAGICK_LDFLAGS=`$PKG_CONFIG --libs-only-L $magick++` | 995 MAGICK_LDFLAGS=`$PKG_CONFIG --libs-only-L $magick++` |
996 MAGICK_LIBS=`$PKG_CONFIG --libs-only-l $magick++` | 996 MAGICK_LIBS=`$PKG_CONFIG --libs-only-l $magick++` |
997 | 997 |
998 warn_magick="$magick++ library fails tests. The imread function for reading image files will not be fully functional." | 998 warn_magick="$magick++ library fails tests. The imread function for reading image files will not be fully functional." |
1049 AC_SUBST(X11_INCFLAGS) | 1049 AC_SUBST(X11_INCFLAGS) |
1050 | 1050 |
1051 if test -z "$x_libraries"; then | 1051 if test -z "$x_libraries"; then |
1052 AC_CHECK_LIB([X11], XrmInitialize, [X11_LIBS="-lX11"], [X11_LIBS=]) | 1052 AC_CHECK_LIB([X11], XrmInitialize, [X11_LIBS="-lX11"], [X11_LIBS=]) |
1053 elif test $x_libraries != "NONE"; then | 1053 elif test $x_libraries != "NONE"; then |
1054 AC_CHECK_LIB([X11], XrmInitialize, | 1054 AC_CHECK_LIB([X11], XrmInitialize, |
1055 [X11_LIBS="-L$x_libraries -lX11"], [X11_LIBS=], "-L$x_libraries") | 1055 [X11_LIBS="-L$x_libraries -lX11"], [X11_LIBS=], "-L$x_libraries") |
1056 fi | 1056 fi |
1057 AC_SUBST(X11_LIBS) | 1057 AC_SUBST(X11_LIBS) |
1058 fi | 1058 fi |
1059 | 1059 |
1223 ]) | 1223 ]) |
1224 if test $octave_cv_fltk_opengl_support = no; then | 1224 if test $octave_cv_fltk_opengl_support = no; then |
1225 warn_fltk_opengl="FLTK does not have OpenGL support. Native graphics will be disabled." | 1225 warn_fltk_opengl="FLTK does not have OpenGL support. Native graphics will be disabled." |
1226 else | 1226 else |
1227 AC_DEFINE(HAVE_FLTK, 1, [Define to 1 if FLTK is available.]) | 1227 AC_DEFINE(HAVE_FLTK, 1, [Define to 1 if FLTK is available.]) |
1228 fi | 1228 fi |
1229 | 1229 |
1230 if test -z "$warn_fltk_opengl"; then | 1230 if test -z "$warn_fltk_opengl"; then |
1231 GRAPHICS_CFLAGS="$FLTK_CFLAGS" | 1231 GRAPHICS_CFLAGS="$FLTK_CFLAGS" |
1232 GRAPHICS_LIBS="$FLTK_LDFLAGS" | 1232 GRAPHICS_LIBS="$FLTK_LDFLAGS" |
1233 else | 1233 else |
1379 AC_MSG_ERROR([BLAS and LAPACK libraries are required]) | 1379 AC_MSG_ERROR([BLAS and LAPACK libraries are required]) |
1380 fi | 1380 fi |
1381 | 1381 |
1382 ### Check for the qrupdate library | 1382 ### Check for the qrupdate library |
1383 | 1383 |
1384 ## No need to adjust FFLAGS because only link is attempted. | 1384 ## No need to adjust FFLAGS because only link is attempted. |
1385 ## Must supply proper LIBS, however. | 1385 ## Must supply proper LIBS, however. |
1386 save_LIBS="$LIBS" | 1386 save_LIBS="$LIBS" |
1387 LIBS="$LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS" | 1387 LIBS="$LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS" |
1388 OCTAVE_CHECK_LIB(qrupdate, qrupdate, | 1388 OCTAVE_CHECK_LIB(qrupdate, qrupdate, |
1389 [qrupdate not found. The QR & Cholesky updating functions will be slow.], | 1389 [qrupdate not found. The QR & Cholesky updating functions will be slow.], |
1514 ## Possibly need other library names for MinGW, Cygwin. | 1514 ## Possibly need other library names for MinGW, Cygwin. |
1515 AC_SEARCH_LIBS([SuiteSparse_time], | 1515 AC_SEARCH_LIBS([SuiteSparse_time], |
1516 [suitesparseconfig SuiteSparse], | 1516 [suitesparseconfig SuiteSparse], |
1517 [], [], [$xtra_libs]) | 1517 [], [], [$xtra_libs]) |
1518 case $ac_cv_search_SuiteSparse_time in | 1518 case $ac_cv_search_SuiteSparse_time in |
1519 -l*) | 1519 -l*) |
1520 UMFPACK_LIBS="$UMFPACK_LIBS $ac_cv_search_SuiteSparse_time" | 1520 UMFPACK_LIBS="$UMFPACK_LIBS $ac_cv_search_SuiteSparse_time" |
1521 ;; | 1521 ;; |
1522 no) | 1522 no) |
1523 UMFPACK_LIBS= | 1523 UMFPACK_LIBS= |
1524 AC_MSG_WARN([UMFPACK library found but is missing SuiteSparse_time functionality.]) | 1524 AC_MSG_WARN([UMFPACK library found but is missing SuiteSparse_time functionality.]) |
1632 CXXPICFLAG= | 1632 CXXPICFLAG= |
1633 CPICFLAG= | 1633 CPICFLAG= |
1634 FPICFLAG= | 1634 FPICFLAG= |
1635 ;; | 1635 ;; |
1636 esac | 1636 esac |
1637 SHLEXT=dylib | 1637 SHLEXT=dylib |
1638 SHLLIB='$(SHLEXT)' | 1638 SHLLIB='$(SHLEXT)' |
1639 SHLEXT_VER='$(version).$(SHLEXT)' | 1639 SHLEXT_VER='$(version).$(SHLEXT)' |
1640 SHLLIB_VER='$(version).$(SHLLIB)' | 1640 SHLLIB_VER='$(version).$(SHLLIB)' |
1641 NO_OCT_FILE_STRIP=true | 1641 NO_OCT_FILE_STRIP=true |
1642 SONAME_FLAGS='-install_name $(octlibdir)/$@' | 1642 SONAME_FLAGS='-install_name $(octlibdir)/$@' |
1643 library_path_var=DYLD_LIBRARY_PATH | 1643 library_path_var=DYLD_LIBRARY_PATH |
1644 ;; | 1644 ;; |
1645 *-*-cygwin*) | 1645 *-*-cygwin*) |
1646 CPICFLAG= | 1646 CPICFLAG= |
1647 CXXPICFLAG= | 1647 CXXPICFLAG= |
1648 FPICFLAG= | 1648 FPICFLAG= |
1649 LIBPRE=lib | 1649 LIBPRE=lib |
1650 SHLPRE=cyg | 1650 SHLPRE=cyg |
1651 SHLBINPRE=cyg | 1651 SHLBINPRE=cyg |
1652 SHLEXT=dll | 1652 SHLEXT=dll |
1653 SHLLIB=dll.a | 1653 SHLLIB=dll.a |
1654 SHLBIN=dll | 1654 SHLBIN=dll |
1655 DL_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc" | 1655 DL_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc" |
1656 SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-auto-image-base" | 1656 SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-auto-image-base" |
1657 SONAME_FLAGS='-Wl,--out-implib=$(patsubst $(SHLPRE)%,$(LIBPRE)%,$@).a' | 1657 SONAME_FLAGS='-Wl,--out-implib=$(patsubst $(SHLPRE)%,$(LIBPRE)%,$@).a' |
1658 ldpreloadsep=":" | 1658 ldpreloadsep=":" |
1659 ;; | 1659 ;; |
2130 | 2130 |
2131 ## Does the C compiler handle alloca() and const correctly? | 2131 ## Does the C compiler handle alloca() and const correctly? |
2132 AC_FUNC_ALLOCA | 2132 AC_FUNC_ALLOCA |
2133 | 2133 |
2134 ## Does the C compiler support Automake subdir-objects option? | 2134 ## Does the C compiler support Automake subdir-objects option? |
2135 AM_PROG_CC_C_O | 2135 AM_PROG_CC_C_O |
2136 | 2136 |
2137 ### gnulib initialization: part 2 | 2137 ### gnulib initialization: part 2 |
2138 ### After all include and path modifications have taken place | 2138 ### After all include and path modifications have taken place |
2139 ### and at the same priority level as function checks. | 2139 ### and at the same priority level as function checks. |
2140 | 2140 |
2239 octave_cv_header_math_defines=yes | 2239 octave_cv_header_math_defines=yes |
2240 AC_DEFINE(_USE_MATH_DEFINES, 1, | 2240 AC_DEFINE(_USE_MATH_DEFINES, 1, |
2241 [Define to 1 if _USE_MATH_DEFINES is required to get math constants like M_LN2.]) | 2241 [Define to 1 if _USE_MATH_DEFINES is required to get math constants like M_LN2.]) |
2242 CPPFLAGS="$CPPFLAGS -D_USE_MATH_DEFINES" | 2242 CPPFLAGS="$CPPFLAGS -D_USE_MATH_DEFINES" |
2243 fi | 2243 fi |
2244 fi | 2244 fi |
2245 | 2245 |
2246 if test $octave_cv_header_math_defines = yes; then | 2246 if test $octave_cv_header_math_defines = yes; then |
2247 AC_DEFINE(HAVE_MATH_DEFINES, 1, | 2247 AC_DEFINE(HAVE_MATH_DEFINES, 1, |
2248 [Define to 1 if defines such as M_PI are available in math.h]) | 2248 [Define to 1 if defines such as M_PI are available in math.h]) |
2249 else | 2249 else |
2291 | 2291 |
2292 AC_CHECK_FUNCS([getpwnam], [], [AC_CHECK_LIB([sun], [getpwnam])]) | 2292 AC_CHECK_FUNCS([getpwnam], [], [AC_CHECK_LIB([sun], [getpwnam])]) |
2293 | 2293 |
2294 AC_FUNC_CLOSEDIR_VOID | 2294 AC_FUNC_CLOSEDIR_VOID |
2295 | 2295 |
2296 ## Check return type of matherr() | 2296 ## Check return type of matherr() |
2297 AC_CACHE_CHECK([for struct exception in math.h], | 2297 AC_CACHE_CHECK([for struct exception in math.h], |
2298 [octave_cv_func_matherr_type], | 2298 [octave_cv_func_matherr_type], |
2299 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ | 2299 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
2300 #include <math.h> | 2300 #include <math.h> |
2301 ]], [[ | 2301 ]], [[ |
2308 ]) | 2308 ]) |
2309 if test $octave_cv_func_matherr_type = yes; then | 2309 if test $octave_cv_func_matherr_type = yes; then |
2310 AC_DEFINE(EXCEPTION_IN_MATH, 1, | 2310 AC_DEFINE(EXCEPTION_IN_MATH, 1, |
2311 [Define to 1 if math.h declares struct exception for matherr().]) | 2311 [Define to 1 if math.h declares struct exception for matherr().]) |
2312 fi | 2312 fi |
2313 | 2313 |
2314 ## Signal stuff. | 2314 ## Signal stuff. |
2315 | 2315 |
2316 AC_CHECK_DECLS([sys_siglist], [], [], | 2316 AC_CHECK_DECLS([sys_siglist], [], [], |
2317 [[#include <signal.h> | 2317 [[#include <signal.h> |
2318 /* NetBSD declares sys_siglist in unistd.h. */ | 2318 /* NetBSD declares sys_siglist in unistd.h. */ |
2338 fi | 2338 fi |
2339 fi | 2339 fi |
2340 AM_CONDITIONAL([AMCOND_BUILD_DOCS], [test -n "$DOCDIR"]) | 2340 AM_CONDITIONAL([AMCOND_BUILD_DOCS], [test -n "$DOCDIR"]) |
2341 | 2341 |
2342 ### Maybe add -Wall, -W, and -Wshadow to compiler flags now that we're | 2342 ### Maybe add -Wall, -W, and -Wshadow to compiler flags now that we're |
2343 ### done feature testing. | 2343 ### done feature testing. |
2344 | 2344 |
2345 GCC_EXTRA_FLAGS="-Wall -W -Wshadow -Wformat -Wpointer-arith -Wmissing-prototypes -Wstrict-prototypes -Wwrite-strings -Wcast-align -Wcast-qual" | 2345 GCC_EXTRA_FLAGS="-Wall -W -Wshadow -Wformat -Wpointer-arith -Wmissing-prototypes -Wstrict-prototypes -Wwrite-strings -Wcast-align -Wcast-qual" |
2346 | 2346 |
2347 GXX_EXTRA_FLAGS="-Wall -W -Wshadow -Wold-style-cast -Wformat -Wpointer-arith -Wwrite-strings -Wcast-align -Wcast-qual" | 2347 GXX_EXTRA_FLAGS="-Wall -W -Wshadow -Wold-style-cast -Wformat -Wpointer-arith -Wwrite-strings -Wcast-align -Wcast-qual" |
2348 | 2348 |
2560 fi | 2560 fi |
2561 done | 2561 done |
2562 fi | 2562 fi |
2563 | 2563 |
2564 if test -z "$JAVA_LDPATH"; then | 2564 if test -z "$JAVA_LDPATH"; then |
2565 ## Nothing found. Try Java again using bootpath argument. | 2565 ## Nothing found. Try Java again using bootpath argument. |
2566 JAVA_TMP_LDPATH=`$JAVA -classpath ${srcdir}/build-aux OctJavaQry JAVA_BOOTPATH` | 2566 JAVA_TMP_LDPATH=`$JAVA -classpath ${srcdir}/build-aux OctJavaQry JAVA_BOOTPATH` |
2567 JAVA_TMP_LDPATH="${JAVA_TMP_LDPATH} ${JAVA_TMP_LDPATH}/client ${JAVA_TMP_LDPATH}/server" | 2567 JAVA_TMP_LDPATH="${JAVA_TMP_LDPATH} ${JAVA_TMP_LDPATH}/client ${JAVA_TMP_LDPATH}/server" |
2568 for dir in $JAVA_TMP_LDPATH; do | 2568 for dir in $JAVA_TMP_LDPATH; do |
2569 if test -f "$dir/$jvmlib"; then | 2569 if test -f "$dir/$jvmlib"; then |
2570 JAVA_LDPATH=$dir | 2570 JAVA_LDPATH=$dir |
2593 if test -n "$JAVA_LDPATH"; then | 2593 if test -n "$JAVA_LDPATH"; then |
2594 if test -f "${JAVA_LDPATH}/$jvmlib"; then | 2594 if test -f "${JAVA_LDPATH}/$jvmlib"; then |
2595 : # libjvm found | 2595 : # libjvm found |
2596 else | 2596 else |
2597 JAVA_LDPATH="" | 2597 JAVA_LDPATH="" |
2598 fi | 2598 fi |
2599 fi | 2599 fi |
2600 | 2600 |
2601 if test -z "$JAVA_LDPATH"; then | 2601 if test -z "$JAVA_LDPATH"; then |
2602 AC_MSG_RESULT([not found]) | 2602 AC_MSG_RESULT([not found]) |
2603 warn_java="Library $jvmlib not found. Octave will not be able to call Java methods." | 2603 warn_java="Library $jvmlib not found. Octave will not be able to call Java methods." |
2633 esac | 2633 esac |
2634 | 2634 |
2635 ## Verify jni.h include file exists. | 2635 ## Verify jni.h include file exists. |
2636 JNI_PATH=`echo $JAVA_CPPFLAGS | $SED -e 's/-I//g'` | 2636 JNI_PATH=`echo $JAVA_CPPFLAGS | $SED -e 's/-I//g'` |
2637 have_jni=no | 2637 have_jni=no |
2638 for dir in $JNI_PATH; do | 2638 for dir in $JNI_PATH; do |
2639 if test -f "${dir}/jni.h"; then have_jni=yes; break; fi | 2639 if test -f "${dir}/jni.h"; then have_jni=yes; break; fi |
2640 done | 2640 done |
2641 if test $have_jni = yes; then | 2641 if test $have_jni = yes; then |
2642 AC_MSG_RESULT([$dir]) | 2642 AC_MSG_RESULT([$dir]) |
2643 else | 2643 else |
2702 AC_CHECK_TOOLS(MOC, [moc-qt5 moc-qt4 moc]) | 2702 AC_CHECK_TOOLS(MOC, [moc-qt5 moc-qt4 moc]) |
2703 AC_CHECK_TOOLS(UIC, [uic-qt5 uic-qt4 uic]) | 2703 AC_CHECK_TOOLS(UIC, [uic-qt5 uic-qt4 uic]) |
2704 AC_CHECK_TOOLS(RCC, [rcc-qt5 rcc-qt4 rcc]) | 2704 AC_CHECK_TOOLS(RCC, [rcc-qt5 rcc-qt4 rcc]) |
2705 AC_CHECK_TOOLS(LRELEASE, [lrelease-qt5 lrelease-qt4 lrelease]) | 2705 AC_CHECK_TOOLS(LRELEASE, [lrelease-qt5 lrelease-qt4 lrelease]) |
2706 if test -n "$MOC" && test -n "$UIC" && test -n "$RCC" && test -n "$LRELEASE"; then | 2706 if test -n "$MOC" && test -n "$UIC" && test -n "$RCC" && test -n "$LRELEASE"; then |
2707 AC_DEFINE(HAVE_QT, 1, | 2707 AC_DEFINE(HAVE_QT, 1, |
2708 [Define to 1 if Qt is available (libraries, developer header files, utility programs (moc, uic, rcc, and lrelease))]) | 2708 [Define to 1 if Qt is available (libraries, developer header files, utility programs (moc, uic, rcc, and lrelease))]) |
2709 else | 2709 else |
2710 warn_gui="Qt utility programs moc, uic, rcc, and lrelease not found -- disabling GUI" | 2710 warn_gui="Qt utility programs moc, uic, rcc, and lrelease not found -- disabling GUI" |
2711 build_gui=no | 2711 build_gui=no |
2712 fi | 2712 fi |
2721 fi | 2721 fi |
2722 | 2722 |
2723 if test $build_gui = yes; then | 2723 if test $build_gui = yes; then |
2724 OCTAVE_CHECK_QFONT_MONOSPACE | 2724 OCTAVE_CHECK_QFONT_MONOSPACE |
2725 OCTAVE_CHECK_FUNC_SETPLACEHOLDERTEXT | 2725 OCTAVE_CHECK_FUNC_SETPLACEHOLDERTEXT |
2726 OCTAVE_CHECK_FUNC_QTABWIDGET_SETMOVABLE | |
2726 fi | 2727 fi |
2727 | 2728 |
2728 if test $build_gui = yes; then | 2729 if test $build_gui = yes; then |
2729 ## Check for Qscintilla library which is used in the GUI editor. | 2730 ## Check for Qscintilla library which is used in the GUI editor. |
2730 AC_CACHE_CHECK([whether Qscintilla library is installed], | 2731 AC_CACHE_CHECK([whether Qscintilla library is installed], |
2731 [octave_cv_lib_qscintilla], | 2732 [octave_cv_lib_qscintilla], |
2732 [save_CPPFLAGS="$CPPFLAGS" | 2733 [save_CPPFLAGS="$CPPFLAGS" |
2733 save_LDFLAGS="$LDFLAGS" | 2734 save_LDFLAGS="$LDFLAGS" |
2734 save_LIBS="$LIBS" | 2735 save_LIBS="$LIBS" |
2754 else | 2755 else |
2755 ## Let's assume Qscintilla library is at the same location as | 2756 ## Let's assume Qscintilla library is at the same location as |
2756 ## other regular Qt libraries. | 2757 ## other regular Qt libraries. |
2757 QT_LIBS="$QT_LIBS -lqscintilla2" | 2758 QT_LIBS="$QT_LIBS -lqscintilla2" |
2758 OCTAVE_CHECK_VERSION_2_6_0 | 2759 OCTAVE_CHECK_VERSION_2_6_0 |
2759 AC_DEFINE(HAVE_QSCINTILLA, 1, | 2760 AC_DEFINE(HAVE_QSCINTILLA, 1, |
2760 [Define to 1 if the QScintilla library and header files are available]) | 2761 [Define to 1 if the QScintilla library and header files are available]) |
2761 | 2762 |
2762 save_CPPFLAGS="$CPPFLAGS" | 2763 save_CPPFLAGS="$CPPFLAGS" |
2763 CPPFLAGS="$QT_CPPFLAGS $CPPFLAGS" | 2764 CPPFLAGS="$QT_CPPFLAGS $CPPFLAGS" |
2764 AC_LANG_PUSH(C++) | 2765 AC_LANG_PUSH(C++) |
2821 AC_SUBST(ac_config_files) | 2822 AC_SUBST(ac_config_files) |
2822 AC_SUBST(ac_config_headers) | 2823 AC_SUBST(ac_config_headers) |
2823 | 2824 |
2824 AC_CONFIG_FILES([ | 2825 AC_CONFIG_FILES([ |
2825 oct-conf-post.h:oct-conf-post.in.h | 2826 oct-conf-post.h:oct-conf-post.in.h |
2826 Makefile | 2827 Makefile |
2827 doc/Makefile | 2828 doc/Makefile |
2828 doc/doxyhtml/Makefile | 2829 doc/doxyhtml/Makefile |
2829 doc/doxyhtml/Doxyfile | 2830 doc/doxyhtml/Doxyfile |
2830 doc/icons/Makefile | 2831 doc/icons/Makefile |
2831 doc/interpreter/Makefile | 2832 doc/interpreter/Makefile |