GIT v0.99.7d

[git.git] / Makefile

diff --git a/Makefile b/Makefile
index 0e9f2ec..cfde69c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,8 @@
 # Define NO_CURL if you do not have curl installed.  git-http-pull is not
 # built, and you cannot use http:// and https:// transports.
 #
+# Define NO_STRCASESTR if you don't have strcasestr.
+#
 # Define PPC_SHA1 environment variable when running make to make use of
 # a bundled SHA1 routine optimized for PowerPC.
 #
@@ -21,6 +23,8 @@
 #
 # Define NO_GETDOMAINNAME if your library lack it (SunOS, Patrick Mauritz).
 #
+# Define WITH_OWN_SUBPROCESS_PY if you want to use with python 2.3.
+#
 # Define COLLISION_CHECK below if you believe that SHA1's
 # 1461501637330902918203684832716283019655932542976 hashes do not give you
 # sufficient guarantee that no collisions between objects will ever happen.
@@ -40,7 +44,7 @@
 
 # DEFINES += -DUSE_STDEV
 
-GIT_VERSION = 0.99.6
+GIT_VERSION = 0.99.7d
 
 CFLAGS = -g -O2 -Wall
 ALL_CFLAGS = $(CFLAGS) $(PLATFORM_DEFINES) $(DEFINES)
@@ -115,6 +119,10 @@ PROGRAMS += git-ssh-pull git-ssh-push
 PYMODULES = \
        gitMergeCommon.py
 
+ifdef WITH_OWN_SUBPROCESS_PY
+       PYMODULES += compat/subprocess.py
+endif
+
 ifdef WITH_SEND_EMAIL
        SCRIPT_PERL += git-send-email.perl
 endif
@@ -203,6 +211,10 @@ ifdef NEEDS_NSL
        LIBS += -lnsl
        SIMPLE_LIB += -lnsl
 endif
+ifdef NO_STRCASESTR
+       DEFINES += -Dstrcasestr=gitstrcasestr
+       LIB_OBJS += compat/strcasestr.o
+endif
 
 DEFINES += '-DSHA1_HEADER=$(SHA1_HEADER)'