Mercurial > mxe-octave

changeset 4766:7f203bae655e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-ltfat: fix configure test for mkoctfile instead of deleting it
author John W. Eaton <jwe@octave.org>
date Fri, 06 Jul 2018 14:16:31 -0400
parents 451959325f84
children a800e350d88b
files src/of-ltfat-1-cross-fixes.patch
diffstat 1 files changed, 254 insertions(+), 110 deletions(-) [+]
line wrap: on
line diff
--- a/src/of-ltfat-1-cross-fixes.patch	Fri Jul 06 12:56:21 2018 -0400
+++ b/src/of-ltfat-1-cross-fixes.patch	Fri Jul 06 14:16:31 2018 -0400
@@ -1,7 +1,7 @@
 diff -uNr a/src/autom4te.cache/output.0 b/src/autom4te.cache/output.0
 --- a/src/autom4te.cache/output.0	1969-12-31 19:00:00.000000000 -0500
-+++ b/src/autom4te.cache/output.0	2018-07-06 12:49:44.051143049 -0400
-@@ -0,0 +1,4293 @@
++++ b/src/autom4te.cache/output.0	2018-07-06 14:01:20.408923225 -0400
+@@ -0,0 +1,4384 @@
 +@%:@! /bin/sh
 +@%:@ Guess values for system-dependent variables and create Makefiles.
 +@%:@ Generated by GNU Autoconf 2.69 for LTFAT 2.3.1.
@@ -591,6 +591,7 @@
 +ac_subst_vars='LTLIBOBJS
 +LIB@&t@OBJS
 +have_libportaudio
++MKOCTFILE
 +ac_ct_CXX
 +CXXFLAGS
 +CXX
@@ -3081,11 +3082,101 @@
 +#   AC_MSG_ERROR([Cannot find LAPACK libraries])
 +#fi
 +
-+#dnl Check for MKOCTFILE
-+#AC_CHECK_PROG(MKOCTFILE_CHECK,mkoctfile,"yes")
-+#if test "$MKOCTFILE_CHECK" != "yes" ; then
-+#    AC_MSG_ERROR([Please install mkoctfile.])
-+#fi
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}mkoctfile", so it can be a program name with args.
++set dummy ${ac_tool_prefix}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+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  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
++do
++  IFS=$as_save_IFS
++  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="${ac_tool_prefix}mkoctfile"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
++
++fi
++fi
++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
++
++
++fi
++if test -z "$ac_cv_prog_MKOCTFILE"; then
++  ac_ct_MKOCTFILE=$MKOCTFILE
++  # Extract the first word of "mkoctfile", so it can be a program name with args.
++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_ac_ct_MKOCTFILE+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$ac_ct_MKOCTFILE"; then
++  ac_cv_prog_ac_ct_MKOCTFILE="$ac_ct_MKOCTFILE" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  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_ac_ct_MKOCTFILE="mkoctfile"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_MKOCTFILE=$ac_cv_prog_ac_ct_MKOCTFILE
++if test -n "$ac_ct_MKOCTFILE"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MKOCTFILE" >&5
++$as_echo "$ac_ct_MKOCTFILE" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++  if test "x$ac_ct_MKOCTFILE" = x; then
++    MKOCTFILE=""
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    MKOCTFILE=$ac_ct_MKOCTFILE
++  fi
++else
++  MKOCTFILE="$ac_cv_prog_MKOCTFILE"
++fi
++
++if test -z "$MKOCTFILE"; then
++    as_fn_error $? "Please install mkoctfile." "$LINENO" 5
++fi
 +
 +#AC_CHECK_HEADERS([fftw3.h],[],[AC_MSG_ERROR([fftw was not found])])
 +# Checking for portaudio, we pack portaudio.h with LTFAT
@@ -4297,7 +4388,7 @@
 +
 diff -uNr a/src/autom4te.cache/requests b/src/autom4te.cache/requests
 --- a/src/autom4te.cache/requests	1969-12-31 19:00:00.000000000 -0500
-+++ b/src/autom4te.cache/requests	2018-07-06 12:49:44.111140169 -0400
++++ b/src/autom4te.cache/requests	2018-07-06 14:01:20.468920717 -0400
 @@ -0,0 +1,78 @@
 +# This file was generated by Autom4te Sun Aug 20 18:29:13 UTC 2017.
 +# It contains the lists of macros which have been traced.
@@ -4315,72 +4406,72 @@
 +                        'configure.ac'
 +                      ],
 +                      {
-+                        'AH_OUTPUT' => 1,
-+                        '_AM_SUBST_NOTMAKE' => 1,
-+                        'AC_CONFIG_LIBOBJ_DIR' => 1,
-+                        'm4_pattern_allow' => 1,
-+                        'AM_PROG_CXX_C_O' => 1,
-+                        'LT_CONFIG_LTDL_DIR' => 1,
-+                        '_LT_AC_TAGCONFIG' => 1,
-+                        'AC_SUBST' => 1,
-+                        'AM_PROG_LIBTOOL' => 1,
-+                        'LT_INIT' => 1,
-+                        'AC_CONFIG_SUBDIRS' => 1,
-+                        'AC_FC_SRCEXT' => 1,
++                        '_AM_MAKEFILE_INCLUDE' => 1,
++                        'm4_include' => 1,
 +                        'AC_CANONICAL_HOST' => 1,
-+                        'AC_DEFINE_TRACE_LITERAL' => 1,
-+                        '_AM_COND_ELSE' => 1,
-+                        'AM_PATH_GUILE' => 1,
++                        'AC_CANONICAL_BUILD' => 1,
 +                        'AM_MAINTAINER_MODE' => 1,
-+                        'AC_FC_PP_SRCEXT' => 1,
-+                        'AM_PROG_F77_C_O' => 1,
-+                        'AM_AUTOMAKE_VERSION' => 1,
-+                        '_AM_MAKEFILE_INCLUDE' => 1,
-+                        'm4_sinclude' => 1,
-+                        'AM_ENABLE_MULTILIB' => 1,
-+                        'AC_FC_FREEFORM' => 1,
-+                        'AM_XGETTEXT_OPTION' => 1,
-+                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
-+                        'AC_REQUIRE_AUX_FILE' => 1,
-+                        'LT_SUPPORTED_TAG' => 1,
++                        'LT_CONFIG_LTDL_DIR' => 1,
++                        'AC_CONFIG_SUBDIRS' => 1,
 +                        '_AM_COND_IF' => 1,
++                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
++                        'AM_XGETTEXT_OPTION' => 1,
++                        'AM_PROG_CXX_C_O' => 1,
++                        'LT_SUPPORTED_TAG' => 1,
++                        'AC_CANONICAL_SYSTEM' => 1,
++                        'AM_PROG_LIBTOOL' => 1,
++                        '_AM_SUBST_NOTMAKE' => 1,
++                        'AC_FC_PP_DEFINE' => 1,
++                        'AM_PROG_CC_C_O' => 1,
 +                        'AM_MAKEFILE_INCLUDE' => 1,
-+                        'AC_CONFIG_LINKS' => 1,
-+                        'AM_PROG_AR' => 1,
-+                        'AC_LIBSOURCE' => 1,
-+                        'AC_SUBST_TRACE' => 1,
++                        'AC_CONFIG_FILES' => 1,
++                        '_AM_COND_ENDIF' => 1,
++                        'AC_CONFIG_LIBOBJ_DIR' => 1,
 +                        'AC_INIT' => 1,
-+                        'AM_POT_TOOLS' => 1,
++                        'AC_LIBSOURCE' => 1,
++                        '_m4_warn' => 1,
++                        'AC_CONFIG_AUX_DIR' => 1,
++                        'AC_REQUIRE_AUX_FILE' => 1,
 +                        'AC_PROG_LIBTOOL' => 1,
-+                        'AC_FC_PP_DEFINE' => 1,
 +                        'AM_PROG_FC_C_O' => 1,
-+                        'AC_CANONICAL_TARGET' => 1,
-+                        'AM_PROG_CC_C_O' => 1,
-+                        'AM_CONDITIONAL' => 1,
-+                        'AM_SILENT_RULES' => 1,
 +                        'AM_GNU_GETTEXT' => 1,
-+                        'm4_pattern_forbid' => 1,
++                        '_AM_COND_ELSE' => 1,
++                        'AM_PROG_F77_C_O' => 1,
++                        'LT_INIT' => 1,
++                        'AC_SUBST' => 1,
++                        'AM_ENABLE_MULTILIB' => 1,
++                        'AM_CONDITIONAL' => 1,
++                        'AC_DEFINE_TRACE_LITERAL' => 1,
 +                        'AM_INIT_AUTOMAKE' => 1,
-+                        'AM_NLS' => 1,
-+                        'AC_CANONICAL_SYSTEM' => 1,
-+                        '_m4_warn' => 1,
++                        'AC_CANONICAL_TARGET' => 1,
++                        '_LT_AC_TAGCONFIG' => 1,
++                        'AH_OUTPUT' => 1,
++                        'AC_CONFIG_LINKS' => 1,
++                        'AM_PROG_MOC' => 1,
++                        'AM_PROG_AR' => 1,
++                        'm4_pattern_forbid' => 1,
++                        'AM_AUTOMAKE_VERSION' => 1,
++                        'AM_PATH_GUILE' => 1,
++                        'sinclude' => 1,
++                        'AM_POT_TOOLS' => 1,
 +                        'include' => 1,
++                        'm4_pattern_allow' => 1,
++                        'm4_sinclude' => 1,
++                        'AC_FC_SRCEXT' => 1,
++                        'AM_SILENT_RULES' => 1,
++                        'AC_FC_PP_SRCEXT' => 1,
 +                        'AC_CONFIG_HEADERS' => 1,
-+                        'm4_include' => 1,
-+                        'AC_CANONICAL_BUILD' => 1,
-+                        'AC_CONFIG_AUX_DIR' => 1,
-+                        'sinclude' => 1,
-+                        'AC_CONFIG_FILES' => 1,
-+                        'AM_PROG_MOC' => 1,
-+                        '_AM_COND_ENDIF' => 1
++                        'AM_NLS' => 1,
++                        'AC_FC_FREEFORM' => 1,
++                        'AC_SUBST_TRACE' => 1
 +                      }
 +                    ], 'Autom4te::Request' )
 +           );
 +
 diff -uNr a/src/autom4te.cache/traces.0 b/src/autom4te.cache/traces.0
 --- a/src/autom4te.cache/traces.0	1969-12-31 19:00:00.000000000 -0500
-+++ b/src/autom4te.cache/traces.0	2018-07-06 12:49:44.051143049 -0400
-@@ -0,0 +1,229 @@
++++ b/src/autom4te.cache/traces.0	2018-07-06 14:01:20.408923225 -0400
+@@ -0,0 +1,232 @@
 +m4trace:configure.ac:2: -1- AC_INIT([LTFAT], [2.3.1], [http://github.com/ltfat/ltfat/issues], [ltfat])
 +m4trace:configure.ac:2: -1- m4_pattern_forbid([^_?A[CHUM]_])
 +m4trace:configure.ac:2: -1- m4_pattern_forbid([_AC_])
@@ -4589,6 +4680,9 @@
 +m4trace:configure.ac:5: -1- AC_SUBST([ac_ct_CXX])
 +m4trace:configure.ac:5: -1- AC_SUBST_TRACE([ac_ct_CXX])
 +m4trace:configure.ac:5: -1- m4_pattern_allow([^ac_ct_CXX$])
++m4trace:configure.ac:29: -1- AC_SUBST([MKOCTFILE])
++m4trace:configure.ac:29: -1- AC_SUBST_TRACE([MKOCTFILE])
++m4trace:configure.ac:29: -1- m4_pattern_allow([^MKOCTFILE$])
 +m4trace:configure.ac:43: -1- AC_SUBST([have_libportaudio])
 +m4trace:configure.ac:43: -1- AC_SUBST_TRACE([have_libportaudio])
 +m4trace:configure.ac:43: -1- m4_pattern_allow([^have_libportaudio$])
@@ -4612,84 +4706,134 @@
 +m4trace:configure.ac:44: -1- AC_SUBST_TRACE([abs_top_builddir])
 diff -uNr a/src/configure b/src/configure
 --- a/src/configure	2018-06-21 11:03:12.000000000 -0400
-+++ b/src/configure	2018-07-06 12:49:44.111140169 -0400
-@@ -587,7 +587,6 @@
++++ b/src/configure	2018-07-06 14:01:20.468920717 -0400
+@@ -587,7 +587,7 @@
  ac_subst_vars='LTLIBOBJS
  LIBOBJS
  have_libportaudio
 -MKOCTFILE_CHECK
++MKOCTFILE
  ac_ct_CXX
  CXXFLAGS
  CXX
-@@ -3078,46 +3077,11 @@
+@@ -3078,15 +3078,56 @@
  #   AC_MSG_ERROR([Cannot find LAPACK libraries])
  #fi
  
 -# Extract the first word of "mkoctfile", so it can be a program name with args.
--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 test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}mkoctfile", so it can be a program name with args.
++set dummy ${ac_tool_prefix}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+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  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
++do
++  IFS=$as_save_IFS
++  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="${ac_tool_prefix}mkoctfile"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
++
++fi
++fi
++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
++
++
++fi
++if test -z "$ac_cv_prog_MKOCTFILE"; then
++  ac_ct_MKOCTFILE=$MKOCTFILE
++  # Extract the first word of "mkoctfile", so it can be a program name with args.
+ 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 :
--  $as_echo_n "(cached) " >&6
--else
++if ${ac_cv_prog_ac_ct_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.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  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
++  if test -n "$ac_ct_MKOCTFILE"; then
++  ac_cv_prog_ac_ct_MKOCTFILE="$ac_ct_MKOCTFILE" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+@@ -3095,7 +3136,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""
--    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--  done
--IFS=$as_save_IFS
--
--fi
--fi
++    ac_cv_prog_ac_ct_MKOCTFILE="mkoctfile"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+@@ -3105,17 +3146,31 @@
+ 
+ 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; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
++ac_ct_MKOCTFILE=$ac_cv_prog_ac_ct_MKOCTFILE
++if test -n "$ac_ct_MKOCTFILE"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MKOCTFILE" >&5
++$as_echo "$ac_ct_MKOCTFILE" >&6; }
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
++  if test "x$ac_ct_MKOCTFILE" = x; then
++    MKOCTFILE=""
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    MKOCTFILE=$ac_ct_MKOCTFILE
++  fi
++else
++  MKOCTFILE="$ac_cv_prog_MKOCTFILE"
++fi
+ 
 -if test "$MKOCTFILE_CHECK" != "yes" ; then
--    as_fn_error $? "Please install mkoctfile." "$LINENO" 5
--fi
-+#dnl Check for MKOCTFILE
-+#AC_CHECK_PROG(MKOCTFILE_CHECK,mkoctfile,"yes")
-+#if test "$MKOCTFILE_CHECK" != "yes" ; then
-+#    AC_MSG_ERROR([Please install mkoctfile.])
-+#fi
++if test -z "$MKOCTFILE"; then
+     as_fn_error $? "Please install mkoctfile." "$LINENO" 5
+ fi
  
- #AC_CHECK_HEADERS([fftw3.h],[],[AC_MSG_ERROR([fftw was not found])])
- # Checking for portaudio, we pack portaudio.h with LTFAT
 diff -uNr a/src/configure.ac b/src/configure.ac
 --- a/src/configure.ac	2018-06-21 11:03:11.000000000 -0400
-+++ b/src/configure.ac	2018-07-06 12:48:40.142216789 -0400
-@@ -25,11 +25,11 @@
- #   AC_MSG_ERROR([Cannot find LAPACK libraries])
++++ b/src/configure.ac	2018-07-06 14:01:10.525335982 -0400
+@@ -26,8 +26,8 @@
  #fi
  
--dnl Check for MKOCTFILE
+ dnl Check for MKOCTFILE
 -AC_CHECK_PROG(MKOCTFILE_CHECK,mkoctfile,"yes")
 -if test "$MKOCTFILE_CHECK" != "yes" ; then
--    AC_MSG_ERROR([Please install mkoctfile.])
--fi
-+#dnl Check for MKOCTFILE
-+#AC_CHECK_PROG(MKOCTFILE_CHECK,mkoctfile,"yes")
-+#if test "$MKOCTFILE_CHECK" != "yes" ; then
-+#    AC_MSG_ERROR([Please install mkoctfile.])
-+#fi
++AC_CHECK_TOOL(MKOCTFILE,mkoctfile)
++if test -z "$MKOCTFILE"; then
+     AC_MSG_ERROR([Please install mkoctfile.])
+ fi
  
- #AC_CHECK_HEADERS([fftw3.h],[],[AC_MSG_ERROR([fftw was not found])])
- # Checking for portaudio, we pack portaudio.h with LTFAT