]>
Commit | Line | Data |
---|---|---|
4836da25 JB |
1 | --- gmerlin-avdecoder-1.1.0/configure.ac.orig 2011-07-27 19:21:58.412106334 +0200 |
2 | +++ gmerlin-avdecoder-1.1.0/configure.ac 2011-07-27 19:38:51.748806931 +0200 | |
fde7ee3e JB |
3 | @@ -89,7 +89,7 @@ |
4 | fi | |
5 | ||
6 | AC_SUBST(GMERLIN_DEP_LIBS) | |
7 | -LDFLAGS="$GMERLIN_DEP_RPATH" | |
8 | +LDFLAGS="$LDFLAGS $GMERLIN_DEP_RPATH" | |
9 | ||
10 | ||
11 | dnl Check for mingw | |
4836da25 JB |
12 | @@ -152,7 +152,7 @@ |
13 | AC_SUBST(GAVL_REQUIRED) | |
14 | ||
15 | ICONV_LIBS= | |
16 | -AC_CHECK_LIB(iconv, libiconv_close, ICONV_LIBS="-liconv") | |
17 | +AC_CHECK_FUNC(iconv_close, , [AC_CHECK_LIB(iconv, libiconv_close, ICONV_LIBS="-liconv")]) | |
18 | AC_SUBST(ICONV_LIBS) | |
19 | ||
20 | if test "x$os_win32" = "xyes"; then |