X-Git-Url: https://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=aclocal.m4;h=4773670807b59abfef54361d284765cee697eb94;hp=f68b844250c16b7c6151f92db5f8b5cde8a706fe;hb=93906adb3a970070dc32dafa885cdf9171ff5742;hpb=a55bea9d736ce6c07dbb9ab8f4803fb78412226a diff --git a/aclocal.m4 b/aclocal.m4 index f68b84425..477367080 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -84,17 +84,19 @@ AC_DEFUN(AC_PATH_LISPDIR, [ theprefix=$ac_default_prefix fi if test "$EMACS_FLAVOR" = "xemacs"; then + datadir="\$(prefix)/lib" lispdir="\$(datadir)/${EMACS_FLAVOR}/site-packages/lisp/gnus" else - lispdir="\$(datadir)/${EMACS_FLAVOR}/site-lisp" + lispdir="\$(datadir)/${EMACS_FLAVOR}/site-lisp/gnus" fi for thedir in share lib; do potential= - if test -d ${theprefix}/${thedir}/${EMACS_FLAVOR}/site-lisp; then + dnl The directory name should be quoted because it might contain spaces. + if test -d "${theprefix}/${thedir}/${EMACS_FLAVOR}/site-lisp"; then if test "$EMACS_FLAVOR" = "xemacs"; then lispdir="\$(prefix)/${thedir}/${EMACS_FLAVOR}/site-packages/lisp/gnus" else - lispdir="\$(datadir)/${EMACS_FLAVOR}/site-lisp" + lispdir="\$(datadir)/${EMACS_FLAVOR}/site-lisp/gnus" fi break fi @@ -108,17 +110,58 @@ AC_DEFUN(AC_PATH_ETCDIR, [ AC_ARG_WITH(etcdir,[ --with-etcdir=DIR Where to install etc files], etcdir=${withval}) AC_MSG_CHECKING([where etc files should go]) if test -z "$etcdir"; then - dnl Set default value + dnl Set default value. if test "$EMACS_FLAVOR" = "xemacs"; then - etcdir="\$(lispdir)/../etc/gnus" + etcdir="\$(lispdir)/../../etc" else - etcdir="\$(lispdir)/../etc" + etcdir="\$(lispdir)/../../etc" fi fi AC_MSG_RESULT($etcdir) AC_SUBST(etcdir) ]) +dnl +dnl This is a bit on the "evil hack" side of things. It is so we can +dnl have a different default infodir for XEmacs. A user can still specify +dnl someplace else with '--infodir=DIR'. +dnl +AC_DEFUN(AC_PATH_INFO_DIR, [ + AC_MSG_CHECKING([where the TeXinfo docs should go]) + dnl Set default value. This must be an absolute path. + if test "$infodir" = "\${prefix}/info"; then + if test "$EMACS_FLAVOR" = "xemacs"; then + info_dir="\$(prefix)/${thedir}/${EMACS_FLAVOR}/site-packages/info" + else + info_dir="\$(prefix)/info" + fi + else + info_dir=$infodir + fi + AC_MSG_RESULT($info_dir) + AC_SUBST(info_dir) +]) + +dnl +dnl This will set the XEmacs command line options to be slightly different +dnl from the Emacs ones. If building with XEmacs the options will be +dnl "-batch -no-autoloads..." to give a much cleaner build environment. +dnl +AC_DEFUN(AC_SET_BUILD_FLAGS, [ + AC_MSG_CHECKING([which options to pass on to (X)Emacs]) + if test "x$FLAGS" = "x"; then + if test "$EMACS_FLAVOR" = "xemacs"; then + FLAGS="-batch -no-autoloads -l \$(srcdir)/dgnushack.el" + else + FLAGS="-batch -q -no-site-file -l \$(srcdir)/dgnushack.el" + fi + else + FLAGS=$FLAGS + fi + AC_MSG_RESULT($FLAGS) + AC_SUBST(FLAGS) +]) + dnl dnl Check whether a function exists in a library dnl All '_' characters in the first argument are converted to '-'