bbs/deb-mbse
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed iconv checks

Browse Source
This commit is contained in:
Michiel Broek 2007-05-27 14:24:11 +00:00
parent b32f11f4be
commit 963b1eb74c
2 changed files with 152 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

152
configure vendored
View File

@ -6132,7 +6132,157 @@ fi
#
# Support for iconv
#
#AC_CHECK_HEADER(iconv.h)
if test "${ac_cv_header_iconv_h+set}" = set; then
{ echo "$as_me:$LINENO: checking for iconv.h" >&5
echo $ECHO_N "checking for iconv.h... $ECHO_C" >&6; }
if test "${ac_cv_header_iconv_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
{ echo "$as_me:$LINENO: result: $ac_cv_header_iconv_h" >&5
echo "${ECHO_T}$ac_cv_header_iconv_h" >&6; }
else
# Is the header compilable?
{ echo "$as_me:$LINENO: checking iconv.h usability" >&5
echo $ECHO_N "checking iconv.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
#include <iconv.h>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
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_compile") 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); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (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_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest.$ac_objext'
{ (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_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
{ echo "$as_me:$LINENO: checking iconv.h presence" >&5
echo $ECHO_N "checking iconv.h presence... $ECHO_C" >&6; }
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>
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
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_cpp conftest.$ac_ext") 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); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
else
ac_cpp_err=
fi
else
ac_cpp_err=yes
fi
if test -z "$ac_cpp_err"; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
{ echo "$as_me:$LINENO: WARNING: iconv.h: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: iconv.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
{ echo "$as_me:$LINENO: WARNING: iconv.h: proceeding with the compiler's result" >&5
echo "$as_me: WARNING: iconv.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
{ echo "$as_me:$LINENO: WARNING: iconv.h: present but cannot be compiled" >&5
echo "$as_me: WARNING: iconv.h: present but cannot be compiled" >&2;}
{ echo "$as_me:$LINENO: WARNING: iconv.h: check for missing prerequisite headers?" >&5
echo "$as_me: WARNING: iconv.h: check for missing prerequisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: iconv.h: see the Autoconf documentation" >&5
echo "$as_me: WARNING: iconv.h: see the Autoconf documentation" >&2;}
{ echo "$as_me:$LINENO: WARNING: iconv.h: section \"Present But Cannot Be Compiled\"" >&5
echo "$as_me: WARNING: iconv.h: section \"Present But Cannot Be Compiled\"" >&2;}
{ echo "$as_me:$LINENO: WARNING: iconv.h: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: iconv.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: iconv.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: iconv.h: in the future, the compiler will take precedence" >&2;}
;;
esac
{ echo "$as_me:$LINENO: checking for iconv.h" >&5
echo $ECHO_N "checking for iconv.h... $ECHO_C" >&6; }
if test "${ac_cv_header_iconv_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_iconv_h=$ac_header_preproc
fi
{ echo "$as_me:$LINENO: result: $ac_cv_header_iconv_h" >&5
echo "${ECHO_T}$ac_cv_header_iconv_h" >&6; }
fi
{ echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5
echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6; }
if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then

2
configure.ac
View File

@ -196,7 +196,7 @@ fi
#
# Support for iconv
#
#AC_CHECK_HEADER(iconv.h)
AC_CHECK_HEADER(iconv.h)
AC_CHECK_LIB(iconv,iconv_open,result=yes,result=no)
if test "$result" = "yes"; then
LIBS="$LIBS -liconv"