Mercurial > octave

diff libinterp/build-env-features.sh @ 21302:8376de2eaf00

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
define OCTAVE_HAVE_FAST_INT_OPS in octave-config.h * acinclude.m4 (OCTAVE_FAST_INT_OPS): Define OCTAVE_HAVE_FAST_INT_OPS instead of HAVE_FAST_INT_OPS. * oct-inttypes.cc, oct-inttypes.h: Use new macro name. * mk-octave-config-h.sh: Emit definition of OCTAVE_HAVE_FAST_INT_OPS. * build-env-features.sh: Also include symbols beginning with "OCTAVE_HAVE_".
author John W. Eaton <jwe@octave.org>
date Thu, 18 Feb 2016 16:42:42 -0500
parents 40de9f8f23a6
children 46284491ffc5
line wrap: on
line diff
--- a/libinterp/build-env-features.sh	Thu Feb 18 13:34:50 2016 -0800
+++ b/libinterp/build-env-features.sh	Thu Feb 18 16:42:42 2016 -0500
@@ -13,8 +13,8 @@
 cat << EOF
 // DO NOT EDIT!  Generated automatically from $conffile by Make."
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
+#if defined (HAVE_CONFIG_H)
+#  include "config.h"
 #endif
 
 #include "build-env.h"
@@ -36,12 +36,12 @@
 EOF
 
 $AWK \
-  '/#define HAVE_/ {
-     sub (/HAVE_/, "", $2);
+  '/#define \(OCTAVE_\|\)HAVE_/ {
+     sub (/\(OCTAVE_\|\)HAVE_/, "", $2);
      printf ("          m.assign (\"%s\", octave_value (true));\n", $2);
    }
-   /\/\* #undef HAVE_/ {
-     sub (/HAVE_/, "", $3);
+   /\/\* #undef \(OCTAVE_\|\)HAVE_/ {
+     sub (/\(OCTAVE_\|\)HAVE_/, "", $3);
      printf ("          m.assign (\"%s\", octave_value (false));\n", $3);
    } {
    }' $conffile | sort