2017-01-22  Juan Manuel Guerrero  <juan.guerrero@gmx.de>

	* configure: prefix default set to /dev/env/DJDIR.

	* gzguts.h [HAVE_VSNPRINTF]:  DJGPP provides vsnprintf.

	* Makefile.in: Set VPATH to SRCDIR.






diff -aprNU5 zlib-1.2.11.orig/configure zlib-1.2.11/configure
--- zlib-1.2.11.orig/configure	2016-12-31 18:06:36 +0000
+++ zlib-1.2.11/configure	2017-01-22 18:13:34 +0000
@@ -69,11 +69,11 @@ fi
 
 # set defaults before processing command line options
 LDCONFIG=${LDCONFIG-"ldconfig"}
 LDSHAREDLIBC="${LDSHAREDLIBC--lc}"
 ARCHS=
-prefix=${prefix-/usr/local}
+prefix=${prefix-'/dev/env/DJDIR'}
 exec_prefix=${exec_prefix-'${prefix}'}
 libdir=${libdir-'${exec_prefix}/lib'}
 sharedlibdir=${sharedlibdir-'${libdir}'}
 includedir=${includedir-'${prefix}/include'}
 mandir=${mandir-'${prefix}/share/man'}
@@ -210,11 +210,11 @@ if test "$gcc" -eq 1 && ($cc -c $test.c)
   Linux* | linux* | GNU | GNU/* | solaris*)
         LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"} ;;
   *BSD | *bsd* | DragonFly)
         LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"}
         LDCONFIG="ldconfig -m" ;;
-  CYGWIN* | Cygwin* | cygwin* | OS/2*)
+  CYGWIN* | Cygwin* | cygwin* | MS-DOS* | OS/2*)
         EXE='.exe' ;;
   MINGW* | mingw*)
 # temporary bypass
         rm -f $test.[co] $test $test$shared_ext
         echo "Please use win32/Makefile.gcc instead." | tee -a configure.log
diff -aprNU5 zlib-1.2.11.orig/gzguts.h zlib-1.2.11/gzguts.h
--- zlib-1.2.11.orig/gzguts.h	2017-01-01 07:37:06 +0000
+++ zlib-1.2.11/gzguts.h	2017-01-22 18:15:52 +0000
@@ -71,11 +71,11 @@
 #    define HAVE_VSNPRINTF
 #  endif
 #endif
 
 #ifndef HAVE_VSNPRINTF
-#  ifdef MSDOS
+#  if defined(MSDOS) && !defined(__DJGPP__)
 /* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
    but for now we just assume it doesn't. */
 #    define NO_vsnprintf
 #  endif
 #  ifdef __TURBOC__
diff -aprNU5 zlib-1.2.11.orig/Makefile.in zlib-1.2.11/Makefile.in
--- zlib-1.2.11.orig/Makefile.in	2017-01-15 17:29:36 +0000
+++ zlib-1.2.11/Makefile.in	2017-01-22 18:10:02 +0000
@@ -22,10 +22,12 @@ CFLAGS=-O
 #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
 #CFLAGS=-g -DZLIB_DEBUG
 #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
 #           -Wstrict-prototypes -Wmissing-prototypes
 
+VPATH = $(SRCDIR)
+
 SFLAGS=-O
 LDFLAGS=
 TEST_LDFLAGS=-L. libz.a
 LDSHARED=$(CC)
 CPP=$(CC) -E