comparison 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
comparison
equal deleted inserted replaced
5227:fbd1485af104 5228:5efbd1253905
975 development environment.]), 975 development environment.]),
976 [], []) 976 [], [])
977 XE_MERGED_ARG([sparcworks], 977 XE_MERGED_ARG([sparcworks],
978 AS_HELP_STRING([--with-sparcworks],[Alias for --with-workshop]), 978 AS_HELP_STRING([--with-sparcworks],[Alias for --with-workshop]),
979 [], []) 979 [], [])
980 XE_MERGED_ARG([infodock],
981 AS_HELP_STRING([--with-infodock],[Support the Infodock version of XEmacs. Infodock is a SourceForge project).]),
982 [], [])
983 dnl 980 dnl
984 XE_HELP_SUBSECTION([Debugging options]) 981 XE_HELP_SUBSECTION([Debugging options])
985 XE_MERGED_ARG([debug], 982 XE_MERGED_ARG([debug],
986 AS_HELP_STRING([--with-debug],[Enable additional debugging information. No noticeable time cost (unlike 983 AS_HELP_STRING([--with-debug],[Enable additional debugging information. No noticeable time cost (unlike
987 `--with-error-checking'). This turns adds `-g' to the compiler options so that 984 `--with-error-checking'). This turns adds `-g' to the compiler options so that
1226 if test "$xemacs_release_date" != ""; then 1223 if test "$xemacs_release_date" != ""; then
1227 AC_DEFINE_UNQUOTED(XEMACS_RELEASE_DATE, "$xemacs_release_date") 1224 AC_DEFINE_UNQUOTED(XEMACS_RELEASE_DATE, "$xemacs_release_date")
1228 fi 1225 fi
1229 AC_DEFINE_UNQUOTED(EMACS_VERSION, "$version") 1226 AC_DEFINE_UNQUOTED(EMACS_VERSION, "$version")
1230 1227
1231 if test "$with_infodock" = "yes"; then 1228 PROGNAME=xemacs
1232 if test ! -f ../../ID-INSTALL; then 1229 SHEBANG_PROGNAME=xemacs-script
1233 echo "Cannot build InfoDock without InfoDock sources"
1234 with_infodock=no
1235 fi
1236 fi
1237
1238 if test "$with_infodock" = "yes"; then
1239 dnl InfoDock version numbers. XEmacs will use the same style of numbering
1240 dnl after the release of XEmacs 21.0.
1241 AC_DEFINE_UNQUOTED(INFODOCK_MAJOR_VERSION, $infodock_major_version)
1242 AC_DEFINE_UNQUOTED(INFODOCK_MINOR_VERSION, $infodock_minor_version)
1243 AC_DEFINE_UNQUOTED(INFODOCK_BUILD_VERSION, $infodock_build_version)
1244 version=${infodock_major_version}.${infodock_minor_version}.${infodock_build_version}
1245 PROGNAME=infodock
1246 SHEBANG_PROGNAME=infodock-script
1247 CPPFLAGS="$CPPFLAGS -DINFODOCK"
1248 else
1249 PROGNAME=xemacs
1250 SHEBANG_PROGNAME=xemacs-script
1251 fi
1252 1230
1253 AC_SUBST(SHEBANG_PROGNAME) 1231 AC_SUBST(SHEBANG_PROGNAME)
1254 1232
1255 AC_DEFINE_UNQUOTED(EMACS_PROGNAME, "$PROGNAME") 1233 AC_DEFINE_UNQUOTED(EMACS_PROGNAME, "$PROGNAME")
1256 1234