For issue#92, flip the sense of the "USE_INSTALLED_TRE_H" flag and re…

…name it to "USE_LOCAL_TRE_H", then add definitions in all local builds.

configure.ac

@@ -101,6 +101,9 @@ dnl Checks for headers, functions, types, and macros
 AC_DEFINE(_GNU_SOURCE, 1, [ Define to enable GNU extensions in glibc ])
 AC_HEADER_STDC
 
+dnl Make sure locally configured headers are used (this adds the #define to config.h).
+AC_DEFINE(USE_LOCAL_TRE_H, 1, [ Define to ensure locally configured headers are used ])
+
 AC_ARG_WITH(alloca,
   AC_HELP_STRING(
     [--without-alloca],

local_includes/regex.h

@@ -13,16 +13,16 @@
 #ifndef TRE_REXEX_H
 #define TRE_REGEX_H 1
 
-#ifdef USE_INSTALLED_TRE_H
-/* Use the header(s) from an installed version of the TRE package
-   (so that this application matches the installed libtre),
-   not the one(s) in the local_includes directory. */
-#include <tre/tre.h>
-#else
+#ifdef USE_LOCAL_TRE_H
 /* Use the header(s) from the TRE package that this file is part of.
    (Yes, this file is in local_include too, but the explict path
    means there is no way to get a system tre.h by accident.) */
 #include "../local_includes/tre.h"
+#else
+/* Use the header(s) from an installed version of the TRE package
+   (so that this application matches the installed libtre),
+   not the one(s) in the local_includes directory. */
+#include <tre/tre.h>
 #endif
 
 #ifndef TRE_USE_SYSTEM_REGEX_H

local_includes/tre.h

@@ -9,13 +9,13 @@
 #ifndef TRE_H
 #define TRE_H 1
 
-#ifdef USE_INSTALLED_TRE_H
-/* Use the header in the same directory as this file if there is one. */
-#include "tre-config.h"
-#else
+#ifdef USE_LOCAL_TRE_H
 /* Make certain to use the header(s) from the TRE package that this
    file is part of by giving the full path to the header from this directory. */
 #include "../local_includes/tre-config.h"
+#else
+/* Use the header in the same directory as this file if there is one. */
+#include "tre-config.h"
 #endif
 
 #ifdef HAVE_SYS_TYPES_H

python/setup.py

@@ -32,7 +32,8 @@
       data_files = data_files,
       ext_modules = [Extension("tre",
                                sources = ["tre-python.c"],
-                               define_macros = [("HAVE_CONFIG_H", None)],
+                               define_macros = [("HAVE_CONFIG_H", None),
+                                                ("USE_LOCAL_TRE_H",1)],
                                include_dirs = include_dirs,
                                library_dirs = library_dirs,
                                libraries = libraries

python/setup.py.in

@@ -32,7 +32,8 @@ setup(name = "tre",
       data_files = data_files,
       ext_modules = [Extension("tre",
                                sources = ["tre-python.c"],
-                               define_macros = [("HAVE_CONFIG_H", None)],
+                               define_macros = [("HAVE_CONFIG_H", None),
+                                                ("USE_LOCAL_TRE_H",1)],
                                include_dirs = include_dirs,
                                library_dirs = library_dirs,
                                libraries = libraries

python/tre-python.c

@@ -26,15 +26,15 @@
 #include "Python.h"
 #include "structmember.h"
 
-#ifdef USE_INSTALLED_TRE_H
+#ifdef USE_LOCAL_TRE_H
+/* Make certain to use the header(s) from the TRE package that this
+   file is part of by giving the full path to the header from this directory. */
+#include "../local_includes/tre.h"
+#else
 /* Use the header(s) from an installed version of the TRE package
    (so that this extension matches the installed libtre),
    not the one(s) in the local_includes directory. */
 #include <tre/tre.h>
-#else
-/* Make certain to use the header(s) from the TRE package that this
-   file is part of by giving the full path to the header from this directory. */
-#include "../local_includes/tre.h"
 #endif
 
 /* Define this if you want to release the GIL during compilation or searching.

wscript

@@ -848,6 +848,7 @@ def configure(cfg):
    # file will remove the named defines from the DEFINES list, leaving only the ones meant
    # for the compiler command line.
    cfg.env.append_unique("DEFINES","HAVE_CONFIG_H=1") # no entry in the list of names, so this ends up on the compiler command line.
+   cfg.env.append_unique("DEFINES","USE_LOCAL_TRE_H=1") # no entry in the list of names, so this ends up on the compiler command line.
    # ================= Platform specific feature availability
    # Get a platform specific env for discovering what the platform has available.
    # It is derived from the original, so it has all the values set up above.