[AUCTeX-diffs] Changes to auctex/preview/aclocal.m4

[David Kastrup]

Index: auctex/preview/aclocal.m4
diff -u auctex/preview/aclocal.m4:1.53 auctex/preview/aclocal.m4:1.54
--- auctex/preview/aclocal.m4:1.53      Fri Apr  8 02:42:55 2005
+++ auctex/preview/aclocal.m4   Mon Apr 11 09:01:32 2005
@@ -192,14 +192,22 @@
 
 AC_DEFUN(TEX_PATH_TEXMFDIR,
  [
-AC_ARG_WITH(texmf-dir,[  --with-texmf-dir=DIR    TEXMF tree to install into],
+AC_ARG_WITH(texmf-dir,
+[  --with-texmf-dir=DIR    TEXMF tree to install into,
+                         or --without-texmf-dir for runtime config],
  [ texmfdir="${withval}" ;
-   AC_FULL_EXPAND(withval)
-   if test ! -d "${withval}"  ; then
-      AC_MSG_ERROR([--with-texmf-dir="${texmfdir}": Directory does not exist])
+   if test "x${texmfdir}" = xno
+   then
+     previewtexmfdir="${packagedatadir}/latex"
+     previewdocdir="${packagedatadir}/doc"
+   else
+     AC_FULL_EXPAND(withval)
+     if test ! -d "${withval}"  ; then
+        AC_MSG_ERROR([--with-texmf-dir="${texmfdir}": Directory does not 
exist])
+     fi
+     previewtexmfdir="${texmfdir}/tex/latex/preview"
+     previewdocdir="${texmfdir}/doc/latex/styles"
    fi
-   previewtexmfdir='${texmfdir}/tex/latex/preview'
-   previewdocdir='${texmfdir}/doc/latex/styles'
    ])
 
 AC_ARG_WITH(tex-dir,
@@ -233,7 +241,8 @@
 # hierarchy"  Install in preview subdirectory.
 # c) anything absolute.  Install both files directly there.
 
-if test -z "${previewtexmfdir}" -o "${previewtexmfdir}" = no  ; then
+if test "x${texmfdir}" != xno ; then
+if test "x${previewtexmfdir}" = x ; then
 
 AC_MSG_CHECKING([for prefix from kpsepath])
 
@@ -260,8 +269,8 @@
     [[pathoutput]],[["${pathoutput}"]])
 
 if test -n "${texmfdir}" -a "${texmfdir}" != "NONE" ; then
-   previewdocdir='${texmfdir}/doc/latex/styles'
-   previewtexmfdir='${texmfdir}/tex/latex/preview'
+   previewdocdir="${texmfdir}/doc/latex/styles"
+   previewtexmfdir="${texmfdir}/tex/latex/preview"
 fi
 
 if test -z "${previewtexmfdir}" -o "${previewtexmfdir}" = no  ; then
@@ -281,8 +290,8 @@
     [[pathoutput]],[["${pathoutput}"]])
 
 if test -n "${texmfdir}" -a "${texmfdir}" != "NONE" ; then
-   previewtexmfdir='${texmfdir}/preview'
-   previewdocdir='${texmfdir}/preview'
+   previewtexmfdir="${texmfdir}/preview"
+   previewdocdir="${texmfdir}/preview"
 fi
 fi
 
@@ -303,9 +312,8 @@
     [[pathoutput]],[["${pathoutput}"]])
 
 if test -n "${texmfdir}" -a "${texmfdir}" != "NONE" ; then
-   previewtexmfdir='${texmfdir}'
-   previewdocdir='${texmfdir}'
-fi
+   previewtexmfdir="${texmfdir}"
+   previewdocdir="${texmfdir}"
 fi
 fi
 fi
@@ -318,6 +326,8 @@
 fi
 
 AC_MSG_RESULT(${texmfdir})
+fi
+fi
 
 echo Preview will be placed in ${previewtexmfdir}
 echo Preview docs will be placed in ${previewdocdir}
@@ -569,7 +579,7 @@
         path
     \`(expand-file-name
        ,(file-relative-name path (file-name-directory startup))
-       load-file-name))))]],-no-site-file,[[path lispdir startup]],
+       (file-name-directory load-file-name)))))]],-no-site-file,[[path lispdir 
startup]],
   [["${tmpdir}" "${explispdir}" "${expstartup}"]])
    AC_SUBST([lisp$1])
    AC_SUBST([$1])])