Mercurial > hg > xemacs-beta

comparison configure.in @ 726:1f525cb38373

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-01-09 18:58:56 by janv] Autodetect Athena when explicitly asked for widgets
author janv
date Wed, 09 Jan 2002 18:58:57 +0000
parents 76d5a3dd827a
children 8ae895c67ce7
comparison
equal deleted inserted replaced
725:b35d39ece38f 726:1f525cb38373
791 l | lu | luc | luci | lucid ) val=lucid ;; 791 l | lu | luc | luci | lucid ) val=lucid ;;
792 mo | mot | moti | motif ) val=motif ;; 792 mo | mot | moti | motif ) val=motif ;;
793 a | at | ath | athe | athen | athena ) val=athena ;; 793 a | at | ath | athe | athen | athena ) val=athena ;;
794 n | no | non | none ) val=no ;; 794 n | no | non | none ) val=no ;;
795 y | ye | yes ) val=yes ;; 795 y | ye | yes ) val=yes ;;
796 dnl Explicit --with-widgets on command line means yes.
797 "") val=yes ;;
796 g | gt | gtk ) val=gtk ;; 798 g | gt | gtk ) val=gtk ;;
797 ms | msw ) val=msw ;; 799 ms | msw ) val=msw ;;
798 * ) USAGE_ERROR(["The \`--$optname' option must have one of these values: 800 * ) USAGE_ERROR(["The \`--$optname' option must have one of these values:
799 \`gtk', \`lucid', \`motif', \`athena', \`yes', or \`no'."]) ;; 801 \`gtk', \`lucid', \`motif', \`athena', \`yes', or \`no'."]) ;;
800 esac 802 esac
3409 3411
3410 if test "$with_x11" = "yes"; then 3412 if test "$with_x11" = "yes"; then
3411 AC_CHECKING(for X11 graphics libraries) 3413 AC_CHECKING(for X11 graphics libraries)
3412 fi 3414 fi
3413 3415
3414 if test "$with_x11" = "yes" -a "$with_widgets" = "athena"; then 3416 dnl We don't automatically trigger widgets if athena is present
3417 dnl because of stability concerns.
3418 dnl But if the user wants widgets, still offer him autodetections
3419 case "$with_widgets" in
3420 "yes" | "athena") detect_athena=yes ;;
3421 *) detect_athena=no ;;
3422 esac
3423
3424 if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then
3415 AC_CHECKING(for the Athena widgets) 3425 AC_CHECKING(for the Athena widgets)
3416 3426
3417 dnl What in heck did the user actually want? 3427 dnl What in heck did the user actually want?
3418 case "$with_athena" in 3428 case "$with_athena" in
3419 dnl This is the default, old fashioned flat Athena. 3429 dnl This is the default, old fashioned flat Athena.
3508 have_xaw=no 3518 have_xaw=no
3509 fi 3519 fi
3510 3520
3511 else 3521 else
3512 have_xaw=no 3522 have_xaw=no
3513 fi dnl "$with_x11" = "yes" -a "$with_widgets" = "athena" 3523 fi dnl "$with_x11" = "yes" -a "detect_athena" = "yes"
3514 3524
3515 if test "$with_x11" = "yes"; then 3525 if test "$with_x11" = "yes"; then
3516 dnl autodetect Motif - but only add to libs_x later (if necessary) 3526 dnl autodetect Motif - but only add to libs_x later (if necessary)
3517 AC_CHECK_HEADER(Xm/Xm.h, 3527 AC_CHECK_HEADER(Xm/Xm.h,
3518 [AC_CHECK_LIB(Xm, XmStringFree, have_motif=yes, have_motif=no)], 3528 [AC_CHECK_LIB(Xm, XmStringFree, have_motif=yes, have_motif=no)],