@@ -1,3 +1,7 @@

+Mon Mar  7 00:32:38 CET 2005 (tk)

+---------------------------------

+  * configure: add support for QNX 6 (patch by mikep*kaluga.org)

+

 Sat Mar  5 11:07:34 GMT 2005 (njh)

 ----------------------------------

   * clamav-milter:	Note about --local needed if incoming socket is INET

@@ -60,6 +60,9 @@

 /* os is OS/2 */

 #undef C_OS2

+/* os is QNX 6.x.x */

+#undef C_QNX6

+

 /* os is solaris */

 #undef C_SOLARIS

@@ -10334,8 +10334,8 @@ else

     if test -n "$vuln"; then

 	if test "$zlib_check" = "yes"; then

-	    { { echo "$as_me:$LINENO: error: The installed zlib version may contain a security bug. Please upgrade to 1.2.2 or later: http://www.zlib.net. You can omit this check with --disable-zlib-vcheck but DO NOT REPORT any stablility issues then!" >&5

-echo "$as_me: error: The installed zlib version may contain a security bug. Please upgrade to 1.2.2 or later: http://www.zlib.net. You can omit this check with --disable-zlib-vcheck but DO NOT REPORT any stablility issues then!" >&2;}

+	    { { echo "$as_me:$LINENO: error: The installed zlib version may contain a security bug. Please upgrade to 1.2.2 or later: http://www.zlib.net. You can omit this check with --disable-zlib-vcheck but DO NOT REPORT any stability issues then!" >&5

+echo "$as_me: error: The installed zlib version may contain a security bug. Please upgrade to 1.2.2 or later: http://www.zlib.net. You can omit this check with --disable-zlib-vcheck but DO NOT REPORT any stability issues then!" >&2;}

    { (exit 1); exit 1; }; }

 	else

 	    { echo "$as_me:$LINENO: WARNING: ****** This ClamAV installation may be linked against" >&5

@@ -11892,6 +11892,25 @@ cat >>confdefs.h <<\_ACEOF

 _ACEOF

     ;;

+nto-qnx*)

+     if test "$have_pthreads" = "yes"; then

+

+cat >>confdefs.h <<\_ACEOF

+#define CL_THREAD_SAFE 1

+_ACEOF

+

+

+cat >>confdefs.h <<\_ACEOF

+#define _REENTRANT 1

+_ACEOF

+

+     fi

+

+cat >>confdefs.h <<\_ACEOF

+#define C_QNX6 1

+_ACEOF

+

+    ;;

 irix*)

     if test "$have_pthreads" = "yes"; then

 	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"

@@ -111,7 +111,7 @@ else

     if test -n "$vuln"; then

 	if test "$zlib_check" = "yes"; then

-	    AC_MSG_ERROR(The installed zlib version may contain a security bug. Please upgrade to 1.2.2 or later: http://www.zlib.net. You can omit this check with --disable-zlib-vcheck but DO NOT REPORT any stablility issues then!)

+	    AC_MSG_ERROR(The installed zlib version may contain a security bug. Please upgrade to 1.2.2 or later: http://www.zlib.net. You can omit this check with --disable-zlib-vcheck but DO NOT REPORT any stability issues then!)

 	else

 	    AC_MSG_WARN([****** This ClamAV installation may be linked against])

 	    AC_MSG_WARN([****** a broken zlib version. Please DO NOT report any])

@@ -475,6 +475,13 @@ aix*)

     fi

     AC_DEFINE(C_AIX,1,[os is aix])

     ;;

+nto-qnx*)

+     if test "$have_pthreads" = "yes"; then

+       AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])

+       AC_DEFINE(_REENTRANT,1,[thread safe])

+     fi

+    AC_DEFINE(C_QNX6,1,[os is QNX 6.x.x])

+    ;;

 irix*)

     if test "$have_pthreads" = "yes"; then

 	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"