[AC 21.5] Refactor Xaw3d checking

APPROVE COMMIT 21.5 This patch is already in 21.4. This patch is a slight refactoring inspired by the code in 21.4 and occasioned by the thread where Giacomo Boffi was having trouble getting configure to recognize his Xaw3d. That turned out to be some kind of issue with Debian packaging IMO, so this patch isn't strictly necessary, but configure.ac is slightly more readable as a result. diff -r 6c76f5b7e2e3 -r 86d6adeb1cf4 ChangeLog --- a/ChangeLog Sun Sep 11 16:05:05 2011 +0100 +++ b/ChangeLog Fri Oct 14 03:54:46 2011 +0900 ＠＠ -1,3 +1,7 ＠＠ +2011-10-14 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + * configure.ac (with_athena): Refactor check for Xaw3d. + 2011-09-05 Aidan Kehoe <kehoea(a)parhasard.net&gt; * configure.ac: $machine is intel386, reflecting the file name diff -r 6c76f5b7e2e3 -r 86d6adeb1cf4 configure.ac --- a/configure.ac Sun Sep 11 16:05:05 2011 +0100 +++ b/configure.ac Fri Oct 14 03:54:46 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.]); _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches