mirror of
https://github.com/odrling/Aegisub
synced 2025-04-11 22:56:02 +02:00
Remove -liconv from the default LDFLAGS if we're building on linux, since iconv
support is built-in. If this ever causes an issue between glibc and iconv support I'll add a warning. Originally committed to SVN as r2170.
This commit is contained in:
parent
0607976605
commit
041820e259
10
configure.in
10
configure.in
@ -52,6 +52,10 @@ case "$target_or_host" in
|
|||||||
build_darwin="yes"
|
build_darwin="yes"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
*-*-linux*)
|
||||||
|
build_linux="yes"
|
||||||
|
;;
|
||||||
|
|
||||||
*)
|
*)
|
||||||
build_default="yes"
|
build_default="yes"
|
||||||
;;
|
;;
|
||||||
@ -398,7 +402,11 @@ AC_ARG_VAR([ICONV_CFLAGS], [CFLAGS to use for iconv (default: CPPFLAGS)])
|
|||||||
AC_ARG_VAR([ICONV_LDFLAGS], [LDFLAGS to use for iconv (default: LDFLAGS -liconv)])
|
AC_ARG_VAR([ICONV_LDFLAGS], [LDFLAGS to use for iconv (default: LDFLAGS -liconv)])
|
||||||
|
|
||||||
if test -z "$ICONV_LDFLAGS"; then
|
if test -z "$ICONV_LDFLAGS"; then
|
||||||
ICONV_LDFLAGS="$LDFLAGS -liconv";
|
if "$build_linux" = "yes"; then
|
||||||
|
ICONV_LDFLAGS="$LDFLAGS"
|
||||||
|
else
|
||||||
|
ICONV_LDFLAGS="$LDFLAGS -liconv";
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test -z "$ICONV_CFLAGS"; then
|
if test -z "$ICONV_CFLAGS"; then
|
||||||
|
Loading…
x
Reference in New Issue
Block a user