Mercurial > hg > xemacs-beta
diff configure.ac @ 5228:5efbd1253905
Remove all support for InfoDock.
src/ChangeLog addition:
2010-06-02 Aidan Kehoe <kehoea@parhasard.net>
* lread.c (vars_of_lread):
* emacs.c:
(shut_down_emacs, vars_of_emacs, complex_vars_of_emacs):
* device-x.c (get_device_from_display)
(have_xemacs_resources_in_xrdb):
* device-gtk.c (Fgtk_init):
* config.h.in:
Remove all checks for InfoDock.
lisp/ChangeLog addition:
2010-06-02 Aidan Kehoe <kehoea@parhasard.net>
* version.el:
(emacs-version):
* startup.el (command-line):
* simple.el (display-warning, emacs-name):
* packages.el (packages-package-hierarchy-directory-names):
* loadup.el (Dumping):
* dumped-lisp.el (preloaded-file-list):
Remove all InfoDock-specific code.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Mon, 07 Jun 2010 18:42:10 +0100 |
| parents | b72f27a08ed5 |
| children | 3889ef128488 c36f065c3090 |
line wrap: on
line diff
--- a/configure.ac Sun Jun 06 13:24:31 2010 +0100 +++ b/configure.ac Mon Jun 07 18:42:10 2010 +0100 @@ -977,9 +977,6 @@ XE_MERGED_ARG([sparcworks], AS_HELP_STRING([--with-sparcworks],[Alias for --with-workshop]), [], []) -XE_MERGED_ARG([infodock], - AS_HELP_STRING([--with-infodock],[Support the Infodock version of XEmacs. Infodock is a SourceForge project).]), - [], []) dnl XE_HELP_SUBSECTION([Debugging options]) XE_MERGED_ARG([debug], @@ -1228,27 +1225,8 @@ fi AC_DEFINE_UNQUOTED(EMACS_VERSION, "$version") -if test "$with_infodock" = "yes"; then - if test ! -f ../../ID-INSTALL; then - echo "Cannot build InfoDock without InfoDock sources" - with_infodock=no - fi -fi - -if test "$with_infodock" = "yes"; then - dnl InfoDock version numbers. XEmacs will use the same style of numbering - dnl after the release of XEmacs 21.0. - AC_DEFINE_UNQUOTED(INFODOCK_MAJOR_VERSION, $infodock_major_version) - AC_DEFINE_UNQUOTED(INFODOCK_MINOR_VERSION, $infodock_minor_version) - AC_DEFINE_UNQUOTED(INFODOCK_BUILD_VERSION, $infodock_build_version) - version=${infodock_major_version}.${infodock_minor_version}.${infodock_build_version} - PROGNAME=infodock - SHEBANG_PROGNAME=infodock-script - CPPFLAGS="$CPPFLAGS -DINFODOCK" -else - PROGNAME=xemacs - SHEBANG_PROGNAME=xemacs-script -fi +PROGNAME=xemacs +SHEBANG_PROGNAME=xemacs-script AC_SUBST(SHEBANG_PROGNAME)