mirror of
https://github.com/samba-team/samba.git
synced 2025-01-12 09:18:10 +03:00
Apply the patch to fix iconv detection for FreeBSD to the Samba 3.0.0 branch
as well.
This commit is contained in:
parent
b628ba0fc0
commit
44be80e488
@ -1605,9 +1605,8 @@ for i in $LOOK_DIRS ; do
|
||||
save_CPPFLAGS=$CPPFLAGS
|
||||
CPPFLAGS="$CPPFLAGS -I$i/include"
|
||||
dnl This is here to handle -withval stuff for --with-libiconv
|
||||
if test x"$ICONV_PATH_SPEC" = "xyes" ; then
|
||||
LDFLAGS="-L$i/lib"
|
||||
fi
|
||||
dnl Perhaps we should always add a -L
|
||||
LDFLAGS="-L$i/lib"
|
||||
LIBS=
|
||||
export LDFLAGS LIBS CPPFLAGS
|
||||
dnl Try to find iconv(3)
|
||||
@ -1616,7 +1615,6 @@ dnl Try to find iconv(3)
|
||||
if test "$ICONV_FOUND" = yes; then
|
||||
LIB_ADD_DIR(LDFLAGS, "$i/lib")
|
||||
CFLAGS_ADD_DIR(CPPFLAGS, "$i/include")
|
||||
LIBS="$save_LIBS"
|
||||
ICONV_LOCATION=$i
|
||||
export LDFLAGS LIBS CPPFLAGS
|
||||
dnl Now, check for a working iconv ... we want to do it here because
|
||||
|
Loading…
Reference in New Issue
Block a user