Mercurial > octave-dspies

comparison m4/acinclude.m4 @ 18976:dcb260e7a648

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Periodic merge of gui-release to default.
author John W. Eaton <jwe@octave.org>
date Fri, 01 Aug 2014 12:10:05 -0400
parents 2b82d2f29a7b c59745865c7f
children
comparison
equal deleted inserted replaced
18972:19cb2530c16b 18976:dcb260e7a648
378 AC_LANG_POP(C++) 378 AC_LANG_POP(C++)
379 ]) 379 ])
380 if test $octave_cv_decl_qfont_monospace = yes; then 380 if test $octave_cv_decl_qfont_monospace = yes; then
381 AC_DEFINE(HAVE_QFONT_MONOSPACE, 1, 381 AC_DEFINE(HAVE_QFONT_MONOSPACE, 1,
382 [Define to 1 if Qt provides QFont::Monospace.]) 382 [Define to 1 if Qt provides QFont::Monospace.])
383 fi
384 ])
385 dnl
386 dnl Check whether Qt provides QFont::ForceIntegerMetrics
387 dnl
388 AC_DEFUN([OCTAVE_CHECK_QFONT_FORCE_INTEGER_METRICS], [
389 AC_CACHE_CHECK([whether Qt provides QFont::ForceIntegerMetrics],
390 [octave_cv_decl_qfont_force_integer_metrics],
391 [AC_LANG_PUSH(C++)
392 ac_octave_save_CPPFLAGS="$CPPFLAGS"
393 CPPFLAGS="$QT_CPPFLAGS $CPPFLAGS"
394 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
395 #include <QFont>
396 ]], [[
397 QFont::StyleStrategy strategy = QFont::ForceIntegerMetrics;
398 ]])],
399 octave_cv_decl_qfont_force_integer_metrics=yes,
400 octave_cv_decl_qfont_force_integer_metrics=no)
401 CPPFLAGS="$ac_octave_save_CPPFLAGS"
402 AC_LANG_POP(C++)
403 ])
404 if test $octave_cv_decl_qfont_force_integer_metrics = yes; then
405 AC_DEFINE(HAVE_QFONT_FORCE_INTEGER_METRICS, 1,
406 [Define to 1 if Qt provides QFont::ForceIntegerMetrics.])
383 fi 407 fi
384 ]) 408 ])
385 dnl 409 dnl
386 dnl Check whether Qscintilla SetPlaceholderText function exists. 410 dnl Check whether Qscintilla SetPlaceholderText function exists.
387 dnl FIXME: This test uses a version number. It potentially could 411 dnl FIXME: This test uses a version number. It potentially could
1859 1883
1860 case "`$YACC --version`" in 1884 case "`$YACC --version`" in
1861 *bison*) tmp_have_bison=yes ;; 1885 *bison*) tmp_have_bison=yes ;;
1862 *) tmp_have_bison=no ;; 1886 *) tmp_have_bison=no ;;
1863 esac 1887 esac
1888
1889 if test $tmp_have_bison = yes; then
1890 AC_CACHE_CHECK([syntax of bison api.prefix (or name-prefix) declaration],
1891 [octave_cv_bison_api_prefix_decl_style], [
1892 style="api name"
1893 for s in $style; do
1894 if test $s = "api"; then
1895 def='%define api.prefix "foo_"'
1896 else
1897 def='%name-prefix="foo_"'
1898 fi
1899 cat << EOF > conftest.yy
1900 $def
1901 %start input
1902 %%
1903 input:;
1904 %%
1905 EOF
1906 $YACC conftest.yy > /dev/null 2>&1
1907 ac_status=$?
1908 if test $ac_status -eq 0; then
1909 octave_cv_bison_api_prefix_decl_style="$s"
1910 break
1911 fi
1912 if test $ac_status -eq 0; then
1913 break
1914 fi
1915 done
1916 rm -f conftest.yy y.tab.h y.tab.c
1917 ])
1918 fi
1919
1920 AC_SUBST(BISON_API_PREFIX_DECL_STYLE, $octave_cv_bison_api_prefix_decl_style)
1921
1922 if test -z "$octave_cv_bison_api_prefix_decl_style"; then
1923 YACC=
1924 warn_bison_api_prefix_decl_style="
1925
1926 I wasn't able to find a suitable style for declaring the api prefix
1927 in a bison input file so I'm disabling bison.
1928 "
1929 OCTAVE_CONFIGURE_WARNING([warn_bison_api_prefix_decl_style])
1930 fi
1864 1931
1865 if test $tmp_have_bison = yes; then 1932 if test $tmp_have_bison = yes; then
1866 AC_CACHE_CHECK([syntax of bison push/pull declaration], 1933 AC_CACHE_CHECK([syntax of bison push/pull declaration],
1867 [octave_cv_bison_push_pull_decl_style], [ 1934 [octave_cv_bison_push_pull_decl_style], [
1868 style="dash underscore" 1935 style="dash underscore"