Mercurial > hg > xemacs-beta

comparison configure.in @ 2416:515786aa760a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2004-12-05 08:06:41 by ben] Support package-prefix and fix mail-locking in configure configure.usage, configure.in, configure: Support --package-prefix and mmdf and pop arguments to --mail-locking. Document in configure.usage.
author ben
date Sun, 05 Dec 2004 08:06:42 +0000
parents df0455455d17
children 97dd9f867cef
comparison
equal deleted inserted replaced
2415:c83d29a262a5 2416:515786aa760a
696 case "$val" in 696 case "$val" in
697 lockf ) val=lockf ;; 697 lockf ) val=lockf ;;
698 flock ) val=flock ;; 698 flock ) val=flock ;;
699 file | dot ) val=file ;; 699 file | dot ) val=file ;;
700 locking ) val=locking ;; 700 locking ) val=locking ;;
701 mmdf ) val=mmdf ;;
702 pop ) val=pop ;;
701 * ) USAGE_ERROR(["The \`--$optname' option must have one of these values: 703 * ) USAGE_ERROR(["The \`--$optname' option must have one of these values:
702 \`lockf', \`flock', \`file', \`locking', or \`mmdf'."]) ;; 704 \`lockf', \`flock', \`file', \`dot', \`locking', \`mmdf', or \`pop'."]) ;;
703 esac 705 esac
704 eval "$opt=\"$val\"" 706 eval "$opt=\"$val\""
705 ;; 707 ;;
706 708
707 dnl Enhanced Lisp numbers 709 dnl Enhanced Lisp numbers
783 ;; 785 ;;
784 786
785 dnl Has the user specified one of the path options? 787 dnl Has the user specified one of the path options?
786 prefix | exec_prefix | bindir | datadir | statedir | libdir | \ 788 prefix | exec_prefix | bindir | datadir | statedir | libdir | \
787 mandir | infodir | infopath | lispdir | etcdir | \ 789 mandir | infodir | infopath | lispdir | etcdir | \
788 archlibdir | docdir | package_path | moduledir ) 790 archlibdir | docdir | package_path | package_prefix | moduledir )
789 dnl If the value was omitted, get it from the next argument. 791 dnl If the value was omitted, get it from the next argument.
790 if test "$valomitted" = "yes"; then 792 if test "$valomitted" = "yes"; then
791 if test "$#" = 0; then 793 if test "$#" = 0; then
792 USAGE_ERROR("The \`--$optname' option requires a value."); 794 USAGE_ERROR("The \`--$optname' option requires a value.");
793 fi 795 fi
804 sitelispdir ) AC_DEFINE(SITELISPDIR_USER_DEFINED) ;; 806 sitelispdir ) AC_DEFINE(SITELISPDIR_USER_DEFINED) ;;
805 moduledir ) AC_DEFINE(MODULEDIR_USER_DEFINED) ;; 807 moduledir ) AC_DEFINE(MODULEDIR_USER_DEFINED) ;;
806 etcdir ) AC_DEFINE(ETCDIR_USER_DEFINED) ;; 808 etcdir ) AC_DEFINE(ETCDIR_USER_DEFINED) ;;
807 infodir ) AC_DEFINE(INFODIR_USER_DEFINED) ;; 809 infodir ) AC_DEFINE(INFODIR_USER_DEFINED) ;;
808 infopath ) AC_DEFINE(INFOPATH_USER_DEFINED) ;; 810 infopath ) AC_DEFINE(INFOPATH_USER_DEFINED) ;;
811 package_prefix ) AC_DEFINE(PACKAGE_PATH_USER_DEFINED) ;;
809 package_path ) AC_DEFINE(PACKAGE_PATH_USER_DEFINED) ;; 812 package_path ) AC_DEFINE(PACKAGE_PATH_USER_DEFINED) ;;
810 datadir ) 813 datadir )
811 AC_DEFINE(INFODIR_USER_DEFINED) 814 AC_DEFINE(INFODIR_USER_DEFINED)
812 AC_DEFINE(LISPDIR_USER_DEFINED) 815 AC_DEFINE(LISPDIR_USER_DEFINED)
813 AC_DEFINE(MODULEDIR_USER_DEFINED) 816 AC_DEFINE(MODULEDIR_USER_DEFINED)
1950 test "$extra_verbose" = "yes" && \ 1953 test "$extra_verbose" = "yes" && \
1951 PRINT_VAR(libs_machine libs_system libs_termcap libs_standard 1954 PRINT_VAR(libs_machine libs_system libs_termcap libs_standard
1952 objects_machine objects_system c_switch_machine c_switch_system 1955 objects_machine objects_system c_switch_machine c_switch_system
1953 ld_switch_machine ld_switch_system unexec ld_switch_shared 1956 ld_switch_machine ld_switch_system unexec ld_switch_shared
1954 ld lib_gcc ld_text_start_addr start_files ordinary_link 1957 ld lib_gcc ld_text_start_addr start_files ordinary_link
1955 have_terminfo mail_use_flock mail_use_lockf) && echo "" 1958 have_terminfo mail_use_flock mail_use_lockf mail_using_locking) && echo ""
1956 1959
1957 dnl Pick up mingw include path 1960 dnl Pick up mingw include path
1958 dnl We only cope with headers in mingw, not mingw32: no previous version of 1961 dnl We only cope with headers in mingw, not mingw32: no previous version of
1959 dnl XEmacs supported mingw and cygnus have made this incompatible change 1962 dnl XEmacs supported mingw and cygnus have made this incompatible change
1960 dnl so we just go with the flow. 1963 dnl so we just go with the flow.
2807 elif test "$mail_locking" = "flock"; then AC_DEFINE(MAIL_LOCK_FLOCK) 2810 elif test "$mail_locking" = "flock"; then AC_DEFINE(MAIL_LOCK_FLOCK)
2808 elif test "$mail_locking" = "locking"; then AC_DEFINE(MAIL_LOCK_LOCKING) 2811 elif test "$mail_locking" = "locking"; then AC_DEFINE(MAIL_LOCK_LOCKING)
2809 elif test "$mail_locking" = "pop"; then 2812 elif test "$mail_locking" = "pop"; then
2810 with_pop=yes 2813 with_pop=yes
2811 mail_locking= 2814 mail_locking=
2812 else mail_locking="dot-locking"; AC_DEFINE(MAIL_LOCK_DOT) 2815 elif test "$mail_locking" = "mmdf"; then AC_DEFINE(MAIL_LOCK_MMDF)
2816 else mail_locking="file"; AC_DEFINE(MAIL_LOCK_DOT)
2813 fi 2817 fi
2814 test "$mail_locking" = "lockf" -a "$ac_cv_func_lockf" != "yes" && \ 2818 test "$mail_locking" = "lockf" -a "$ac_cv_func_lockf" != "yes" && \
2815 XE_DIE("lockf mail locking requested but not available.") 2819 XE_DIE("lockf mail locking requested but not available.")
2816 test "$mail_locking" = "flock" -a "$ac_cv_func_flock" != "yes" && \ 2820 test "$mail_locking" = "flock" -a "$ac_cv_func_flock" != "yes" && \
2817 XE_DIE("flock mail locking requested but not available.") 2821 XE_DIE("flock mail locking requested but not available.")
5203 *) break ;; 5207 *) break ;;
5204 esac 5208 esac
5205 done 5209 done
5206 AC_SUBST(INFOPATH) 5210 AC_SUBST(INFOPATH)
5207 5211
5212 if test -z "$package_path" && test -n "$package_prefix" ; then
5213 if test "$with_mule" = "yes" ; then
5214 package_path="~/.xemacs::${package_prefix}/site-packages:${package_prefix}/xemacs-packages:${package_prefix}/mule-packages"
5215 else
5216 package_path="~/.xemacs::${package_prefix}/site-packages:${package_prefix}/xemacs-packages"
5217 fi
5218 fi
5219
5208 AC_SUBST(package_path) 5220 AC_SUBST(package_path)
5209 AC_SUBST(PACKAGE_PATH_USER_DEFINED) 5221 AC_SUBST(PACKAGE_PATH_USER_DEFINED)
5210 PACKAGE_PATH=$package_path 5222 PACKAGE_PATH=$package_path
5211 while true; do 5223 while true; do
5212 case "$PACKAGE_PATH" in 5224 case "$PACKAGE_PATH" in