diff options
| author | Gerald Carter <jerry@samba.org> | 2003-11-06 17:39:01 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2003-11-06 17:39:01 +0000 |
| commit | 949a05bcb7dcb4f557f35f5ffea815a1665a6a3e (patch) | |
| tree | 0b9f767e9d3252b24b29d9d7466608690267f9f4 | |
| parent | 25d64aa855c23277cd4cb6cce4a52fa9a591307b (diff) | |
| download | samba-949a05bcb7dcb4f557f35f5ffea815a1665a6a3e.tar.gz samba-949a05bcb7dcb4f557f35f5ffea815a1665a6a3e.tar.bz2 samba-949a05bcb7dcb4f557f35f5ffea815a1665a6a3e.zip | |
merge's tpot build fix from 3.0
(This used to be commit ac9f9f9ea83b0419d3f1f95b57ff3ead625d7576)
| -rw-r--r-- | source3/configure.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/configure.in b/source3/configure.in index feac7da673..269fdf97ed 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -1605,8 +1605,9 @@ 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 -dnl Perhaps we should always add a -L - LDFLAGS="-L$i/lib" + if test x"$ICONV_PATH_SPEC" = "xyes" ; then + LDFLAGS="-L$i/lib" + fi LIBS= export LDFLAGS LIBS CPPFLAGS dnl Try to find iconv(3) @@ -1616,6 +1617,7 @@ dnl Try to find iconv(3) LDFLAGS=$save_LDFLAG 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 |