File 0001-Revert-chore-be-more-portable-in-sxe-matla... of Package dateutils

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Revert-chore-be-more-portable-in-sxe-matlab.m4.patch of Package dateutils (Revision fedf9275ca4e33dd1945c81afa442d3e)

Currently displaying revision fedf9275ca4e33dd1945c81afa442d3e , Show latest

From 98a8df78e1668f05df86b250c4ad12efb7490b24 Mon Sep 17 00:00:00 2001
From: Sebastian Freundt <freundt@ga-group.nl>
Date: Wed, 15 Jun 2016 09:26:02 +0000
Subject: [PATCH] Revert "chore, be more portable in sxe-matlab.m4"

This reverts commit 471c813a4fb6d26f828cd7c191cfd1ec478a2bd8.

This makes the matlab detection fail on systems with older shells.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
 m4/sxe-matlab.m4 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/m4/sxe-matlab.m4 b/m4/sxe-matlab.m4
index 77fc708..5f1099e 100644
--- a/m4/sxe-matlab.m4
+++ b/m4/sxe-matlab.m4
@@ -3,10 +3,10 @@ AC_DEFUN([SXE_CHECK_MATLAB], [dnl
 	foo=`mktemp /tmp/sxe_check_matlab.XXXXXXXXXX`
 
 	AC_ARG_VAR([MATLAB], [full path to matlab binary])
-	sxe_cv_matlab="${MATLAB-matlab}"
+	sxe_cv_matlab="${MATLAB:-matlab}"
 
 	AC_ARG_VAR([MATLABPATH], [path to matlab toolboxes])
-	sxe_cv_matlabpath="${MATLABPATH-no}"
+	sxe_cv_matlabpath="${MATLABPATH:-no}"
 
 	AC_MSG_CHECKING([for matlab root])
 	## assume no matlab
@@ -35,9 +35,9 @@ AC_DEFUN([SXE_CHECK_MATLAB], [dnl
 
 	AC_MSG_CHECKING([for matlab mex file extension])
 	sxe_cv_mexext=`"${MATLABROOT}/bin/mexext" 2>/dev/null`
-	MEXEXT="${sxe_cv_mexext-mex}"
+	MEXEXT="${sxe_cv_mexext:-mex}"
 	AC_SUBST([MEXEXT])
-	AC_MSG_RESULT([${sxe_cv_mexext-mex (assumed)}])
+	AC_MSG_RESULT([${sxe_cv_mexext:-mex (assumed)}])
 
 	## now reset *our* idea of what MATLAB should be
 	MATLAB="${sxe_cv_matlab}"
@@ -70,7 +70,7 @@ AC_DEFUN([SXE_CHECK_OCTAVE], [dnl
 	AC_ARG_VAR([octave_LIBS], [library directives for octave linking])
 
 	AC_ARG_VAR([OCTAVEPATH], [path to octave toolboxes])
-	sxe_cv_octavepath="${OCTAVEPATH-no}"
+	sxe_cv_octavepath="${OCTAVEPATH:-no}"
 
 	## prep the octave extension path, this is twofold
 	AC_PATH_PROG([OCTAVE_CONFIG], [octave-config])
-- 
1.8.5.6

--- dateutils-0.4.0.orig/configure	2016-05-20 10:26:30.000000000 +0200
+++ dateutils-0.4.0/configure	2016-06-15 11:46:51.339401361 +0200
@@ -10376,10 +10396,10 @@
 		foo=`mktemp /tmp/sxe_check_matlab.XXXXXXXXXX`
 
 
-	sxe_cv_matlab="${MATLAB-matlab}"
+	sxe_cv_matlab="${MATLAB:-matlab}"
 
 
-	sxe_cv_matlabpath="${MATLABPATH-no}"
+	sxe_cv_matlabpath="${MATLABPATH:-no}"
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for matlab root" >&5
 $as_echo_n "checking for matlab root... " >&6; }
@@ -10413,10 +10433,10 @@
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for matlab mex file extension" >&5
 $as_echo_n "checking for matlab mex file extension... " >&6; }
 	sxe_cv_mexext=`"${MATLABROOT}/bin/mexext" 2>/dev/null`
-	MEXEXT="${sxe_cv_mexext-mex}"
+	MEXEXT="${sxe_cv_mexext:-mex}"
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${sxe_cv_mexext-mex (assumed)}" >&5
-$as_echo "${sxe_cv_mexext-mex (assumed)}" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${sxe_cv_mexext:-mex (assumed)}" >&5
+$as_echo "${sxe_cv_mexext:-mex (assumed)}" >&6; }
 
 	## now reset *our* idea of what MATLAB should be
 	MATLAB="${sxe_cv_matlab}"

Places

File 0001-Revert-chore-be-more-portable-in-sxe-matlab.m4.patch of Package dateutils (Revision fedf9275ca4e33dd1945c81afa442d3e)

Places