Mercurial > mxe-octave

comparison src/of-ltfat-1-fixes.patch @ 4509:3d2263062bbd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-ltfat, of-video: Fix mkoctfile detection.
author John W. Eaton <jwe@octave.org>
date Thu, 12 Oct 2017 15:37:33 -0400
parents
children
comparison
equal deleted inserted replaced
4508:7dc3bebccab9 4509:3d2263062bbd
1 diff -uNr a/src/configure b/src/configure
2 --- a/src/configure 2016-12-20 12:05:08.000000000 -0500
3 +++ b/src/configure 2017-10-12 14:13:16.956665770 -0400
4 @@ -587,7 +587,7 @@
5 ac_subst_vars='LTLIBOBJS
6 LIBOBJS
7 have_libportaudio
8 -MKOCTFILE_CHECK
9 +MKOCTFILE
10 ac_ct_CXX
11 CXXFLAGS
12 CXX
13 @@ -3082,11 +3082,11 @@
14 set dummy mkoctfile; ac_word=$2
15 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16 $as_echo_n "checking for $ac_word... " >&6; }
17 -if ${ac_cv_prog_MKOCTFILE_CHECK+:} false; then :
18 +if ${ac_cv_prog_MKOCTFILE+:} false; then :
19 $as_echo_n "(cached) " >&6
20 else
21 - if test -n "$MKOCTFILE_CHECK"; then
22 - ac_cv_prog_MKOCTFILE_CHECK="$MKOCTFILE_CHECK" # Let the user override the test.
23 + if test -n "$MKOCTFILE"; then
24 + ac_cv_prog_MKOCTFILE="$MKOCTFILE" # Let the user override the test.
25 else
26 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
27 for as_dir in $PATH
28 @@ -3095,7 +3095,7 @@
29 test -z "$as_dir" && as_dir=.
30 for ac_exec_ext in '' $ac_executable_extensions; do
31 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
32 - ac_cv_prog_MKOCTFILE_CHECK=""yes""
33 + ac_cv_prog_MKOCTFILE="mkoctfile"
34 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
35 break 2
36 fi
37 @@ -3105,17 +3105,17 @@
38
39 fi
40 fi
41 -MKOCTFILE_CHECK=$ac_cv_prog_MKOCTFILE_CHECK
42 -if test -n "$MKOCTFILE_CHECK"; then
43 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKOCTFILE_CHECK" >&5
44 -$as_echo "$MKOCTFILE_CHECK" >&6; }
45 +MKOCTFILE=$ac_cv_prog_MKOCTFILE
46 +if test -n "$MKOCTFILE"; then
47 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKOCTFILE" >&5
48 +$as_echo "$MKOCTFILE" >&6; }
49 else
50 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
51 $as_echo "no" >&6; }
52 fi
53
54
55 -if test "$MKOCTFILE_CHECK" != "yes" ; then
56 +if test -z "$MKOCTFILE"; then
57 as_fn_error $? "Please install mkoctfile." "$LINENO" 5
58 fi
59
60 diff -uNr a/src/configure.ac b/src/configure.ac
61 --- a/src/configure.ac 2016-12-20 12:05:08.000000000 -0500
62 +++ b/src/configure.ac 2017-10-12 14:08:11.627023155 -0400
63 @@ -26,8 +26,8 @@
64 #fi
65
66 dnl Check for MKOCTFILE
67 -AC_CHECK_PROG(MKOCTFILE_CHECK,mkoctfile,"yes")
68 -if test "$MKOCTFILE_CHECK" != "yes" ; then
69 +AC_CHECK_PROG(MKOCTFILE,mkoctfile,mkoctfile)
70 +if test -z "$MKOCTFILE"; then
71 AC_MSG_ERROR([Please install mkoctfile.])
72 fi
73