--- pgnus-0.63/lisp/dgnushack.el.in.dist Mon Jun 22 23:13:12 1998 +++ dgnushack.el.in Fri Dec 4 22:31:15 1998 @@ -0,0 +1,88 @@ +;;; dgnushack.el --- a hack to set the load path for byte-compiling +;; Copyright (C) 1994,95,96,97,98 Free Software Foundation, Inc. + +;; Author: Lars Magne Ingebrigtsen +;; Version: 4.19 +;; Keywords: news, path + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, +;; Boston, MA 02111-1307, USA. + +;;; Commentary: + +;;; Code: + +(fset 'facep 'ignore) + +(require 'cl) +(require 'bytecomp) +(push "@CUSTOM@" load-path) +(push "." load-path) +(load "./lpath.el" nil t) + +(defalias 'device-sound-enabled-p 'ignore) +(defalias 'play-sound-file 'ignore) +(defalias 'nndb-request-article 'ignore) +(defalias 'efs-re-read-dir 'ignore) +(defalias 'ange-ftp-re-read-dir 'ignore) +(defalias 'define-mail-user-agent 'ignore) + +(eval-and-compile + (unless (string-match "XEmacs" emacs-version) + (fset 'get-popup-menu-response 'ignore) + (fset 'event-object 'ignore) + (fset 'x-defined-colors 'ignore) + (fset 'read-color 'ignore))) + +(defun dgnushack-compile (&optional warn) + ;;(setq byte-compile-dynamic t) + (unless warn + (setq byte-compile-warnings + '(free-vars unresolved callargs redefine))) + (unless (locate-library "cus-edit") + (error "You do not seem to have Custom installed. +Fetch it from . +You also then need to add the following to the lisp/dgnushack.el file: + + (push \"@CUSTOM@\" load-path) + +Modify to suit your needs.")) + (let ((files (directory-files "." nil "^[^=].*\\.el$")) + (xemacs (string-match "XEmacs" emacs-version)) + ;;(byte-compile-generate-call-tree t) + file elc) + (condition-case () + (require 'w3-forms) + (error (setq files (delete "nnweb.el" (delete "nnlistserv.el" files))))) + (while (setq file (pop files)) + (when (or (and (not xemacs) + (not (member file '("gnus-xmas.el" "gnus-picon.el" + "messagexmas.el" "nnheaderxm.el" + "smiley.el" "x-overlay.el")))) + (and xemacs + (not (member file '("md5.el"))))) + (when (or (not (file-exists-p (setq elc (concat file "c")))) + (file-newer-than-file-p file elc)) + (ignore-errors + (byte-compile-file file))))))) + +(defun dgnushack-recompile () + (require 'gnus) + (byte-recompile-directory "." 0)) + +;;; dgnushack.el ends here + --- pgnus-0.63/lisp/dgnushack.el.dist Sun May 31 22:30:13 1998 +++ pgnus-0.63/lisp/dgnushack.el Mon Jun 22 23:31:20 1998 @@ -1,87 +0,0 @@ -;;; dgnushack.el --- a hack to set the load path for byte-compiling -;; Copyright (C) 1994,95,96,97,98 Free Software Foundation, Inc. - -;; Author: Lars Magne Ingebrigtsen -;; Version: 4.19 -;; Keywords: news, path - -;; This file is part of GNU Emacs. - -;; GNU Emacs is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 2, or (at your option) -;; any later version. - -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. - -;;; Commentary: - -;;; Code: - -(fset 'facep 'ignore) - -(require 'cl) -(require 'bytecomp) -(push "." load-path) -(load "./lpath.el" nil t) - -(defalias 'device-sound-enabled-p 'ignore) -(defalias 'play-sound-file 'ignore) -(defalias 'nndb-request-article 'ignore) -(defalias 'efs-re-read-dir 'ignore) -(defalias 'ange-ftp-re-read-dir 'ignore) -(defalias 'define-mail-user-agent 'ignore) - -(eval-and-compile - (unless (string-match "XEmacs" emacs-version) - (fset 'get-popup-menu-response 'ignore) - (fset 'event-object 'ignore) - (fset 'x-defined-colors 'ignore) - (fset 'read-color 'ignore))) - -(defun dgnushack-compile (&optional warn) - ;;(setq byte-compile-dynamic t) - (unless warn - (setq byte-compile-warnings - '(free-vars unresolved callargs redefine))) - (unless (locate-library "cus-edit") - (error "You do not seem to have Custom installed. -Fetch it from . -You also then need to add the following to the lisp/dgnushack.el file: - - (push \"/afs/sipb.mit.edu/contrib/emacs/packages/custom\" load-path) - -Modify to suit your needs.")) - (let ((files (directory-files "." nil "^[^=].*\\.el$")) - (xemacs (string-match "XEmacs" emacs-version)) - ;;(byte-compile-generate-call-tree t) - file elc) - (condition-case () - (require 'w3-forms) - (error (setq files (delete "nnweb.el" (delete "nnlistserv.el" files))))) - (while (setq file (pop files)) - (when (or (and (not xemacs) - (not (member file '("gnus-xmas.el" "gnus-picon.el" - "messagexmas.el" "nnheaderxm.el" - "smiley.el" "x-overlay.el")))) - (and xemacs - (not (member file '("md5.el"))))) - (when (or (not (file-exists-p (setq elc (concat file "c")))) - (file-newer-than-file-p file elc)) - (ignore-errors - (byte-compile-file file))))))) - -(defun dgnushack-recompile () - (require 'gnus) - (byte-recompile-directory "." 0)) - -;;; dgnushack.el ends here - --- pgnus-0.63/configure.dist Sat Feb 28 02:20:19 1998 +++ pgnus-0.63/configure Sun Mar 8 18:32:07 1998 @@ -11,6 +11,12 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: +ac_help="$ac_help +--with-xemacs Use XEmacs to build" +ac_help="$ac_help +--with-emacs Use Emacs to build" +ac_help="$ac_help +--with-custom Specify where to find the custom package" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -519,7 +525,7 @@ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:523: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:529: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -575,7 +581,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:579: checking for a BSD compatible install" >&5 +echo "configure:585: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -624,13 +630,59 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +# Check whether --with-xemacs or --without-xemacs was given. +if test "${with_xemacs+set}" = set; then + withval="$with_xemacs" + if test "${withval}" = "yes"; then EMACS=xemacs; else EMACS=${withval}; fi +fi + +# Check whether --with-emacs or --without-emacs was given. +if test "${with_emacs+set}" = set; then + withval="$with_emacs" + if test "${withval}" = "yes"; then EMACS=emacs; else EMACS=${withval}; fi +fi + + +# Extract the first word of "makeinfo", so it can be a program name with args. +set dummy makeinfo; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:651: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$MAKEINFO"; then + ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_MAKEINFO="makeinfo" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_MAKEINFO" && ac_cv_prog_MAKEINFO="\$(EMACS) -batch -q -l texinfmt -f batch-texinfo-format" +fi +fi +MAKEINFO="$ac_cv_prog_MAKEINFO" +if test -n "$MAKEINFO"; then + echo "$ac_t""$MAKEINFO" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + # If set to t, that means we are running in a shell under Emacs. # If you have an Emacs named "t", then use the full path. - test "$EMACS" = t && EMACS= - # Extract the first word of "emacs xemacs", so it can be a program name with args. -set dummy emacs xemacs; ac_word=$2 + if test "${EMACS}" = t; then + EMACS= + fi + # Extract the first word of "emacs", so it can be a program name with args. +set dummy emacs; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:634: checking for $ac_word" >&5 +echo "configure:686: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_EMACS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -640,7 +692,7 @@ ;; *) IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + for ac_dir in no$ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_EMACS="$ac_dir/$ac_word" @@ -648,7 +700,7 @@ fi done IFS="$ac_save_ifs" - test -z "$ac_cv_path_EMACS" && ac_cv_path_EMACS="no" + test -z "$ac_cv_path_EMACS" && ac_cv_path_EMACS="xemacs" ;; esac fi @@ -661,7 +713,7 @@ if test $EMACS != "no"; then echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6 -echo "configure:665: checking where .elc files should go" >&5 +echo "configure:717: checking where .elc files should go" >&5 lispdir="\$(datadir)/emacs/site-lisp" if test "x$prefix" = "xNONE"; then if test -d $ac_default_prefix/share/emacs/site-lisp; then @@ -683,38 +735,266 @@ echo "$ac_t""$lispdir" 1>&6 fi -# Extract the first word of "makeinfo", so it can be a program name with args. -set dummy makeinfo; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:690: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_MAKEINFO'+set}'`\" = set"; then + + +echo $ac_n "checking for acceptable custom library""... $ac_c" 1>&6 +echo "configure:742: checking for acceptable custom library" >&5 +if eval "test \"`echo '$''{'EMACS_cv_ACCEPTABLE_CUSTOM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - case "$MAKEINFO" in - /*) - ac_cv_path_MAKEINFO="$MAKEINFO" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_MAKEINFO="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_MAKEINFO" && ac_cv_path_MAKEINFO="no" - ;; -esac + + +if test -z ""noecho""; then + echo $ac_n "checking for widget-convert-text in widget""... $ac_c" 1>&6 +echo "configure:750: checking for widget-convert-text in widget" >&5 fi -MAKEINFO="$ac_cv_path_MAKEINFO" -if test -n "$MAKEINFO"; then - echo "$ac_t""$MAKEINFO" 1>&6 +library=`echo widget | tr _ -` + +elisp="(progn (fmakunbound 'widget-convert-text) (condition-case nil (progn (require '$library) (fboundp 'widget-convert-text)) (error nil)))" +if test -z ""noecho""; then + echo $ac_n "checking for widget""... $ac_c" 1>&6 +echo "configure:757: checking for widget" >&5 +fi +if eval "test \"`echo '$''{'EMACS_cv_SYS_widget'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - echo "$ac_t""no" 1>&6 + + OUTPUT=./conftest-$$ + ${EMACS} -batch -eval "(let ((x ${elisp})) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil \"${OUTPUT}\"))" > /dev/null 2>&1 + retval=`cat ${OUTPUT}` + rm -f ${OUTPUT} + EMACS_cv_SYS_widget=$retval + +fi + +widget=${EMACS_cv_SYS_widget} +if test -z ""noecho""; then + echo "$ac_t""$widget" 1>&6 +fi + +if test "${EMACS_cv_SYS_widget}" = "nil"; then + EMACS_cv_SYS_widget=no +fi +HAVE_widget=${EMACS_cv_SYS_widget} + +if test -z ""noecho""; then + echo "$ac_t""$HAVE_widget" 1>&6 +fi + + +if test -z ""noecho""; then + echo $ac_n "checking for widget-convert-text in wid_edit""... $ac_c" 1>&6 +echo "configure:788: checking for widget-convert-text in wid_edit" >&5 +fi +library=`echo wid_edit | tr _ -` + +elisp="(progn (fmakunbound 'widget-convert-text) (condition-case nil (progn (require '$library) (fboundp 'widget-convert-text)) (error nil)))" +if test -z ""noecho""; then + echo $ac_n "checking for wid_edit""... $ac_c" 1>&6 +echo "configure:795: checking for wid_edit" >&5 +fi +if eval "test \"`echo '$''{'EMACS_cv_SYS_wid_edit'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + OUTPUT=./conftest-$$ + ${EMACS} -batch -eval "(let ((x ${elisp})) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil \"${OUTPUT}\"))" > /dev/null 2>&1 + retval=`cat ${OUTPUT}` + rm -f ${OUTPUT} + EMACS_cv_SYS_wid_edit=$retval + +fi + +wid_edit=${EMACS_cv_SYS_wid_edit} +if test -z ""noecho""; then + echo "$ac_t""$wid_edit" 1>&6 +fi + +if test "${EMACS_cv_SYS_wid_edit}" = "nil"; then + EMACS_cv_SYS_wid_edit=no +fi +HAVE_wid_edit=${EMACS_cv_SYS_wid_edit} + +if test -z ""noecho""; then + echo "$ac_t""$HAVE_wid_edit" 1>&6 +fi + +if test "${HAVE_widget}" = "yes"; then + EMACS_cv_ACCEPTABLE_CUSTOM=yes +else + if test "${HAVE_wid_edit}" != "no"; then + EMACS_cv_ACCEPTABLE_CUSTOM=yes + else + EMACS_cv_ACCEPTABLE_CUSTOM=no + fi +fi +if test "${EMACS_cv_ACCEPTABLE_CUSTOM}" = "yes"; then + +elisp="(file-name-directory (locate-library \"widget\"))" +if test -z ""noecho""; then + echo $ac_n "checking for widget_dir""... $ac_c" 1>&6 +echo "configure:837: checking for widget_dir" >&5 +fi +if eval "test \"`echo '$''{'EMACS_cv_SYS_widget_dir'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + OUTPUT=./conftest-$$ + ${EMACS} -batch -eval "(let ((x ${elisp})) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil \"${OUTPUT}\"))" > /dev/null 2>&1 + retval=`cat ${OUTPUT}` + rm -f ${OUTPUT} + EMACS_cv_SYS_widget_dir=$retval + +fi + +widget_dir=${EMACS_cv_SYS_widget_dir} +if test -z ""noecho""; then + echo "$ac_t""$widget_dir" 1>&6 +fi + + EMACS_cv_ACCEPTABLE_CUSTOM=$EMACS_cv_SYS_widget_dir +fi + +fi + + # Check whether --with-custom or --without-custom was given. +if test "${with_custom+set}" = set; then + withval="$with_custom" + EMACS_cv_ACCEPTABLE_CUSTOM="$withval" +fi + + CUSTOM=${EMACS_cv_ACCEPTABLE_CUSTOM} + echo "$ac_t"""${CUSTOM}"" 1>&6 + + +echo $ac_n "checking how to rebuild custom autoloads""... $ac_c" 1>&6 +echo "configure:872: checking how to rebuild custom autoloads" >&5 +if eval "test \"`echo '$''{'EMACS_cv_REBUILD_CUSTOMLOADS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + +if test -z ""noecho""; then + echo $ac_n "checking for Custom-make-dependencies in cus_dep""... $ac_c" 1>&6 +echo "configure:880: checking for Custom-make-dependencies in cus_dep" >&5 +fi +library=`echo cus_dep | tr _ -` + +elisp="(progn (fmakunbound 'Custom-make-dependencies) (condition-case nil (progn (require '$library) (fboundp 'Custom-make-dependencies)) (error nil)))" +if test -z ""noecho""; then + echo $ac_n "checking for cus_dep""... $ac_c" 1>&6 +echo "configure:887: checking for cus_dep" >&5 +fi +if eval "test \"`echo '$''{'EMACS_cv_SYS_cus_dep'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + OUTPUT=./conftest-$$ + ${EMACS} -batch -eval "(let ((x ${elisp})) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil \"${OUTPUT}\"))" > /dev/null 2>&1 + retval=`cat ${OUTPUT}` + rm -f ${OUTPUT} + EMACS_cv_SYS_cus_dep=$retval + +fi + +cus_dep=${EMACS_cv_SYS_cus_dep} +if test -z ""noecho""; then + echo "$ac_t""$cus_dep" 1>&6 +fi + +if test "${EMACS_cv_SYS_cus_dep}" = "nil"; then + EMACS_cv_SYS_cus_dep=no +fi +HAVE_cus_dep=${EMACS_cv_SYS_cus_dep} + +if test -z ""noecho""; then + echo "$ac_t""$HAVE_cus_dep" 1>&6 fi +EMACS_cv_REBUILD_CUSTOMLOADS=${HAVE_cus_dep} + +fi + +if test "${EMACS_cv_REBUILD_CUSTOMLOADS}" != "no"; then + REBUILD_CUSTOMLOADS='$(EMACS) $(BATCHFLAGS) -l cus-dep -f Custom-make-dependencies .' +else + REBUILD_CUSTOMLOADS='touch custom-load.el' +fi +echo "$ac_t"""${REBUILD_CUSTOMLOADS}"" 1>&6 + + + +echo $ac_n "checking how to rebuild autoloads""... $ac_c" 1>&6 +echo "configure:929: checking how to rebuild autoloads" >&5 +if eval "test \"`echo '$''{'EMACS_cv_REBUILD_AUTOLOADS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + +if test -z ""noecho""; then + echo $ac_n "checking for batch-update-directory in autoload""... $ac_c" 1>&6 +echo "configure:937: checking for batch-update-directory in autoload" >&5 +fi +library=`echo autoload | tr _ -` + +elisp="(progn (fmakunbound 'batch-update-directory) (condition-case nil (progn (require '$library) (fboundp 'batch-update-directory)) (error nil)))" +if test -z ""noecho""; then + echo $ac_n "checking for autoload""... $ac_c" 1>&6 +echo "configure:944: checking for autoload" >&5 +fi +if eval "test \"`echo '$''{'EMACS_cv_SYS_autoload'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + OUTPUT=./conftest-$$ + ${EMACS} -batch -eval "(let ((x ${elisp})) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil \"${OUTPUT}\"))" > /dev/null 2>&1 + retval=`cat ${OUTPUT}` + rm -f ${OUTPUT} + EMACS_cv_SYS_autoload=$retval + +fi + +autoload=${EMACS_cv_SYS_autoload} +if test -z ""noecho""; then + echo "$ac_t""$autoload" 1>&6 +fi + +if test "${EMACS_cv_SYS_autoload}" = "nil"; then + EMACS_cv_SYS_autoload=no +fi +HAVE_autoload=${EMACS_cv_SYS_autoload} + +if test -z ""noecho""; then + echo "$ac_t""$HAVE_autoload" 1>&6 +fi + +EMACS_cv_REBUILD_AUTOLOADS=${HAVE_autoload} + +fi + +if test "${EMACS_cv_REBUILD_AUTOLOADS}" != "no"; then + REBUILD_AUTOLOADS='$(EMACS) $(BATCHFLAGS) -eval "(setq autoload-package-name \"gnus\")" -l autoload -f batch-update-directory .' +else + REBUILD_AUTOLOADS='touch auto-autoloads.el' +fi +echo "$ac_t"""${REBUILD_AUTOLOADS}"" 1>&6 + + + +if test "${CUSTOM}" = "no"; then +echo "configure: warning: " "" 1>&2 +echo "configure: warning: No usable version of the widget/custom libraries have been" 1>&2 +echo "configure: warning: detected on your system. This version of Gnus requires" 1>&2 +echo "configure: warning: features present in newer versions of the widget library." 1>&2 +echo "configure: warning: " "" 1>&2 +echo "configure: warning: Please upgrade to the latest version of custom available." 1>&2 +echo "configure: warning: This package is included with Emacs 20.1 and XEmacs 20.3" 1>&2 +echo "configure: warning: or from http://www.dina.kvl.dk/~abraham/custom/" 1>&2 +echo "configure: warning: or /ftp.dina.kvl.dk:/pub/Staff/Per.Abrahamsen/custom/" 1>&2 +echo "configure: warning: " "" 1>&2 +fi + + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -828,7 +1108,7 @@ ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo "Makefile lisp/Makefile texi/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "Makefile lisp/Makefile texi/Makefile lisp/dgnushack.el" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then --- pgnus-0.63/aclocal.m4.dist Sat Feb 28 02:20:19 1998 +++ pgnus-0.63/aclocal.m4 Fri Feb 27 23:38:24 1998 @@ -3,8 +3,10 @@ AC_DEFUN(AM_PATH_LISPDIR, [# If set to t, that means we are running in a shell under Emacs. # If you have an Emacs named "t", then use the full path. - test "$EMACS" = t && EMACS= - AC_PATH_PROG(EMACS, emacs xemacs, no) + if test "${EMACS}" = t; then + EMACS= + fi + AC_PATH_PROG(EMACS, emacs, xemacs, no) if test $EMACS != "no"; then AC_MSG_CHECKING([where .elc files should go]) dnl Set default value @@ -29,3 +31,136 @@ AC_MSG_RESULT($lispdir) fi AC_SUBST(lispdir)]) + +dnl +dnl Execute arbitrary emacs lisp +dnl +AC_DEFUN(AC_EMACS_LISP, [ +elisp="$2" +if test -z "$3"; then + AC_MSG_CHECKING(for $1) +fi +AC_CACHE_VAL(EMACS_cv_SYS_$1,[ + OUTPUT=./conftest-$$ + ${EMACS} -batch -eval "(let ((x ${elisp})) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil \"${OUTPUT}\"))" > /dev/null 2>&1 + retval=`cat ${OUTPUT}` + rm -f ${OUTPUT} + EMACS_cv_SYS_$1=$retval +]) +$1=${EMACS_cv_SYS_$1} +if test -z "$3"; then + AC_MSG_RESULT($$1) +fi +]) + +dnl +dnl Determine the emacs version we are running. +dnl Automatically substitutes @EMACS_VERSION@ with this number. +dnl +AC_DEFUN(AC_EMACS_VERSION, [ +AC_MSG_CHECKING(for emacs version) +AC_EMACS_LISP(version,(and (boundp 'emacs-major-version) (format \"%d.%d\" emacs-major-version emacs-minor-version)),"noecho") + +EMACS_VERSION=${EMACS_cv_SYS_version} +AC_SUBST(EMACS_VERSION) +AC_MSG_RESULT(${EMACS_VERSION}) +]) + +dnl +dnl Check whether a function exists in a library +dnl All '_' characters in the first argument are converted to '-' +dnl +AC_DEFUN(AC_EMACS_CHECK_LIB, [ +if test -z "$3"; then + AC_MSG_CHECKING(for $2 in $1) +fi +library=`echo $1 | tr _ -` +AC_EMACS_LISP($1,(progn (fmakunbound '$2) (condition-case nil (progn (require '$library) (fboundp '$2)) (error nil))),"noecho") +if test "${EMACS_cv_SYS_$1}" = "nil"; then + EMACS_cv_SYS_$1=no +fi +HAVE_$1=${EMACS_cv_SYS_$1} +AC_SUBST(HAVE_$1) +if test -z "$3"; then + AC_MSG_RESULT($HAVE_$1) +fi +]) + +dnl +dnl Check whether a variable exists in a library +dnl All '_' characters in the first argument are converted to '-' +dnl +AC_DEFUN(AC_EMACS_CHECK_VAR, [ +AC_MSG_CHECKING(for $2 in $1) +library=`echo $1 | tr _ -` +AC_EMACS_LISP($1,(progn (makunbound '$2) (condition-case nil (progn (require '$library) (boundp '$2)) (error nil))),"noecho") +if test "${EMACS_cv_SYS_$1}" = "nil"; then + EMACS_cv_SYS_$1=no +fi +HAVE_$1=${EMACS_cv_SYS_$1} +AC_SUBST(HAVE_$1) +AC_MSG_RESULT($HAVE_$1) +]) + +dnl +dnl Perform sanity checking and try to locate the custom and widget packages +dnl +AC_DEFUN(AC_CHECK_CUSTOM, [ +AC_MSG_CHECKING(for acceptable custom library) +AC_CACHE_VAL(EMACS_cv_ACCEPTABLE_CUSTOM,[ +AC_EMACS_CHECK_LIB(widget,widget-convert-text,"noecho") +AC_EMACS_CHECK_LIB(wid_edit,widget-convert-text,"noecho") +if test "${HAVE_widget}" = "yes"; then + EMACS_cv_ACCEPTABLE_CUSTOM=yes +else + if test "${HAVE_wid_edit}" != "no"; then + EMACS_cv_ACCEPTABLE_CUSTOM=yes + else + EMACS_cv_ACCEPTABLE_CUSTOM=no + fi +fi +if test "${EMACS_cv_ACCEPTABLE_CUSTOM}" = "yes"; then + AC_EMACS_LISP(widget_dir,(file-name-directory (locate-library \"widget\")),"noecho") + EMACS_cv_ACCEPTABLE_CUSTOM=$EMACS_cv_SYS_widget_dir +fi +]) + AC_ARG_WITH(custom, --with-custom Specify where to find the custom package, [ EMACS_cv_ACCEPTABLE_CUSTOM="$withval" ]) + CUSTOM=${EMACS_cv_ACCEPTABLE_CUSTOM} + AC_MSG_RESULT("${CUSTOM}") +]) + +dnl +dnl Figure out how we can rebuild auto-autoloads.el +dnl +AC_DEFUN(AC_CHECK_AUTOLOADS, [ +AC_MSG_CHECKING(how to rebuild autoloads) +AC_CACHE_VAL(EMACS_cv_REBUILD_AUTOLOADS,[ +AC_EMACS_CHECK_LIB(autoload,batch-update-directory,"noecho") +EMACS_cv_REBUILD_AUTOLOADS=${HAVE_autoload} +]) +if test "${EMACS_cv_REBUILD_AUTOLOADS}" != "no"; then + REBUILD_AUTOLOADS='$(EMACS) $(BATCHFLAGS) -eval "(setq autoload-package-name \"$1\")" -l autoload -f batch-update-directory .' +else + REBUILD_AUTOLOADS='touch auto-autoloads.el' +fi +AC_MSG_RESULT("${REBUILD_AUTOLOADS}") +AC_SUBST(REBUILD_AUTOLOADS) +]) + +dnl +dnl Figure out how we can rebuild custom-load.el +dnl +AC_DEFUN(AC_CHECK_CUSTOMLOADS, [ +AC_MSG_CHECKING(how to rebuild custom autoloads) +AC_CACHE_VAL(EMACS_cv_REBUILD_CUSTOMLOADS,[ +AC_EMACS_CHECK_LIB(cus_dep,Custom-make-dependencies,"noecho") +EMACS_cv_REBUILD_CUSTOMLOADS=${HAVE_cus_dep} +]) +if test "${EMACS_cv_REBUILD_CUSTOMLOADS}" != "no"; then + REBUILD_CUSTOMLOADS='$(EMACS) $(BATCHFLAGS) -l cus-dep -f Custom-make-dependencies .' +else + REBUILD_CUSTOMLOADS='touch custom-load.el' +fi +AC_MSG_RESULT("${REBUILD_CUSTOMLOADS}") +AC_SUBST(REBUILD_CUSTOMLOADS) +]) --- pgnus-0.63/configure.in.dist Sat Feb 28 02:20:19 1998 +++ pgnus-0.63/configure.in Sun Mar 8 18:32:01 1998 @@ -1,6 +1,30 @@ AC_INIT(lisp/gnus.el) AC_SET_MAKE AC_PROG_INSTALL + +AC_ARG_WITH(xemacs, --with-xemacs Use XEmacs to build, [ if test "${withval}" = "yes"; then EMACS=xemacs; else EMACS=${withval}; fi ]) +AC_ARG_WITH(emacs, --with-emacs Use Emacs to build, [ if test "${withval}" = "yes"; then EMACS=emacs; else EMACS=${withval}; fi ]) + +AC_CHECK_PROG(MAKEINFO, makeinfo, makeinfo, \$(EMACS) -batch -q -l texinfmt -f batch-texinfo-format) + AM_PATH_LISPDIR -AC_PATH_PROG(MAKEINFO, makeinfo, no) -AC_OUTPUT(Makefile lisp/Makefile texi/Makefile) + +AC_CHECK_CUSTOM +AC_CHECK_CUSTOMLOADS +AC_CHECK_AUTOLOADS(gnus) + +if test "${CUSTOM}" = "no"; then +AC_MSG_WARN(" ") +AC_MSG_WARN(No usable version of the widget/custom libraries have been) +AC_MSG_WARN(detected on your system. This version of Gnus requires) +AC_MSG_WARN(features present in newer versions of the widget library.) +AC_MSG_WARN(" ") +AC_MSG_WARN(Please upgrade to the latest version of custom available.) +AC_MSG_WARN(This package is included with Emacs 20.1 and XEmacs 20.3) +AC_MSG_WARN(or from http://www.dina.kvl.dk/~abraham/custom/) +AC_MSG_WARN(or /ftp.dina.kvl.dk:/pub/Staff/Per.Abrahamsen/custom/) +AC_MSG_WARN(" ") +fi +AC_SUBST(CUSTOM) + +AC_OUTPUT(Makefile lisp/Makefile texi/Makefile lisp/dgnushack.el)