Mercurial > octave

changeset 22143:1bd872efdab5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow installed f77-fcn.h to use config info from Octave (bug #48559) * mk-octave-config-h.sh: Also extract macros beginning with F77_USES_ from config.h. * oct-conf-post.in.h (F77_USES_CRAY_CALLING_CONVENTION, F77_USES_VISUAL_FORTRAN_CALLING_CONVENTION): Delete macros.
author John W. Eaton <jwe@octave.org>
date Tue, 19 Jul 2016 08:39:27 -0400
parents 62208397b99e
children 469a4142c4cf
files build-aux/mk-octave-config-h.sh oct-conf-post.in.h
diffstat 2 files changed, 1 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/build-aux/mk-octave-config-h.sh	Mon Jul 18 19:38:27 2016 +0200
+++ b/build-aux/mk-octave-config-h.sh	Tue Jul 19 08:39:27 2016 -0400
@@ -239,6 +239,7 @@
 EOF
 fi
 
+sed -n 's/#\(\(undef\|define\) F77_USES_.*$\)/#  \1/p' $config_h_file
 sed -n 's/#\(\(undef\|define\) F77_FUNC.*$\)/#  \1/p' $config_h_file
 
 cat << EOF
--- a/oct-conf-post.in.h	Mon Jul 18 19:38:27 2016 +0200
+++ b/oct-conf-post.in.h	Tue Jul 19 08:39:27 2016 -0400
@@ -103,14 +103,6 @@
 #  define OCTAVE_HAVE_SIG_JUMP 1
 #endif
 
-#if defined (_UNICOS)
-#  define F77_USES_CRAY_CALLING_CONVENTION
-#endif
-
-#if 0
-#  define F77_USES_VISUAL_FORTRAN_CALLING_CONVENTION
-#endif
-
 #if defined (OCTAVE_ENABLE_64)
 #  define SIZEOF_OCTAVE_IDX_TYPE SIZEOF_INT64_T
 #else