-if test "$subexdir" = "-" ; then
- subexdir=""
-else
- subexdir="/$subexdir"
-fi
-for exdir in $exdirs ; do
- if test "$exdir" != "/usr" || test "$subexdir" != ""; then
- incdir="${exdir}/include${subexdir}"
- wi_EXTRA_IDIR($incdir)
+ if test "$subexdir" = "-" ; then
+ subexdir=""
+ else
+ subexdir="/$subexdir"
+ fi
+ for exdir in $exdirs ; do
+ if test "$exdir" != "/usr" || test "$subexdir" != ""; then
+ incdir="${exdir}/include${subexdir}"
+ wi_EXTRA_IDIR($incdir)
+
+dnl On 64-bit machines, if lib64/ exists and is not identical to lib/
+dnl then it should be listed here, listed ahead of lib/.
+ mylibdir64="${exdir}/lib64${subexdir}"
+ mylibdir32="${exdir}/lib${subexdir}"
+
+ if test "x86_64" = $(uname -m) \
+ -a ! ${mylibdir64} -ef ${mylibdir32} ; then
+ wi_EXTRA_LDIR($mylibdir64)
+ fi