[MPlayer-cvslog] r34271 - in trunk: Makefile configure

[diego]

Author: diego
Date: Thu Oct 27 14:16:01 2011
New Revision: 34271

Log:
build: Only compile Windows-specific local glob() replacement on MinGW.

Modified:
   trunk/Makefile
   trunk/configure

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Thu Oct 27 03:11:34 2011	(r34270)
+++ trunk/Makefile	Thu Oct 27 14:16:01 2011	(r34271)
@@ -25,7 +25,7 @@ include config.mak
 
 # local fallbacks for missing operating system features
 OS_FEATURE-$(GETTIMEOFDAY)           += osdep/gettimeofday.c
-OS_FEATURE-$(GLOB)                   += osdep/glob-win.c
+OS_FEATURE-$(GLOB_WIN)               += osdep/glob-win.c
 OS_FEATURE-$(MMAP)                   += osdep/mmap-os2.c
 OS_FEATURE-$(SETENV)                 += osdep/setenv.c
 OS_FEATURE-$(SHMEM)                  += osdep/shmem.c

Modified: trunk/configure
==============================================================================
--- trunk/configure	Thu Oct 27 03:11:34 2011	(r34270)
+++ trunk/configure	Thu Oct 27 14:16:01 2011	(r34271)
@@ -3885,10 +3885,13 @@ echores "$gettimeofday"
 
 
 echocheck "glob()"
+# glob_win enables a Windows-specific glob() replacement
 glob=yes
+glob_win=yes
 def_glob='#define HAVE_GLOB 1'
 statement_check glob.h 'glob("filename", 0, 0, 0)' ||
-    { glob=no ; def_glob='#undef HAVE_GLOB' ; }
+    { glob=no ; def_glob='#undef HAVE_GLOB' ;
+      mingw32 && glob_win=no ; }
 echores "$glob"
 
 
@@ -7844,6 +7847,7 @@ MPLAYER  = $_mplayer
 # operating system features which have local fallbacks
 GETTIMEOFDAY = $gettimeofday
 GLOB         = $glob
+GLOB_WIN     = $glob_win
 MMAP         = $mmap
 SETENV       = $setenv
 SHMEM        = $shmem