Fixed a problem with the new iconv const check.
authorWayne Davison <wayned@samba.org>
Mon, 20 Nov 2006 19:12:35 +0000 (19:12 +0000)
committerWayne Davison <wayned@samba.org>
Mon, 20 Nov 2006 19:12:35 +0000 (19:12 +0000)
configure.in

index 934e9c5..35ccbcc 100644 (file)
@@ -405,10 +405,9 @@ AC_SEARCH_LIBS(inet_ntop, resolv)
 # Search for libiconv_open (not iconv_open) to discover if -liconv is needed!
 AC_SEARCH_LIBS(libiconv_open, iconv)
 
-if test "$am_cv_func_iconv" = yes; then
-    AC_MSG_CHECKING([for iconv declaration])
-    AC_CACHE_VAL(am_cv_proto_iconv, [
-      AC_TRY_COMPILE([
+AC_MSG_CHECKING([for iconv declaration])
+AC_CACHE_VAL(am_cv_proto_iconv, [
+    AC_TRY_COMPILE([
 #include <stdlib.h>
 #include <iconv.h>
 extern
@@ -423,11 +422,10 @@ size_t iconv();
 ], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
       am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
     am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    AC_MSG_RESULT([$]{ac_t:-
+AC_MSG_RESULT([$]{ac_t:-
          }[$]am_cv_proto_iconv)
-    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
-      [Define as const if the declaration of iconv() needs const.])
-fi
+AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
+                  [Define as const if the declaration of iconv() needs const.])
 
 dnl AC_MSG_NOTICE([Looking in libraries: $LIBS])