Author: rmeggins
Update of /cvs/dirsec/adminutil/m4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22701/adminutil/m4
Modified Files: fhs.m4 Log Message: Resolves: bug 323381 Bug Description: Solaris: setup-ds-admin.pl fails due to extra ICU links Reviewed by: nhosoi (Thanks!) Fix Description: The problem is that when we link against libadminutil.la, libtool adds more -L paths to the link line, and in this case, it adds the path where libadminutil will be installed, which is /usr/lib/sparcv9. There appears to be no way to fix libtool. So the solution is to just use NSPR_LINK as the first link item and move libadminutil.la to the end. This will make sure that the path to nspr will always be first, which will either be $libdir/dirsec or $libdir. On the platforms where it is $libdir/dirsec, the correct version of ICU will either be in that directory, so it will link against that one first, or it will be installed in libdir, in which case it will be found. Platforms tested: Solaris 9 64-bit Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none
Index: fhs.m4 =================================================================== RCS file: /cvs/dirsec/adminutil/m4/fhs.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fhs.m4 4 Apr 2007 19:37:41 -0000 1.1 +++ fhs.m4 11 Oct 2007 02:32:44 -0000 1.2 @@ -25,6 +25,7 @@ AC_ARG_WITH(fhs, [ --with-fhs Use FHS layout], [ with_fhs=yes + AC_MSG_RESULT(yes) ], AC_MSG_RESULT(no))