X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=aclocal.m4;h=9a5da0dd247660a8bdf283f62f72aef06444c87b;hp=4e4e435bd6dd5db293c1af17bd863a8dd026b2b6;hb=0dbf44d1978501350ac563b8d402411e741eb6f7;hpb=419c1e0ea5345be602e8097ffd13b5fcfb7c1809

diff --git a/aclocal.m4 b/aclocal.m4
index 4e4e435bd..9a5da0dd2 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
@@ -112,7 +114,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)
@@ -140,6 +142,26 @@ AC_DEFUN(AC_PATH_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 '-'
@@ -163,54 +185,6 @@ if test -z "$3"; then
 fi
 ])
 
-dnl
-dnl Perform sanity checking and try to locate the W3 package
-dnl
-AC_DEFUN(AC_CHECK_W3, [
-AC_MSG_CHECKING(for acceptable W3 version)
-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
-	EMACS_cv_ACCEPTABLE_W3=yes
-else
-	EMACS_cv_ACCEPTABLE_W3=no
-fi
-
-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)
-   AC_MSG_RESULT("${W3}")
-])
-
-dnl
-dnl Perform sanity checking and try to locate the W3 package
-dnl
-AC_DEFUN(AC_CHECK_URL, [
-AC_MSG_CHECKING(for acceptable URL version)
-AC_CACHE_VAL(EMACS_cv_ACCEPTABLE_URL,[
-AC_EMACS_CHECK_LIB(url, url-retrieve, "noecho")
-if test "${HAVE_url}" = "yes"; then
-	EMACS_cv_ACCEPTABLE_URL=yes
-else
-	EMACS_cv_ACCEPTABLE_URL=no
-fi
-
-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)
-   AC_MSG_RESULT("${URL}")
-])
-
 dnl
 dnl Perform checking available fonts: Adobe Bembo, Adobe Futura and 
 dnl Bitstream Courier.