[MPlayer-cvslog] r26350 - in trunk: configure osdep/Makefile

[diego]

Author: diego
Date: Tue Apr  8 19:31:25 2008
New Revision: 26350

Log:
Move decision about whether or not to compile osdep/mmap_os2.c to configure.


Modified:
   trunk/configure
   trunk/osdep/Makefile

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Tue Apr  8 19:31:25 2008
@@ -3054,6 +3054,7 @@ if test "$_mman" = yes ; then
   _def_mman='#define HAVE_SYS_MMAN_H 1'
 else
   _def_mman='#undef HAVE_SYS_MMAN_H'
+  os2 && _need_mmap=yes
 fi
 echores "$_mman"
 
@@ -7732,6 +7733,7 @@ HAVE_POSIX_SELECT = $_posix_select
 
 NEED_GETTIMEOFDAY    = $_need_gettimeofday
 NEED_GLOB    = $_need_glob
+NEED_MMAP    = $_need_mmap
 NEED_SETENV  = $_need_setenv
 NEED_SHMEM   = $_need_shmem
 NEED_STRSEP  = $_need_strsep

Modified: trunk/osdep/Makefile
==============================================================================
--- trunk/osdep/Makefile	(original)
+++ trunk/osdep/Makefile	Tue Apr  8 19:31:25 2008
@@ -7,6 +7,7 @@ SRCS_COMMON-$(MACOSX_FINDER_SUPPORT) += 
 
 SRCS_COMMON-$(NEED_GETTIMEOFDAY)     += gettimeofday.c
 SRCS_COMMON-$(NEED_GLOB)             += glob-win.c
+SRCS_COMMON-$(NEED_MMAP)             += mmap-os2.c
 SRCS_COMMON-$(NEED_SETENV)           += setenv.c
 SRCS_COMMON-$(NEED_SHMEM)            += shmem.c
 SRCS_COMMON-$(NEED_STRSEP)           += strsep.c
@@ -26,9 +27,6 @@ getch = getch2-win.c
 endif
 ifeq ($(TARGET_OS),OS/2)
 getch = getch2-os2.c
-ifneq ($(HAVE_SYS_MMAN_H),yes)
-SRCS_COMMON += mmap-os2.c
-endif
 endif
 SRCS_COMMON += $(timer)
 SRCS_COMMON += $(getch)