/[auctex]/auctex/preview/aclocal.m4
ViewVC logotype

Diff of /auctex/preview/aclocal.m4

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

revision 1.58 by dak, Wed Apr 27 19:16:39 2005 UTC revision 1.59 by dak, Thu Apr 28 05:10:24 2005 UTC
# Line 557  AC_DEFUN(AUCTEX_AUTO_DIR, Line 557  AC_DEFUN(AUCTEX_AUTO_DIR,
557   AC_ARG_WITH(auto-dir,   AC_ARG_WITH(auto-dir,
558               [  --with-auto-dir=DIR     directory containing AUCTeX automatically generated               [  --with-auto-dir=DIR     directory containing AUCTeX automatically generated
559                            global style hooks],                            global style hooks],
560               [autodir="${withval}"               [autodir="${withval}"],
561                autodir_expanded="${autodir}"               [autodir='${localstatedir}/auctex'])
562                AC_FULL_EXPAND(autodir_expanded)],   AC_MSG_RESULT([${autodir}])
              [autodir='${localstatedir}/auctex'  
               autodir_expanded="${autodir}"  
               AC_FULL_EXPAND(autodir_expanded)  
 ])  
  AC_MSG_RESULT([${autodir}, expanded to ${autodir_expanded}])  
563   AC_SUBST(autodir)   AC_SUBST(autodir)
  AC_SUBST(autodir_expanded)  
564  ])  ])
565    
566  # AC_LISPIFY_DIR  # AC_LISPIFY_DIR
# Line 576  AC_DEFUN(AUCTEX_AUTO_DIR, Line 570  AC_DEFUN(AUCTEX_AUTO_DIR,
570  # relative to lispdir, and the lispification uses relative file names  # relative to lispdir, and the lispification uses relative file names
571  # in relation to the second argument if the target dir is in the  # in relation to the second argument if the target dir is in the
572  # lispdir hierarchy.  # lispdir hierarchy.
573    # Second argument is a path to be resolved relatively to the filename
574    # in the third argument.
575    # If a third argument is given, it specifies a path specification
576    # to be expanded relative to the resulting directory.
577  AC_DEFUN(AC_LISPIFY_DIR,[  AC_DEFUN(AC_LISPIFY_DIR,[
578   tmpdir="[$]{$1}"   tmpdir="[$]{$1}"
579   AC_FULL_EXPAND(tmpdir)   AC_FULL_EXPAND(tmpdir)
# Line 584  AC_DEFUN(AC_LISPIFY_DIR,[ Line 582  AC_DEFUN(AC_LISPIFY_DIR,[
582   expstartup=$2   expstartup=$2
583   AC_FULL_EXPAND(expstartup)   AC_FULL_EXPAND(expstartup)
584  EMACS_LISP([lisp$1],[[(progn (setq path (directory-file-name path))  EMACS_LISP([lisp$1],[[(progn (setq path (directory-file-name path))
585    (unless (string= (car load-path) (directory-file-name (car load-path)))    (if (or target
586              (not (string= (car load-path) (directory-file-name (car load-path)))))
587      (setq path (file-name-as-directory path)))      (setq path (file-name-as-directory path)))
588    (setq path (expand-file-name path lispdir))    (setq path (expand-file-name path lispdir))
589    (setq startup (expand-file-name startup lispdir))    (setq startupdir (file-name-directory (expand-file-name startup lispdir)))
590    (prin1-to-string    (prin1-to-string
591      (if (or (string-match \"\\\\\`\\\\.\\\\.\"      (if (or (string-match \"\\\\\`\\\\.\\\\.\"
592                (setq relname (file-relative-name startup lispdir)))                (setq relname (file-relative-name startupdir lispdir)))
593              (file-name-absolute-p relname)              (file-name-absolute-p relname)
594              (string-match \"\\\\\`\\\\.\\\\.\"              (string-match \"\\\\\`\\\\.\\\\.\"
595                (setq relname (file-relative-name path lispdir)))                (setq relname (file-relative-name path lispdir)))
596              (file-name-absolute-p relname))              (file-name-absolute-p relname))
597           path            (concat path target)
598      \`(expand-file-name          (cond (target
599         ,(file-relative-name path (file-name-directory startup))                 \`(expand-file-name
600         (file-name-directory load-file-name)))))]],-no-site-file,[[path lispdir startup]],                     ,(file-relative-name (concat path target) startupdir)
601    [["${tmpdir}" "${explispdir}" "${expstartup}"]])                     (file-name-directory load-file-name)))
602                  ((string= path startupdir)
603                     '(file-name-directory load-file-name))
604                  ((string= path (directory-file-name startupdir))
605                     '(directory-file-name (file-name-directory load-file-name)))
606                  (t
607                   \`(expand-file-name
608                       ,(file-relative-name path startupdir)
609                       (file-name-directory load-file-name)))))))]],
610           -no-site-file,[[path lispdir startup target]],
611      [["${tmpdir}" "${explispdir}" "${expstartup}" $3]])
612     AC_SUBST([lisp$1])     AC_SUBST([lisp$1])
613     AC_SUBST([$1])])     AC_SUBST([$1])])

Legend:
Removed from v.1.58  
changed lines
  Added in v.1.59

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