2002-02-22 Steve Youngs <youngs@xemacs.org>

[gnus] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 0996cb0..f68b844 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -5,7 +5,7 @@ AC_DEFUN(AM_PATH_LISPDIR,
   # If you have an Emacs named "t", then use the full path.
   test "$EMACS" = t && EMACS=
   test "$EMACS" || AC_PATH_PROGS(EMACS, emacs xemacs, no)
-  if test $EMACS != "no"; then
+  if test "$EMACS" != "no"; then
     AC_MSG_CHECKING([where .elc files should go])
     dnl Set default value
     lispdir="\$(datadir)/emacs/site-lisp"
@@ -83,11 +83,19 @@ AC_DEFUN(AC_PATH_LISPDIR, [
     if test "x$theprefix" = "xNONE"; then
        theprefix=$ac_default_prefix
     fi
+    if test "$EMACS_FLAVOR" = "xemacs"; then
+        lispdir="\$(datadir)/${EMACS_FLAVOR}/site-packages/lisp/gnus"
+    else
     lispdir="\$(datadir)/${EMACS_FLAVOR}/site-lisp"
+    fi
     for thedir in share lib; do
        potential=
        if test -d ${theprefix}/${thedir}/${EMACS_FLAVOR}/site-lisp; then
-          lispdir="\$(prefix)/${thedir}/${EMACS_FLAVOR}/site-lisp"
+           if test "$EMACS_FLAVOR" = "xemacs"; then
+              lispdir="\$(prefix)/${thedir}/${EMACS_FLAVOR}/site-packages/lisp/gnus"
+           else
+               lispdir="\$(datadir)/${EMACS_FLAVOR}/site-lisp"
+           fi
           break
        fi
     done
@@ -101,7 +109,11 @@ AC_DEFUN(AC_PATH_ETCDIR, [
   AC_MSG_CHECKING([where etc files should go])
   if test -z "$etcdir"; then
     dnl Set default value
+    if test "$EMACS_FLAVOR" = "xemacs"; then
+      etcdir="\$(lispdir)/../etc/gnus"
+    else
     etcdir="\$(lispdir)/../etc"
+    fi
   fi
   AC_MSG_RESULT($etcdir)
   AC_SUBST(etcdir)
@@ -179,21 +191,24 @@ fi
 ])
 
 dnl
-dnl Perform checking commercial fonts: Adobe Bembo and Adobe Futura
+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 commercial fonts)
-AC_ARG_WITH(fonts,[  --with-fonts            Use commercial fonts],[USE_FONTS="$withval"])
+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
-    WITH_FONTS_bembo='%'
-    WITHOUT_FONTS_bembo=
-    WITH_FONTS_pfu='%'
-    WITHOUT_FONTS_pfu=
-    WITH_FONTS_bcr='%'
-    WITHOUT_FONTS_bcr=
+       :
   else
     OUTPUT=./conftest-$$
     echo '\nonstopmode\documentclass{article}\usepackage{bembo}\begin{document}\end{document}' > ${OUTPUT}
@@ -205,54 +220,44 @@ if test -z "${USE_FONTS}"; then
       fi
       WITH_FONTS_bembo=
       WITHOUT_FONTS_bembo='%'
-    else 
-      WITH_FONTS_bembo='%'
-      WITHOUT_FONTS_bembo=
     fi
     echo '\nonstopmode\documentclass{article}\begin{document}{\fontfamily{pfu}\fontsize{10pt}{10}\selectfont test}\end{document}' > ${OUTPUT}
-    if ${LATEX} ${OUTPUT} </dev/null 2>& AC_FD_CC | grep 'Some font shapes were not available' >& AC_FD_CC 2>&1  ; then  
-      WITH_FONTS_pfu='%'
-      WITHOUT_FONTS_pfu=
-    else
-      if test -z "${USE_FONTS}"; then
-       USE_FONTS="Adobe Futura"
+    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
-       USE_FONTS="${USE_FONTS}, Adobe Futura"
+        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
-      WITH_FONTS_pfu=
-      WITHOUT_FONTS_pfu='%'
     fi
     echo '\nonstopmode\documentclass{article}\begin{document}{\fontfamily{bcr}\fontsize{10pt}{10}\selectfont test}\end{document}' > ${OUTPUT}
-    if ${LATEX} ${OUTPUT} </dev/null 2>& AC_FD_CC | grep 'Some font shapes were not available' >& AC_FD_CC 2>&1  ; then  
-      WITH_FONTS_bcr='%'
-      WITHOUT_FONTS_bcr=
-    else
-      if test -z "${USE_FONTS}"; then
-       USE_FONTS="Adobe Futura"
+    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
-       USE_FONTS="${USE_FONTS}, Bitstream Courier"
+        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
-      WITH_FONTS_bcr=
-      WITHOUT_FONTS_bcr='%'
     fi
     rm -f ${OUTPUT} ${OUTPUT}.aux ${OUTPUT}.log ${OUTPUT}.dvi
   fi
-else
-  if test "${USE_FONTS}" = yes ; then
-    WITH_FONTS_bembo=
-    WITHOUT_FONTS_bembo='%'
-    WITH_FONTS_pfu=
-    WITHOUT_FONTS_pfu='%'
-    WITH_FONTS_bcr=
-    WITHOUT_FONTS_bcr='%'
-  else
-    WITH_FONTS_bembo='%'
-    WITHOUT_FONTS_bembo=
-    WITH_FONTS_pfu='%'
-    WITHOUT_FONTS_pfu=
-    WITH_FONTS_bcr='%'
-    WITHOUT_FONTS_bcr=
-  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)
@@ -263,7 +268,7 @@ AC_SUBST(WITHOUT_FONTS_bcr)
 if test -z "${USE_FONTS}" ; then
   USE_FONTS=no
 fi
-USE_FONTS=`echo "${USE_FONTS}" | sed 's/,\([^,]*\)$/ and\1/'`
+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.'