Mercurial > mplayer.hg

changeset 34183:3053e7ffd08d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Only compile Windows-specific local glob() replacement on MinGW.
author diego
date Thu, 27 Oct 2011 12:16:01 +0000
parents b86eb5d72594
children da679f8d2ac6
files Makefile configure
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Thu Oct 27 01:11:34 2011 +0000
+++ b/Makefile	Thu Oct 27 12:16:01 2011 +0000
@@ -25,7 +25,7 @@
 
 # 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
--- a/configure	Thu Oct 27 01:11:34 2011 +0000
+++ b/configure	Thu Oct 27 12:16:01 2011 +0000
@@ -3885,10 +3885,13 @@
 
 
 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 @@
 # operating system features which have local fallbacks
 GETTIMEOFDAY = $gettimeofday
 GLOB         = $glob
+GLOB_WIN     = $glob_win
 MMAP         = $mmap
 SETENV       = $setenv
 SHMEM        = $shmem