2 new commits in XEmacs:
https://bitbucket.org/xemacs/xemacs/changeset/86d6adeb1cf4/
changeset: 86d6adeb1cf4
user: stephen_at_xemacs
date: 2011-10-13 20:54:46
summary: Refactor check for Xaw3d.
affected #: 2 files
diff -r 6c76f5b7e2e3e77d6a7c4a21507032a2adae439e -r
86d6adeb1cf4bcba2289618f1a187d791f08f07a ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-14 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * configure.ac (with_athena): Refactor check for Xaw3d.
+
2011-09-05 Aidan Kehoe <kehoea(a)parhasard.net>
* configure.ac: $machine is intel386, reflecting the file name
diff -r 6c76f5b7e2e3e77d6a7c4a21507032a2adae439e -r
86d6adeb1cf4bcba2289618f1a187d791f08f07a configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -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.]);
https://bitbucket.org/xemacs/xemacs/changeset/d8a11d5ebc9f/
changeset: d8a11d5ebc9f
user: stephen_at_xemacs
date: 2011-10-28 16:52:26
summary: Merge refactored Xaw3d configure.ac.
affected #: 2 files
diff -r d469c668462e5b004a23418bd255949613be5608 -r
d8a11d5ebc9fd44f07ba43e58876aaf83122264d ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-14 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * configure.ac (with_athena): Refactor check for Xaw3d.
+
2011-09-05 Aidan Kehoe <kehoea(a)parhasard.net>
* configure.ac: $machine is intel386, reflecting the file name
diff -r d469c668462e5b004a23418bd255949613be5608 -r
d8a11d5ebc9fd44f07ba43e58876aaf83122264d configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -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.]);
Repository URL:
https://bitbucket.org/xemacs/xemacs/
--
This is a commit notification from
bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches