added variadic macro stuff.

diff --git a/ares/Makefile.netware b/ares/Makefile.netware
index 300b91b..6e39c84 100644 (file)
--- a/ares/Makefile.netware
+++ b/ares/Makefile.netware
@@ -258,6 +258,9 @@ config.h: Makefile.netware
        @echo $(DL)** Do not edit this file - it is created by make!$(DL) >> $@
        @echo $(DL)** All your changes will be lost!!$(DL) >> $@
        @echo $(DL)*/$(DL) >> $@
+       @echo $(DL)#ifndef NETWARE$(DL) >> $@
+       @echo $(DL)#error This $(notdir $@) is created for NetWare platform!$(DL) >> $@
+       @echo $(DL)#endif$(DL) >> $@
        @echo $(DL)#define OS "i586-pc-NetWare"$(DL) >> $@
        @echo $(DL)#define VERSION "$(LIBCARES_VERSION_STR)"$(DL) >> $@
        @echo $(DL)#define PACKAGE_BUGREPORT "a suitable curl mailing list => http://curl.haxx.se/mail/"$(DL) >> $@
@@ -335,6 +338,11 @@ else
        @echo $(DL)#define HAVE_SYS_SOCKIO_H 1$(DL) >> $@
        @echo $(DL)#define HAVE_NETDB_H 1$(DL) >> $@
 endif
+       @echo $(DL)#ifdef __GNUC__$(DL) >> $@
+       @echo $(DL)#define HAVE_VARIADIC_MACROS_GCC 1$(DL) >> $@
+       @echo $(DL)#else$(DL) >> $@
+       @echo $(DL)#define HAVE_VARIADIC_MACROS_C99 1$(DL) >> $@
+       @echo $(DL)#endif$(DL) >> $@
 ifdef OLD_NOVELLSDK
        @echo $(DL)#define socklen_t int$(DL) >> $@
 endif

diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index 313b107..a9749ca 100644 (file)
--- a/lib/Makefile.netware
+++ b/lib/Makefile.netware
@@ -324,6 +324,9 @@ config.h: Makefile.netware
        @echo $(DL)** Do not edit this file - it is created by make!$(DL) >> $@
        @echo $(DL)** All your changes will be lost!!$(DL) >> $@
        @echo $(DL)*/$(DL) >> $@
+       @echo $(DL)#ifndef NETWARE$(DL) >> $@
+       @echo $(DL)#error This $(notdir $@) is created for NetWare platform!$(DL) >> $@
+       @echo $(DL)#endif$(DL) >> $@
        @echo $(DL)#define OS "i586-pc-NetWare"$(DL) >> $@
        @echo $(DL)#define VERSION "$(LIBCURL_VERSION_STR)"$(DL) >> $@
        @echo $(DL)#define PACKAGE_BUGREPORT "a suitable curl mailing list => http://curl.haxx.se/mail/"$(DL) >> $@
@@ -431,6 +434,11 @@ ifdef WITH_SSH2
        @echo $(DL)#define USE_LIBSSH2 1$(DL) >> $@
        @echo $(DL)#define HAVE_LIBSSH2_H 1$(DL) >> $@
 endif
+       @echo $(DL)#ifdef __GNUC__$(DL) >> $@
+       @echo $(DL)#define HAVE_VARIADIC_MACROS_GCC 1$(DL) >> $@
+       @echo $(DL)#else$(DL) >> $@
+       @echo $(DL)#define HAVE_VARIADIC_MACROS_C99 1$(DL) >> $@
+       @echo $(DL)#endif$(DL) >> $@
 ifdef OLD_NOVELLSDK
        @echo $(DL)#define socklen_t int$(DL) >> $@
 endif

diff --git a/src/Makefile.netware b/src/Makefile.netware
index 71e8a27..f391413 100644 (file)
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -300,7 +300,6 @@ ifdef IMPORTS
 endif
 ifeq ($(LD),nlmconv)
        @echo $(DL)input $(OBJS)$(DL) >> $@
-       @echo $(DL)input $(OBJX)$(DL) >> $@
        @echo $(DL)input $(PRELUDE)$(DL) >> $@
 ifdef LDLIBS
        @echo $(DL)input $(LDLIBS)$(DL) >> $@
@@ -314,6 +313,9 @@ config.h: Makefile.netware
        @echo $(DL)** Do not edit this file - it is created by make!$(DL) >> $@
        @echo $(DL)** All your changes will be lost!!$(DL) >> $@
        @echo $(DL)*/$(DL) >> $@
+       @echo $(DL)#ifndef NETWARE$(DL) >> $@
+       @echo $(DL)#error This $(notdir $@) is created for NetWare platform!$(DL) >> $@
+       @echo $(DL)#endif$(DL) >> $@
        @echo $(DL)#define OS "i586-pc-NetWare"$(DL) >> $@
        @echo $(DL)#define VERSION "$(LIBCURL_VERSION_STR)"$(DL) >> $@
        @echo $(DL)#define PACKAGE_BUGREPORT "a suitable curl mailing list => http://curl.haxx.se/mail/"$(DL) >> $@
@@ -412,6 +414,11 @@ ifdef WITH_SSH2
        @echo $(DL)#define USE_LIBSSH2 1$(DL) >> $@
        @echo $(DL)#define HAVE_LIBSSH2_H 1$(DL) >> $@
 endif
+       @echo $(DL)#ifdef __GNUC__$(DL) >> $@
+       @echo $(DL)#define HAVE_VARIADIC_MACROS_GCC 1$(DL) >> $@
+       @echo $(DL)#else$(DL) >> $@
+       @echo $(DL)#define HAVE_VARIADIC_MACROS_C99 1$(DL) >> $@
+       @echo $(DL)#endif$(DL) >> $@
 ifdef OLD_NOVELLSDK
        @echo $(DL)#define socklen_t int$(DL) >> $@
 endif