diff options
| author | Matthias Ringwald <mringwal@inf.ethz.ch> | 2008-07-08 22:49:00 +0200 |
|---|---|---|
| committer | Matthias Ringwald <mringwal@inf.ethz.ch> | 2008-07-08 22:49:00 +0200 |
| commit | db77cc621ac71f2a18aba0c2072c3d379e871e85 (patch) | |
| tree | 9ec418aaf1d4313672f217e14bf177e27a12e678 | |
| parent | cfd21368e1eaaad3ab1659fb221e1d4241fac7cf (diff) | |
| download | xine-lib-db77cc621ac71f2a18aba0c2072c3d379e871e85.tar.gz xine-lib-db77cc621ac71f2a18aba0c2072c3d379e871e85.tar.bz2 | |
Fix compilation for pthread support provided by PTHREAD_{CFLAGS+LIBS}
<xine-internals.h> includes <xine-utils/refcounter.h> which includes
<pthread.h>. As all xine sources include <xine-internal.h>, the
PTHREAD_CFLAGS are always needed. This patch removed it from two Makefile.am
and adds them to CPPFLAGS
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/xine-engine/Makefile.am | 4 | ||||
| -rw-r--r-- | src/xine-utils/Makefile.am | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index e15311cdf..7c7030009 100644 --- a/configure.ac +++ b/configure.ac @@ -228,6 +228,8 @@ dnl --------------------------------------------- CC_PTHREAD_FLAGS(, [AC_MSG_ERROR([Pthread support is needed])]) CC_PTHREAD_RECURSIVE_MUTEX(, [AC_MSG_ERROR([recursive mutex support is needed - please report])]) +dnl <pthread.h> is implicitly included by xine-internals.h, so the include dir is needed everywhere +CPPFLAGS="$CPPFLAGS $PTHREAD_CFLAGS" AC_CHECK_DECL(sysi86,[ AC_DEFINE(HAVE_SYSI86,1,[Define this if the 'sysi86' function is declared in sys/sysi86.h]) diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index 03176fb80..17dd96b10 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -1,8 +1,8 @@ include $(top_srcdir)/misc/Makefile.common include $(top_srcdir)/lib/Makefile.common -AM_CFLAGS = $(X_CFLAGS) $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) $(PTHREAD_CFLAGS) $(VISIBILITY_FLAG) -AM_CPPFLAGS = $(ZLIB_CPPFLAGS) $(PTHREAD_CFLAGS) -DXINE_LIBRARY_COMPILE +AM_CFLAGS = $(X_CFLAGS) $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) $(VISIBILITY_FLAG) +AM_CPPFLAGS = $(ZLIB_CPPFLAGS) -DXINE_LIBRARY_COMPILE LIBTOOL = $(SHELL) $(top_builddir)/libtool lib_LTLIBRARIES = libxine.la diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am index a599f9b12..8a3d88ddd 100644 --- a/src/xine-utils/Makefile.am +++ b/src/xine-utils/Makefile.am @@ -12,7 +12,7 @@ endif endif AM_CFLAGS = $(X_CFLAGS) $(VISIBILITY_FLAG) -AM_CPPFLAGS= $(PTHREAD_CFLAGS) -DXINE_LIBRARY_COMPILE +AM_CPPFLAGS= -DXINE_LIBRARY_COMPILE libxineutils_la_SOURCES = $(pppc_files) \ cpu_accel.c \ |