diff --git a/configure.ac b/configure.ac index 2a459413a5..9cc640bf64 100644 --- a/configure.ac +++ b/configure.ac @@ -743,25 +743,22 @@ AS_IF([test "${SYS}" != "mingw32"], [ ]) ]) VLC_RESTORE_FLAGS - - AC_CHECK_LIB(rt, clock_nanosleep, [ - VLC_ADD_LIBS([libvlccore],[-lrt]) - ], [ - AC_CHECK_FUNC(nanosleep,,[ - AC_CHECK_LIB(rt,nanosleep, [ - VLC_ADD_LIBS([libvlccore],[-lrt]) - ], [ - AC_CHECK_LIB(posix4,nanosleep, [ - VLC_ADD_LIBS([libvlccore],[-lposix4]) - ]) - ]) - ]) - dnl HP/UX port - AC_CHECK_LIB(rt,sem_init, [VLC_ADD_LIBS([libvlccore],[-lrt])]) - ]) ]) AC_SUBST(LIBPTHREAD) +AC_SEARCH_LIBS([clock_nanosleep], [rt pthread], [ + AS_IF([test "$ac_cv_search_clock_nanosleep" != "none required"], [ + LIBRT="$ac_cv_search_clock_nanosleep" + ]) +], [ + AC_SEARCH_LIBS([nanosleep], [rt pthread posix4], [ + AS_IF([test "$ac_cv_search_nanosleep" != "none required"], [ + LIBRT="$ac_cv_search_nanosleep" + ]) + ]) +]) +AC_SUBST(LIBRT) + dnl dnl Check for headers dnl diff --git a/src/Makefile.am b/src/Makefile.am index 1db5d00be0..e0155dd88e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -188,7 +188,7 @@ libvlccore_la_LDFLAGS = \ libvlccore_la_LIBADD = $(LIBS_libvlccore) \ ../compat/libcompat.la \ $(LTLIBINTL) $(LTLIBICONV) \ - $(IDN_LIBS) $(LIBPTHREAD) $(SOCKET_LIBS) $(LIBDL) $(LIBM) + $(IDN_LIBS) $(LIBPTHREAD) $(SOCKET_LIBS) $(LIBRT) $(LIBDL) $(LIBM) libvlccore_la_DEPENDENCIES = libvlccore.sym if HAVE_WIN32 libvlccore_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT)