Mercurial > hg > xemacs-beta

comparison configure.in @ 432:3a7e78e1142d r21-2-24

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-2-24
author cvs
date Mon, 13 Aug 2007 11:29:58 +0200
parents a5df635868b2
children 9d177e8d4150
comparison
equal deleted inserted replaced
431:a97165e56215 432:3a7e78e1142d
615 nonative ) with_native_sound=no ;; 615 nonative ) with_native_sound=no ;;
616 616
617 nas ) with_nas_sound=yes ;; 617 nas ) with_nas_sound=yes ;;
618 nonas ) with_nas_sound=no ;; 618 nonas ) with_nas_sound=no ;;
619 619
620 esd ) with_esd=yes ;; 620 esd ) with_esd_sound=yes ;;
621 noesd ) with_esh=no ;; 621 noesd ) with_esd_sound=no ;;
622 622
623 * ) bogus_sound=yes ;; 623 * ) bogus_sound=yes ;;
624 esac 624 esac
625 if test "$bogus_sound" -o \ 625 if test "$bogus_sound" -o \
626 \( -n "$new_sdefault" -a -n "$sound_notfirst" \) ; then 626 \( -n "$new_sdefault" -a -n "$sound_notfirst" \) ; then
627 types="\`all', \`none', \`(no)native', \`no(nas)', \`(no)esd'." 627 types="\`all', \`none', \`(no)native', \`no(nas)', \`(no)esd'."
628 USAGE_ERROR(["Valid types for the \`--$optname' option are: 628 USAGE_ERROR(["Valid types for the \`--$optname' option are:
629 $types. 629 $types.
630 The default is native,esd."]) 630 The default is to autodetect all sound support."])
631 elif test -n "$new_sdefault" ; then 631 elif test -n "$new_sdefault" ; then
632 with_native_sound=$new_sdefault 632 with_native_sound=$new_sdefault
633 with_nas_sound=$new_sdefault 633 with_nas_sound=$new_sdefault
634 with_esd=$new_sdefault 634 with_esd_sound=$new_sdefault
635 new_sdefault= # reset this 635 new_sdefault= # reset this
636 fi 636 fi
637 sound_notfirst=true 637 sound_notfirst=true
638 done 638 done
639 ;; 639 ;;
2566 dnl It ought to be reasonable to have no output device at all, and only use 2566 dnl It ought to be reasonable to have no output device at all, and only use
2567 dnl XEmacs in --batch mode. 2567 dnl XEmacs in --batch mode.
2568 dnl if test "$with_tty" = "no" ; then 2568 dnl if test "$with_tty" = "no" ; then
2569 dnl AC_MSG_ERROR([No window system support and no TTY support - Unable to proceed.]) 2569 dnl AC_MSG_ERROR([No window system support and no TTY support - Unable to proceed.])
2570 dnl fi 2570 dnl fi
2571 for feature in tooltalk cde offix wmcommand xim xmu 2571 for feature in tooltalk cde offix wmcommand xim xmu xpm nas_sound
2572 do 2572 do
2573 if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then 2573 if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then
2574 AC_MSG_WARN([--with-$feature ignored: Not valid without X support]) 2574 AC_MSG_WARN([--with-$feature ignored: Not valid without X support])
2575 fi 2575 fi
2576 eval "with_${feature}=no" 2576 eval "with_${feature}=no"
3006 test "$with_menubars" != "no" && XE_ADD_OBJS(menubar-x.o) 3006 test "$with_menubars" != "no" && XE_ADD_OBJS(menubar-x.o)
3007 test "$with_scrollbars" != "no" && XE_ADD_OBJS(scrollbar-x.o) 3007 test "$with_scrollbars" != "no" && XE_ADD_OBJS(scrollbar-x.o)
3008 test "$with_dialogs" != "no" && XE_ADD_OBJS(dialog-x.o) 3008 test "$with_dialogs" != "no" && XE_ADD_OBJS(dialog-x.o)
3009 test "$with_toolbars" != "no" && XE_ADD_OBJS(toolbar-x.o) 3009 test "$with_toolbars" != "no" && XE_ADD_OBJS(toolbar-x.o)
3010 test "$all_widgets" != "no no no no no" && XE_ADD_OBJS(gui-x.o) 3010 test "$all_widgets" != "no no no no no" && XE_ADD_OBJS(gui-x.o)
3011 else
3012 if test "$with_nas_sound" = "nas"; then
3013 echo "Attempt to Build NAS sound without X"
3014 echo "Please remove NAS configuration or build with X"
3015 exit 1
3016 fi
3017 fi 3011 fi
3018 3012
3019 dnl ---------------------- 3013 dnl ----------------------
3020 dnl Mule-dependent options 3014 dnl Mule-dependent options
3021 dnl ---------------------- 3015 dnl ----------------------
3468 if test "$with_native_sound" = "yes"; then 3462 if test "$with_native_sound" = "yes"; then
3469 AC_DEFINE(HAVE_NATIVE_SOUND) 3463 AC_DEFINE(HAVE_NATIVE_SOUND)
3470 test -n "$native_sound_lib" && XE_PREPEND($native_sound_lib, LIBS) 3464 test -n "$native_sound_lib" && XE_PREPEND($native_sound_lib, LIBS)
3471 fi 3465 fi
3472 3466
3473 if test "$with_nas_sound" = "yes"; then 3467 dnl NAS Sound support
3474 AC_DEFINE(HAVE_NAS_SOUND) 3468 if test "$with_nas_sound" != "no"; then
3475 XE_ADD_OBJS(nas.o) 3469 AC_CHECK_HEADER(audio/audiolib.h, [
3476 XE_PREPEND(-laudio, libs_x) 3470 AC_CHECK_LIB(audio, AuOpenServer, have_nas_sound=yes)])
3477 dnl If the nas library does not contain the error jump point, 3471 if test "$have_nas_sound" = "yes"; then
3478 dnl then we force safer behavior. 3472 with_nas_sound=yes
3479 AC_EGREP_HEADER(AuXtErrorJump,audio/Xtutil.h,,[AC_DEFINE(NAS_NO_ERROR_JUMP)]) 3473 AC_DEFINE(HAVE_NAS_SOUND)
3480 fi 3474 XE_ADD_OBJS(nas.o)
3481 3475 XE_PREPEND(-laudio, libs_x)
3482 AC_CHECK_PROG(have_esd_config, esd-config, yes, no) 3476 dnl If the nas library does not contain the error jump point,
3483 if test -z "$with_esd"; then 3477 dnl then we force safer behavior.
3484 with_esd=$have_esd_config 3478 AC_EGREP_HEADER(AuXtErrorJump,audio/Xtutil.h,,[old_nas=yes; AC_DEFINE(NAS_NO_ERROR_JUMP)])
3485 fi
3486
3487 if test "$with_esd" = "yes"; then
3488 if test "$have_esd_config" = "no"; then
3489 echo "*** esd-config was not found in your PATH. Disabling esd support."
3490 with_esd=no
3491 else 3479 else
3492 AC_DEFINE(HAVE_ESD_SOUND) 3480 test "$with_nas_sound" = "yes" && \
3481 XE_DIE("Required NAS sound support cannot be provided.")
3482 with_nas_sound=no
3483 fi
3484 fi
3485
3486 dnl ESD Sound support
3487 if test "$with_esd_sound" != "no"; then
3488 AC_CHECK_PROG(have_esd_config, esd-config, yes, no)
3489 if test "$have_esd_config" = "yes"; then
3490 save_c_switch_site="$c_switch_site" save_LIBS="$LIBS"
3491 XE_APPEND(`esd-config --cflags`, c_switch_site)
3492 XE_PREPEND(`esd-config --libs`, LIBS)
3493 AC_CHECK_FUNC(esd_play_stream,
3494 have_esd_sound=yes,
3495 c_switch_site="$save_c_switch_site" LIBS="$save_LIBS")
3496 fi
3497
3498 if test "$have_esd_sound" = "yes"; then
3499 with_esd_sound=yes
3493 need_miscplay=yes 3500 need_miscplay=yes
3494 XE_ADD_OBJS(esd.o) 3501 XE_ADD_OBJS(esd.o)
3495 XE_PREPEND(`esd-config --libs`, libs_x) 3502 AC_DEFINE(HAVE_ESD_SOUND)
3496 fi 3503 else
3497 fi 3504 test "$with_esd_sound" = "yes" && \
3498 3505 XE_DIE("Required ESD sound support cannot be provided.")
3499 if test "$need_miscplay" = "yes"; then 3506 with_esd_sound=no
3500 XE_ADD_OBJS(miscplay.o) 3507 fi
3501 fi 3508 fi
3509
3510 test "$need_miscplay" = "yes" && XE_ADD_OBJS(miscplay.o)
3502 3511
3503 dnl --------------------- 3512 dnl ---------------------
3504 dnl TTY-dependent options 3513 dnl TTY-dependent options
3505 dnl --------------------- 3514 dnl ---------------------
3506 3515
4173 fi 4182 fi
4174 test "$with_gif" = yes && echo " Compiling in support for (builtin) GIF image handling." 4183 test "$with_gif" = yes && echo " Compiling in support for (builtin) GIF image handling."
4175 test "$with_jpeg" = yes && echo " Compiling in support for JPEG image handling." 4184 test "$with_jpeg" = yes && echo " Compiling in support for JPEG image handling."
4176 test "$with_tiff" = yes && echo " Compiling in support for TIFF image handling." 4185 test "$with_tiff" = yes && echo " Compiling in support for TIFF image handling."
4177 test "$with_xface" = yes && echo " Compiling in support for X-Face message headers." 4186 test "$with_xface" = yes && echo " Compiling in support for X-Face message headers."
4187
4178 test "$with_native_sound" = yes && echo " Compiling in native sound support." 4188 test "$with_native_sound" = yes && echo " Compiling in native sound support."
4179 test "$with_nas_sound" = yes && echo " Compiling in network sound (NAS) support." 4189 test "$with_nas_sound" = yes && echo " Compiling in network sound (NAS) support."
4180 test "$old_nas" = yes && echo " nas library lacks error trapping, will play synchronously." 4190 test "$old_nas" = yes && echo " nas library lacks error trapping, will play synchronously."
4181 test "$with_esd" = yes && echo " Compiling in support for Enlightened Sound Daemon." 4191 test "$with_esd_sound" = yes && echo " Compiling in support for Enlightened Sound Daemon (ESD)."
4182 4192
4183 test "$with_database_berkdb" = yes && echo " Compiling in support for Berkeley DB." 4193 test "$with_database_berkdb" = yes && echo " Compiling in support for Berkeley DB."
4184 test "$with_database_dbm" = yes && echo " Compiling in support for DBM." 4194 test "$with_database_dbm" = yes && echo " Compiling in support for DBM."
4185 test "$with_database_gdbm" = yes && echo " Compiling in support for GNU DBM." 4195 test "$with_database_gdbm" = yes && echo " Compiling in support for GNU DBM."
4186 4196