Mercurial > hg > xemacs-beta
diff configure @ 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 308d34e9f07d |
line wrap: on
line diff
--- a/configure Sun Jun 06 13:24:31 2010 +0100 +++ b/configure Mon Jun 07 18:42:10 2010 +0100 @@ -1005,8 +1005,6 @@ with_workshop enable_sparcworks with_sparcworks -enable_infodock -with_infodock enable_debug with_debug enable_error_checking @@ -1952,8 +1950,6 @@ --with-workshop Support the Sun WorkShop (formerly Sparcworks) development environment. --with-sparcworks Alias for --with-workshop - --with-infodock Support the Infodock version of XEmacs. Infodock is - a SourceForge project). Debugging options ----------------- @@ -5190,22 +5186,6 @@ withval="$with_sparcworks" fi; -# If --with-infodock or --without-infodock were given then copy the value to the -# equivalent enable_infodock variable. -if test "${with_infodock+set}" = set; then - enable_infodock="$with_infodock" -fi; -# If -enable-infodock or --disable-infodock were given then copy the value to the -# equivalent with_infodock variable. -if test "${enable_infodock+set}" = set; then - with_infodock="$enable_infodock" -fi; -# Check whether --with-infodock or --without-infodock was given. -if test "${with_infodock+set}" = set; then - enableval="$with_infodock" - withval="$with_infodock" - -fi; # If --with-debug or --without-debug were given then copy the value to the # equivalent enable_debug variable. @@ -5716,34 +5696,8 @@ _ACEOF -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 - cat >>confdefs.h <<_ACEOF -#define INFODOCK_MAJOR_VERSION $infodock_major_version -_ACEOF - - cat >>confdefs.h <<_ACEOF -#define INFODOCK_MINOR_VERSION $infodock_minor_version -_ACEOF - - cat >>confdefs.h <<_ACEOF -#define INFODOCK_BUILD_VERSION $infodock_build_version -_ACEOF - - 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