Revert "Update to 7.40.1"

[platform/upstream/curl.git] / packages / DOS / common.dj

diff --git a/packages/DOS/common.dj b/packages/DOS/common.dj
index 4cf95c7..1b3e757 100644 (file)
--- a/packages/DOS/common.dj
+++ b/packages/DOS/common.dj
@@ -1,14 +1,44 @@
 #
 # Common defines for curl (djgpp/Watt-32)
 #
-# Assumes you've unpacked cURL with short-file names
-# I.e use "set LFN=n" before untaring on Win9x/XP.
+# Assumes you've unpacked cURL with long-file names
+# I.e use "set LFN=y" before untaring on Win9x/XP.
 # Requires sed, yacc, rm and the usual stuff.
 #
+# Define TOPDIR before including this file.
 
 .SUFFIXES: .exe .y
 
 MAKEFILE = Makefile.dj
+OBJ_DIR = djgpp
+
+#
+# Find out if using a UNIX-like shell or a DOS command interpreter
+#
+ifneq ($(findstring COMMAND.COM,$(SHELL)),COMMAND.COM)
+  ifneq ($(findstring CMD.EXE,$(SHELL)),CMD.EXE)
+    ifneq ($(findstring 4DOS.COM,$(SHELL)),4DOS.COM)
+      IS_UNIX_SHELL = 1
+    endif
+  endif
+endif
+
+#
+# Define shell dependent commands and vars
+#
+ifeq ($(IS_UNIX_SHELL),1)
+  COPY   = cp -f
+  DELETE = rm -f
+  MKDIR  = mkdir
+  RMDIR  = rm -f -r
+  DS     = /
+else
+  COPY   = copy
+  DELETE = del
+  MKDIR  = mkdir
+  RMDIR  = rmdir
+  DS     = \$(NOTHING)
+endif
 
 #
 # OpenSSL is available from www.openssl.org and builds okay
@@ -23,9 +53,29 @@ USE_SSL = 0
 USE_ZLIB = 0
 
 #
+# Use libidn for international domain names
+#
+USE_IDNA = 0
+
+#
 # Use Watt-32 IPv6 stack (only IPv6 name resolution working at the moment)
 #
-USE_IPV6 = 1
+USE_IPV6 = 0
+
+#
+# Use C-Ares resolver library
+#
+USE_ARES = 0
+
+#
+# Enable debug code in libcurl/curl
+#
+USE_DEBUG = 0
+
+#
+# Enable memory tracking code in libcurl/curl
+#
+USE_CURLDEBUG = 0
 
 default: all
 
@@ -34,16 +84,19 @@ default: all
 # WATT_ROOT should be set during Watt-32 install.
 #
 WATT32_ROOT  = $(subst \,/,$(WATT_ROOT))
-OPENSSL_ROOT = /net/openssl.098
-ZLIB_ROOT    = /djgpp/contrib/zlib.121
+OPENSSL_ROOT = e:/net/openssl.099
+ZLIB_ROOT    = $(DJDIR)/contrib/zlib
+LIBIDN_ROOT  = $(TOPDIR)/../IDN/libidn
+ARES_ROOT    = $(TOPDIR)/ares
 
 CC   = gcc
 YACC = bison -y
 
-CFLAGS = -g -O2 -I. -I../include -Wall -DHAVE_CONFIG_H -DHAVE_SPNEGO
+CFLAGS = -g -O2 -I. -I$(TOPDIR)/include -I$(TOPDIR)/lib \
+         -I$(WATT32_ROOT)/inc -Wall -DHAVE_CONFIG_H
 
 ifeq ($(USE_SSL),1)
-  CFLAGS += -DUSE_SSLEAY
+  CFLAGS += -DUSE_SSLEAY -DUSE_OPENSSL -I$(OPENSSL_ROOT)
 endif
 
 ifeq ($(USE_ZLIB),1)
@@ -54,21 +107,30 @@ ifeq ($(USE_IPV6),1)
   CFLAGS += -DENABLE_IPV6
 endif
 
-#
-# Generated dependencies; Due to some hacks in gcc 2.95+ and djgpp 2.03
-# we must prevent "$(DJDIR)/bin/../include/sys/version.h" from beeing
-# included in dependency output (or else this makefile cannot be used on
-# another machine). We therefore use a special 'specs' file during
-# pre-processing.
-#
-MM_SPECS = ./specs.dj
+ifeq ($(USE_ARES),1)
+  CFLAGS += -DUSE_ARES -I$(ARES_ROOT)
+endif
+
+ifeq ($(USE_IDNA),1)
+  CFLAGS += -DHAVE_LIBIDN -DHAVE_IDN_FREE_H -DHAVE_IDN_FREE -DHAVE_TLD_H \
+            -DHAVE_TLD_STRERROR -I$(LIBIDN_ROOT)/lib
+endif
+
+ifeq ($(USE_DEBUG),1)
+  CFLAGS += -DDEBUG=1 -DDEBUGBUILD
+endif
+
+ifeq ($(USE_CURLDEBUG),1)
+  CFLAGS += -DCURLDEBUG
+endif
+
+$(OBJ_DIR):
+       $(MKDIR) $(OBJ_DIR)
 
-depend: $(DEPEND_PREREQ)
-       @echo Generating dependencies..
-       @copy $(MAKEFILE) Makefile.bak
-       @echo "*cpp: %(cpp_cpu) %{posix:-D_POSIX_SOURCE} -remap" > $(MM_SPECS)
-       sed -e "/^# DO NOT DELETE THIS LINE/,$$d" < Makefile.bak > $(MAKEFILE)
-       echo "# DO NOT DELETE THIS LINE"                        >> $(MAKEFILE)
-       $(CC) -MM -specs=$(MM_SPECS) $(CFLAGS) $(SOURCES)       >> $(MAKEFILE)
-       rm -f $(MM_SPECS)
+$(OBJ_DIR)/%.o: %.c
+       $(CC) $(CFLAGS) -o $@ -c $<
+       @echo
 
+depend: $(DEPEND_PREREQ) $(MAKEFILE)
+       $(CC) -MM $(CFLAGS) $(CSOURCES) | \
+       sed -e 's/^\([a-zA-Z0-9_-]*\.o:\)/$$(OBJ_DIR)\/\1/' > depend.dj