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

+Mon Apr 19 17:12:06 EEST 2010 (edwin)

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

+ * clamconf: print information about platform and build.

+

 Thu Apr 15 20:04:16 EEST 2010 (edwin)

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

  * libclamav/c++/configure: disable gcc 3.4.6 by default, you can still use it with --enable-llvm (bb #1935).

@@ -28,6 +28,9 @@ clamconf_SOURCES = \

     clamconf.c

 DEFS = @DEFS@ -DCL_NOTHREADS

-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav\

+	      -DBUILD_CPPFLAGS="\"$(CPPFLAGS)\"" -DBUILD_CFLAGS="\"$(CFLAGS)\""\

+	      -DBUILD_CXXFLAGS="\"$(CXXFLAGS)\"" -DBUILD_LDFLAGS="\"$(LDFLAGS)\""\

+	      -DBUILD_CONFIGURE_FLAGS="\"$(BUILD_CONFIGURE_FLAGS)\""

 LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@

 CLEANFILES=*.gcda *.gcno

@@ -27,6 +27,10 @@

 #include <unistd.h>

 #endif

 #include <time.h>

+#ifdef HAVE_UNAME_SYSCALL

+#include <sys/utsname.h>

+#endif

+#include <zlib.h>

 #include "shared/optparser.h"

 #include "shared/misc.h"

@@ -35,6 +39,7 @@

 #include "libclamav/clamav.h"

 #include "libclamav/others.h"

 #include "libclamav/bytecode.h"

+#include "target.h"

 #ifndef _WIN32

 extern const struct clam_option *clam_options;

@@ -205,6 +210,65 @@ static void help(void)

     return;

 }

+static void print_platform(void)

+{

+    printf("\nPlatform information\n--------------------\n");

+#ifdef HAVE_UNAME_SYSCALL

+    struct utsname name;

+    uname(&name);

+    printf("uname: %s %s %s %s\n", name.sysname, name.release, name.version,

+	   name.machine);

+#endif

+    printf("OS: "TARGET_OS_TYPE", ARCH: "TARGET_ARCH_TYPE", CPU: "TARGET_CPU_TYPE"\n");

+

+#ifdef C_LINUX

+    if (!access("/usr/bin/lsb_release", X_OK)) {

+	fputs("Full OS version: ", stdout);

+	fflush(stdout);

+	system("/usr/bin/lsb_release -d -s");

+    }

+#else

+    /* e.g. Solaris */

+    if (!access("/etc/release", R_OK)) {

+	char buf[1024];

+	FILE *f = fopen("/etc/release", "r");

+	fgets(buf, sizeof(buf), f);

+	printf("Full OS version: %s", buf);

+    }

+#endif

+

+#ifdef ZLIB_VERNUM

+    printf("zlib version: %s (%s), compile flags: %02x\n",

+	   ZLIB_VERSION, zlibVersion(), zlibCompileFlags());

+#else

+    /* old zlib w/o zlibCompileFlags() */

+    printf("zlib version: %s (%s)\n",

+	   ZLIB_VERSION, zlibVersion());

+#endif

+}

+

+static void print_build(void)

+{

+    printf("\nBuild information\n-----------------\n");

+    /* Try to print information about some commonly used compilers */

+#ifdef __GNUC__

+    printf("GNU C: %s (%u.%u.%u)\n", __VERSION__, __GNUC__, __GNUC_MINOR__,

+	   __GNUC_PATCHLEVEL__);

+#endif

+#ifdef __INTEL_COMPILER

+    printf("Intel Compiler %u\n", __INTEL_COMPILER);

+#endif

+#ifdef _MSC_VER

+    printf("Microsoft Visual C++ %u\n", _MSC_VER);

+#endif

+#ifdef __SUNPRO_C

+    printf("Sun studio %u\n", __SUNPRO_C);

+#endif

+    printf("CPPFLAGS: %s\nCFLAGS: %s\nCXXFLAGS: %s\nLDFLAGS: %s\nConfigure: %s\n",

+	   BUILD_CPPFLAGS, BUILD_CFLAGS, BUILD_CXXFLAGS, BUILD_LDFLAGS,

+	   BUILD_CONFIGURE_FLAGS);

+}

+

 int main(int argc, char **argv)

 {

 	const char *dir;

@@ -328,5 +392,7 @@ int main(int argc, char **argv)

 	    }

 	}

     }

+    print_platform();

+    print_build();

     return 0;

 }

@@ -430,6 +430,10 @@ if test "$enable_experimental" = "yes"; then

   VERSION_SUFFIX="$VERSION_SUFFIX-exp"

 fi

+build_configure_args=`echo "$ac_configure_args" | sed -e 's/[\"]//g'`

+AC_SUBST([BUILD_CONFIGURE_FLAGS], [$build_configure_args])

+

+AX_CHECK_UNAME_SYSCALL

 AC_CHECK_LIB([socket], [bind], [LIBS="$LIBS -lsocket"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsocket"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lsocket"; CLAMD_LIBS="$CLAMD_LIBS -lsocket"])

 AC_SEARCH_LIBS([gethostent],[nsl], [(LIBS="$LIBS -lnsl"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lnsl"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lnsl"; CLAMD_LIBS="$CLAMD_LIBS -lnsl")])

new file mode 100644

@@ -0,0 +1,39 @@

+# ===========================================================================

+#  http://www.gnu.org/software/autoconf-archive/ax_check_uname_syscall.html

+# ===========================================================================

+#

+# SYNOPSIS

+#

+#   AX_CHECK_UNAME_SYSCALL

+#

+# DESCRIPTION

+#

+#   Check that the POSIX compliant uname(2) call works properly.

+#

+# LICENSE

+#

+#   Copyright (c) 2008 Bruce Korb <bkorb@gnu.org>

+#

+#   Copying and distribution of this file, with or without modification, are

+#   permitted in any medium without royalty provided the copyright notice

+#   and this notice are preserved. This file is offered as-is, without any

+#   warranty.

+

+#serial 5

+

+AU_ALIAS([AG_CHECK_UNAME_SYSCALL], [AX_CHECK_UNAME_SYSCALL])

+AC_DEFUN([AX_CHECK_UNAME_SYSCALL],[

+  AC_MSG_CHECKING([whether uname(2) is POSIX])

+  AC_CACHE_VAL([ax_cv_uname_syscall],[

+  AC_TRY_RUN([#include <sys/utsname.h>

+int main() { struct utsname unm;

+return uname( &unm ); }],[ax_cv_uname_syscall=yes],[ax_cv_uname_syscall=no],[ax_cv_uname_syscall=no]

+  ) # end of TRY_RUN]) # end of CACHE_VAL

+

+  AC_MSG_RESULT([$ax_cv_uname_syscall])

+  if test x$ax_cv_uname_syscall = xyes

+  then

+    AC_DEFINE(HAVE_UNAME_SYSCALL, 1,

+       [Define this if uname(2) is POSIX])

+  fi

+]) # end of AC_DEFUN of AX_CHECK_UNAME_SYSCALL