Mercurial > hg > xemacs-beta

comparison configure.ac @ 5585:86d6adeb1cf4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Refactor check for Xaw3d.
author Stephen J. Turnbull <stephen@xemacs.org>
date Fri, 14 Oct 2011 03:54:46 +0900
parents 209024442c24
children bccc91a65536
comparison
equal deleted inserted replaced
5570:6c76f5b7e2e3 5585:86d6adeb1cf4
3893 "95") athena_variant=Xaw95 athena_3d=yes ;; 3893 "95") athena_variant=Xaw95 athena_3d=yes ;;
3894 "xpm") athena_variant=XawXpm athena_3d=yes ;; 3894 "xpm") athena_variant=XawXpm athena_3d=yes ;;
3895 *) XE_DIE("Unknown Athena widget set \`$with_athena'. This should not happen.") ;; 3895 *) XE_DIE("Unknown Athena widget set \`$with_athena'. This should not happen.") ;;
3896 esac 3896 esac
3897 3897
3898 athena_3d_function=Xaw3dComputeBottomShadowRGB
3899
3898 dnl Search for the Athena library... 3900 dnl Search for the Athena library...
3899 if test "$athena_3d" = "no"; then 3901 if test "$athena_3d" = "no"; then
3900 AC_CHECK_LIB($athena_variant, XawScrollbarSetThumb, 3902 AC_CHECK_LIB($athena_variant, XawScrollbarSetThumb,
3901 [ 3903 [
3902 dnl Must not be a 3d library... 3904 dnl Must not be a 3d library...
3903 AC_CHECK_LIB($athena_variant, XawSme3dComputeTopShadowRGB, 3905 AC_CHECK_LIB($athena_variant, $athena_3d_function,
3904 [AC_MSG_WARN([Could not find a non-3d Athena widget library.])], 3906 [AC_MSG_WARN([Could not find a non-3d Athena widget library.])],
3905 athena_lib=$athena_variant) 3907 athena_lib=$athena_variant)
3906 ], 3908 ],
3907 AC_MSG_WARN([Could not find an Athena widget library.])) 3909 AC_MSG_WARN([Could not find an Athena widget library.]))
3908 else 3910 else
3909 dnl The real configuration, need 3d library 3911 dnl The real configuration, need 3d library
3910 AC_CHECK_LIB($athena_variant, XawSme3dComputeTopShadowRGB, athena_lib=$athena_variant, 3912 AC_CHECK_LIB($athena_variant, $athena_3d_function, athena_lib=$athena_variant,
3911 dnl OK, couldn't find it with a proper name, try the standard Athena lib 3913 dnl OK, couldn't find it with a proper name, try the standard Athena lib
3912 dnl If that is 3d, presume the user asked for what they have installed. 3914 dnl If that is 3d, presume the user asked for what they have installed.
3913 AC_CHECK_LIB(Xaw, XawSme3dComputeTopShadowRGB, 3915 AC_CHECK_LIB(Xaw, $athena_3d_function,
3914 [ 3916 [
3915 athena_lib=Xaw; 3917 athena_lib=Xaw;
3916 AC_MSG_WARN([Assuming that libXaw is actually $athena_variant.]); 3918 AC_MSG_WARN([Assuming that libXaw is actually $athena_variant.]);
3917 ], 3919 ],
3918 [AC_MSG_WARN([Could not find a 3d Athena widget library that looked like $athena_variant.])])) 3920 [AC_MSG_WARN([Could not find a 3d Athena widget library that looked like $athena_variant.])]))