Mercurial > hg > xemacs-beta
changeset 5586:d8a11d5ebc9f
Merge refactored Xaw3d configure.ac.
| author | Stephen J. Turnbull <stephen@xemacs.org> |
|---|---|
| date | Fri, 28 Oct 2011 23:52:26 +0900 |
| parents | d469c668462e (current diff) 86d6adeb1cf4 (diff) |
| children | 3fde0e346ad7 |
| files | |
| diffstat | 2 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Oct 18 12:03:36 2011 +0100 +++ b/ChangeLog Fri Oct 28 23:52:26 2011 +0900 @@ -1,3 +1,7 @@ +2011-10-14 Stephen J. Turnbull <stephen@xemacs.org> + + * configure.ac (with_athena): Refactor check for Xaw3d. + 2011-09-05 Aidan Kehoe <kehoea@parhasard.net> * configure.ac: $machine is intel386, reflecting the file name
--- a/configure.ac Tue Oct 18 12:03:36 2011 +0100 +++ b/configure.ac Fri Oct 28 23:52:26 2011 +0900 @@ -3895,22 +3895,24 @@ *) XE_DIE("Unknown Athena widget set \`$with_athena'. This should not happen.") ;; esac + athena_3d_function=Xaw3dComputeBottomShadowRGB + dnl Search for the Athena library... if test "$athena_3d" = "no"; then AC_CHECK_LIB($athena_variant, XawScrollbarSetThumb, [ dnl Must not be a 3d library... - AC_CHECK_LIB($athena_variant, XawSme3dComputeTopShadowRGB, + AC_CHECK_LIB($athena_variant, $athena_3d_function, [AC_MSG_WARN([Could not find a non-3d Athena widget library.])], athena_lib=$athena_variant) ], AC_MSG_WARN([Could not find an Athena widget library.])) else dnl The real configuration, need 3d library - AC_CHECK_LIB($athena_variant, XawSme3dComputeTopShadowRGB, athena_lib=$athena_variant, + AC_CHECK_LIB($athena_variant, $athena_3d_function, athena_lib=$athena_variant, dnl OK, couldn't find it with a proper name, try the standard Athena lib dnl If that is 3d, presume the user asked for what they have installed. - AC_CHECK_LIB(Xaw, XawSme3dComputeTopShadowRGB, + AC_CHECK_LIB(Xaw, $athena_3d_function, [ athena_lib=Xaw; AC_MSG_WARN([Assuming that libXaw is actually $athena_variant.]);