t/t9814-git-p4-rename.sh: avoid "test <cond> -a/-o <cond>"

diff --git a/Makefile b/Makefile
index 74a929b6d40557f9433e8874c97739d2a06cc858..07ea1058379ab963648d0df7fd2917e0d2efa8a7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -30,19 +30,14 @@ all::
 # Define LIBPCREDIR=/foo/bar if your libpcre header and library files are in
 # /foo/bar/include and /foo/bar/lib directories.
 #
+# Define HAVE_ALLOCA_H if you have working alloca(3) defined in that header.
+#
 # Define NO_CURL if you do not have libcurl installed.  git-http-fetch and
 # git-http-push are not built, and you cannot use http:// and https://
 # transports (neither smart nor dumb).
 #
-# Define CURL_CONFIG to the path to a curl-config binary other than the
-# default 'curl-config'.
-#
-# Define CURL_STATIC to statically link libcurl.  Only applies if
-# CURL_CONFIG is used.
-#
 # Define CURLDIR=/foo/bar if your curl header and library files are in
-# /foo/bar/include and /foo/bar/lib directories.  This overrides CURL_CONFIG,
-# but is less robust.
+# /foo/bar/include and /foo/bar/lib directories.
 #
 # Define NO_EXPAT if you do not have expat installed.  git-http-push is
 # not built, and you cannot push using http:// and https:// transports (dumb).
@@ -150,11 +145,9 @@ all::
 #
 # Define NEEDS_SSL_WITH_CRYPTO if you need -lssl when using -lcrypto (Darwin).
 #
-# Define NEEDS_SSL_WITH_CURL if you need -lssl with -lcurl (Minix).  Only used
-# if CURLDIR is set.
+# Define NEEDS_SSL_WITH_CURL if you need -lssl with -lcurl (Minix).
 #
-# Define NEEDS_IDN_WITH_CURL if you need -lidn when using -lcurl (Minix).  Only
-# used if CURLDIR is set.
+# Define NEEDS_IDN_WITH_CURL if you need -lidn when using -lcurl (Minix).
 #
 # Define NEEDS_LIBICONV if linking with libc is not enough (Darwin).
 #
@@ -192,9 +185,6 @@ all::
 # Define NO_STRUCT_ITIMERVAL if you don't have struct itimerval
 # This also implies NO_SETITIMER
 #
-# Define NO_THREAD_SAFE_PREAD if your pread() implementation is not
-# thread-safe. (e.g. compat/pread.c or cygwin)
-#
 # Define NO_FAST_WORKING_DIRECTORY if accessing objects in pack files is
 # generally faster on your platform than accessing the working directory.
 #
@@ -739,6 +729,7 @@ LIB_H += transport.h
 LIB_H += tree-walk.h
 LIB_H += tree.h
 LIB_H += unpack-trees.h
+LIB_H += unicode_width.h
 LIB_H += url.h
 LIB_H += urlmatch.h
 LIB_H += userdiff.h
@@ -1120,6 +1111,10 @@ ifdef USE_LIBPCRE
        EXTLIBS += -lpcre
 endif
 
+ifdef HAVE_ALLOCA_H
+       BASIC_CFLAGS += -DHAVE_ALLOCA_H
+endif
+
 ifdef NO_CURL
        BASIC_CFLAGS += -DNO_CURL
        REMOTE_CURL_PRIMARY =
@@ -1130,30 +1125,18 @@ else
                # Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case.
                BASIC_CFLAGS += -I$(CURLDIR)/include
                CURL_LIBCURL = -L$(CURLDIR)/$(lib) $(CC_LD_DYNPATH)$(CURLDIR)/$(lib) -lcurl
-               ifdef NEEDS_SSL_WITH_CURL
-                       CURL_LIBCURL += -lssl
-                       ifdef NEEDS_CRYPTO_WITH_SSL
-                               CURL_LIBCURL += -lcrypto
-                       endif
-               endif
-               ifdef NEEDS_IDN_WITH_CURL
-                       CURL_LIBCURL += -lidn
-               endif
        else
-               CURL_CONFIG ?= curl-config
-               BASIC_CFLAGS += $(shell $(CURL_CONFIG) --cflags)
-               ifdef CURL_STATIC
-                       CURL_LIBCURL = $(shell $(CURL_CONFIG) --static-libs)
-                       ifeq "$(CURL_LIBCURL)" ""
-                               $(error libcurl not detected or not compiled with static support)
-                       endif
-               else
-                       CURL_LIBCURL = $(shell $(CURL_CONFIG) --libs)
-                       ifeq "$(CURL_LIBCURL)" ""
-                               $(error libcurl not detected; try setting CURLDIR)
-                       endif
+               CURL_LIBCURL = -lcurl
+       endif
+       ifdef NEEDS_SSL_WITH_CURL
+               CURL_LIBCURL += -lssl
+               ifdef NEEDS_CRYPTO_WITH_SSL
+                       CURL_LIBCURL += -lcrypto
                endif
        endif
+       ifdef NEEDS_IDN_WITH_CURL
+               CURL_LIBCURL += -lidn
+       endif
 
        REMOTE_CURL_PRIMARY = git-remote-http$X
        REMOTE_CURL_ALIASES = git-remote-https$X git-remote-ftp$X git-remote-ftps$X
@@ -1360,10 +1343,6 @@ endif
 ifdef NO_PREAD
        COMPAT_CFLAGS += -DNO_PREAD
        COMPAT_OBJS += compat/pread.o
-       NO_THREAD_SAFE_PREAD = YesPlease
-endif
-ifdef NO_THREAD_SAFE_PREAD
-       BASIC_CFLAGS += -DNO_THREAD_SAFE_PREAD
 endif
 ifdef NO_FAST_WORKING_DIRECTORY
        BASIC_CFLAGS += -DNO_FAST_WORKING_DIRECTORY