diff options
| -rw-r--r-- | configure.in | 13 | ||||
| -rw-r--r-- | m4/features.m4 | 9 |
2 files changed, 9 insertions, 13 deletions
diff --git a/configure.in b/configure.in index 5aab52caa7a..7657d067a97 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl dnl $Id$ -AC_REVISION($Revision 0.57 $)dnl +AC_REVISION($Revision 0.58 $)dnl dnl dnl An autoconf script to automatically configure ACE. @@ -936,17 +936,6 @@ if test "$ace_user_enable_threads" = yes; then ACE_CHECK_THREADS fi dnl test "$ace_user_enable_threads" = yes -dnl Asynchronous IO library check -dnl Some platforms, such as Solaris puts aio_read in -lposix4, for example. -dnl In some cases, the thread library must be linked to in addition to the -dnl real-time support library. As such, make sure these checks are done -dnl after the thread library checks. -ace_has_aio_funcs=yes -AC_CHECK_FUNC(aio_read, , dnl - AC_CHECK_LIB(aio, aio_read, , - AC_CHECK_LIB(posix4, aio_read, , - AC_CHECK_LIB(rt, aio_read, , ace_has_aio_funcs=no)))) - dnl Check for sched_yield() in posix4 library. dnl Some platforms, such as Solaris, may define sched_yield() there. dnl Later we run AC_CHECK_FUNC(sched_yield), which is redundant i this case diff --git a/m4/features.m4 b/m4/features.m4 index b247ff6e97a..9960cb8c26d 100644 --- a/m4/features.m4 +++ b/m4/features.m4 @@ -29,6 +29,13 @@ AC_DEFUN(ACE_CHECK_ASYNCH_IO, dnl AC_REQUIRE([AC_PROG_CXXCPP]) AC_REQUIRE([AC_LANG_CPLUSPLUS]) + dnl In case a library with the asynchronous libraries is found but + dnl the asynchronous IO support is not functional then save a copy + dnl of the list of libraries before the asynch IO function library + dnl is added to the list so that we can revert the list to its + dnl pre-asynch-IO check state. + ace_save_LIBS="$LIBS" + dnl Asynchronous IO library check dnl Some platforms, such as Solaris puts aio_read in -lposix4, for example. dnl In some cases, the thread library must be linked to in addition to the @@ -540,6 +547,6 @@ main (int, char *[]) ace_cv_feature_aio_calls=no ]) ]) - ], AC_DEFINE(ACE_HAS_AIO_CALLS),) + ], AC_DEFINE(ACE_HAS_AIO_CALLS), LIBS="$ace_save_LIBS") fi dnl test "$ace_has_aio_funcs" = yes ]) |