diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 1999-03-29 00:04:22 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 1999-03-29 00:04:22 +0000 |
| commit | c71e9b3e1e649f333bf815fb16c75aa81b965a9b (patch) | |
| tree | 9e3b12726d1dd61b4bd74f6fb602f1a1fd755537 /m4 | |
| parent | 4403cfb32e1b2e46cf53196caffec232ebefcd91 (diff) | |
| download | ATCD-c71e9b3e1e649f333bf815fb16c75aa81b965a9b.tar.gz | |
* m4/acinclude.m4:
* m4/threads.m4:
Renamed some variables. Namespace pollution was breaking most
of the tests.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/acinclude.m4 | 14 | ||||
| -rw-r--r-- | m4/threads.m4 | 31 |
2 files changed, 21 insertions, 24 deletions
diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index a8db6bad648..e1cf34a47b1 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -29,17 +29,17 @@ dnl Usage: ACE_TRY_COMPILE(COMPILER-FLAGS, INCLUDES, FUNCTION-BODY, dnl [ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]) AC_DEFUN(ACE_TRY_COMPILE, dnl [ - save_CXXFLAGS="$CXXFLAGS" + ace_pre_try_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS $1" - save_CFLAGS="$CFLAGS" + ace_pre_try_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $1" AC_TRY_COMPILE($2, $3, $4, $5) dnl Restore the C++ and C flags - CXXFLAGS="$save_CXXFLAGS" - CFLAGS="$save_CFLAGS" + CXXFLAGS="$ace_pre_try_CXXFLAGS" + CFLAGS="$ace_pre_try_CFLAGS" ]) @@ -79,7 +79,7 @@ dnl fail. Some of the tests pass because the GNU C++ compiler issues dnl warnings instead of errors when errors should occur. dnl Other "treat warnings as errors" flags for other compilers should dnl be added if possible. - save_CXXFLAGS="$CXXFLAGS" + ace_pre_warning_CXXFLAGS="$CXXFLAGS" if test -n "$GXX"; then CXXFLAGS="$CXXFLAGS -Werror" @@ -96,7 +96,7 @@ dnl be added if possible. $1 - CXXFLAGS="$save_CXXFLAGS" + CXXFLAGS="$ace_pre_warning_CXXFLAGS" ]) dnl Wrapper around AC_CACHE_VAL used to ensure "ACTION-IF" commands are run @@ -119,7 +119,7 @@ ifelse([$4], , :, [$4]) else ace_just_a_place_holder=fixme ifelse([$5], , , [$5 -])dnl +]) fi ]) diff --git a/m4/threads.m4 b/m4/threads.m4 index 468065ec9e8..7682bd40e71 100644 --- a/m4/threads.m4 +++ b/m4/threads.m4 @@ -48,11 +48,8 @@ dnl Check if compiler accepts specific flag to enable threads [ ace_cv_feature_thread_flag_set=no - save_CXXFLAGS="$CXXFLAGS" - save_CFLAGS="$CFLAGS" - - CXXFLAGS="$CXXFLAGS -mt" - CFLAGS="$CFLAGS -mt" + ace_save_CXXFLAGS="$CXXFLAGS" + ace_save_CFLAGS="$CFLAGS" ACE_CACHE_CHECK(if compiler can use -mt flag, ace_cv_feature_has_mt_flag, @@ -69,8 +66,8 @@ dnl Check if compiler accepts specific flag to enable threads ace_cv_feature_thread_flag_set=yes ], [ - CXXFLAGS="$save_CXXFLAGS" - CFLAGS="$save_CFLAGS" + CXXFLAGS="$ace_save_CXXFLAGS" + CFLAGS="$ace_save_CFLAGS" ]) if test "$ace_cv_feature_thread_flag_set" = no; then @@ -93,8 +90,8 @@ dnl Check if compiler accepts specific flag to enable threads ace_cv_feature_thread_flag_set=yes ], [ - CXXFLAGS="$save_CXXFLAGS" - CFLAGS="$save_CFLAGS" + CXXFLAGS="$ace_save_CXXFLAGS" + CFLAGS="$ace_save_CFLAGS" ]) fi dnl test "$ace_cv_feature_thread_flag_set" = no @@ -119,8 +116,8 @@ dnl Check if compiler accepts specific flag to enable threads ace_cv_feature_thread_flag_set=yes ], [ - CXXFLAGS="$save_CXXFLAGS" - CFLAGS="$save_CFLAGS" + CXXFLAGS="$ace_save_CXXFLAGS" + CFLAGS="$ace_save_CFLAGS" ]) fi dnl test "$ace_cv_feature_thread_flag_set" = no @@ -145,8 +142,8 @@ dnl Check if compiler accepts specific flag to enable threads ace_cv_feature_thread_flag_set=yes ], [ - CXXFLAGS="$save_CXXFLAGS" - CFLAGS="$save_CFLAGS" + CXXFLAGS="$ace_save_CXXFLAGS" + CFLAGS="$ace_save_CFLAGS" ]) fi dnl test "$ace_cv_feature_thread_flag_set" = no @@ -171,8 +168,8 @@ dnl Check if compiler accepts specific flag to enable threads ace_cv_feature_thread_flag_set=yes ], [ - CXXFLAGS="$save_CXXFLAGS" - CFLAGS="$save_CFLAGS" + CXXFLAGS="$ace_save_CXXFLAGS" + CFLAGS="$ace_save_CFLAGS" ]) fi dnl test "$ace_cv_feature_thread_flag_set" = no @@ -197,8 +194,8 @@ dnl Check if compiler accepts specific flag to enable threads ace_cv_feature_thread_flag_set=yes ], [ - CXXFLAGS="$save_CXXFLAGS" - CFLAGS="$save_CFLAGS" + CXXFLAGS="$ace_save_CXXFLAGS" + CFLAGS="$ace_save_CFLAGS" ]) fi dnl test "$ace_cv_feature_thread_flag_set" = no |