dnl Apparently, if you run a shell window in Emacs, it sets the EMACS
dnl environment variable to 't'. Lets undo the damage.
- test x$EMACS = xt && EMACS=
+ test "$EMACS" = t && EMACS=
dnl Ignore cache.
unset ac_cv_prog_EMACS; unset ac_cv_prog_XEMACS;
AC_ARG_WITH(emacs,
[ --with-emacs=EMACS compile with EMACS [EMACS=emacs, mule...]],
- [if test x$withval = xyes -o x$withval = x; then
+ [if test "$withval" = yes -o -z "$withval"; then
AC_CHECK_PROGS(EMACS, emacs xemacs mule, emacs)
else
AC_CHECK_PROG(EMACS, $withval, $withval, emacs)
fi])
AC_ARG_WITH(xemacs,
[ --with-xemacs=XEMACS compile with XEMACS [XEMACS=xemacs]],
- [if test x$withval = xyes -o x$withval = x; then
+ [if test "$withval" = yes -o -z "$withval"; then
AC_CHECK_PROG(XEMACS, xemacs, xemacs, xemacs)
else
AC_CHECK_PROG(XEMACS, $withval, $withval, xemacs)
fi
EMACS=$XEMACS],
[XEMACS=xemacs
- test x$EMACS = x &&\
- AC_CHECK_PROGS(EMACS, emacs xemacs mule, emacs)])
+ test -z "$EMACS" && AC_CHECK_PROGS(EMACS, emacs xemacs mule, emacs)])
AC_SUBST(EMACS)
AC_SUBST(XEMACS)])
AC_DEFUN(AC_PATH_LISPDIR, [
AC_CHECK_EMACS_FLAVOR
- if test "$prefix" = "NONE"; then
+ if test "$prefix" = NONE; then
AC_MSG_CHECKING([prefix for your Emacs])
AC_EMACS_LISP(prefix,(expand-file-name \"..\" invocation-directory),"noecho")
prefix=${EMACS_cv_SYS_prefix}
if test -z "$lispdir"; then
dnl Set default value
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
library=`echo $1 | tr _ -`
AC_EMACS_LISP($1,(progn (fmakunbound (quote $2)) (condition-case nil (progn (require (quote $library)) (fboundp (quote $2))) (error (prog1 nil (message \"$library not found\"))))),"noecho")
-if test "${EMACS_cv_SYS_$1}" = "nil"; then
+if test "${EMACS_cv_SYS_$1}" = nil; then
EMACS_cv_SYS_$1=no
fi
-if test "${EMACS_cv_SYS_$1}" = "t"; then
+if test "${EMACS_cv_SYS_$1}" = t; then
EMACS_cv_SYS_$1=yes
fi
HAVE_$1=${EMACS_cv_SYS_$1}
AC_CACHE_VAL(EMACS_cv_ACCEPTABLE_W3,[
AC_EMACS_CHECK_LIB(w3_forms, w3-form-encode-xwfu,"noecho")
-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
AC_EMACS_LISP(w3_dir,(file-name-directory (locate-library \"w3-forms\")),"noecho")
EMACS_cv_ACCEPTABLE_W3=$EMACS_cv_SYS_w3_dir
fi
AC_ARG_WITH(w3,[ --with-w3=DIR Specify where to find the w3 package], [ EMACS_cv_ACCEPTABLE_W3=`( cd $withval && pwd || echo "$withval" ) 2> /dev/null` ])
W3=${EMACS_cv_ACCEPTABLE_W3}
AC_SUBST(W3)
- if test "x${EMACS_cv_ACCEPTABLE_W3}" = "x"; then
+ if test -z "${EMACS_cv_ACCEPTABLE_W3}"; then
AC_MSG_RESULT(not found)
else
AC_MSG_RESULT(${W3})
AC_CACHE_VAL(EMACS_cv_ACCEPTABLE_URL,[
AC_EMACS_CHECK_LIB(url, url-retrieve, "noecho")
-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
AC_EMACS_LISP(url_dir,(file-name-directory (locate-library \"url\")),"noecho")
EMACS_cv_ACCEPTABLE_URL=$EMACS_cv_SYS_url_dir
fi
AC_ARG_WITH(url,[ --with-url=DIR Specify where to find the url package], [ EMACS_cv_ACCEPTABLE_URL=`( cd $withval && pwd || echo "$withval" ) 2> /dev/null` ])
URL=${EMACS_cv_ACCEPTABLE_URL}
AC_SUBST(URL)
- if test "x${EMACS_cv_ACCEPTABLE_URL}" = "x"; then
+ if test -z "${EMACS_cv_ACCEPTABLE_URL}"; then
AC_MSG_RESULT(not found)
else
AC_MSG_RESULT("${URL}")
fi
])
+dnl
+dnl Perform checking available fonts: Adobe Bembo, Adobe Futura and
+dnl Bitstream Courier.
+dnl
+
+AC_DEFUN(GNUS_CHECK_FONTS, [
+test "$LATEX" = t && LATEX=
+test "$LATEX" || AC_PATH_PROGS(LATEX, latex, no)
+AC_MSG_CHECKING(for available fonts)
+AC_ARG_WITH(fonts,[ --with-fonts Assume all fonts required are available],[USE_FONTS="$withval"])
+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 >& AC_FD_CC 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>& AC_FD_CC`; then
+ if echo "$retval" | grep 'Some font shapes were not available' >& AC_FD_CC 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>& AC_FD_CC`; then
+ if echo "$retval" | grep 'Some font shapes were not available' >& AC_FD_CC 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
+AC_SUBST(WITH_FONTS_bembo)
+AC_SUBST(WITHOUT_FONTS_bembo)
+AC_SUBST(WITH_FONTS_pfu)
+AC_SUBST(WITHOUT_FONTS_pfu)
+AC_SUBST(WITH_FONTS_bcr)
+AC_SUBST(WITHOUT_FONTS_bcr)
+if test -z "${USE_FONTS}" ; then
+ USE_FONTS=no
+fi
+USE_FONTS=`echo "${USE_FONTS}" | sed 's/,\([[^,]]*\)$/ and\1/'`
+AC_MSG_RESULT("${USE_FONTS}")
+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
+AC_SUBST(USE_FONTS)
+])
+
AC_DEFUN(AC_EXAMINE_PACKAGEDIR,
[dnl Examine PACKAGEDIR.
AC_EMACS_LISP(PACKAGEDIR,
AC_MSG_CHECKING([where the XEmacs package is])
AC_ARG_WITH(packagedir,
[ --with-packagedir=DIR package DIR for XEmacs],
- [if test x$withval != xyes -a x$withval != x; then
+ [if test "$withval" != yes -a -n "$withval"; then
PACKAGEDIR=$withval
else
AC_EXAMINE_PACKAGEDIR
fi],
AC_EXAMINE_PACKAGEDIR)
- if test x$PACKAGEDIR = x; then
+ if test -z "$PACKAGEDIR"; then
AC_MSG_RESULT(not found)
else
AC_MSG_RESULT($PACKAGEDIR)
AC_ARG_WITH(addpath,
[ --with-addpath=PATH search Emacs-Lisp libraries with PATH
use colons to separate directory names],
- [if test x$withval != xyes -a x$withval != x; then
+ [if test "$withval" != yes -a -n "$withval"; then
AC_MSG_CHECKING([where to find the additional elisp libraries])
ADDITIONAL_LOAD_PATH=$withval
AC_MSG_RESULT($ADDITIONAL_LOAD_PATH)
projects / elisp / gnus.git- / blobdiff