@@ -1,3 +1,8 @@

+Sun Jan  6 19:35:28 EET 2008 (edwin)

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

+ * build system: improve iconv() detection, by actually trying to link a

+ test-program (bb #599).

+

 Sun Jan  6 18:26:57 EET 2008 (edwin)

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

  * build system: avoid bringing in checks for languages we don't use

@@ -147,8 +147,8 @@

 /* Define to 1 if you have the <grp.h> header file. */

 #undef HAVE_GRP_H

-/* Define to 1 if you have the <iconv.h> header file. */

-#undef HAVE_ICONV_H

+/* iconv() available */

+#undef HAVE_ICONV

 /* Define to 1 if you have the `inet_ntop' function. */

 #undef HAVE_INET_NTOP

@@ -1511,6 +1511,7 @@ Optional Packages:

   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]

   --with-pic              try to use only PIC/non-PIC objects [default=use

                           both]

+  --with-iconv supports iconv() (default=auto)

   --with-zlib=DIR	  path to directory containing zlib library (default=

 			  /usr/local or /usr if not found in /usr/local)

   --with-sendmail=PATH    specify location of Sendmail binary (default=auto find)

@@ -4724,7 +4725,7 @@ ia64-*-hpux*)

   ;;

 *-*-irix6*)

   # Find out which ABI we are using.

-  echo '#line 4727 "configure"' > conftest.$ac_ext

+  echo '#line 4728 "configure"' > conftest.$ac_ext

   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5

   ac_status=$?

@@ -6494,11 +6495,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:6497: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:6498: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>conftest.err)

    ac_status=$?

    cat conftest.err >&5

-   echo "$as_me:6501: \$? = $ac_status" >&5

+   echo "$as_me:6502: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s "$ac_outfile"; then

      # The compiler can only warn and ignore the option if not recognized

      # So say no if there are warnings other than the usual output.

@@ -6784,11 +6785,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:6787: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:6788: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>conftest.err)

    ac_status=$?

    cat conftest.err >&5

-   echo "$as_me:6791: \$? = $ac_status" >&5

+   echo "$as_me:6792: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s "$ac_outfile"; then

      # The compiler can only warn and ignore the option if not recognized

      # So say no if there are warnings other than the usual output.

@@ -6888,11 +6889,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:6891: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:6892: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>out/conftest.err)

    ac_status=$?

    cat out/conftest.err >&5

-   echo "$as_me:6895: \$? = $ac_status" >&5

+   echo "$as_me:6896: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s out/conftest2.$ac_objext

    then

      # The compiler can only warn and ignore the option if not recognized

@@ -9250,7 +9251,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<EOF

-#line 9253 "configure"

+#line 9254 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -9350,7 +9351,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<EOF

-#line 9353 "configure"

+#line 9354 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -10542,8 +10543,7 @@ fi

-

-for ac_header in stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h poll.h limits.h sys/filio.h sys/uio.h termios.h iconv.h stdbool.h pwd.h grp.h

+for ac_header in stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h poll.h limits.h sys/filio.h sys/uio.h termios.h stdbool.h pwd.h grp.h

 do

 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

@@ -11300,7 +11300,22 @@ if test $ac_cv_lib_nsl_gethostent = yes; then

 fi

-{ echo "$as_me:$LINENO: checking for libiconv_open in -liconv" >&5

+

+# Check whether --with-iconv was given.

+if test "${with_iconv+set}" = set; then

+  withval=$with_iconv;

+ case "$withval" in

+	 yes|no) wiconv="$withval";;

+	 *) { { echo "$as_me:$LINENO: error: --with-iconv does not take an argument" >&5

+echo "$as_me: error: --with-iconv does not take an argument" >&2;}

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

+ esac

+else

+   wiconv=auto

+fi

+

+if test "X$wiconv" != "Xno"; then

+	{ echo "$as_me:$LINENO: checking for libiconv_open in -liconv" >&5

 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6; }

 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then

   echo $ECHO_N "(cached) $ECHO_C" >&6

@@ -11365,6 +11380,78 @@ if test $ac_cv_lib_iconv_libiconv_open = yes; then

   LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -liconv"

 fi

+	{ echo "$as_me:$LINENO: checking for iconv" >&5

+echo $ECHO_N "checking for iconv... $ECHO_C" >&6; }

+	save_LIBS="$LIBS"

+	LIBS="$LIBCLAMAV_LIBS"

+	cat >conftest.$ac_ext <<_ACEOF

+/* confdefs.h.  */

+_ACEOF

+cat confdefs.h >>conftest.$ac_ext

+cat >>conftest.$ac_ext <<_ACEOF

+/* end confdefs.h.  */

+

+		     #include <iconv.h>

+

+int

+main ()

+{

+

+int main(int argc, char** argv) {

+	char** xin,**xout;

+	unsigned il,ol;

+	int rc;

+	iconv_t iconv_struct = iconv_open("UTF-16BE","UTF-8");

+	rc = iconv(iconv_struct,xin,&il,xout,&ol);

+	iconv_close(iconv_struct);

+	return 0;

+}

+

+  ;

+  return 0;

+}

+_ACEOF

+rm -f conftest.$ac_objext conftest$ac_exeext

+if { (ac_try="$ac_link"

+case "(($ac_try" in

+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

+  *) ac_try_echo=$ac_try;;

+esac

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

+  (eval "$ac_link") 2>conftest.er1

+  ac_status=$?

+  grep -v '^ *+' conftest.er1 >conftest.err

+  rm -f conftest.er1

+  cat conftest.err >&5

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); } && {

+	 test -z "$ac_c_werror_flag" ||

+	 test ! -s conftest.err

+       } && test -s conftest$ac_exeext &&

+       $as_test_x conftest$ac_exeext; then

+

+   { echo "$as_me:$LINENO: result: yes" >&5

+echo "${ECHO_T}yes" >&6; }

+

+cat >>confdefs.h <<\_ACEOF

+#define HAVE_ICONV 1

+_ACEOF

+

+

+else

+  echo "$as_me: failed program was:" >&5

+sed 's/^/| /' conftest.$ac_ext >&5

+

+

+	{ echo "$as_me:$LINENO: result: no" >&5

+echo "${ECHO_T}no" >&6; }

+

+fi

+

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

+      conftest$ac_exeext conftest.$ac_ext

+	LIBS="$save_LIBS"

+fi

@@ -193,7 +193,7 @@ int main()

 ], [AC_MSG_RESULT([ok, bug not present])],

 [AC_MSG_ERROR([your compiler has a bug that causes clamav 670, use a different compiler, see http://bugs.clamav.net/bugzilla/show_bug.cgi?id=670])], [AC_MSG_RESULT([cross-compiling, assumed ok])])

-AC_CHECK_HEADERS(stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h poll.h limits.h sys/filio.h sys/uio.h termios.h iconv.h stdbool.h pwd.h grp.h)

+AC_CHECK_HEADERS(stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h poll.h limits.h sys/filio.h sys/uio.h termios.h stdbool.h pwd.h grp.h)

 AC_CHECK_HEADER(syslog.h,AC_DEFINE(USE_SYSLOG,1,[use syslog]),)

 AC_TYPE_OFF_T

@@ -213,7 +213,40 @@ fi

 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_CHECK_LIB(nsl, gethostent, [LIBS="$LIBS -lnsl"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lnsl"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lnsl"; CLAMD_LIBS="$CLAMD_LIBS -lnsl"])

-AC_CHECK_LIB(iconv, libiconv_open, LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -liconv")

+dnl we need to try to link with iconv, otherwise there could be a 

+dnl mismatch between a 32-bit and 64-bit lib. Detect this at configure time.

+AC_ARG_WITH(iconv, [  --with-iconv supports iconv() (default=auto)],

+[

+ case "$withval" in

+	 yes|no) wiconv="$withval";;

+	 *) AC_MSG_ERROR([--with-iconv does not take an argument]);;

+ esac],

+[ wiconv=auto ])

+if test "X$wiconv" != "Xno"; then

+	AC_CHECK_LIB(iconv, libiconv_open, LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -liconv")

+	AC_MSG_CHECKING([for iconv])

+	save_LIBS="$LIBS"

+	LIBS="$LIBCLAMAV_LIBS"

+	AC_TRY_LINK([

+		     #include <iconv.h>

+	],[

+int main(int argc, char** argv) {

+	char** xin,**xout;

+	unsigned il,ol;

+	int rc;

+	iconv_t iconv_struct = iconv_open("UTF-16BE","UTF-8");

+	rc = iconv(iconv_struct,xin,&il,xout,&ol);

+	iconv_close(iconv_struct);

+	return 0;

+}

+],[

+   AC_MSG_RESULT(yes)

+   AC_DEFINE(HAVE_ICONV, 1, [iconv() available])

+],[

+	AC_MSG_RESULT(no)

+])

+	LIBS="$save_LIBS"

+fi

 AC_CHECK_FUNCS(poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat strcasestr inet_ntop setgroups initgroups ctime_r mkstemp)

 AC_FUNC_MMAP

@@ -40,9 +40,10 @@

 #include "entitylist.h"

 #include "cltypes.h"

-#ifdef HAVE_ICONV_H

+#ifdef HAVE_ICONV

 #include <iconv.h>

 #endif

+

 #include "encoding_aliases.h"

@@ -178,7 +179,7 @@ static size_t encoding_bytes(const unsigned char* fromcode, enum encodings* enco

 	}

 	}

-#ifndef HAVE_ICONV_H

+#ifndef HAVE_ICONV

 typedef struct {

 	enum encodings encoding;

 	size_t size;