Fix building on newer versions of Linux

clamav-config.h.in

@@ -514,28 +514,6 @@
 /* use syslog */
 #undef USE_SYSLOG
 
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-
-
 /* Version number of package */
 #undef VERSION
 
@@ -557,19 +535,9 @@
 /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
 #undef _LARGEFILE_SOURCE
 
-/* Define to 1 if on MINIX. */
-#undef _MINIX
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-#undef _POSIX_1_SOURCE
-
 /* POSIX compatibility */
 #undef _POSIX_PII_SOCKET
 
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-#undef _POSIX_SOURCE
-
 /* thread safe */
 #undef _REENTRANT
 

clamscan/Makefile.am

@@ -37,7 +37,7 @@ clamscan_SOURCES = \
 
 AM_CFLAGS=@WERR_CFLAGS@
 DEFS = @DEFS@ -DCL_NOTHREADS
-LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@
+LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ @CLAMSCAN_LIBS@
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
 
 CLEANFILES=*.gcda *.gcno

clamscan/Makefile.in

@@ -273,7 +273,7 @@ LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@
 LIBLTDL = @LIBLTDL@
 LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
-LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@
+LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ @CLAMSCAN_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@

configure.ac

@@ -31,7 +31,6 @@ dnl safety check, this used to be a parameter to AC_INIT
 AC_CONFIG_SRCDIR([clamscan/clamscan.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CREATE_TARGET_H([target.h])
-AC_USE_SYSTEM_EXTENSIONS
 
 dnl -Wall and -Werror here are NOT CFLAGS, they refer to automake warnings
 dnl enable stealth builds and psychedelic tests

m4/reorganization/code_checks/pthreads.m4

@@ -1,3 +1,6 @@
+have_pthreads=no
+AC_CHECK_HEADER([pthread.h],[have_pthreads=yes])
+
 AC_ARG_ENABLE([pthreads],
 [  --disable-pthreads      disable POSIX threads support],
 have_pthreads=$enableval,)

m4/reorganization/libs/openssl.m4

@@ -27,11 +27,11 @@ SSL_CPPFLAGS="-I$LIBSSL_HOME/include"
 
 save_LDFLAGS="$LDFLAGS"
 LDFLAGS="-L$LIBSSL_HOME/lib -lssl"
-AC_CHECK_LIB([ssl], [SSL_library_init], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $SSL_LDFLAGS"],
+AC_CHECK_LIB([ssl], [SSL_library_init], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $SSL_LDFLAGS";CLAMSCAN_LIBS="$CLAMSCAN_LIBS $SSL_LDFLAGS";FRESHCLAM_LIBS="$FRESHCLAM_LIBS $SSL_LDFLAGS";CLAMD_LIBS="$CLAMD_LIBS $SSL_LDFLAGS";SIGTOOL_LIBS="$SIGTOOL_LIBS $SSL_LDFLAGS"],
         [AC_MSG_ERROR([Your OpenSSL is misconfigured])])
 
 LDFLAGS="-L$LIBSSL_HOME/lib -lcrypto"
-AC_CHECK_LIB([crypto], [EVP_EncryptInit], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lcrypto"],
+AC_CHECK_LIB([crypto], [EVP_EncryptInit], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lcrypto";CLAMSCAN_LIBS="$CLAMSCAN_LIBS -lcrypto";FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lcrypto";CLAMD_LIBS="$CLAMD_LIBS -lcrypto";SIGTOOL_LIBS="$SIGTOOL_LIBS $SSL_LDFLAGS"],
         [AC_MSG_ERROR([Your OpenSSL installation is misconfigured])])
 
 LDFLAGS="$save_LDFLAGS"