Merge branch 'nd/make-wildmatch-default'
authorJunio C Hamano <gitster@pobox.com>
Thu, 20 Jun 2013 23:02:14 +0000 (16:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 20 Jun 2013 23:02:14 +0000 (16:02 -0700)
* nd/make-wildmatch-default:
Makefile: promote wildmatch to be the default fnmatch implementation

Makefile
index 03524d022c3bea71a71d736214c07a8667d625d8..17c7ecb972d888182be26856496e99c68047d4c7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -109,7 +109,7 @@ all::
 # Define NO_FNMATCH_CASEFOLD if your fnmatch function doesn't have the
 # FNM_CASEFOLD GNU extension.
 #
-# Define USE_WILDMATCH if you want to use Git's wildmatch
+# Define NO_WILDMATCH if you do not want to use Git's wildmatch
 # implementation as fnmatch
 #
 # Define NO_GECOS_IN_PWENT if you don't have pw_gecos in struct passwd
@@ -1278,7 +1278,7 @@ ifdef NO_FNMATCH_CASEFOLD
        COMPAT_OBJS += compat/fnmatch/fnmatch.o
 endif
 endif
-ifdef USE_WILDMATCH
+ifndef NO_WILDMATCH
        COMPAT_CFLAGS += -DUSE_WILDMATCH
 endif
 ifdef NO_SETENV