From 3d50c8aa2226aea58695b9295556f805d1cf165d Mon Sep 17 00:00:00 2001 From: Richard Sharpe Date: Wed, 5 Nov 2003 23:36:00 +0000 Subject: [PATCH] Better handling of iconv support and etc because gnu libiconv on FreeBSD changed where it puts things :-) (This used to be commit 123a516a6095e3fb6c2ad372b2800a825bbd2a13) --- source3/configure.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/source3/configure.in b/source3/configure.in index 0a6005b28f4..8ac4541024e 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -1605,9 +1605,10 @@ 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 +dnl Perhaps we should always add a -L +dnl if test x"$ICONV_PATH_SPEC" = "xyes" ; then LDFLAGS="-L$i/lib" - fi +dnl fi LIBS= export LDFLAGS LIBS CPPFLAGS dnl Try to find iconv(3) @@ -1616,7 +1617,7 @@ 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" +dnl LIBS="$save_LIBS" ICONV_LOCATION=$i export LDFLAGS LIBS CPPFLAGS dnl Now, check for a working iconv ... we want to do it here because -- 2.11.4.GIT