sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

Apply the patch to fix iconv detection for FreeBSD to the Samba 3.0.0 branch

Browse Source 
as well.
This commit is contained in:
Richard Sharpe 0001-01-01 00:00:00 +00:00
parent b628ba0fc0
commit 44be80e488
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/configure.in
View File

@ -1605,9 +1605,8 @@ for i in $LOOK_DIRS ; do
save_CPPFLAGS=$CPPFLAGS save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$i/include" CPPFLAGS="$CPPFLAGS -I$i/include"
dnl This is here to handle -withval stuff for --with-libiconv dnl This is here to handle -withval stuff for --with-libiconv
if test x"$ICONV_PATH_SPEC" = "xyes" ; then dnl Perhaps we should always add a -L
LDFLAGS="-L$i/lib" LDFLAGS="-L$i/lib"
fi
LIBS= LIBS=
export LDFLAGS LIBS CPPFLAGS export LDFLAGS LIBS CPPFLAGS
dnl Try to find iconv(3) dnl Try to find iconv(3)
@ -1616,7 +1615,6 @@ dnl Try to find iconv(3)
if test "$ICONV_FOUND" = yes; then if test "$ICONV_FOUND" = yes; then
LIB_ADD_DIR(LDFLAGS, "$i/lib") LIB_ADD_DIR(LDFLAGS, "$i/lib")
CFLAGS_ADD_DIR(CPPFLAGS, "$i/include") CFLAGS_ADD_DIR(CPPFLAGS, "$i/include")
LIBS="$save_LIBS"
ICONV_LOCATION=$i ICONV_LOCATION=$i
export LDFLAGS LIBS CPPFLAGS export LDFLAGS LIBS CPPFLAGS
dnl Now, check for a working iconv ... we want to do it here because dnl Now, check for a working iconv ... we want to do it here because