From c3f0320d911d333b7cc8c7dcdec3868d071e610d Mon Sep 17 00:00:00 2001 From: Alberto Massari <amassari@apache.org> Date: Tue, 24 Oct 2006 10:45:35 +0000 Subject: [PATCH] Added report at the end of configure git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@467302 13f79535-47bb-0310-9956-ffa450edef68 --- configure.ac | 11 +++++++++++ m4/xerces_atomicopmgr_selection.m4 | 24 ++++++++++++------------ m4/xerces_filemgr_selection.m4 | 14 +++++++------- m4/xerces_mutexmgr_selection.m4 | 22 +++++++++++----------- 4 files changed, 41 insertions(+), 30 deletions(-) diff --git a/configure.ac b/configure.ac index 57ebdf2c8..b1963319e 100644 --- a/configure.ac +++ b/configure.ac @@ -238,3 +238,14 @@ AS_IF([test x$ac_cv_cxx_have_std_libs = xyes], AC_OUTPUT + +AC_MSG_NOTICE +AC_MSG_NOTICE([Report:]) +AC_MSG_NOTICE([ NetAccessor: $netaccessor]) +AC_MSG_NOTICE([ File Manager: $filemgr]) +AC_MSG_NOTICE([ Atomic Op Manager: $aopmgr]) +AC_MSG_NOTICE([ Mutex Manager: $mutexmgr]) +AC_MSG_NOTICE([ Message Loader: $msgloader]) +AC_MSG_NOTICE([ Transcoder: $transcoder]) + + diff --git a/m4/xerces_atomicopmgr_selection.m4 b/m4/xerces_atomicopmgr_selection.m4 index 72cd8edbe..08d4701a2 100644 --- a/m4/xerces_atomicopmgr_selection.m4 +++ b/m4/xerces_atomicopmgr_selection.m4 @@ -14,28 +14,28 @@ AC_DEFUN([XERCES_ATOMICOPMGR_SELECTION], AC_REQUIRE([XERCES_NO_THREADS]) AC_MSG_CHECKING([for which AtomicOp Manager to use]) - mgr= + aopmgr= # If no threads is specified, use the NoThread Atomic Op Mgr AS_IF([test x$xerces_cv_no_threads = xyes], [ - mgr=NoThreads + aopmgr=NoThreads AC_DEFINE([XERCES_USE_ATOMICOPMGR_NOTHREAD], 1, [Define to use the NoThread AtomicOp mgr]) ]) # Platform specific checks - AS_IF([test -z "$mgr"], + AS_IF([test -z "$aopmgr"], [ case $host_os in windows* | cygwin* | mingw*) - mgr=Windows; + aopmgr=Windows; AC_DEFINE([XERCES_USE_ATOMICOPMGR_WINDOWS], 1, [Define to use the Windows AtomicOp mgr]) ;; darwin*) # On MacOS, use the built-in AtomicOp primitives AS_IF([test x$ac_cv_header_CoreServices_CoreServices_h = xyes], [ - mgr=MacOS + aopmgr=MacOS AC_DEFINE([XERCES_USE_ATOMICOPMGR_MACOS], 1, [Define to use the MacOS AtomicOp mgr]) XERCES_LINK_DARWIN_FRAMEWORK([CoreServices]) ]) @@ -44,20 +44,20 @@ AC_DEFUN([XERCES_ATOMICOPMGR_SELECTION], ]) # Fall back to using posix mutex - AS_IF([test -z "$mgr"], + AS_IF([test -z "$aopmgr"], [ - mgr=POSIX; + aopmgr=POSIX; AC_DEFINE([XERCES_USE_ATOMICOPMGR_POSIX], 1, [Define to use the POSIX AtomicOp mgr]) ]) - AC_MSG_RESULT($mgr) + AC_MSG_RESULT($aopmgr) # Define the auto-make conditionals which determine what actually gets compiled # Note that these macros can't be executed conditionally, which is why they're here, not above. - AM_CONDITIONAL([XERCES_USE_ATOMICOPMGR_NOTHREAD], [test x"$mgr" = xNoThreads]) - AM_CONDITIONAL([XERCES_USE_ATOMICOPMGR_POSIX], [test x"$mgr" = xPOSIX]) - AM_CONDITIONAL([XERCES_USE_ATOMICOPMGR_MACOS], [test x"$mgr" = xMacOS]) - AM_CONDITIONAL([XERCES_USE_ATOMICOPMGR_WINDOWS], [test x"$mgr" = xWindows]) + AM_CONDITIONAL([XERCES_USE_ATOMICOPMGR_NOTHREAD], [test x"$aopmgr" = xNoThreads]) + AM_CONDITIONAL([XERCES_USE_ATOMICOPMGR_POSIX], [test x"$aopmgr" = xPOSIX]) + AM_CONDITIONAL([XERCES_USE_ATOMICOPMGR_MACOS], [test x"$aopmgr" = xMacOS]) + AM_CONDITIONAL([XERCES_USE_ATOMICOPMGR_WINDOWS], [test x"$aopmgr" = xWindows]) ] ) diff --git a/m4/xerces_filemgr_selection.m4 b/m4/xerces_filemgr_selection.m4 index 086911f50..48d225d18 100644 --- a/m4/xerces_filemgr_selection.m4 +++ b/m4/xerces_filemgr_selection.m4 @@ -13,28 +13,28 @@ AC_DEFUN([XERCES_FILEMGR_SELECTION], [ AC_MSG_CHECKING([for which File Manager to use]) - mgr= + filemgr= # Platform specific checks case $host_os in windows* | cygwin* | mingw*) - mgr=Windows; + filemgr=Windows; AC_DEFINE([XERCES_USE_FILEMGR_WINDOWS], 1, [Define to use the Windows file mgr]) ;; esac # Fall back to using posix files - AS_IF([test -z "$mgr"], - [mgr=POSIX; + AS_IF([test -z "$filemgr"], + [filemgr=POSIX; AC_DEFINE([XERCES_USE_FILEMGR_POSIX], 1, [Define to use the POSIX file mgr]) ]) - AC_MSG_RESULT($mgr) + AC_MSG_RESULT($filemgr) # Define the auto-make conditionals which determine what actually gets compiled # Note that these macros can't be executed conditionally, which is why they're here, not above. - AM_CONDITIONAL([XERCES_USE_FILEMGR_POSIX], [test x"$mgr" = xPOSIX]) - AM_CONDITIONAL([XERCES_USE_FILEMGR_WINDOWS],[test x"$mgr" = xWindows]) + AM_CONDITIONAL([XERCES_USE_FILEMGR_POSIX], [test x"$filemgr" = xPOSIX]) + AM_CONDITIONAL([XERCES_USE_FILEMGR_WINDOWS],[test x"$filemgr" = xWindows]) ] ) diff --git a/m4/xerces_mutexmgr_selection.m4 b/m4/xerces_mutexmgr_selection.m4 index 34336bc05..b8432ee1d 100644 --- a/m4/xerces_mutexmgr_selection.m4 +++ b/m4/xerces_mutexmgr_selection.m4 @@ -15,21 +15,21 @@ AC_DEFUN([XERCES_MUTEXMGR_SELECTION], AC_REQUIRE([ACX_PTHREAD]) AC_MSG_CHECKING([for which Mutex Manager to use]) - mgr= + mutexmgr= # If no threads is specified, use the NoThread Mutex Mgr AS_IF([test x$xerces_cv_no_threads = xyes], [ - mgr=NoThreads + mutexmgr=NoThreads AC_DEFINE([XERCES_USE_MUTEXMGR_NOTHREAD], 1, [Define to use the NoThread mutex mgr]) ]) # Platform specific checks - AS_IF([test -z "$mgr"], + AS_IF([test -z "$mutexmgr"], [ case $host_os in windows* | cygwin* | mingw*) - mgr=Windows; + mutexmgr=Windows; AC_DEFINE([XERCES_USE_MUTEXMGR_WINDOWS], 1, [Define to use the Windows mutex mgr]) case $host_os in @@ -43,9 +43,9 @@ AC_DEFUN([XERCES_MUTEXMGR_SELECTION], ]) # Fall back to using posix mutex id we can - AS_IF([test -z "$mgr" && test x$acx_pthread_ok = xyes], + AS_IF([test -z "$mutexmgr" && test x$acx_pthread_ok = xyes], [ - mgr=POSIX; + mutexmgr=POSIX; AC_DEFINE([XERCES_USE_MUTEXMGR_POSIX], 1, [Define to use the POSIX mutex mgr]) # Set additional flags for link and compile @@ -54,16 +54,16 @@ AC_DEFUN([XERCES_MUTEXMGR_SELECTION], ]) # If we still didn't find a mutex package, bail - AS_IF([test -z "$mgr"], + AS_IF([test -z "$mutexmgr"], [AC_MSG_ERROR([Xerces cannot function without mutex support. You may want to --disable-threads.])]) - AC_MSG_RESULT($mgr) + AC_MSG_RESULT($mutexmgr) # Define the auto-make conditionals which determine what actually gets compiled # Note that these macros can't be executed conditionally, which is why they're here, not above. - AM_CONDITIONAL([XERCES_USE_MUTEXMGR_NOTHREAD], [test x"$mgr" = xNoThreads]) - AM_CONDITIONAL([XERCES_USE_MUTEXMGR_POSIX], [test x"$mgr" = xPOSIX]) - AM_CONDITIONAL([XERCES_USE_MUTEXMGR_WINDOWS], [test x"$mgr" = xWindows]) + AM_CONDITIONAL([XERCES_USE_MUTEXMGR_NOTHREAD], [test x"$mutexmgr" = xNoThreads]) + AM_CONDITIONAL([XERCES_USE_MUTEXMGR_POSIX], [test x"$mutexmgr" = xPOSIX]) + AM_CONDITIONAL([XERCES_USE_MUTEXMGR_WINDOWS], [test x"$mutexmgr" = xWindows]) ] ) -- GitLab