Mercurial > hg > xemacs-beta

comparison configure.in @ 420:41dbb7a9d5f2 r21-2-18

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-2-18
author cvs
date Mon, 13 Aug 2007 11:24:09 +0200
parents e804706bfb8c
children 95016f13131a
comparison
equal deleted inserted replaced
419:66615b78f1a5 420:41dbb7a9d5f2
355 pkgdir='${datadir}/${PROGNAME}-${version}/lisp' 355 pkgdir='${datadir}/${PROGNAME}-${version}/lisp'
356 package_path='' 356 package_path=''
357 etcdir='${datadir}/${PROGNAME}-${version}/etc' 357 etcdir='${datadir}/${PROGNAME}-${version}/etc'
358 lockdir='${statedir}/${PROGNAME}/lock' 358 lockdir='${statedir}/${PROGNAME}/lock'
359 archlibdir='${datadir}/${PROGNAME}-${version}/${configuration}' 359 archlibdir='${datadir}/${PROGNAME}-${version}/${configuration}'
360 docdir='${archlibdir}'
361 with_prefix='yes'
360 with_site_lisp='no' 362 with_site_lisp='no'
361 with_site_modules='yes' 363 with_site_modules='yes'
362 with_menubars='' 364 with_menubars=''
363 with_scrollbars='' 365 with_scrollbars=''
366 with_widgets=''
364 with_dialogs='' 367 with_dialogs=''
365 with_file_coding='' 368 with_file_coding=''
366 dnl const_is_losing is removed - we rely on AC_C_CONST instead. 369 dnl const_is_losing is removed - we rely on AC_C_CONST instead.
367 dnl We accept (and ignore) the --const-is-losing option for compatibility. 370 dnl We accept (and ignore) the --const-is-losing option for compatibility.
368 dnl const_is_losing='yes' 371 dnl const_is_losing='yes'
461 dnl Process the option. 464 dnl Process the option.
462 case "$opt" in 465 case "$opt" in
463 466
464 dnl Process (many) boolean options 467 dnl Process (many) boolean options
465 with_site_lisp | \ 468 with_site_lisp | \
466 with_site_modules | \ 469 with_prefix | \
470 with_site_modules | \
467 with_x | \ 471 with_x | \
468 with_x11 | \ 472 with_x11 | \
469 with_msw | \ 473 with_msw | \
470 with_gcc | \ 474 with_gcc | \
471 dynamic | \ 475 dynamic | \
707 eval "$opt=\"$val\"" 711 eval "$opt=\"$val\""
708 712
709 dnl You need to synchronize this with the way the 713 dnl You need to synchronize this with the way the
710 dnl default values are built. 714 dnl default values are built.
711 case "$opt" in 715 case "$opt" in
716 dnl prefix is taken care of by --with-prefix
717 exec_prefix ) AC_DEFINE(EXEC_PREFIX_USER_DEFINED) ;;
712 lispdir ) AC_DEFINE(LISPDIR_USER_DEFINED) ;; 718 lispdir ) AC_DEFINE(LISPDIR_USER_DEFINED) ;;
713 sitelispdir ) AC_DEFINE(SITELISPDIR_USER_DEFINED) ;; 719 sitelispdir ) AC_DEFINE(SITELISPDIR_USER_DEFINED) ;;
714 moduledir ) AC_DEFINE(MODULEDIR_USER_DEFINED) ;; 720 moduledir ) AC_DEFINE(MODULEDIR_USER_DEFINED) ;;
715 etcdir ) AC_DEFINE(ETCDIR_USER_DEFINED) ;; 721 etcdir ) AC_DEFINE(ETCDIR_USER_DEFINED) ;;
716 infodir ) AC_DEFINE(INFODIR_USER_DEFINED) ;; 722 infodir ) AC_DEFINE(INFODIR_USER_DEFINED) ;;
720 AC_DEFINE(INFODIR_USER_DEFINED) 726 AC_DEFINE(INFODIR_USER_DEFINED)
721 AC_DEFINE(LISPDIR_USER_DEFINED) 727 AC_DEFINE(LISPDIR_USER_DEFINED)
722 AC_DEFINE(MODULEDIR_USER_DEFINED) 728 AC_DEFINE(MODULEDIR_USER_DEFINED)
723 AC_DEFINE(ETCDIR_USER_DEFINED) ;; 729 AC_DEFINE(ETCDIR_USER_DEFINED) ;;
724 statedir | lockdir ) AC_DEFINE(LOCKDIR_USER_DEFINED) ;; 730 statedir | lockdir ) AC_DEFINE(LOCKDIR_USER_DEFINED) ;;
731 docdir ) AC_DEFINE(DOCDIR_USER_DEFINED) ;;
725 exec_prefix | libdir | archlibdir ) AC_DEFINE(ARCHLIBDIR_USER_DEFINED) ;; 732 exec_prefix | libdir | archlibdir ) AC_DEFINE(ARCHLIBDIR_USER_DEFINED) ;;
726 esac 733 esac
727 ;; 734 ;;
728 735
729 dnl --no-create added by autoconf for use by config.status 736 dnl --no-create added by autoconf for use by config.status
733 "usage" | "help" ) ${PAGER-more} ${srcdir}/configure.usage; exit 0 ;; 740 "usage" | "help" ) ${PAGER-more} ${srcdir}/configure.usage; exit 0 ;;
734 741
735 dnl Has the user specified the toolkit(s) to use for GUI elements? 742 dnl Has the user specified the toolkit(s) to use for GUI elements?
736 "with_menubars" | \ 743 "with_menubars" | \
737 "with_scrollbars" | \ 744 "with_scrollbars" | \
738 "with_dialogs" ) 745 "with_dialogs" | \
746 "with_widgets" )
739 case "$val" in 747 case "$val" in
740 l | lu | luc | luci | lucid ) val=lucid ;; 748 l | lu | luc | luci | lucid ) val=lucid ;;
741 m | mo | mot | moti | motif ) val=motif ;; 749 m | mo | mot | moti | motif ) val=motif ;;
742 athena3d | athena-3d ) val=athena3d ;; 750 athena3d | athena-3d ) val=athena3d ;;
743 a | at | ath | athe | athen | athena ) val=athena ;; 751 a | at | ath | athe | athen | athena ) val=athena ;;
929 fi 937 fi
930 AC_DEFINE_UNQUOTED(XEMACS_CODENAME, "$xemacs_codename") 938 AC_DEFINE_UNQUOTED(XEMACS_CODENAME, "$xemacs_codename")
931 AC_DEFINE_UNQUOTED(EMACS_VERSION, "$version") 939 AC_DEFINE_UNQUOTED(EMACS_VERSION, "$version")
932 940
933 if test "$with_infodock" = "yes"; then 941 if test "$with_infodock" = "yes"; then
934 if test ! -f ../ID-INSTALL; then 942 if test ! -f ../../ID-INSTALL; then
935 echo "Cannot build InfoDock without InfoDock sources" 943 echo "Cannot build InfoDock without InfoDock sources"
936 with_infodock=no 944 with_infodock=no
937 fi 945 fi
938 fi 946 fi
939 947
2872 fi ;; 2880 fi ;;
2873 esac 2881 esac
2874 case "$with_scrollbars" in "" | "yes" ) 2882 case "$with_scrollbars" in "" | "yes" )
2875 with_scrollbars="lucid" ;; 2883 with_scrollbars="lucid" ;;
2876 esac 2884 esac
2877 2885 case "$with_widgets" in "" | "yes" )
2878 all_widgets="$with_menubars $with_scrollbars $with_dialogs $with_toolbars" 2886 if test "$have_motif" = "yes"; then with_widgets="motif"
2887 else with_widgets=no
2888 fi ;;
2889 esac
2890
2891 all_widgets="$with_menubars $with_scrollbars $with_dialogs $with_toolbars $with_widgets"
2879 2892
2880 case "$all_widgets" in *athena* ) 2893 case "$all_widgets" in *athena* )
2881 AC_DEFINE(LWLIB_USES_ATHENA) 2894 AC_DEFINE(LWLIB_USES_ATHENA)
2882 AC_DEFINE(NEED_ATHENA) 2895 AC_DEFINE(NEED_ATHENA)
2883 XE_APPEND(lwlib-Xaw.o, lwlib_objs) 2896 XE_APPEND(lwlib-Xaw.o, lwlib_objs)
2926 if test "$with_x11" = "yes"; then 2939 if test "$with_x11" = "yes"; then
2927 test "$with_menubars" != "no" && XE_ADD_OBJS(menubar-x.o) 2940 test "$with_menubars" != "no" && XE_ADD_OBJS(menubar-x.o)
2928 test "$with_scrollbars" != "no" && XE_ADD_OBJS(scrollbar-x.o) 2941 test "$with_scrollbars" != "no" && XE_ADD_OBJS(scrollbar-x.o)
2929 test "$with_dialogs" != "no" && XE_ADD_OBJS(dialog-x.o) 2942 test "$with_dialogs" != "no" && XE_ADD_OBJS(dialog-x.o)
2930 test "$with_toolbars" != "no" && XE_ADD_OBJS(toolbar-x.o) 2943 test "$with_toolbars" != "no" && XE_ADD_OBJS(toolbar-x.o)
2931 test "$all_widgets" != "no no no no" && XE_ADD_OBJS(gui-x.o) 2944 test "$all_widgets" != "no no no no no" && XE_ADD_OBJS(gui-x.o)
2932 else 2945 else
2933 if test \( "$with_sound" = "nas" \) -o \( "$with_sound" = "both" \); then 2946 if test \( "$with_sound" = "nas" \) -o \( "$with_sound" = "both" \); then
2934 echo "Attempt to Build NAS sound without X" 2947 echo "Attempt to Build NAS sound without X"
2935 echo "Please remove NAS configuration or build with X" 2948 echo "Please remove NAS configuration or build with X"
2936 exit 1 2949 exit 1
3739 AC_SUBST(statedir) 3752 AC_SUBST(statedir)
3740 AC_SUBST(libdir) 3753 AC_SUBST(libdir)
3741 AC_SUBST(mandir) 3754 AC_SUBST(mandir)
3742 3755
3743 AC_SUBST(prefix) 3756 AC_SUBST(prefix)
3757 AC_SUBST(PREFIX_USER_DEFINED)
3744 dnl Yo, Stephen Bourne! I want to marry you! 3758 dnl Yo, Stephen Bourne! I want to marry you!
3745 PREFIX=$prefix 3759 PREFIX=$prefix
3746 while true; do 3760 while true; do
3747 case "$PREFIX" in 3761 case "$PREFIX" in
3748 *\$* ) eval "PREFIX=$PREFIX" ;; 3762 *\$* ) eval "PREFIX=$PREFIX" ;;
3750 esac 3764 esac
3751 done 3765 done
3752 AC_SUBST(PREFIX) 3766 AC_SUBST(PREFIX)
3753 3767
3754 AC_SUBST(exec_prefix) 3768 AC_SUBST(exec_prefix)
3769 AC_SUBST(EXEC_PREFIX_USER_DEFINED)
3755 EXEC_PREFIX=$exec_prefix 3770 EXEC_PREFIX=$exec_prefix
3756 while true; do 3771 while true; do
3757 case "$EXEC_PREFIX" in 3772 case "$EXEC_PREFIX" in
3758 *\$* ) eval "EXEC_PREFIX=$EXEC_PREFIX" ;; 3773 *\$* ) eval "EXEC_PREFIX=$EXEC_PREFIX" ;;
3759 *) break ;; 3774 *) break ;;
3857 *\$* ) eval "LOCKDIR=$LOCKDIR" ;; 3872 *\$* ) eval "LOCKDIR=$LOCKDIR" ;;
3858 *) break ;; 3873 *) break ;;
3859 esac 3874 esac
3860 done 3875 done
3861 AC_SUBST(LOCKDIR) 3876 AC_SUBST(LOCKDIR)
3877
3878 AC_SUBST(docdir)
3879 AC_SUBST(DOCDIR_USER_DEFINED)
3880 DOCDIR=$docdir
3881 while true; do
3882 case "$DOCDIR" in
3883 *\$* ) eval "DOCDIR=$DOCDIR" ;;
3884 *) break ;;
3885 esac
3886 done
3887 AC_SUBST(DOCDIR)
3862 3888
3863 AC_SUBST(archlibdir) 3889 AC_SUBST(archlibdir)
3864 AC_SUBST(ARCHLIBDIR_USER_DEFINED) 3890 AC_SUBST(ARCHLIBDIR_USER_DEFINED)
3865 ARCHLIBDIR=$archlibdir 3891 ARCHLIBDIR=$archlibdir
3866 while true; do 3892 while true; do
3905 dnl Preliminary support for using a different compiler for xemacs itself. 3931 dnl Preliminary support for using a different compiler for xemacs itself.
3906 dnl Useful for building XEmacs with a C++ or 64-bit compiler. 3932 dnl Useful for building XEmacs with a C++ or 64-bit compiler.
3907 : ${XEMACS_CC:=$CC} 3933 : ${XEMACS_CC:=$CC}
3908 AC_SUBST(XEMACS_CC) 3934 AC_SUBST(XEMACS_CC)
3909 3935
3936 dnl The default is yes
3937 if test "$with_prefix" = "yes"; then
3938 AC_DEFINE(PREFIX_USER_DEFINED)
3939 fi
3910 3940
3911 dnl The default is no 3941 dnl The default is no
3912 if test "$with_site_lisp" = "no"; then 3942 if test "$with_site_lisp" = "no"; then
3913 AC_DEFINE(INHIBIT_SITE_LISP) 3943 AC_DEFINE(INHIBIT_SITE_LISP)
3914 fi 3944 fi