Mercurial > hg > xemacs-beta
comparison configure.ac @ 4554:4953b7353349
Automated merge with file:/Sources/xemacs-21.5-checked-out
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 03 May 2008 13:09:06 +0200 |
parents | e4225b6d9389 |
children | ac6231e0c1df |
comparison
equal
deleted
inserted
replaced
4553:75654496fa0e | 4554:4953b7353349 |
---|---|
4239 dnl Search for the Athena library... | 4239 dnl Search for the Athena library... |
4240 if test "$athena_3d" = "no"; then | 4240 if test "$athena_3d" = "no"; then |
4241 AC_CHECK_LIB($athena_variant, XawScrollbarSetThumb, | 4241 AC_CHECK_LIB($athena_variant, XawScrollbarSetThumb, |
4242 [ | 4242 [ |
4243 dnl Must not be a 3d library... | 4243 dnl Must not be a 3d library... |
4244 AC_CHECK_LIB($athena_variant, threeDClassRec, | 4244 AC_CHECK_LIB($athena_variant, XawSme3dComputeTopShadowRGB, |
4245 [AC_MSG_WARN([Could not find a non-3d Athena widget library.])], | 4245 [AC_MSG_WARN([Could not find a non-3d Athena widget library.])], |
4246 athena_lib=$athena_variant) | 4246 athena_lib=$athena_variant) |
4247 ], | 4247 ], |
4248 AC_MSG_WARN([Could not find an Athena widget library.])) | 4248 AC_MSG_WARN([Could not find an Athena widget library.])) |
4249 else | 4249 else |
4250 dnl The real configuration, need 3d library | 4250 dnl The real configuration, need 3d library |
4251 AC_CHECK_LIB($athena_variant, threeDClassRec, athena_lib=$athena_variant, | 4251 AC_CHECK_LIB($athena_variant, XawSme3dComputeTopShadowRGB, athena_lib=$athena_variant, |
4252 dnl OK, couldn't find it with a proper name, try the standard Athena lib | 4252 dnl OK, couldn't find it with a proper name, try the standard Athena lib |
4253 dnl If that is 3d, presume the user asked for what they have installed. | 4253 dnl If that is 3d, presume the user asked for what they have installed. |
4254 AC_CHECK_LIB(Xaw, threeDClassRec, | 4254 AC_CHECK_LIB(Xaw, XawSme3dComputeTopShadowRGB, |
4255 [ | 4255 [ |
4256 athena_lib=Xaw; | 4256 athena_lib=Xaw; |
4257 AC_MSG_WARN([Assuming that libXaw is actually $athena_variant.]); | 4257 AC_MSG_WARN([Assuming that libXaw is actually $athena_variant.]); |
4258 ], | 4258 ], |
4259 [AC_MSG_WARN([Could not find a 3d Athena widget library that looked like $athena_variant.])])) | 4259 [AC_MSG_WARN([Could not find a 3d Athena widget library that looked like $athena_variant.])])) |