Mercurial > mxe-octave

comparison src/of-video-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 00e61c4a5657
comparison
equal deleted inserted replaced
4508:7dc3bebccab9 4509:3d2263062bbd
1 diff -uNr a/src/configure b/src/configure
2 --- a/src/configure 2017-05-28 10:27:03.780918854 -0400
3 +++ b/src/configure 2017-10-12 14:47:24.737839006 -0400
4 @@ -623,7 +623,7 @@
5 EGREP
6 GREP
7 CXXCPP
8 -HAVE_MKOCTFILE
9 +MKOCTFILE
10 OBJEXT
11 EXEEXT
12 ac_ct_CXX
13 @@ -650,6 +650,7 @@
14 docdir
15 oldincludedir
16 includedir
17 +runstatedir
18 localstatedir
19 sharedstatedir
20 sysconfdir
21 @@ -721,6 +722,7 @@
22 sysconfdir='${prefix}/etc'
23 sharedstatedir='${prefix}/com'
24 localstatedir='${prefix}/var'
25 +runstatedir='${localstatedir}/run'
26 includedir='${prefix}/include'
27 oldincludedir='/usr/include'
28 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
29 @@ -973,6 +975,15 @@
30 | -silent | --silent | --silen | --sile | --sil)
31 silent=yes ;;
32
33 + -runstatedir | --runstatedir | --runstatedi | --runstated \
34 + | --runstate | --runstat | --runsta | --runst | --runs \
35 + | --run | --ru | --r)
36 + ac_prev=runstatedir ;;
37 + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
38 + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
39 + | --run=* | --ru=* | --r=*)
40 + runstatedir=$ac_optarg ;;
41 +
42 -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
43 ac_prev=sbindir ;;
44 -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
45 @@ -1110,7 +1121,7 @@
46 for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
47 datadir sysconfdir sharedstatedir localstatedir includedir \
48 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
49 - libdir localedir mandir
50 + libdir localedir mandir runstatedir
51 do
52 eval ac_val=\$$ac_var
53 # Remove trailing slashes.
54 @@ -1263,6 +1274,7 @@
55 --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
56 --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
57 --localstatedir=DIR modifiable single-machine data [PREFIX/var]
58 + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
59 --libdir=DIR object code libraries [EPREFIX/lib]
60 --includedir=DIR C header files [PREFIX/include]
61 --oldincludedir=DIR C header files for non-gcc [/usr/include]
62 @@ -2649,11 +2661,11 @@
63 set dummy mkoctfile; ac_word=$2
64 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
65 $as_echo_n "checking for $ac_word... " >&6; }
66 -if ${ac_cv_prog_HAVE_MKOCTFILE+:} false; then :
67 +if ${ac_cv_prog_MKOCTFILE+:} false; then :
68 $as_echo_n "(cached) " >&6
69 else
70 - if test -n "$HAVE_MKOCTFILE"; then
71 - ac_cv_prog_HAVE_MKOCTFILE="$HAVE_MKOCTFILE" # Let the user override the test.
72 + if test -n "$MKOCTFILE"; then
73 + ac_cv_prog_MKOCTFILE="$MKOCTFILE" # Let the user override the test.
74 else
75 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
76 for as_dir in $PATH
77 @@ -2662,7 +2674,7 @@
78 test -z "$as_dir" && as_dir=.
79 for ac_exec_ext in '' $ac_executable_extensions; do
80 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
81 - ac_cv_prog_HAVE_MKOCTFILE="yes"
82 + ac_cv_prog_MKOCTFILE="mkoctfile"
83 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
84 break 2
85 fi
86 @@ -2670,20 +2682,19 @@
87 done
88 IFS=$as_save_IFS
89
90 - test -z "$ac_cv_prog_HAVE_MKOCTFILE" && ac_cv_prog_HAVE_MKOCTFILE="no"
91 fi
92 fi
93 -HAVE_MKOCTFILE=$ac_cv_prog_HAVE_MKOCTFILE
94 -if test -n "$HAVE_MKOCTFILE"; then
95 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_MKOCTFILE" >&5
96 -$as_echo "$HAVE_MKOCTFILE" >&6; }
97 +MKOCTFILE=$ac_cv_prog_MKOCTFILE
98 +if test -n "$MKOCTFILE"; then
99 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKOCTFILE" >&5
100 +$as_echo "$MKOCTFILE" >&6; }
101 else
102 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
103 $as_echo "no" >&6; }
104 fi
105
106
107 -if test $HAVE_MKOCTFILE = "no"; then
108 +if test -z "$MKOCTFILE"; then
109 as_fn_error $? "mkoctfile required to install $PACKAGE_NAME" "$LINENO" 5
110 fi
111
112 diff -uNr a/src/configure.ac b/src/configure.ac
113 --- a/src/configure.ac 2017-05-28 10:27:02.828900351 -0400
114 +++ b/src/configure.ac 2017-10-12 14:47:04.434779853 -0400
115 @@ -13,8 +13,8 @@
116 AC_DEFINE(__STDC_CONSTANT_MACROS, [], [workaround for C++ programs to use C99 macros])
117 AC_DEFINE(VIDEO_OUTBUF_SIZE, [200000], [size of video buffer])
118
119 -AC_CHECK_PROG([HAVE_MKOCTFILE], [mkoctfile], [yes], [no])
120 -if [test $HAVE_MKOCTFILE = "no"]; then
121 +AC_CHECK_PROG([MKOCTFILE], [mkoctfile], [mkoctfile])
122 +if test -z "$MKOCTFILE"; then
123 AC_MSG_ERROR([mkoctfile required to install $PACKAGE_NAME])
124 fi
125