diff options
| author | František Dvořák <valtri@users.sourceforge.net> | 2006-09-04 06:19:55 +0000 |
|---|---|---|
| committer | František Dvořák <valtri@users.sourceforge.net> | 2006-09-04 06:19:55 +0000 |
| commit | 48eb1f3bfe29e086b363ee98c25d760f0a6401f3 (patch) | |
| tree | 63334db57eb4a4a9ec5e1def823dac5d5a8b98e9 | |
| parent | 9b2b001b5dadde6771d40df9da6dcb4cab3dda40 (diff) | |
| download | xine-lib-48eb1f3bfe29e086b363ee98c25d760f0a6401f3.tar.gz xine-lib-48eb1f3bfe29e086b363ee98c25d760f0a6401f3.tar.bz2 | |
Proper configure fix,
added Xorg's X_CFLAGS where needed.
CVS patchset: 8201
CVS date: 2006/09/04 06:19:55
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/video_out/Makefile.am | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 6e6f32807..4c6ca6e5e 100644 --- a/configure.ac +++ b/configure.ac @@ -573,7 +573,7 @@ dnl ---------------------------------------------- if test x"$no_x" != "xyes"; then ac_save_CPPFLAGS="$CPPFLAGS" - CPPLAGS="$CPPFLAGS $X_CFLAGS" + CPPFLAGS="$CPPFLAGS $X_CFLAGS" AC_CHECK_HEADERS([X11/extensions/XShm.h], [], [AC_MSG_ERROR([XShm extension is required])]) CPPFLAGS="$ac_save_CPPFLAGS" diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am index 58f7db0cf..64d95b4f8 100644 --- a/src/video_out/Makefile.am +++ b/src/video_out/Makefile.am @@ -136,7 +136,7 @@ xineplug_vo_out_vidix_la_SOURCES = video_out_vidix.c $(X11OSD) xineplug_vo_out_vidix_la_LIBADD = $(X_LIBS) \ $(top_builddir)/src/video_out/vidix/libvidix.la \ $(top_builddir)/src/video_out/libdha/libdha.la $(THREAD_LIBS) -xineplug_vo_out_vidix_la_CFLAGS = $(VISIBILITY_FLAG) $(VIDIX_CFLAGS) -fno-strict-aliasing +xineplug_vo_out_vidix_la_CFLAGS = $(VISIBILITY_FLAG) $(VIDIX_CFLAGS) $(X_CFLAGS) -fno-strict-aliasing xineplug_vo_out_vidix_la_LDFLAGS = -avoid-version -module xineplug_vo_out_aa_la_SOURCES = video_out_aa.c @@ -163,7 +163,7 @@ xineplug_vo_out_directfb_la_LDFLAGS = -avoid-version -module xineplug_vo_out_sdl_la_SOURCES = video_out_sdl.c xineplug_vo_out_sdl_la_LIBADD = $(SDL_LIBS) $(XINE_LIB) $(THREAD_LIBS) -xineplug_vo_out_sdl_la_CFLAGS = $(VISIBILITY_FLAG) $(SDL_CFLAGS) +xineplug_vo_out_sdl_la_CFLAGS = $(VISIBILITY_FLAG) $(X_CFLAGS) $(SDL_CFLAGS) xineplug_vo_out_sdl_la_LDFLAGS = -avoid-version -module xineplug_vo_out_stk_la_SOURCES = video_out_stk.c |