X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=aclocal.m4;h=356692666f4ba9c649667d8f96a8bdfab24aac56;hb=ab6b58ba032f3baaf4c78e63be9e39e9d8de5e62;hp=4e4e435bd6dd5db293c1af17bd863a8dd026b2b6;hpb=4a9268a5cbbcc7c74fc6fa94d7a3409cda1d6dbf;p=elisp%2Fgnus.git- diff --git a/aclocal.m4 b/aclocal.m4 index 4e4e435..3566926 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -84,9 +84,10 @@ 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= @@ -94,7 +95,7 @@ AC_DEFUN(AC_PATH_LISPDIR, [ 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 @@ -112,7 +113,7 @@ AC_DEFUN(AC_PATH_ETCDIR, [ if test "$EMACS_FLAVOR" = "xemacs"; then etcdir="\$(lispdir)/../../etc" else - etcdir="\$(lispdir)/../etc" + etcdir="\$(lispdir)/../../etc" fi fi AC_MSG_RESULT($etcdir) @@ -141,6 +142,26 @@ AC_DEFUN(AC_PATH_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 '-' dnl @@ -300,3 +321,7 @@ else fi AC_SUBST(USE_FONTS) ]) + +ifelse(dnl Do not change this comment + arch-tag: 5c987641-c3ef-4f12-b067-028302282c66 +)dnl