From 82c19a74b275c540f912c8b449e6ef318f19e312 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Sun, 6 Oct 2002 11:48:09 +0000 Subject: [PATCH] Also look in -lposix4 for sem_init. Fixes #618615. --- configure | 82 ++++++++++++++++++++++++++++++++++++++++------------ configure.in | 3 +- 2 files changed, 65 insertions(+), 20 deletions(-) diff --git a/configure b/configure index ffdc0a2ec94..e6c99dc7441 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.350 . +# From configure.in Revision: 1.351 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.53. # @@ -9219,14 +9219,13 @@ _ACEOF fi # Dynamic linking for HP-UX - -echo "$as_me:$LINENO: checking for sem_init in -lrt" >&5 -echo $ECHO_N "checking for sem_init in -lrt... $ECHO_C" >&6 -if test "${ac_cv_lib_rt_sem_init+set}" = set; then +echo "$as_me:$LINENO: checking for library containing sem_init" >&5 +echo $ECHO_N "checking for library containing sem_init... $ECHO_C" >&6 +if test "${ac_cv_search_sem_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lrt $LIBS" + ac_func_search_save_LIBS=$LIBS +ac_cv_search_sem_init=no cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" @@ -9264,26 +9263,71 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_rt_sem_init=yes + ac_cv_search_sem_init="none required" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_rt_sem_init=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_rt_sem_init" >&5 -echo "${ECHO_T}$ac_cv_lib_rt_sem_init" >&6 -if test $ac_cv_lib_rt_sem_init = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBRT 1 +if test "$ac_cv_search_sem_init" = no; then + for ac_lib in rt posix4; do + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char sem_init (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +sem_init (); + ; + return 0; +} _ACEOF - - LIBS="-lrt $LIBS" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_search_sem_init="-l$ac_lib" +break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + done +fi +LIBS=$ac_func_search_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_search_sem_init" >&5 +echo "${ECHO_T}$ac_cv_search_sem_init" >&6 +if test "$ac_cv_search_sem_init" != no; then + test "$ac_cv_search_sem_init" = "none required" || LIBS="$ac_cv_search_sem_init $LIBS" fi - # 'Real Time' functions on Solaris + # 'Real Time' functions on Solaris, + # posix4 on Solaris 2.6 # checks for system dependent C++ extensions support case "$ac_sys_system" in diff --git a/configure.in b/configure.in index aef3c067e9d..4ec1bed2706 100644 --- a/configure.in +++ b/configure.in @@ -1093,7 +1093,8 @@ AC_MSG_RESULT($SHLIBS) # checks for libraries AC_CHECK_LIB(dl, dlopen) # Dynamic linking for SunOS/Solaris and SYSV AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-UX -AC_CHECK_LIB(rt, sem_init) # 'Real Time' functions on Solaris +AC_SEARCH_LIBS(sem_init, rt posix4) # 'Real Time' functions on Solaris, + # posix4 on Solaris 2.6 # checks for system dependent C++ extensions support case "$ac_sys_system" in