fi
- GNUS_PRODUCT_NAME=t-gnus
+echo $ac_n "defining gnus product name... $ac_c"
+ if eval "test \"\${EMACS_cv_GNUS_PRODUCT_NAME+set}\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ EMACS_cv_GNUS_PRODUCT_NAME=t-gnus
+fi
+
+ GNUS_PRODUCT_NAME=${EMACS_cv_GNUS_PRODUCT_NAME}
+ echo "$ac_t""${GNUS_PRODUCT_NAME}" 1>&6
+
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:541: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:550: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
# 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:598: checking for a BSD compatible install" >&5
+echo "configure:607: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"\${ac_cv_path_install+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
# 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:657: checking for $ac_word" >&5
+echo "configure:666: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_MAKEINFO+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo "$ac_t""no" 1>&6
fi
+
+ test x$EMACS = xt && EMACS=
+
+ unset ac_cv_prog_EMACS; unset ac_cv_prog_XEMACS;
+
# Check whether --with-emacs or --without-emacs was given.
if test "${with_emacs+set}" = set; then
withval="$with_emacs"
- if test x$withval = xyes -o x$withval = xt -o x$withval = x; then
+ if test x$withval = xyes -o x$withval = x; then
for ac_prog in emacs xemacs mule
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:693: checking for $ac_word" >&5
+echo "configure:707: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_EMACS+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "$withval", so it can be a program name with args.
set dummy $withval; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:727: checking for $ac_word" >&5
+echo "configure:741: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_EMACS+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "xemacs", so it can be a program name with args.
set dummy xemacs; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:764: checking for $ac_word" >&5
+echo "configure:778: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_XEMACS+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "$withval", so it can be a program name with args.
set dummy $withval; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:795: checking for $ac_word" >&5
+echo "configure:809: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_XEMACS+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
EMACS=$XEMACS
else
XEMACS=xemacs
- test x$EMACS = xt -o x$EMACS = x &&\
+ test x$EMACS = x &&\
for ac_prog in emacs xemacs mule
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:832: checking for $ac_word" >&5
+echo "configure:846: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_EMACS+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo $ac_n "checking what a flavor does $EMACS have""... $ac_c" 1>&6
-echo "configure:868: checking what a flavor does $EMACS have" >&5
+echo "configure:882: checking what a flavor does $EMACS have" >&5
+
+ unset EMACS_cv_SYS_flavor;
+
elisp="(cond ((featurep (quote xemacs)) \"XEmacs\")\
((boundp (quote MULE)) \"MULE\")\
(t \"FSF Emacs\"))"
if test -z ""noecho""; then
echo $ac_n "checking for flavor""... $ac_c" 1>&6
-echo "configure:875: checking for flavor" >&5
+echo "configure:892: checking for flavor" >&5
fi
if eval "test \"\${EMACS_cv_SYS_flavor+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
echo "$ac_t""$EMACS_cv_SYS_flavor" 1>&6
if test "$prefix" = "NONE"; then
echo $ac_n "checking prefix for your Emacs""... $ac_c" 1>&6
-echo "configure:907: checking prefix for your Emacs" >&5
+echo "configure:924: checking prefix for your Emacs" >&5
elisp="(expand-file-name \"..\" invocation-directory)"
if test -z ""noecho""; then
echo $ac_n "checking for prefix""... $ac_c" 1>&6
-echo "configure:912: checking for prefix" >&5
+echo "configure:929: checking for prefix" >&5
fi
if eval "test \"\${EMACS_cv_SYS_prefix+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
fi
echo $ac_n "checking where lisp files should go""... $ac_c" 1>&6
-echo "configure:943: checking where lisp files should go" >&5
+echo "configure:960: checking where lisp files should go" >&5
if test -z "$lispdir"; then
theprefix=$prefix
if test "x$theprefix" = "xNONE"; then
fi
done
fi
- echo "$ac_t""$lispdir
+ if test ${EMACS_FLAVOR} = xemacs; then
+ echo "$ac_t""$lispdir
(it will be ignored when \"make install-package[-ja]\" is done)" 1>&6
+ else
+ echo "$ac_t""$lispdir" 1>&6
+ fi
echo $ac_n "checking for acceptable W3 version""... $ac_c" 1>&6
-echo "configure:964: checking for acceptable W3 version" >&5
+echo "configure:985: checking for acceptable W3 version" >&5
+
+unset EMACS_cv_ACCEPTABLE_W3;
+unset EMACS_cv_SYS_w3_dir;
+unset EMACS_cv_SYS_w3_forms;
+
if eval "test \"\${EMACS_cv_ACCEPTABLE_W3+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test -z ""noecho""; then
echo $ac_n "checking for w3-form-encode-xwfu in w3_forms""... $ac_c" 1>&6
-echo "configure:972: checking for w3-form-encode-xwfu in w3_forms" >&5
+echo "configure:998: checking for w3-form-encode-xwfu in w3_forms" >&5
fi
library=`echo w3_forms | tr _ -`
elisp="(progn (fmakunbound (quote w3-form-encode-xwfu)) (condition-case nil (progn (require (quote $library)) (fboundp (quote w3-form-encode-xwfu))) (error (prog1 nil (message \"$library not found\")))))"
if test -z ""noecho""; then
echo $ac_n "checking for w3_forms""... $ac_c" 1>&6
-echo "configure:979: checking for w3_forms" >&5
+echo "configure:1005: checking for w3_forms" >&5
fi
if eval "test \"\${EMACS_cv_SYS_w3_forms+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
if test "${HAVE_w3_forms}" = "yes"; then
EMACS_cv_ACCEPTABLE_W3=yes
else
- EMACS_cv_ACCEPTABLE_W3=no
+ EMACS_cv_ACCEPTABLE_W3=
fi
-if test "${EMACS_cv_ACCEPTABLE_W3}" = "yes"; then
+if test "x${EMACS_cv_ACCEPTABLE_W3}" = "xyes"; then
elisp="(file-name-directory (locate-library \"w3-forms\"))"
if test -z ""noecho""; then
echo $ac_n "checking for w3_dir""... $ac_c" 1>&6
-echo "configure:1023: checking for w3_dir" >&5
+echo "configure:1049: checking for w3_dir" >&5
fi
if eval "test \"\${EMACS_cv_SYS_w3_dir+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
W3=${EMACS_cv_ACCEPTABLE_W3}
- echo "$ac_t"""${W3}"" 1>&6
-
- # Check whether --with-packagedir or --without-packagedir was given.
+ if test "x${EMACS_cv_ACCEPTABLE_W3}" = "x"; then
+ echo "$ac_t""not found" 1>&6
+ else
+ echo "$ac_t""${W3}" 1>&6
+ fi
+
+ if test ${EMACS_FLAVOR} = xemacs; then
+ echo $ac_n "checking where the XEmacs package is""... $ac_c" 1>&6
+echo "configure:1091: checking where the XEmacs package is" >&5
+ # Check whether --with-packagedir or --without-packagedir was given.
if test "${with_packagedir+set}" = set; then
withval="$with_packagedir"
if test x$withval != xyes -a x$withval != x; then
- echo $ac_n "checking where the package should go""... $ac_c" 1>&6
-echo "configure:1064: checking where the package should go" >&5
- PACKAGEDIR=$withval
- echo "$ac_t""$PACKAGEDIR" 1>&6
- fi
+ PACKAGEDIR=$withval
+ else
+
+elisp="(let (package-dir)\
+ (if (boundp (quote early-packages))\
+ (let ((dirs (delq nil (append (if early-package-load-path\
+ early-packages)\
+ (if late-package-load-path\
+ late-packages)\
+ (if last-package-load-path\
+ last-packages)))))\
+ (while (and dirs (not package-dir))\
+ (if (file-directory-p (car dirs))\
+ (setq package-dir (car dirs)\
+ dirs (cdr dirs))))))\
+ (or package-dir \"\"))"
+if test -z ""noecho""; then
+ echo $ac_n "checking for PACKAGEDIR""... $ac_c" 1>&6
+echo "configure:1114: checking for PACKAGEDIR" >&5
+fi
+if eval "test \"\${EMACS_cv_SYS_PACKAGEDIR+set}\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
- PACKAGEDIR=
+
+ OUTPUT=./conftest-$$
+ echo ${EMACS}' -batch -eval '\''(let ((x '${elisp}')) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil "'${OUTPUT}'" nil 5))'\' >& 5 2>&1
+ eval ${EMACS}' -batch -eval '\''(let ((x '${elisp}')) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil "'${OUTPUT}'" nil 5))'\' >& 5 2>&1
+ retval=`cat ${OUTPUT}`
+ echo "=> ${retval}" >& 5 2>&1
+ rm -f ${OUTPUT}
+ EMACS_cv_SYS_PACKAGEDIR=$retval
+
fi
+PACKAGEDIR=${EMACS_cv_SYS_PACKAGEDIR}
+if test -z ""noecho""; then
+ echo "$ac_t""$PACKAGEDIR" 1>&6
+fi
+
+ fi
+else
+
+elisp="(let (package-dir)\
+ (if (boundp (quote early-packages))\
+ (let ((dirs (delq nil (append (if early-package-load-path\
+ early-packages)\
+ (if late-package-load-path\
+ late-packages)\
+ (if last-package-load-path\
+ last-packages)))))\
+ (while (and dirs (not package-dir))\
+ (if (file-directory-p (car dirs))\
+ (setq package-dir (car dirs)\
+ dirs (cdr dirs))))))\
+ (or package-dir \"\"))"
+if test -z ""noecho""; then
+ echo $ac_n "checking for PACKAGEDIR""... $ac_c" 1>&6
+echo "configure:1153: checking for PACKAGEDIR" >&5
+fi
+if eval "test \"\${EMACS_cv_SYS_PACKAGEDIR+set}\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
+ OUTPUT=./conftest-$$
+ echo ${EMACS}' -batch -eval '\''(let ((x '${elisp}')) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil "'${OUTPUT}'" nil 5))'\' >& 5 2>&1
+ eval ${EMACS}' -batch -eval '\''(let ((x '${elisp}')) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil "'${OUTPUT}'" nil 5))'\' >& 5 2>&1
+ retval=`cat ${OUTPUT}`
+ echo "=> ${retval}" >& 5 2>&1
+ rm -f ${OUTPUT}
+ EMACS_cv_SYS_PACKAGEDIR=$retval
+
+fi
+
+PACKAGEDIR=${EMACS_cv_SYS_PACKAGEDIR}
+if test -z ""noecho""; then
+ echo "$ac_t""$PACKAGEDIR" 1>&6
+fi
+
+fi
+
+ if test x$PACKAGEDIR = x; then
+ echo "$ac_t""not found" 1>&6
+ else
+ echo "$ac_t""$PACKAGEDIR" 1>&6
+ fi
+ else
+ PACKAGEDIR=
+ fi
# Check whether --with-addpath or --without-addpath was given.
if test "${with_addpath+set}" = set; then
withval="$with_addpath"
if test x$withval != xyes -a x$withval != x; then
echo $ac_n "checking where to find the additional elisp libraries""... $ac_c" 1>&6
-echo "configure:1078: checking where to find the additional elisp libraries" >&5
+echo "configure:1190: checking where to find the additional elisp libraries" >&5
ADDITIONAL_LOAD_PATH=$withval
echo "$ac_t""$ADDITIONAL_LOAD_PATH" 1>&6
fi
s%@oldincludedir@%$oldincludedir%g
s%@infodir@%$infodir%g
s%@mandir@%$mandir%g
+s%@GNUS_PRODUCT_NAME@%$GNUS_PRODUCT_NAME%g
s%@SET_MAKE@%$SET_MAKE%g
s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
projects / elisp / gnus.git- / blobdiff