Gisle Vanem made curl build with djgpp on DOS.

4 files changed, 63 insertions, 6 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 82433a659..00c51afd6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,7 +24,7 @@ BUILT_SOURCES = hugehelp.c
 CLEANFILES = hugehelp.c
 NROFF=@NROFF@
 
-EXTRA_DIST = mkhelp.pl curlmsg.msg \
+EXTRA_DIST = mkhelp.pl curlmsg.msg makefile.dj \
 	Makefile.vc6 Makefile.b32 Makefile.m32 Makefile.riscos config.h.in \
 	macos/curl.mcp.xml.sit.hqx \
 	macos/MACINSTALL.TXT \
diff --git a/src/main.c b/src/main.c
index 62348df3e..7a56882e6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -411,6 +411,9 @@ static void help(void)
        "                    Overrides -n and --netrc-optional\n"
        " -U/--proxy-user <user[:password]> Specify Proxy authentication\n"
        " -v/--verbose       Makes the operation more talkative\n"
+#ifdef DJGPP
+       "                    Also enables Watt-32 debugging\n"
+#endif
        " -V/--version       Outputs version number then quits");
   puts(" -w/--write-out [format] What to output after completion\n"
        " -x/--proxy <host[:port]>  Use proxy. (Default port is 1080)\n"
@@ -1670,6 +1673,9 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */
       cleanarg(nextarg);
       break;
     case 'v':
+#ifdef DJGPP
+      dbug_init();
+#endif
       config->conf ^= CONF_VERBOSE; /* talk a lot */
       break;
     case 'V':
diff --git a/src/makefile.dj b/src/makefile.dj
new file mode 100644
index 000000000..e84ba0284
--- /dev/null
+++ b/src/makefile.dj
@@ -0,0 +1,48 @@
+#

+#  Adapted for djgpp2 / Watt-32 / DOS by

+#  Gisle Vanem <giva@bgnett.no>

+#

+

+DEPEND_PREREQ = config.h

+

+include ../packages/DOS/common.dj

+

+ifeq ($(USE_SSL),1)

+  EX_LIBS = $(OPENSSL_ROOT)/lib/libssl.a $(OPENSSL_ROOT)/lib/libcrypt.a

+endif

+

+EX_LIBS += $(WATT32_ROOT)/lib/libwatt.a $(ZLIB_ROOT)/libz.a

+

+BIN     = ../curl.exe

+SOURCES = hugehelp.c main.c urlglob.c writeenv.c writeout.c

+OBJECTS = $(SOURCES:.c=.o)

+

+all: config.h $(BIN)

+

+$(BIN): $(OBJECTS) ../lib/libcurl.a

+	$(CC) -o $@ $^ $(EX_LIBS)

+

+config.h:

+	@echo '#include "../lib/config.dj"' > $@

+

+hugehelp.c: ../docs/curl.1

+	groff -man $^ | perl mkhelp.pl ../readme > $@

+

+clean:

+	- rm -f $(OBJECTS) Makefile.bak config.h

+

+vclean: clean

+	- rm -f $(BIN) hugehelp.c

+

+# DO NOT DELETE THIS LINE

+hugehelp.o: hugehelp.c

+main.o: main.c setup.h config.h ../lib/config.dj ../include/curl/curl.h \

+  ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \

+  ../include/curl/mprintf.h urlglob.h writeout.h version.h

+urlglob.o: urlglob.c setup.h config.h ../lib/config.dj \

+  ../include/curl/curl.h ../include/curl/types.h ../include/curl/easy.h \

+  ../include/curl/multi.h urlglob.h

+writeenv.o: writeenv.c setup.h config.h ../lib/config.dj

+writeout.o: writeout.c setup.h config.h ../lib/config.dj \

+  ../include/curl/curl.h ../include/curl/types.h ../include/curl/easy.h \

+  ../include/curl/multi.h ../include/curl/mprintf.h writeout.h

diff --git a/src/setup.h b/src/setup.h
index 65eef4b4a..c5ab80ed9 100644
--- a/src/setup.h
+++ b/src/setup.h
@@ -66,7 +66,6 @@ int fileno( FILE *stream);
 #endif
 
 #ifdef WIN32
-#define PATH_CHAR     ";"
 #define DIR_CHAR      "\\"
 #define DOT_CHAR      "_"
 #else
@@ -74,17 +73,21 @@ int fileno( FILE *stream);
 /* 20000318 mgs
  * OS/2 supports leading dots in filenames if the volume is formatted
  * with JFS or HPFS. */
-#define PATH_CHAR     ";"
 #define DIR_CHAR      "\\"
 #define DOT_CHAR      "."
 #else
 
-#define PATH_CHAR     ":"
+#ifdef DJGPP
+#define DIR_CHAR      "/"
+#define DOT_CHAR      "_"
+#else
+
 #define DIR_CHAR      "/"
 #define DOT_CHAR      "."
 
-#endif
-#endif
+#endif /* !DJGPP */
+#endif /* !__EMX__ */
+#endif /* !WIN32 */
 
 #ifdef __riscos__
 #define USE_ENVIRONMENT