Mercurial > octave

comparison m4/acinclude.m4 @ 25310:0b253ba6eb91 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid syntax errors in build-aux/subst scripts * m4/acinclude.m4: Use ${top_srcdir} instead of $(top_srcdir) to avoid syntax errors in shell scripts. * subst-config-vals.in.sh, subst-cross-config-vals.in.sh: Also define srcdir, top_srcdir, abs_srcdir, and abs_top_srcdir. Define directory variables ahead of any other variables that might use them.
author John W. Eaton <jwe@octave.org>
date Wed, 25 Apr 2018 10:23:22 -0400
parents 537b732926fb
children 4fe32753cb56
comparison
equal deleted inserted replaced
25309:7d32780f4dea 25310:0b253ba6eb91
2934 " 2934 "
2935 OCTAVE_CONFIGURE_WARNING([warn_bison_push_pull_decl_style]) 2935 OCTAVE_CONFIGURE_WARNING([warn_bison_push_pull_decl_style])
2936 fi 2936 fi
2937 2937
2938 if test $tmp_have_bison = no; then 2938 if test $tmp_have_bison = no; then
2939 YACC='$(top_srcdir)/build-aux/missing bison' 2939 YACC='${top_srcdir}/build-aux/missing bison'
2940 warn_bison=" 2940 warn_bison="
2941 2941
2942 I didn't find bison, or the version of bison that I found does not 2942 I didn't find bison, or the version of bison that I found does not
2943 support all the features that are required, but it's only a problem 2943 support all the features that are required, but it's only a problem
2944 if you need to reconstruct parse.cc, which is the case if you're 2944 if you need to reconstruct parse.cc, which is the case if you're
2972 LFLAGS="-I" 2972 LFLAGS="-I"
2973 AC_MSG_RESULT([defining LFLAGS to be $LFLAGS]) 2973 AC_MSG_RESULT([defining LFLAGS to be $LFLAGS])
2974 LEXLIB= 2974 LEXLIB=
2975 ;; 2975 ;;
2976 *) 2976 *)
2977 LEX='$(top_srcdir)/build-aux/missing flex' 2977 LEX='${top_srcdir}/build-aux/missing flex'
2978 warn_flex=" 2978 warn_flex="
2979 2979
2980 I didn't find flex, but it's only a problem if you need to reconstruct 2980 I didn't find flex, but it's only a problem if you need to reconstruct
2981 lex.cc, which is the case if you're building from VCS sources. 2981 lex.cc, which is the case if you're building from VCS sources.
2982 " 2982 "
2997 ac_octave_gs_names="gs" 2997 ac_octave_gs_names="gs"
2998 ;; 2998 ;;
2999 esac 2999 esac
3000 AC_CHECK_PROGS(GHOSTSCRIPT, [$ac_octave_gs_names]) 3000 AC_CHECK_PROGS(GHOSTSCRIPT, [$ac_octave_gs_names])
3001 if test -z "$GHOSTSCRIPT"; then 3001 if test -z "$GHOSTSCRIPT"; then
3002 GHOSTSCRIPT='$(top_srcdir)/build-aux/missing gs' 3002 GHOSTSCRIPT='${top_srcdir}/build-aux/missing gs'
3003 warn_ghostscript=" 3003 warn_ghostscript="
3004 3004
3005 I didn't find ghostscript, so reconstructing figures for the manual 3005 I didn't find ghostscript, so reconstructing figures for the manual
3006 will fail, and saving graphics in some output formats will fail when 3006 will fail, and saving graphics in some output formats will fail when
3007 using Octave 3007 using Octave
3038 dnl Check for gperf. 3038 dnl Check for gperf.
3039 dnl 3039 dnl
3040 AC_DEFUN([OCTAVE_PROG_GPERF], [ 3040 AC_DEFUN([OCTAVE_PROG_GPERF], [
3041 AC_CHECK_PROG(GPERF, gperf, gperf, []) 3041 AC_CHECK_PROG(GPERF, gperf, gperf, [])
3042 if test -z "$GPERF"; then 3042 if test -z "$GPERF"; then
3043 GPERF='$(top_srcdir)/build-aux/missing gperf' 3043 GPERF='${top_srcdir}/build-aux/missing gperf'
3044 warn_gperf=" 3044 warn_gperf="
3045 3045
3046 I didn't find gperf, but it's only a problem if you need to 3046 I didn't find gperf, but it's only a problem if you need to
3047 reconstruct oct-gperf.h 3047 reconstruct oct-gperf.h
3048 " 3048 "
3049 OCTAVE_CONFIGURE_WARNING([warn_gperf]) 3049 OCTAVE_CONFIGURE_WARNING([warn_gperf])
3050 GPERF='$(top_srcdir)/build-aux/missing gperf' 3050 GPERF='${top_srcdir}/build-aux/missing gperf'
3051 fi 3051 fi
3052 AC_SUBST(GPERF) 3052 AC_SUBST(GPERF)
3053 ]) 3053 ])
3054 dnl 3054 dnl
3055 dnl Find icotool program. 3055 dnl Find icotool program.
3056 dnl 3056 dnl
3057 AC_DEFUN([OCTAVE_PROG_ICOTOOL], [ 3057 AC_DEFUN([OCTAVE_PROG_ICOTOOL], [
3058 AC_CHECK_PROG(ICOTOOL, icotool, icotool, []) 3058 AC_CHECK_PROG(ICOTOOL, icotool, icotool, [])
3059 if test -z "$ICOTOOL"; then 3059 if test -z "$ICOTOOL"; then
3060 ICOTOOL='$(top_srcdir)/build-aux/missing icotool' 3060 ICOTOOL='${top_srcdir}/build-aux/missing icotool'
3061 warn_icotool=" 3061 warn_icotool="
3062 3062
3063 I didn't find icotool, but it's only a problem if you need to 3063 I didn't find icotool, but it's only a problem if you need to
3064 reconstruct octave-logo.ico, which is the case if you're building from 3064 reconstruct octave-logo.ico, which is the case if you're building from
3065 VCS sources. 3065 VCS sources.
3164 dnl Find rsvg-convert program. 3164 dnl Find rsvg-convert program.
3165 dnl 3165 dnl
3166 AC_DEFUN([OCTAVE_PROG_RSVG_CONVERT], [ 3166 AC_DEFUN([OCTAVE_PROG_RSVG_CONVERT], [
3167 AC_CHECK_PROG(RSVG_CONVERT, rsvg-convert, rsvg-convert, []) 3167 AC_CHECK_PROG(RSVG_CONVERT, rsvg-convert, rsvg-convert, [])
3168 if test -z "$RSVG_CONVERT"; then 3168 if test -z "$RSVG_CONVERT"; then
3169 RSVG_CONVERT='$(top_srcdir)/build-aux/missing rsvg-convert' 3169 RSVG_CONVERT='${top_srcdir}/build-aux/missing rsvg-convert'
3170 warn_rsvg_convert=" 3170 warn_rsvg_convert="
3171 3171
3172 I didn't find rsvg-convert, but it's only a problem if you need to 3172 I didn't find rsvg-convert, but it's only a problem if you need to
3173 reconstruct octave-logo-*.png, which is the case if you're building 3173 reconstruct octave-logo-*.png, which is the case if you're building
3174 from VCS sources. 3174 from VCS sources.
3272 dnl Check for texi2dvi. 3272 dnl Check for texi2dvi.
3273 dnl 3273 dnl
3274 AC_DEFUN([OCTAVE_PROG_TEXI2DVI], [ 3274 AC_DEFUN([OCTAVE_PROG_TEXI2DVI], [
3275 AC_CHECK_PROG(TEXI2DVI, texi2dvi, texi2dvi, []) 3275 AC_CHECK_PROG(TEXI2DVI, texi2dvi, texi2dvi, [])
3276 if test -z "$TEXI2DVI"; then 3276 if test -z "$TEXI2DVI"; then
3277 TEXI2DVI='$(top_srcdir)/build-aux/missing texi2dvi' 3277 TEXI2DVI='${top_srcdir}/build-aux/missing texi2dvi'
3278 warn_texi2dvi=" 3278 warn_texi2dvi="
3279 3279
3280 I didn't find texi2dvi, but it's only a problem if you need to 3280 I didn't find texi2dvi, but it's only a problem if you need to
3281 reconstruct the DVI version of the manual 3281 reconstruct the DVI version of the manual
3282 " 3282 "
3298 fi 3298 fi
3299 else 3299 else
3300 ac_octave_texi2pdf_missing=no; 3300 ac_octave_texi2pdf_missing=no;
3301 fi 3301 fi
3302 if test $ac_octave_texi2pdf_missing = yes; then 3302 if test $ac_octave_texi2pdf_missing = yes; then
3303 TEXI2PDF='$(top_srcdir)/build-aux/missing texi2pdf' 3303 TEXI2PDF='${top_srcdir}/build-aux/missing texi2pdf'
3304 warn_texi2pdf=" 3304 warn_texi2pdf="
3305 3305
3306 I didn't find texi2pdf, but it's only a problem if you need to 3306 I didn't find texi2pdf, but it's only a problem if you need to
3307 reconstruct the PDF version of the manual 3307 reconstruct the PDF version of the manual
3308 " 3308 "