Mercurial > hg > xemacs-beta

comparison configure.ac @ 3179:15139dbf89f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2005-12-27 18:50:47 by michaels] This: 2005-11-25 Mike Sperber <mike@xemacs.org> * CHANGES-beta: * configure.ac: Zap --with-package-prefix; instead, add --with-user-packages/--with-early-packages, --with-system-packages/--with-late-packages, and --with-legacy-packages/--with-last-packages. ... and the changes that result from it throughout the code.
author michaels
date Tue, 27 Dec 2005 18:51:30 +0000
parents 483af4dd065b
children 80361b938eaa
comparison
equal deleted inserted replaced
3178:632fdf307588 3179:15139dbf89f4
641 AC_HELP_STRING([--with-site-lisp=no],[Allow for a site-lisp directory in the XEmacs hierarchy searched before the installation packages.]), 641 AC_HELP_STRING([--with-site-lisp=no],[Allow for a site-lisp directory in the XEmacs hierarchy searched before the installation packages.]),
642 [true], [with_site_lisp=no]) 642 [true], [with_site_lisp=no])
643 XE_MERGED_ARG([site-modules], 643 XE_MERGED_ARG([site-modules],
644 AC_HELP_STRING([--with-site-modules=no],[Disable site-modules directory in the XEmacs hierarchy, which is searched before the installation modules.]), 644 AC_HELP_STRING([--with-site-modules=no],[Disable site-modules directory in the XEmacs hierarchy, which is searched before the installation modules.]),
645 [], []) 645 [], [])
646 XE_MERGED_ARG([package-prefix], 646 XE_MERGED_ARG([early-packages],
647 AC_HELP_STRING([--with-package-prefix=DIR],[Specify packages root.]), 647 AC_HELP_STRING([--with-early-packages=DIR],[Specify location of early/user packages (instead of ~/.xemacs; same as --with-user-packages).]),
648 [AC_DEFINE(PACKAGE_PATH_USER_DEFINED)], []) 648 [AC_DEFINE(EARLY_PACKAGE_DIRECTORIES_USER_DEFINED)], [])
649 XE_MERGED_ARG([user-packages],
650 AC_HELP_STRING([--with-user-packages=DIR],[Specify location of early/user packages (instead of ~/.xemacs; same as --with-early-packages).]),
651 [AC_DEFINE(EARLY_PACKAGE_DIRECTORIES_USER_DEFINED)], [])
652 XE_MERGED_ARG([late-packages],
653 AC_HELP_STRING([--with-late-packages=DIR],[Specify location of late/system packages (instead of default location; same as --with-system-packages).]),
654 [AC_DEFINE(LATE_PACKAGE_DIRECTORIES_USER_DEFINED)], [])
655 XE_MERGED_ARG([system-packages],
656 AC_HELP_STRING([--with-late-packages=DIR],[Specify location of late/system packages (instead of default location; same as --with-late-packages).]),
657 [AC_DEFINE(LATE_PACKAGE_DIRECTORIES_USER_DEFINED)], [])
658 XE_MERGED_ARG([last-packages],
659 AC_HELP_STRING([--with-last-packages=DIR],[Specify location of last/legacy packages (instead of default location; same as --with-legacy-packages).]),
660 [AC_DEFINE(LAST_PACKAGE_DIRECTORIES_USER_DEFINED)], [])
661 XE_MERGED_ARG([legacy-packages],
662 AC_HELP_STRING([--with-late-packages=DIR],[Specify location of late/legacy packages (instead of default location; same as --with-late-packages).]),
663 [AC_DEFINE(LATE_PACKAGE_DIRECTORIES_USER_DEFINED)], [])
649 XE_MERGED_ARG([package-path], 664 XE_MERGED_ARG([package-path],
650 AC_HELP_STRING([--with-package-path=PATH],[Search path for package hierarchies.]), 665 AC_HELP_STRING([--with-package-path=PATH],[Search path for package directories.]),
651 [AC_DEFINE(PACKAGE_PATH_USER_DEFINED)], []) 666 [AC_DEFINE(PACKAGE_PATH_USER_DEFINED)], [])
652 XE_MERGED_ARG([infopath], 667 XE_MERGED_ARG([infopath],
653 AC_HELP_STRING([--with-infopath=PATH],[Location of info directories]), 668 AC_HELP_STRING([--with-infopath=PATH],[Location of info directories]),
654 [AC_DEFINE(INFOPATH_USER_DEFINED)], []) 669 [AC_DEFINE(INFOPATH_USER_DEFINED)], [])
655 dnl 670 dnl
5615 *) break ;; 5630 *) break ;;
5616 esac 5631 esac
5617 done 5632 done
5618 AC_SUBST(INFOPATH) 5633 AC_SUBST(INFOPATH)
5619 5634
5620 if test -z "$with_package_path" && test -n "$with_package_prefix" ; then 5635 test -n "$with_user_packages" && with_early_packages=$with_user_packages
5621 if test "$enable_mule" = "yes" ; then 5636 AC_SUBST(early_packages,$with_early_packages)
5622 with_package_path="~/.xemacs::${with_package_prefix}/site-packages:${with_package_prefix}/xemacs-packages:${with_package_prefix}/mule-packages" 5637 AC_SUBST(EARLY_PACKAGE_DIRECTORIES_USER_DEFINED)
5623 else 5638 EARLY_PACKAGE_DIRECTORIES=$with_early_packages
5624 with_package_path="~/.xemacs::${with_package_prefix}/site-packages:${with_package_prefix}/xemacs-packages" 5639 while true; do
5625 fi 5640 case "$EARLY_PACKAGE_DIRECTORIES" in
5626 fi 5641 *\$* ) eval "EARLY_PACKAGE_DIRECTORIES=$EARLY_PACKAGE_DIRECTORIES" ;;
5642 *) break ;;
5643 esac
5644 done
5645 AC_SUBST(EARLY_PACKAGE_DIRECTORIES)
5646
5647 test -n "$with_system_packages" && with_late_packages=$with_system_packages
5648 AC_SUBST(late_packages,$with_late_packages)
5649 AC_SUBST(LATE_PACKAGE_DIRECTORIES_USER_DEFINED)
5650 LATE_PACKAGE_DIRECTORIES=$with_late_packages
5651 while true; do
5652 case "$LATE_PACKAGE_DIRECTORIES" in
5653 *\$* ) eval "LATE_PACKAGE_DIRECTORIES=$LATE_PACKAGE_DIRECTORIES" ;;
5654 *) break ;;
5655 esac
5656 done
5657 AC_SUBST(LATE_PACKAGE_DIRECTORIES)
5658
5659 test -n "$with_legacy_packages" && with_last_packages=$with_legacy_packages
5660 AC_SUBST(last_packages,$with_last_packages)
5661 AC_SUBST(LAST_PACKAGE_DIRECTORIES_USER_DEFINED)
5662 LAST_PACKAGE_DIRECTORIES=$with_last_packages
5663 while true; do
5664 case "$LAST_PACKAGE_DIRECTORIES" in
5665 *\$* ) eval "LAST_PACKAGE_DIRECTORIES=$LAST_PACKAGE_DIRECTORIES" ;;
5666 *) break ;;
5667 esac
5668 done
5669 AC_SUBST(LAST_PACKAGE_DIRECTORIES)
5627 5670
5628 AC_SUBST(package_path,$with_package_path) 5671 AC_SUBST(package_path,$with_package_path)
5629 AC_SUBST(PACKAGE_PATH_USER_DEFINED) 5672 AC_SUBST(PACKAGE_PATH_USER_DEFINED)
5630 PACKAGE_PATH=$with_package_path 5673 PACKAGE_PATH=$with_package_path
5631 while true; do 5674 while true; do