walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rework to avoid adding the unexpected value to ICONV_CFLAGS and ICONV_LIBS

This commit is contained in:
Akira TAGOH 2012-04-20 11:17:41 +09:00
parent dd2a3d3520
commit 9fa7b7c8f2
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
configure.in
View File

@ -150,7 +150,11 @@ AC_DEFINE_UNQUOTED(USE_REGEX,$use_regex,[Use regex.])
AC_ARG_WITH(libiconv, AC_ARG_WITH(libiconv,
[AC_HELP_STRING([--with-libiconv=DIR], [AC_HELP_STRING([--with-libiconv=DIR],
[Use libiconv in DIR])], [Use libiconv in DIR])],
[libiconv_prefix=$withval], [if test "x$withval" = "xyes"; then
libiconv_prefix=$prefix
else
libiconv_prefix=$withval
fi],
[libiconv_prefix=auto]) [libiconv_prefix=auto])
AC_ARG_WITH(libiconv-includes, AC_ARG_WITH(libiconv-includes,
[AC_HELP_STRING([--with-libiconv-includes=DIR], [AC_HELP_STRING([--with-libiconv-includes=DIR],
@ -163,8 +167,8 @@ AC_ARG_WITH(libiconv-lib,
[libiconv_lib=$withval], [libiconv_lib=$withval],
[libiconv_lib=auto]) [libiconv_lib=auto])
# if none of libiconv,libiconv-includes,libiconv-libs are specified # if no libiconv,libiconv-includes,libiconv-lib are specified,
if test "$libiconv_prefix" != "auto" -o "$libiconv_includes" != "auto" -o "$libiconv_lib" != "auto"; then # libc's iconv has a priority.
if test "$libiconv_includes" != "auto" -a -r ${libiconv_includes}/iconv.h; then if test "$libiconv_includes" != "auto" -a -r ${libiconv_includes}/iconv.h; then
libiconv_cflags="-I${libiconv_includes}" libiconv_cflags="-I${libiconv_includes}"
elif test "$libiconv_prefix" != "auto" -a -r ${libiconv_prefix}/include/iconv.h; then elif test "$libiconv_prefix" != "auto" -a -r ${libiconv_prefix}/include/iconv.h; then
@ -172,24 +176,24 @@ if test "$libiconv_prefix" != "auto" -o "$libiconv_includes" != "auto" -o "$libi
else else
libiconv_cflags="" libiconv_cflags=""
fi fi
if test "$libiconv_lib" != "auto"; then libiconv_libs=""
libiconv_lib="-L${libiconv_lib} -liconv" if test "x$libiconv_cflags" != "x"; then
elif test "$libiconv_prefix" != "auto"; then if test "$libiconv_lib" != "auto" -a -d ${libiconv_lib}; then
libiconv_lib="-L${libiconv_prefix}/lib -liconv" libiconv_libs="-L${libiconv_lib} -liconv"
elif test "x$libiconv_cflags" != "x"; then elif test "$libiconv_prefix" != "auto" -a -d ${libiconv_prefix}/lib; then
libiconv_lib="-liconv" libiconv_libs="-L${libiconv_prefix}/lib -liconv"
else else
libiconv_lib="" libiconv_libs="-liconv"
fi fi
fi fi
use_iconv=0 use_iconv=0
AC_MSG_CHECKING([for a usable iconv]) AC_MSG_CHECKING([for a usable iconv])
if test "x$libiconv_cflags" != "x" -o "x$libiconv_lib" != "x"; then if test "x$libiconv_cflags" != "x" -o "x$libiconv_libs" != "x"; then
iconvsaved_CFLAGS="$CFLAGS" iconvsaved_CFLAGS="$CFLAGS"
iconvsaved_LIBS="$LIBS" iconvsaved_LIBS="$LIBS"
CFLAGS="$CFLAGS $libiconv_cflags" CFLAGS="$CFLAGS $libiconv_cflags"
LIBS="$LIBS $libiconv_lib" LIBS="$LIBS $libiconv_libs"
AC_TRY_LINK([#include <iconv.h>], AC_TRY_LINK([#include <iconv.h>],
[iconv_open ("from", "to");], [iconv_open ("from", "to");],
@ -200,7 +204,7 @@ if test "x$libiconv_cflags" != "x" -o "x$libiconv_lib" != "x"; then
CFLAGS="$iconvsaved_CFLAGS" CFLAGS="$iconvsaved_CFLAGS"
LIBS="$iconvsaved_LIBS" LIBS="$iconvsaved_LIBS"
ICONV_CFLAGS="$libiconv_cflags" ICONV_CFLAGS="$libiconv_cflags"
ICONV_LIBS="$libiconv_lib" ICONV_LIBS="$libiconv_libs"
fi fi
if test "x$use_iconv" = "x0"; then if test "x$use_iconv" = "x0"; then
AC_TRY_LINK([#include <iconv.h>], AC_TRY_LINK([#include <iconv.h>],