[Samba] iconv detection on Irix 6.5

[Jason Mader]

On Feb 9, 2004, at 5:14 PM, Jeremy Allison wrote:

> On Mon, Feb 09, 2004 at 02:31:22PM -0500, Jason Mader wrote:
>> Samba 3.0.2 and earlier on Irix 6.5 haven't been detecting libiconv, 
>> even when using the --with-libiconv directive.
>>
>> I found it best to configure libiconv as,
>>   ./configure --prefix=/opt --libdir=/opt/lib32
>> because /opt/lib32 is in ldd's search path.
>>
>> And before configuring Samba to make three changes to the configure 
>> script to properly detect libiconv and build the test programs.  I've 
>> attached the diff.  Changing LOOK_DIRS="/usr /usr/local /sw" to also 
>> include /opt might be useful for Irix builds.
>
> Can you send a patch for configure.on, not configure, as the configure 
> file is auto generated.

--- samba-3.0.2/source/configure.in	Fri Feb 13 09:19:44 2004
+++ configure.in	Fri Feb 13 09:22:35 2004
@@ -1634,7 +1634,7 @@
      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="$LDFLAGS -L$i/lib"
+    LDFLAGS="$LDFLAGS -L$i/lib32"
      LIBS=
      export LDFLAGS LIBS CPPFLAGS
  dnl Try to find iconv(3)
@@ -1642,7 +1642,7 @@

      if test "$ICONV_FOUND" = yes; then
  	LDFLAGS=$save_LDFLAGS
-        LIB_ADD_DIR(LDFLAGS, "$i/lib")
+        LIB_ADD_DIR(LDFLAGS, "$i/lib32")
          CFLAGS_ADD_DIR(CPPFLAGS, "$i/include")
          LIBS="$save_LIBS"
          ICONV_LOCATION=$i
@@ -1718,7 +1718,7 @@
             fi
  	   dnl Add the flags we need to CPPFLAGS and LDFLAGS
  	   CFLAGS_ADD_DIR(CPPFLAGS, "$i/include")
-	   LIB_ADD_DIR(LDFLAGS, "$i/lib")
+	   LIB_ADD_DIR(LDFLAGS, "$i/lib32")
  	   export CPPFLAGS
             AC_DEFINE(HAVE_NATIVE_ICONV,1,[Whether to use native iconv])
  	   
AC_DEFINE_UNQUOTED(DEFAULT_DOS_CHARSET,$default_dos_charset,[Default 
dos charset name])

---Jason Mader, FHWA/NHTSA National Crash Analysis Center,
The George Washington University, VA Campus