diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2004-10-30 15:04:46 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2004-10-30 15:04:46 +0000 |
| commit | 4afb5b7cc665c984e6c979614ea1cf7065780bfe (patch) | |
| tree | d8c944d90aa482e9418caa96406f51789d1f2cdf | |
| parent | 8595ac3d9b110a5c0fe46ccaaddc620d4c8681a1 (diff) | |
| download | xine-lib-4afb5b7cc665c984e6c979614ea1cf7065780bfe.tar.gz xine-lib-4afb5b7cc665c984e6c979614ea1cf7065780bfe.tar.bz2 | |
better check for posix timers
CVS patchset: 7092
CVS date: 2004/10/30 15:04:46
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | src/xine-engine/Makefile.am | 2 | ||||
| -rw-r--r-- | src/xine-utils/utils.c | 4 |
3 files changed, 13 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index e8951b28c..28427ccaf 100644 --- a/configure.ac +++ b/configure.ac @@ -257,7 +257,6 @@ dnl WIN32 platform AC_SUBST(WIN32_CPPFLAGS) AM_CONDITIONAL(WIN32, test x$SYS = "xmingw32") - dnl --------------------------------------------- dnl dynamic linker dnl --------------------------------------------- @@ -443,6 +442,16 @@ AC_SUBST(ZLIB_INCLUDES) AC_SUBST(ZLIB_LIBS) AC_SUBST(ZLIB_LIBS_CONFIG) +dnl --------------------------------------------- +dnl check posix timers +dnl --------------------------------------------- + +AC_CHECK_LIB(rt, clock_getres, + [RT_LIBS="-lrt" + AC_DEFINE(HAVE_POSIX_TIMERS,1, + [Define this if you have POSIX timers.])], + AC_MSG_RESULT([*** no POSIX timers available.])) +AC_SUBST(RT_LIBS) dnl --------------------------------------------- dnl Check for OpenGL & [GLut | GLU] diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index d207c3e3e..ede3216a7 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -35,7 +35,7 @@ libxine_la_DEPENDENCIES = @INTLLIBS@ $(XINEUTILS_LIB) $(zlib_dep) \ $(dirent_lib) $(pthread_dep) $(LIBXINEPOSIX) libxine_la_LIBADD = $(THREAD_LIBS) $(DYNAMIC_LD_LIBS) @INTLLIBS@ $(ZLIB_LIBS) \ -lm $(XINEUTILS_LIB) $(LIBICONV) $(FT2_LIBS) \ - $(dirent_lib) $(LIBXINEPOSIX) + $(dirent_lib) $(LIBXINEPOSIX) $(RT_LIBS) libxine_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(def_ldflags) diff --git a/src/xine-utils/utils.c b/src/xine-utils/utils.c index fb421ef74..16499b713 100644 --- a/src/xine-utils/utils.c +++ b/src/xine-utils/utils.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: utils.c,v 1.36 2004/10/29 23:11:38 miguelfreitas Exp $ + * $Id: utils.c,v 1.37 2004/10/30 15:04:47 miguelfreitas Exp $ * */ #define _POSIX_PTHREAD_SEMANTICS 1 /* for 5-arg getpwuid_r on solaris */ @@ -584,7 +584,7 @@ void xine_xprintf(xine_t *xine, int verbose, const char *fmt, ...) { int xine_monotonic_clock(struct timeval *tv, struct timezone *tz) { -#if _POSIX_TIMERS > 0 && defined(_POSIX_MONOTONIC_CLOCK) +#if _POSIX_TIMERS > 0 && defined(_POSIX_MONOTONIC_CLOCK) && defined(HAVE_POSIX_TIMERS) static int initialized = 0; static int use_clock_monotonic = 0; |