Mercurial > mxe-octave

changeset 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 7dc3bebccab9
children 140689282d54
files dist-files.mk src/of-ltfat-1-fixes.patch src/of-video-1-fixes.patch
diffstat 3 files changed, 200 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Thu Oct 12 09:10:00 2017 -0400
+++ b/dist-files.mk	Thu Oct 12 15:37:33 2017 -0400
@@ -472,6 +472,7 @@
   of-linear-algebra-2-dev-fixes.patch \
   of-linear-algebra.mk \
   of-lssa.mk \
+  of-ltfat-1-fixes.patch \
   of-ltfat.mk \
   of-mapping.mk \
   of-miscellaneous-1-fixes.patch \
@@ -503,6 +504,7 @@
   of-struct.mk \
   of-tisean.mk \
   of-tsa.mk \
+  of-video-1-fixes.patch \
   of-video.mk \
   of-windows-1-fixes.patch \
   of-windows.mk \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/of-ltfat-1-fixes.patch	Thu Oct 12 15:37:33 2017 -0400
@@ -0,0 +1,73 @@
+diff -uNr a/src/configure b/src/configure
+--- a/src/configure	2016-12-20 12:05:08.000000000 -0500
++++ b/src/configure	2017-10-12 14:13:16.956665770 -0400
+@@ -587,7 +587,7 @@
+ ac_subst_vars='LTLIBOBJS
+ LIBOBJS
+ have_libportaudio
+-MKOCTFILE_CHECK
++MKOCTFILE
+ ac_ct_CXX
+ CXXFLAGS
+ CXX
+@@ -3082,11 +3082,11 @@
+ set dummy mkoctfile; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_MKOCTFILE_CHECK+:} false; then :
++if ${ac_cv_prog_MKOCTFILE+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  if test -n "$MKOCTFILE_CHECK"; then
+-  ac_cv_prog_MKOCTFILE_CHECK="$MKOCTFILE_CHECK" # Let the user override the test.
++  if test -n "$MKOCTFILE"; then
++  ac_cv_prog_MKOCTFILE="$MKOCTFILE" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+@@ -3095,7 +3095,7 @@
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_MKOCTFILE_CHECK=""yes""
++    ac_cv_prog_MKOCTFILE="mkoctfile"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+@@ -3105,17 +3105,17 @@
+ 
+ fi
+ fi
+-MKOCTFILE_CHECK=$ac_cv_prog_MKOCTFILE_CHECK
+-if test -n "$MKOCTFILE_CHECK"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKOCTFILE_CHECK" >&5
+-$as_echo "$MKOCTFILE_CHECK" >&6; }
++MKOCTFILE=$ac_cv_prog_MKOCTFILE
++if test -n "$MKOCTFILE"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKOCTFILE" >&5
++$as_echo "$MKOCTFILE" >&6; }
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+ 
+-if test "$MKOCTFILE_CHECK" != "yes" ; then
++if test -z "$MKOCTFILE"; then
+     as_fn_error $? "Please install mkoctfile." "$LINENO" 5
+ fi
+ 
+diff -uNr a/src/configure.ac b/src/configure.ac
+--- a/src/configure.ac	2016-12-20 12:05:08.000000000 -0500
++++ b/src/configure.ac	2017-10-12 14:08:11.627023155 -0400
+@@ -26,8 +26,8 @@
+ #fi
+ 
+ dnl Check for MKOCTFILE
+-AC_CHECK_PROG(MKOCTFILE_CHECK,mkoctfile,"yes")
+-if test "$MKOCTFILE_CHECK" != "yes" ; then
++AC_CHECK_PROG(MKOCTFILE,mkoctfile,mkoctfile)
++if test -z "$MKOCTFILE"; then
+     AC_MSG_ERROR([Please install mkoctfile.])
+ fi
+ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/of-video-1-fixes.patch	Thu Oct 12 15:37:33 2017 -0400
@@ -0,0 +1,125 @@
+diff -uNr a/src/configure b/src/configure
+--- a/src/configure	2017-05-28 10:27:03.780918854 -0400
++++ b/src/configure	2017-10-12 14:47:24.737839006 -0400
+@@ -623,7 +623,7 @@
+ EGREP
+ GREP
+ CXXCPP
+-HAVE_MKOCTFILE
++MKOCTFILE
+ OBJEXT
+ EXEEXT
+ ac_ct_CXX
+@@ -650,6 +650,7 @@
+ docdir
+ oldincludedir
+ includedir
++runstatedir
+ localstatedir
+ sharedstatedir
+ sysconfdir
+@@ -721,6 +722,7 @@
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
++runstatedir='${localstatedir}/run'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+ docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+@@ -973,6 +975,15 @@
+   | -silent | --silent | --silen | --sile | --sil)
+     silent=yes ;;
+ 
++  -runstatedir | --runstatedir | --runstatedi | --runstated \
++  | --runstate | --runstat | --runsta | --runst | --runs \
++  | --run | --ru | --r)
++    ac_prev=runstatedir ;;
++  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
++  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
++  | --run=* | --ru=* | --r=*)
++    runstatedir=$ac_optarg ;;
++
+   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+     ac_prev=sbindir ;;
+   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+@@ -1110,7 +1121,7 @@
+ for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+ 		datadir sysconfdir sharedstatedir localstatedir includedir \
+ 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+-		libdir localedir mandir
++		libdir localedir mandir runstatedir
+ do
+   eval ac_val=\$$ac_var
+   # Remove trailing slashes.
+@@ -1263,6 +1274,7 @@
+   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
++  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
+   --libdir=DIR            object code libraries [EPREFIX/lib]
+   --includedir=DIR        C header files [PREFIX/include]
+   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+@@ -2649,11 +2661,11 @@
+ set dummy mkoctfile; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_HAVE_MKOCTFILE+:} false; then :
++if ${ac_cv_prog_MKOCTFILE+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  if test -n "$HAVE_MKOCTFILE"; then
+-  ac_cv_prog_HAVE_MKOCTFILE="$HAVE_MKOCTFILE" # Let the user override the test.
++  if test -n "$MKOCTFILE"; then
++  ac_cv_prog_MKOCTFILE="$MKOCTFILE" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+@@ -2662,7 +2674,7 @@
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_HAVE_MKOCTFILE="yes"
++    ac_cv_prog_MKOCTFILE="mkoctfile"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+@@ -2670,20 +2682,19 @@
+   done
+ IFS=$as_save_IFS
+ 
+-  test -z "$ac_cv_prog_HAVE_MKOCTFILE" && ac_cv_prog_HAVE_MKOCTFILE="no"
+ fi
+ fi
+-HAVE_MKOCTFILE=$ac_cv_prog_HAVE_MKOCTFILE
+-if test -n "$HAVE_MKOCTFILE"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_MKOCTFILE" >&5
+-$as_echo "$HAVE_MKOCTFILE" >&6; }
++MKOCTFILE=$ac_cv_prog_MKOCTFILE
++if test -n "$MKOCTFILE"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKOCTFILE" >&5
++$as_echo "$MKOCTFILE" >&6; }
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+ 
+-if test $HAVE_MKOCTFILE = "no"; then
++if test -z "$MKOCTFILE"; then
+   as_fn_error $? "mkoctfile required to install $PACKAGE_NAME" "$LINENO" 5
+ fi
+ 
+diff -uNr a/src/configure.ac b/src/configure.ac
+--- a/src/configure.ac	2017-05-28 10:27:02.828900351 -0400
++++ b/src/configure.ac	2017-10-12 14:47:04.434779853 -0400
+@@ -13,8 +13,8 @@
+ AC_DEFINE(__STDC_CONSTANT_MACROS, [], [workaround for C++ programs to use C99 macros])
+ AC_DEFINE(VIDEO_OUTBUF_SIZE, [200000], [size of video buffer])
+ 
+-AC_CHECK_PROG([HAVE_MKOCTFILE], [mkoctfile], [yes], [no])
+-if [test $HAVE_MKOCTFILE = "no"]; then
++AC_CHECK_PROG([MKOCTFILE], [mkoctfile], [mkoctfile])
++if test -z "$MKOCTFILE"; then
+   AC_MSG_ERROR([mkoctfile required to install $PACKAGE_NAME])
+ fi
+