diff options
| author | Richard Sharpe <sharpe@samba.org> | 2003-11-06 05:44:55 +0000 |
|---|---|---|
| committer | Richard Sharpe <sharpe@samba.org> | 2003-11-06 05:44:55 +0000 |
| commit | a999e7c1b9b428de851e8ed978fd9ffb8ed64b94 (patch) | |
| tree | d7628765e6ba545e75e998cc67f2fd9c66e3cba0 /source3 | |
| parent | cb78cd74a2a8ed5cf2f88d2c01668f6a0d182b14 (diff) | |
| download | samba-a999e7c1b9b428de851e8ed978fd9ffb8ed64b94.tar.gz samba-a999e7c1b9b428de851e8ed978fd9ffb8ed64b94.tar.bz2 samba-a999e7c1b9b428de851e8ed978fd9ffb8ed64b94.zip | |
Apply the patch to fix iconv detection for FreeBSD to the Samba 3.0.0 branch
as well.
(This used to be commit 44be80e4883c8578b98ec02ac422c97229b063c5)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/configure.in | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source3/configure.in b/source3/configure.in index bd7a31f25d..19355d4158 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -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 |