ac_help="$ac_help
--with-w3=DIR Specify where to find the w3 package"
ac_help="$ac_help
+ --with-fonts Assume all fonts required are available"
+ac_help="$ac_help
--with-packagedir=DIR package DIR for XEmacs"
ac_help="$ac_help
--with-addpath=PATH search Emacs-Lisp libraries with PATH
echo "$ac_t""${GNUS_PRODUCT_NAME}" 1>&6
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:554: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:556: 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:611: checking for a BSD compatible install" >&5
+echo "configure:613: 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:670: checking for $ac_word" >&5
+echo "configure:672: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_MAKEINFO+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
fi
- test x$EMACS = xt && EMACS=
+ test "$EMACS" = t && 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 = x; then
+ if test "$withval" = yes -o -z "$withval"; 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:711: checking for $ac_word" >&5
+echo "configure:713: 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:745: checking for $ac_word" >&5
+echo "configure:747: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_EMACS+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Check whether --with-xemacs or --without-xemacs was given.
if test "${with_xemacs+set}" = set; then
withval="$with_xemacs"
- if test x$withval = xyes -o x$withval = x; then
+ if test "$withval" = yes -o -z "$withval"; then
# 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:782: checking for $ac_word" >&5
+echo "configure:784: 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:813: checking for $ac_word" >&5
+echo "configure:815: 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 = x &&\
- for ac_prog in emacs xemacs mule
+ test -z "$EMACS" && 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:850: checking for $ac_word" >&5
+echo "configure:851: 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:886: checking what a flavor does $EMACS have" >&5
+echo "configure:887: checking what a flavor does $EMACS have" >&5
unset EMACS_cv_SYS_flavor;
(t \"FSF Emacs\"))"
if test -z ""noecho""; then
echo $ac_n "checking for flavor""... $ac_c" 1>&6
-echo "configure:896: checking for flavor" >&5
+echo "configure:897: checking for flavor" >&5
fi
if eval "test \"\${EMACS_cv_SYS_flavor+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
EMACS_FLAVOR=emacs;;
esac
echo "$ac_t""$EMACS_cv_SYS_flavor" 1>&6
- if test "$prefix" = "NONE"; then
+ if test "$prefix" = NONE; then
echo $ac_n "checking prefix for your Emacs""... $ac_c" 1>&6
-echo "configure:928: checking prefix for your Emacs" >&5
+echo "configure:929: 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:933: checking for prefix" >&5
+echo "configure:934: 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:964: checking where lisp files should go" >&5
+echo "configure:965: checking where lisp files should go" >&5
if test -z "$lispdir"; then
theprefix=$prefix
- if test "x$theprefix" = "xNONE"; then
+ if test "$theprefix" = NONE; then
theprefix=$ac_default_prefix
fi
lispdir="\$(datadir)/${EMACS_FLAVOR}/site-lisp/${GNUS_PRODUCT_NAME}"
fi
echo $ac_n "checking where etc files should go""... $ac_c" 1>&6
-echo "configure:995: checking where etc files should go" >&5
+echo "configure:996: checking where etc files should go" >&5
if test -z "$etcdir"; then
etcdir="\$(lispdir)/../etc"
fi
echo $ac_n "checking for acceptable URL version""... $ac_c" 1>&6
-echo "configure:1004: checking for acceptable URL version" >&5
+echo "configure:1005: checking for acceptable URL version" >&5
unset EMACS_cv_ACCEPTABLE_URL;
unset EMACS_cv_SYS_url_dir;
if test -z ""noecho""; then
echo $ac_n "checking for url-retrieve in url""... $ac_c" 1>&6
-echo "configure:1017: checking for url-retrieve in url" >&5
+echo "configure:1018: checking for url-retrieve in url" >&5
fi
library=`echo url | tr _ -`
elisp="(progn (fmakunbound (quote url-retrieve)) (condition-case nil (progn (require (quote $library)) (fboundp (quote url-retrieve))) (error (prog1 nil (message \"$library not found\")))))"
if test -z ""noecho""; then
echo $ac_n "checking for url""... $ac_c" 1>&6
-echo "configure:1024: checking for url" >&5
+echo "configure:1025: checking for url" >&5
fi
if eval "test \"\${EMACS_cv_SYS_url+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
echo "$ac_t""$url" 1>&6
fi
-if test "${EMACS_cv_SYS_url}" = "nil"; then
+if test "${EMACS_cv_SYS_url}" = nil; then
EMACS_cv_SYS_url=no
fi
-if test "${EMACS_cv_SYS_url}" = "t"; then
+if test "${EMACS_cv_SYS_url}" = t; then
EMACS_cv_SYS_url=yes
fi
HAVE_url=${EMACS_cv_SYS_url}
echo "$ac_t""$HAVE_url" 1>&6
fi
-if test "${HAVE_url}" = "yes"; then
+if test "${HAVE_url}" = yes; then
EMACS_cv_ACCEPTABLE_URL=yes
else
EMACS_cv_ACCEPTABLE_URL=
fi
-if test "x${EMACS_cv_ACCEPTABLE_URL}" = "xyes"; then
+if test "${EMACS_cv_ACCEPTABLE_URL}" = yes; then
elisp="(file-name-directory (locate-library \"url\"))"
if test -z ""noecho""; then
echo $ac_n "checking for url_dir""... $ac_c" 1>&6
-echo "configure:1068: checking for url_dir" >&5
+echo "configure:1069: checking for url_dir" >&5
fi
if eval "test \"\${EMACS_cv_SYS_url_dir+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
URL=${EMACS_cv_ACCEPTABLE_URL}
- if test "x${EMACS_cv_ACCEPTABLE_URL}" = "x"; then
+ if test -z "${EMACS_cv_ACCEPTABLE_URL}"; then
echo "$ac_t""not found" 1>&6
else
echo "$ac_t"""${URL}"" 1>&6
echo $ac_n "checking for acceptable W3 version""... $ac_c" 1>&6
-echo "configure:1110: checking for acceptable W3 version" >&5
+echo "configure:1111: checking for acceptable W3 version" >&5
unset EMACS_cv_ACCEPTABLE_W3;
unset EMACS_cv_SYS_w3_dir;
if test -z ""noecho""; then
echo $ac_n "checking for w3-form-encode-xwfu in w3_forms""... $ac_c" 1>&6
-echo "configure:1123: checking for w3-form-encode-xwfu in w3_forms" >&5
+echo "configure:1124: 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:1130: checking for w3_forms" >&5
+echo "configure:1131: 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
echo "$ac_t""$w3_forms" 1>&6
fi
-if test "${EMACS_cv_SYS_w3_forms}" = "nil"; then
+if test "${EMACS_cv_SYS_w3_forms}" = nil; then
EMACS_cv_SYS_w3_forms=no
fi
-if test "${EMACS_cv_SYS_w3_forms}" = "t"; then
+if test "${EMACS_cv_SYS_w3_forms}" = t; then
EMACS_cv_SYS_w3_forms=yes
fi
HAVE_w3_forms=${EMACS_cv_SYS_w3_forms}
echo "$ac_t""$HAVE_w3_forms" 1>&6
fi
-if test "${HAVE_w3_forms}" = "yes"; then
+if test "${HAVE_w3_forms}" = yes; then
EMACS_cv_ACCEPTABLE_W3=yes
else
EMACS_cv_ACCEPTABLE_W3=
fi
-if test "x${EMACS_cv_ACCEPTABLE_W3}" = "xyes"; then
+if test "${EMACS_cv_ACCEPTABLE_W3}" = yes; 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:1174: checking for w3_dir" >&5
+echo "configure:1175: 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}
- if test "x${EMACS_cv_ACCEPTABLE_W3}" = "x"; then
+ if test -z "${EMACS_cv_ACCEPTABLE_W3}"; then
echo "$ac_t""not found" 1>&6
else
echo "$ac_t""${W3}" 1>&6
fi
+
+test "$LATEX" = t && LATEX=
+test "$LATEX" || for ac_prog in latex
+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:1222: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_path_LATEX+set}\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ case "$LATEX" in
+ /*)
+ ac_cv_path_LATEX="$LATEX" # Let the user override the test with a path.
+ ;;
+ ?:/*)
+ ac_cv_path_LATEX="$LATEX" # Let the user override the test with a dos path.
+ ;;
+ *)
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_path_LATEX="$ac_dir/$ac_word"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+ ;;
+esac
+fi
+LATEX="$ac_cv_path_LATEX"
+if test -n "$LATEX"; then
+ echo "$ac_t""$LATEX" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+test -n "$LATEX" && break
+done
+test -n "$LATEX" || LATEX="no"
+
+echo $ac_n "checking for available fonts""... $ac_c" 1>&6
+echo "configure:1259: checking for available fonts" >&5
+# Check whether --with-fonts or --without-fonts was given.
+if test "${with_fonts+set}" = set; then
+ withval="$with_fonts"
+ USE_FONTS="$withval"
+fi
+
+WITH_FONTS_bembo='%'
+WITHOUT_FONTS_bembo=
+WITH_FONTS_pfu='%'
+WITHOUT_FONTS_pfu=
+WITH_FONTS_bcr='%'
+WITHOUT_FONTS_bcr=
+if test -z "${USE_FONTS}"; then
+ if test "${LATEX}" = no; then
+ :
+ else
+ OUTPUT=./conftest-$$
+ echo '\nonstopmode\documentclass{article}\usepackage{bembo}\begin{document}\end{document}' > ${OUTPUT}
+ if ${LATEX} ${OUTPUT} </dev/null >& 5 2>&1 ; then
+ if test -z "${USE_FONTS}"; then
+ USE_FONTS="Adobe Bembo"
+ else
+ USE_FONTS="${USE_FONTS}, Adobe Bembo"
+ fi
+ WITH_FONTS_bembo=
+ WITHOUT_FONTS_bembo='%'
+ fi
+ echo '\nonstopmode\documentclass{article}\begin{document}{\fontfamily{pfu}\fontsize{10pt}{10}\selectfont test}\end{document}' > ${OUTPUT}
+ if retval=`${LATEX} ${OUTPUT} </dev/null 2>& 5`; then
+ if echo "$retval" | grep 'Some font shapes were not available' >& 5 2>&1 ; then
+ :
+ else
+ if test -z "${USE_FONTS}"; then
+ USE_FONTS="Adobe Futura"
+ else
+ USE_FONTS="${USE_FONTS}, Adobe Futura"
+ fi
+ WITH_FONTS_pfu=
+ WITHOUT_FONTS_pfu='%'
+ fi
+ fi
+ echo '\nonstopmode\documentclass{article}\begin{document}{\fontfamily{bcr}\fontsize{10pt}{10}\selectfont test}\end{document}' > ${OUTPUT}
+ if retval=`${LATEX} ${OUTPUT} </dev/null 2>& 5`; then
+ if echo "$retval" | grep 'Some font shapes were not available' >& 5 2>&1 ; then
+ :
+ else
+ if test -z "${USE_FONTS}"; then
+ USE_FONTS="Bitstream Courier"
+ else
+ USE_FONTS="${USE_FONTS}, Bitstream Courier"
+ fi
+ WITH_FONTS_bcr=
+ WITHOUT_FONTS_bcr='%'
+ fi
+ fi
+ rm -f ${OUTPUT} ${OUTPUT}.aux ${OUTPUT}.log ${OUTPUT}.dvi
+ fi
+elif test "${USE_FONTS}" = yes ; then
+ WITH_FONTS_bembo=
+ WITHOUT_FONTS_bembo='%'
+ WITH_FONTS_pfu=
+ WITHOUT_FONTS_pfu='%'
+ WITH_FONTS_bcr=
+ WITHOUT_FONTS_bcr='%'
+fi
+
+
+
+
+
+
+if test -z "${USE_FONTS}" ; then
+ USE_FONTS=no
+fi
+USE_FONTS=`echo "${USE_FONTS}" | sed 's/,\([^,]*\)$/ and\1/'`
+echo "$ac_t"""${USE_FONTS}"" 1>&6
+if test "${USE_FONTS}" = yes ; then
+ USE_FONTS='Set in Adobe Bembo, Adobe Futura and Bitstream Courier.'
+elif test "${USE_FONTS}" = no ; then
+ USE_FONTS=''
+else
+ USE_FONTS="Set in ${USE_FONTS}."
+fi
+
+
if test ${EMACS_FLAVOR} = xemacs; then
echo $ac_n "checking where the XEmacs package is""... $ac_c" 1>&6
-echo "configure:1216: checking where the XEmacs package is" >&5
+echo "configure:1347: 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
+ if test "$withval" != yes -a -n "$withval"; then
PACKAGEDIR=$withval
else
(or package-dir \"\"))"
if test -z ""noecho""; then
echo $ac_n "checking for PACKAGEDIR""... $ac_c" 1>&6
-echo "configure:1239: checking for PACKAGEDIR" >&5
+echo "configure:1370: checking for PACKAGEDIR" >&5
fi
if eval "test \"\${EMACS_cv_SYS_PACKAGEDIR+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
(or package-dir \"\"))"
if test -z ""noecho""; then
echo $ac_n "checking for PACKAGEDIR""... $ac_c" 1>&6
-echo "configure:1278: checking for PACKAGEDIR" >&5
+echo "configure:1409: checking for PACKAGEDIR" >&5
fi
if eval "test \"\${EMACS_cv_SYS_PACKAGEDIR+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
fi
- if test x$PACKAGEDIR = x; then
+ if test -z "$PACKAGEDIR"; then
echo "$ac_t""not found" 1>&6
else
echo "$ac_t""$PACKAGEDIR" 1>&6
# 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
+ if test "$withval" != yes -a -n "$withval"; then
echo $ac_n "checking where to find the additional elisp libraries""... $ac_c" 1>&6
-echo "configure:1315: checking where to find the additional elisp libraries" >&5
+echo "configure:1446: checking where to find the additional elisp libraries" >&5
ADDITIONAL_LOAD_PATH=$withval
echo "$ac_t""$ADDITIONAL_LOAD_PATH" 1>&6
fi
ac_given_srcdir=$srcdir
ac_given_INSTALL="$INSTALL"
-trap 'rm -fr `echo "Makefile lisp/Makefile lisp/dgnuspath.el texi/Makefile etc/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile etc/Makefile lisp/Makefile texi/Makefile \
+ texi/gnusconfig.tex texi/ps/Makefile lisp/dgnuspath.el" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <<EOF
s%@URL@%$URL%g
s%@HAVE_w3_forms@%$HAVE_w3_forms%g
s%@W3@%$W3%g
+s%@LATEX@%$LATEX%g
+s%@WITH_FONTS_bembo@%$WITH_FONTS_bembo%g
+s%@WITHOUT_FONTS_bembo@%$WITHOUT_FONTS_bembo%g
+s%@WITH_FONTS_pfu@%$WITH_FONTS_pfu%g
+s%@WITHOUT_FONTS_pfu@%$WITHOUT_FONTS_pfu%g
+s%@WITH_FONTS_bcr@%$WITH_FONTS_bcr%g
+s%@WITHOUT_FONTS_bcr@%$WITHOUT_FONTS_bcr%g
+s%@USE_FONTS@%$USE_FONTS%g
s%@PACKAGEDIR@%$PACKAGEDIR%g
s%@ADDITIONAL_LOAD_PATH@%$ADDITIONAL_LOAD_PATH%g
cat >> $CONFIG_STATUS <<EOF
-CONFIG_FILES=\${CONFIG_FILES-"Makefile lisp/Makefile lisp/dgnuspath.el texi/Makefile etc/Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile etc/Makefile lisp/Makefile texi/Makefile \
+ texi/gnusconfig.tex texi/ps/Makefile lisp/dgnuspath.el"}
EOF
cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
projects / elisp / gnus.git- / blobdiff