Mercurial > mxe-octave
annotate src/of-ltfat-1-fixes.patch @ 4733:1ecb1e67eaa1
* src/src-msys-dos2unix.mk: update checksum
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Sat, 09 Jun 2018 10:13:46 -0400 |
parents | 3d2263062bbd |
children |
rev | line source |
---|---|
4509
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1 diff -uNr a/src/configure b/src/configure |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2 --- a/src/configure 2016-12-20 12:05:08.000000000 -0500 |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
3 +++ b/src/configure 2017-10-12 14:13:16.956665770 -0400 |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
4 @@ -587,7 +587,7 @@ |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
5 ac_subst_vars='LTLIBOBJS |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
6 LIBOBJS |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
7 have_libportaudio |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
8 -MKOCTFILE_CHECK |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
9 +MKOCTFILE |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
10 ac_ct_CXX |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
11 CXXFLAGS |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
12 CXX |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
13 @@ -3082,11 +3082,11 @@ |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
14 set dummy mkoctfile; ac_word=$2 |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
15 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
16 $as_echo_n "checking for $ac_word... " >&6; } |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
17 -if ${ac_cv_prog_MKOCTFILE_CHECK+:} false; then : |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
18 +if ${ac_cv_prog_MKOCTFILE+:} false; then : |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
19 $as_echo_n "(cached) " >&6 |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
20 else |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
21 - if test -n "$MKOCTFILE_CHECK"; then |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
22 - ac_cv_prog_MKOCTFILE_CHECK="$MKOCTFILE_CHECK" # Let the user override the test. |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
23 + if test -n "$MKOCTFILE"; then |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
24 + ac_cv_prog_MKOCTFILE="$MKOCTFILE" # Let the user override the test. |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
25 else |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
26 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
27 for as_dir in $PATH |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
28 @@ -3095,7 +3095,7 @@ |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
29 test -z "$as_dir" && as_dir=. |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
30 for ac_exec_ext in '' $ac_executable_extensions; do |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
31 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
32 - ac_cv_prog_MKOCTFILE_CHECK=""yes"" |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
33 + ac_cv_prog_MKOCTFILE="mkoctfile" |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
34 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
35 break 2 |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
36 fi |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
37 @@ -3105,17 +3105,17 @@ |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
38 |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
39 fi |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
40 fi |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
41 -MKOCTFILE_CHECK=$ac_cv_prog_MKOCTFILE_CHECK |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
42 -if test -n "$MKOCTFILE_CHECK"; then |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
43 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKOCTFILE_CHECK" >&5 |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
44 -$as_echo "$MKOCTFILE_CHECK" >&6; } |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
45 +MKOCTFILE=$ac_cv_prog_MKOCTFILE |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
46 +if test -n "$MKOCTFILE"; then |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
47 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKOCTFILE" >&5 |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
48 +$as_echo "$MKOCTFILE" >&6; } |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
49 else |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
50 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
51 $as_echo "no" >&6; } |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
52 fi |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
53 |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
54 |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
55 -if test "$MKOCTFILE_CHECK" != "yes" ; then |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
56 +if test -z "$MKOCTFILE"; then |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
57 as_fn_error $? "Please install mkoctfile." "$LINENO" 5 |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
58 fi |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
59 |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
60 diff -uNr a/src/configure.ac b/src/configure.ac |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
61 --- a/src/configure.ac 2016-12-20 12:05:08.000000000 -0500 |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
62 +++ b/src/configure.ac 2017-10-12 14:08:11.627023155 -0400 |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
63 @@ -26,8 +26,8 @@ |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
64 #fi |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
65 |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
66 dnl Check for MKOCTFILE |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
67 -AC_CHECK_PROG(MKOCTFILE_CHECK,mkoctfile,"yes") |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
68 -if test "$MKOCTFILE_CHECK" != "yes" ; then |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
69 +AC_CHECK_PROG(MKOCTFILE,mkoctfile,mkoctfile) |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
70 +if test -z "$MKOCTFILE"; then |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
71 AC_MSG_ERROR([Please install mkoctfile.]) |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
72 fi |
3d2263062bbd
of-ltfat, of-video: Fix mkoctfile detection.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
73 |