From: <ca...@us...> - 2008-06-25 10:36:47
|
Revision: 1467 http://ganglia.svn.sourceforge.net/ganglia/?rev=1467&view=rev Author: carenas Date: 2008-06-25 03:36:55 -0700 (Wed, 25 Jun 2008) Log Message: ----------- build: linux: fix biarch support avoid overloading prefix to indicate the expected root for the calculated libdir; check for both exec_prefix and prefix to be used as root for libdir Modified Paths: -------------- trunk/monitor-core/configure.in Modified: trunk/monitor-core/configure.in =================================================================== --- trunk/monitor-core/configure.in 2008-06-25 08:38:33 UTC (rev 1466) +++ trunk/monitor-core/configure.in 2008-06-25 10:36:55 UTC (rev 1467) @@ -498,10 +498,6 @@ dnl Some operating systems require additional flags in order to get all dnl the definitions that we're looking for in some system headers. -if test x"$prefix" = xNONE; then - prefix="$ac_default_prefix" -fi - dnl default VARSTATEDIR to /var/lib since that's the traditional location. dnl varstatedir="/var/lib" @@ -517,11 +513,21 @@ AC_DEFINE(STAT_STATVFS, 1, STAT_STATVFS) AC_DEFINE(SUPPORT_GEXEC, 1, SUPPORT_GEXEC) if test x"$libdir" = x"\${exec_prefix}/lib"; then + if test x"$exec_prefix" = xNONE; then + if test x"$prefix" = xNONE; then + libroot="/usr" + else + libroot="$prefix" + fi + else + libroot="$exec_prefix" + fi + if test x"$host_cpu" = xx86_64 || \ test x"$host_cpu" = xpowerpc64; then - libdir="$prefix/lib64" + libdir="$libroot/lib64" else - libdir="$prefix/lib" + libdir="$libroot/lib" fi moduledir=${libdir}/ganglia fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |