REXPruning: fix the finding of HAVE_PTHREAD_H header maco and config

passlab · Feb 5, 2020 · 149de56 · 149de56
1 parent be2e65f
commit 149de56
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -420,7 +420,7 @@ docs: FORCE_DOCS_TO_BE_MADE
 	   $(MAKE) -Ctests/nonsmoke/functional/roseTests/astInterfaceTests check && \
 	   $(MAKE) -Ctests/nonsmoke/functional/roseTests/ompLoweringTests check && \
 	   $(MAKE) -Ctests/nonsmoke/functional/CompileTests/UPC_tests check && \
-	   $(MAKE) -Cdocs docs && \
+	   $(MAKE) -Cdocs docs \
 	else \
 	   echo "Please look at the ROSE web site for documentation (www.roseCompiler.org)"; \
 	fi

diff --git a/config/support-rose.m4 b/config/support-rose.m4
@@ -1357,6 +1357,8 @@ AC_CHECK_TYPE([hrtime_t],[AC_DEFINE(HAVE_HRTIME_T, 1, [Define to 1 if hrtime_t i
 #include <sys/time.h>
 #endif])
 
+AC_CHECK_HEADERS(pthread.h)
+
 AC_CHECK_FUNCS([gethrtime read_real_time time_base_to_time clock_gettime mach_absolute_time])
 
 dnl Cray UNICOS _rtc() (real-time clock) intrinsic

diff --git a/src/midend/astProcessing/AstSharedMemoryParallelSimpleProcessing.C b/src/midend/astProcessing/AstSharedMemoryParallelSimpleProcessing.C
@@ -1,9 +1,10 @@
 // Author: Gergo Barany
 // $Id: AstSharedMemoryParallelSimpleProcessing.C,v 1.1 2008/01/08 02:56:39 dquinlan Exp $
 #include "sage3basic.h"
+#include "rosePublicConfig.h"
 
 #ifdef _REENTRANT                                       // Does user want multi-thread support? (e.g., g++ -pthread)
-# ifdef HAVE_PTHREAD_H                                  // Do we have POSIX threads?
+# ifdef ROSE_HAVE_PTHREAD_H                                  // Do we have POSIX threads?
 #  include <pthread.h>
 # else
    // This should all be switched to Boost Threads instead, which is more portable.

diff --git a/src/util/commandlineProcessing/commandline_processing.C b/src/util/commandlineProcessing/commandline_processing.C
@@ -1,5 +1,5 @@
 #include <rose_config.h>
-
+#include <rosePublicConfig.h>
 #include "StringUtility.h"
 #include <string.h>
 #include <iostream>