/[auctex]/auctex/preview/configure.in
ViewVC logotype

Diff of /auctex/preview/configure.in

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.78 by angeli, Tue Apr 5 10:56:18 2005 UTC revision 1.79 by dak, Fri Apr 8 02:42:55 2005 UTC
# Line 39  fi Line 39  fi
39  if test "${packagedir}" = no  if test "${packagedir}" = no
40  then  then
41     EMACS_PATH_LISPDIR([preview-latex])     EMACS_PATH_LISPDIR([preview-latex])
42     packagelispdir=preview     AC_MSG_CHECKING(What file to use for preview startup)
43     icondir='${packagelispdir}'/images     AC_ARG_WITH(previewstartfile,
44       [[  --with-preview-startfile=FILE    What file to use for preview startup.]],
45       [[ previewstartfile="${withval}" ]],
46       [ _tmpdir_="${lispdir}"
47         AC_FULL_EXPAND(_tmpdir_)
48         if test -d "${_tmpdir_}/site-start.d"
49         then
50           previewstartfile='${lispdir}/site-start.d/preview-latex.el'
51         else
52           previewstartfile='${lispdir}/preview-latex.el'
53         fi])
54       AC_MSG_RESULT([[${previewstartfile}]])
55       packagelispdir='${lispdir}/preview'
56       icondir="${packagelispdir}/images"
57  else  else
58     lispdir="${packagedir}/lisp/preview"     #lispdir is only used for determining relative files.
59     packagelispdir=.     lispdir="${packagedir}"
60     icondir='${packagelispdir}'/../../etc/preview     packagelispdir="${packagedir}/lisp/preview"
61       previewstartfile="${packagelispdir}"/auto-autoloads.el
62       icondir="${packagedir}/etc/preview"
63     infodir="${packagedir}/info"     infodir="${packagedir}/info"
64  fi  fi
65    
66  AC_MSG_CHECKING([[  AC_SUBST(previewstartfile)
 The place for the startup file]])  
 AC_MSG_RESULT([[${lispdir}  
   
 Startup file relative directories:]])  
67    
68  AC_MSG_CHECKING([where the package lisp files go])  AC_MSG_CHECKING([where the package lisp files go])
69  AC_ARG_WITH(packagelispdir,  AC_ARG_WITH(packagelispdir,
70  [[  --with-packagelispdir=DIR  [[  --with-packagelispdir=DIR
71                            Where to find the package lisp files                          Directory for the package lisp files.]],
                           relative to the Lisp startup file.]],  
72    [packagelispdir=["${withval}"]])    [packagelispdir=["${withval}"]])
73  AC_LISPIFY_DIR(packagelispdir)  AC_LISPIFY_DIR(packagelispdir,"${previewstartfile}")
74  AC_MSG_RESULT([[${packagelispdir}]])  AC_MSG_RESULT([[${packagelispdir}]])
75    
76  AC_MSG_CHECKING([where the icon files go])  AC_MSG_CHECKING([where the icon files go])
77  AC_ARG_WITH(icondir,  AC_ARG_WITH(icondir,
78  [[  --with-icon=DIR         Where the icon files go  [[  --with-icondir=DIR         Where the icon files go.]],
79                            relative to the Lisp startup file.]],    [icondir=["${withval}"]])
80    [icon=["${withval}"]])  AC_LISPIFY_DIR(icondir,"${previewstartfile}")
81  AC_LISPIFY_DIR(icondir)  AC_MSG_RESULT([[${icondir}]])
 AC_MSG_RESULT([[${icondir}  
 ]])  
   
 AC_MAKE_FILENAME_ABSOLUTE(packagelispdir,[["${lispdir}/"]])  
 AC_MAKE_FILENAME_ABSOLUTE(icondir,[["${lispdir}/"]])  
82    
83  AC_MSG_CHECKING(Where the info files go)  AC_MSG_CHECKING(Where the info files go)
84  AC_MSG_RESULT([[${infodir}]])  AC_MSG_RESULT([[${infodir}]])
# Line 132  AC_PATH_PROG(INSTALL_INFO, install-info, Line 137  AC_PATH_PROG(INSTALL_INFO, install-info,
137  AC_MSG_CHECKING([[for glaring installation conflicts]])  AC_MSG_CHECKING([[for glaring installation conflicts]])
138  exppackagelispdir="$packagelispdir"  exppackagelispdir="$packagelispdir"
139  AC_FULL_EXPAND(exppackagelispdir)  AC_FULL_EXPAND(exppackagelispdir)
140  explispdir="$lispdir"  exppreviewstartfile="$previewstartfile"
141  AC_FULL_EXPAND(explispdir)  AC_FULL_EXPAND(exppreviewstartfile)
142    
143  EMACS_LISP(shadows,[[  EMACS_LISP(shadows,[[
144    (concat    (concat
# Line 145  EMACS_LISP(shadows,[[ Line 150  EMACS_LISP(shadows,[[
150                   (file-name-directory tmp)))                   (file-name-directory tmp)))
151      (and (setq tmp (locate-library \"preview-latex.el\"))      (and (setq tmp (locate-library \"preview-latex.el\"))
152           (not (string= (file-truename tmp)           (not (string= (file-truename tmp)
153                         (file-truename (expand-file-name \"preview-latex.el\"                         (file-truename previewstartfile)))
                                       lispdir))))  
154           (format \"Conflicting previous startup file \`%s' found!\n\" tmp)))]],,           (format \"Conflicting previous startup file \`%s' found!\n\" tmp)))]],,
155    [[packagelispdir lispdir]],[["${exppackagelispdir}" "${explispdir}"]])    [[packagelispdir previewstartfile]],[["${exppackagelispdir}" "${exppreviewstartfile}"]])
156  if test "NONE${shadows}" != NONE  if test "NONE${shadows}" != NONE
157  then  then
158    conflictsmsg="Conflicts with previous installations have been detected.    conflictsmsg="Conflicts with previous installations have been detected.
# Line 170  AC_SHELL_QUOTIFY(previewtexmfdir) Line 174  AC_SHELL_QUOTIFY(previewtexmfdir)
174  AC_SHELL_QUOTIFY(previewdocdir)  AC_SHELL_QUOTIFY(previewdocdir)
175  AC_SHELL_QUOTIFY(packagedir)  AC_SHELL_QUOTIFY(packagedir)
176  AC_SHELL_QUOTIFY(packagelispdir)  AC_SHELL_QUOTIFY(packagelispdir)
177    AC_SHELL_QUOTIFY(previewstartfile)
178  AC_SHELL_QUOTIFY(lispdir)  AC_SHELL_QUOTIFY(lispdir)
179  AC_SHELL_QUOTIFY(icondir)  AC_SHELL_QUOTIFY(icondir)
180  AC_SHELL_QUOTIFY(infodir)  AC_SHELL_QUOTIFY(infodir)

Legend:
Removed from v.1.78  
changed lines
  Added in v.1.79

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26